Permalink
Browse files

Merge branch 'master' of git://github.com/bjhess/paperclip

  • Loading branch information...
2 parents 567657c + 6696a2b commit f301de524bfa029a23765d9780805b2c809d5b04 @jyurek jyurek committed Oct 24, 2008
Showing with 5 additions and 5 deletions.
  1. +1 −1 lib/paperclip.rb
  2. +4 −4 test/integration_test.rb
View
@@ -130,7 +130,7 @@ module ClassMethods
# of thumbnail being generated. You can also specify :all as a key, which will apply
# to all of the thumbnails being generated. If you specify options for the :original,
# it would be best if you did not specify destructive options, as the intent of keeping
- # the original around is to regenerate all the thumbnails then requirements change.
+ # the original around is to regenerate all the thumbnails when requirements change.
# has_attached_file :avatar, :styles => { :large => "300x300", :negative => "100x100" }
# :convert_options => {
# :all => "-strip",
@@ -91,7 +91,7 @@ class IntegrationTest < Test::Unit::TestCase
end
end
- context "A model with no thumbnail_convert_options setting" do
+ context "A model with no convert_options setting" do
setup do
rebuild_model :styles => { :large => "300x300>",
:medium => "100x100",
@@ -103,22 +103,22 @@ class IntegrationTest < Test::Unit::TestCase
end
should "have its definition return nil when asked about convert_options" do
- assert ! Dummy.attachment_definitions[:avatar][:thumbnail_convert_options]
+ assert ! Dummy.attachment_definitions[:avatar][:convert_options]
end
context "redefined to have convert_options setting" do
setup do
rebuild_model :styles => { :large => "300x300>",
:medium => "100x100",
:thumb => ["32x32#", :gif] },
- :thumbnail_convert_options => "-strip -depth 8",
+ :convert_options => "-strip -depth 8",
:default_style => :medium,
:url => "/:attachment/:class/:style/:id/:basename.:extension",
:path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
end
should "have its definition return convert_options value when asked about convert_options" do
- assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:thumbnail_convert_options]
+ assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
end
end
end

0 comments on commit f301de5

Please sign in to comment.