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
cde22564
Commit
cde22564
authored
Aug 15, 2011
by
Harold Giménez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Handle interpolation of string IDs (supports mongo) as well as integers"
This reverts commit
fe01ae69
.
parent
e3653269
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
13 deletions
+2
-13
lib/paperclip/interpolations.rb
+1
-5
test/interpolations_test.rb
+1
-8
No files found.
lib/paperclip/interpolations.rb
View file @
cde22564
...
@@ -143,11 +143,7 @@ module Paperclip
...
@@ -143,11 +143,7 @@ module Paperclip
# Returns the id of the instance in a split path form. e.g. returns
# Returns the id of the instance in a split path form. e.g. returns
# 000/001/234 for an id of 1234.
# 000/001/234 for an id of 1234.
def
id_partition
attachment
,
style_name
def
id_partition
attachment
,
style_name
if
(
id
=
attachment
.
instance
.
id
).
is_a?
(
Integer
)
(
"%09d"
%
attachment
.
instance
.
id
).
scan
(
/\d{3}/
).
join
(
"/"
)
(
"%09d"
%
id
).
scan
(
/\d{3}/
).
join
(
"/"
)
else
id
.
scan
(
/.{3}/
).
first
(
3
).
join
(
"/"
)
end
end
end
# Returns the pluralized form of the attachment name. e.g.
# Returns the pluralized form of the attachment name. e.g.
...
...
test/interpolations_test.rb
View file @
cde22564
...
@@ -88,20 +88,13 @@ class InterpolationsTest < Test::Unit::TestCase
...
@@ -88,20 +88,13 @@ class InterpolationsTest < Test::Unit::TestCase
assert_equal
23
,
Paperclip
::
Interpolations
.
id
(
attachment
,
:style
)
assert_equal
23
,
Paperclip
::
Interpolations
.
id
(
attachment
,
:style
)
end
end
should
"return the partitioned id of the attachment
when the id is an integer
"
do
should
"return the partitioned id of the attachment"
do
attachment
=
mock
attachment
=
mock
attachment
.
expects
(
:id
).
returns
(
23
)
attachment
.
expects
(
:id
).
returns
(
23
)
attachment
.
expects
(
:instance
).
returns
(
attachment
)
attachment
.
expects
(
:instance
).
returns
(
attachment
)
assert_equal
"000/000/023"
,
Paperclip
::
Interpolations
.
id_partition
(
attachment
,
:style
)
assert_equal
"000/000/023"
,
Paperclip
::
Interpolations
.
id_partition
(
attachment
,
:style
)
end
end
should
"return the partitioned id of the attachment when the id is a string"
do
attachment
=
mock
attachment
.
expects
(
:id
).
returns
(
"32fnj23oio2f"
)
attachment
.
expects
(
:instance
).
returns
(
attachment
)
assert_equal
"32f/nj2/3oi"
,
Paperclip
::
Interpolations
.
id_partition
(
attachment
,
:style
)
end
should
"return the name of the attachment"
do
should
"return the name of the attachment"
do
attachment
=
mock
attachment
=
mock
attachment
.
expects
(
:name
).
returns
(
"file"
)
attachment
.
expects
(
:name
).
returns
(
"file"
)
...
...
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