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
1d775739
Commit
1d775739
authored
Oct 26, 2010
by
Jon Yurek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes a stupid bit of name generation.
parent
8fdf01ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
lib/paperclip/storage/s3.rb
+2
-2
test/storage_test.rb
+5
-0
No files found.
lib/paperclip/storage/s3.rb
View file @
1d775739
...
@@ -127,10 +127,10 @@ module Paperclip
...
@@ -127,10 +127,10 @@ module Paperclip
# style, in the format most representative of the current storage.
# style, in the format most representative of the current storage.
def
to_file
style
=
default_style
def
to_file
style
=
default_style
return
@queued_for_write
[
style
]
if
@queued_for_write
[
style
]
return
@queued_for_write
[
style
]
if
@queued_for_write
[
style
]
filename
=
path
(
style
)
.
split
(
"."
)
filename
=
path
(
style
)
extname
=
File
.
extname
(
filename
)
extname
=
File
.
extname
(
filename
)
basename
=
File
.
basename
(
filename
,
extname
)
basename
=
File
.
basename
(
filename
,
extname
)
file
=
Tempfile
.
new
(
basename
,
extname
)
file
=
Tempfile
.
new
(
[
basename
,
extname
]
)
file
.
write
(
AWS
::
S3
::
S3Object
.
value
(
path
(
style
),
bucket_name
))
file
.
write
(
AWS
::
S3
::
S3Object
.
value
(
path
(
style
),
bucket_name
))
file
.
rewind
file
.
rewind
return
file
return
file
...
...
test/storage_test.rb
View file @
1d775739
...
@@ -351,6 +351,11 @@ class StorageTest < Test::Unit::TestCase
...
@@ -351,6 +351,11 @@ class StorageTest < Test::Unit::TestCase
should
"be on S3"
do
should
"be on S3"
do
assert
true
assert
true
end
end
should
"generate a tempfile with the right name"
do
file
=
@dummy
.
avatar
.
to_file
assert_match
/^original.*\.png$/
,
File
.
basename
(
file
.
path
)
end
end
end
end
end
end
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