Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
06a5d776
Commit
06a5d776
authored
Dec 23, 2008
by
Jon Yurek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting tweaks
parent
dfb603d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
lib/paperclip/storage.rb
+1
-1
test/storage_test.rb
+4
-1
No files found.
lib/paperclip/storage.rb
View file @
06a5d776
...
...
@@ -114,7 +114,7 @@ module Paperclip
@s3_options
=
@options
[
:s3_options
]
||
{}
@s3_permissions
=
@options
[
:s3_permissions
]
||
'public-read'
@s3_protocol
=
@options
[
:s3_protocol
]
||
(
@s3_permissions
==
'public-read'
?
'http'
:
'https'
)
@s3_headers
=
@options
[
:s3_headers
]
||
{}
@s3_headers
=
@options
[
:s3_headers
]
||
{}
@url
=
":s3_path_url"
unless
@url
.
to_s
.
match
(
/^:s3.*url$/
)
end
base
.
class
.
interpolations
[
:s3_path_url
]
=
lambda
do
|
attachment
,
style
|
...
...
test/storage_test.rb
View file @
06a5d776
...
...
@@ -153,7 +153,10 @@ class StorageTest < Test::Unit::TestCase
@key_mock
=
stub
@bucket_mock
.
expects
(
:key
).
returns
(
@key_mock
)
@key_mock
.
expects
(
:data
=
)
@key_mock
.
expects
(
:put
).
with
(
nil
,
'public-read'
,
'Content-type'
=>
'image/png'
,
'Cache-Control'
=>
'max-age=31557600'
)
@key_mock
.
expects
(
:put
).
with
(
nil
,
'public-read'
,
'Content-type'
=>
'image/png'
,
'Cache-Control'
=>
'max-age=31557600'
)
@dummy
.
save
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment