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

lib/paperclip.rb

@@ -130,7 +130,7 @@ module Paperclip
     #   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",

test/integration_test.rb

@@ -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,7 +103,7 @@ 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
@@ -111,14 +111,14 @@ class IntegrationTest < Test::Unit::TestCase
         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