paperclip 2.4.2 → 2.4.3

data/lib/paperclip/style.rb

@@ -32,12 +32,12 @@ module Paperclip
     # by default we behave as before, though.
     # if a proc has been supplied, we call it here
     def processors
-      @processors.respond_to?(:call) ? @processors.call(attachment.instance) : (@processors || attachment.processors)
+      @processors.respond_to?(:call) ? @processors.call(attachment.instance) : (@processors || attachment.options.processors)
     end
 
     # retrieves from the attachment the whiny setting
     def whiny
-      attachment.whiny
+      attachment.options.whiny
     end
 
     # returns true if we're inclined to grumble
@@ -74,7 +74,7 @@ module Paperclip
     end
 
     # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
-    # eg. @attachment.styles[:large][:geometry]@ will still work
+    # eg. @attachment.options.styles[:large][:geometry]@ will still work
     def [](key)
       if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated, :source_file_options].include?(key)
         send(key)

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.4.2" unless defined? Paperclip::VERSION
+  VERSION = "2.4.3" unless defined? Paperclip::VERSION
 end

data/test/attachment_test.rb

@@ -85,7 +85,7 @@ class AttachmentTest < Test::Unit::TestCase
       Paperclip::Attachment.default_options.keys.each do |key|
         should "be the default_options for #{key}" do
           assert_equal @old_default_options[key],
-                       @attachment.instance_variable_get("@#{key}"),
+                       @attachment.options.send(key),
                        key
         end
       end
@@ -100,24 +100,11 @@ class AttachmentTest < Test::Unit::TestCase
         Paperclip::Attachment.default_options.keys.each do |key|
           should "be the new default_options for #{key}" do
             assert_equal @new_default_options[key],
-                         @attachment.instance_variable_get("@#{key}"),
+                         @attachment.options.send(key),
                          key
           end
         end
       end
-
-      context "with nested hash default" do
-        setup do
-          @nested_hash = {:thumb => {:first => "second" }}
-          Paperclip::Attachment.default_options[:styles] = @nested_hash
-          @dummy = Dummy.new
-          @attachment = @dummy.avatar
-        end
-
-        should "correctly clone the nested hash" do
-          assert_equal(@nested_hash, @attachment.instance_variable_get(:@styles))
-        end
-      end
     end
   end
 
@@ -197,12 +184,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "interpolate the hash data" do
-        @attachment.expects(:interpolate).with(@attachment.options[:hash_data],anything).returns("interpolated_stuff")
+        @attachment.expects(:interpolate).with(@attachment.options.hash_data,anything).returns("interpolated_stuff")
         @attachment.hash
       end
 
       should "result in the correct interpolation" do
-        assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options[:hash_data])
+        assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options.hash_data)
       end
 
       should "result in a correct hash" do
@@ -285,7 +272,7 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "report the correct options when sent #extra_source_file_options_for(:thumb)" do
-      assert_equal "-depth 8 -density 400", @dummy.avatar.send(:extra_source_file_options_for, :thumb), @dummy.avatar.source_file_options.inspect
+      assert_equal "-depth 8 -density 400", @dummy.avatar.send(:extra_source_file_options_for, :thumb), @dummy.avatar.options.source_file_options.inspect
     end
 
     should "report the correct options when sent #extra_source_file_options_for(:large)" do
@@ -367,7 +354,7 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "have the correct geometry" do
-      assert_equal "50x50#", @attachment.styles[:thumb][:geometry]
+      assert_equal "50x50#", @attachment.options.styles[:thumb][:geometry]
     end
   end
   
@@ -379,13 +366,13 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "have the correct styles for the assigned instance values" do
-      assert_equal "50x50#", @dummy.avatar.styles[:thumb][:geometry]
-      assert_nil @dummy.avatar.styles[:large]
+      assert_equal "50x50#", @dummy.avatar.options.styles[:thumb][:geometry]
+      assert_nil @dummy.avatar.options.styles[:large]
 
       @dummy.other = 'b'
       
-      assert_equal "400x400", @dummy.avatar.styles[:large][:geometry]
-      assert_nil @dummy.avatar.styles[:thumb]
+      assert_equal "400x400", @dummy.avatar.options.styles[:large][:geometry]
+      assert_nil @dummy.avatar.options.styles[:thumb]
     end
   end
 
@@ -429,7 +416,7 @@ class AttachmentTest < Test::Unit::TestCase
         end
 
         should "have the correct geometry" do
-          assert_equal "50x50#", @attachment.styles[:normal][:geometry]
+          assert_equal "50x50#", @attachment.options.styles[:normal][:geometry]
         end
       end
     end
@@ -447,7 +434,7 @@ class AttachmentTest < Test::Unit::TestCase
 
     [:processors, :whiny, :convert_options, :geometry, :format].each do |field|
       should "have the same #{field} field" do
-        assert_equal @attachment.styles[:normal][field], @attachment.styles[:hash][field]
+        assert_equal @attachment.options.styles[:normal][field], @attachment.options.styles[:hash][field]
       end
     end
   end
@@ -468,7 +455,7 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "have the correct processors" do
-        assert_equal [ :test ], @attachment.styles[:normal][:processors]
+        assert_equal [ :test ], @attachment.options.styles[:normal][:processors]
       end
     end
   end
@@ -881,7 +868,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             context "and trying to delete" do
               setup do
-                @existing_names = @attachment.styles.keys.collect do |style|
+                @existing_names = @attachment.options.styles.keys.collect do |style|
                   @attachment.path(style)
                 end
               end
@@ -1121,12 +1108,12 @@ class AttachmentTest < Test::Unit::TestCase
         @dummy.destroy
       end
 
-      assert File.exists?(@path)
+      assert File.exists?(@path), "#{@path} does not exist."
     end
 
     should "be deleted when the model is destroyed" do
       @dummy.destroy
-      assert ! File.exists?(@path)
+      assert ! File.exists?(@path), "#{@path} does not exist."
     end
   end
 

data/test/fog_test.rb

@@ -18,7 +18,7 @@ class FogTest < Test::Unit::TestCase
       end
 
       should "have the proper information loading credentials from a file" do
-        assert_equal @dummy.avatar.instance_variable_get("@fog_credentials")[:provider], 'AWS'
+        assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
     end
 
@@ -34,7 +34,7 @@ class FogTest < Test::Unit::TestCase
       end
 
       should "have the proper information loading credentials from a file" do
-        assert_equal @dummy.avatar.instance_variable_get("@fog_credentials")[:provider], 'AWS'
+        assert_equal @dummy.avatar.fog_credentials[:provider], 'AWS'
       end
     end
 
@@ -61,7 +61,7 @@ class FogTest < Test::Unit::TestCase
         File.stubs(:exist?).returns(true)
         Paperclip::Tempfile.any_instance.expects(:close).at_least_once()
         Paperclip::Tempfile.any_instance.expects(:unlink).at_least_once()
-        
+
         @dummy.save!
       end
     end
@@ -181,7 +181,7 @@ class FogTest < Test::Unit::TestCase
         end
 
         should 'set the @fog_public instance variable to false' do
-          assert_equal false, @dummy.avatar.instance_variable_get('@fog_public')
+          assert_equal false, @dummy.avatar.options.fog_public
         end
       end
 

data/test/geometry_test.rb

@@ -132,7 +132,7 @@ class GeometryTest < Test::Unit::TestCase
 
     should "not generate from a file with no path" do
       file = mock("file", :path => "")
-      file.stubs(:respond_to?).with("path").returns(true)
+      file.stubs(:respond_to?).with(:path).returns(true)
       assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 

data/test/helper.rb

@@ -9,6 +9,7 @@ require 'active_record'
 require 'active_record/version'
 require 'active_support'
 require 'mime/types'
+require 'pry'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 

data/test/options_test.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+require './test/helper'
+
+class MockAttachment < Struct.new(:one, :two)
+  def instance
+    self
+  end
+end
+
+class OptionsTest < Test::Unit::TestCase
+  context "#styles with a plain hash" do
+    setup do
+      @attachment = MockAttachment.new(nil, nil)
+      @options = Paperclip::Options.new(@attachment,
+                                        :styles => {
+                                          :something => ["400x400", :png]
+                                        })
+    end
+
+    should "return the right data for the style's geometry" do
+      assert_equal "400x400", @options.styles[:something][:geometry]
+    end
+
+    should "return the right data for the style's format" do
+      assert_equal :png, @options.styles[:something][:format]
+    end
+  end
+
+  context "#styles is a proc" do
+    setup do
+      @attachment = MockAttachment.new("123x456", :doc)
+      @options = Paperclip::Options.new(@attachment,
+                                        :styles => lambda {|att|
+                                          {:something => {:geometry => att.one, :format => att.two}}
+                                        })
+    end
+
+    should "return the right data for the style's geometry" do
+      assert_equal "123x456", @options.styles[:something][:geometry]
+    end
+
+    should "return the right data for the style's format" do
+      assert_equal :doc, @options.styles[:something][:format]
+    end
+
+    should "run the proc each time, giving dynamic results" do
+      assert_equal :doc, @options.styles[:something][:format]
+      @attachment.two = :pdf
+      assert_equal :pdf, @options.styles[:something][:format]
+    end
+  end
+
+  context "#processors" do
+    setup do
+      @attachment = MockAttachment.new(nil, nil)
+    end
+    should "return processors if not a proc" do
+      @options = Paperclip::Options.new(@attachment, :processors => [:one])
+      assert_equal [:one], @options.processors
+    end
+    should "return processors if it is a proc" do
+      @options = Paperclip::Options.new(@attachment, :processors => lambda{|att| [att.one]})
+      assert_equal [nil], @options.processors
+      @attachment.one = :other
+      assert_equal [:other], @options.processors
+    end
+  end
+end

data/test/paperclip_missing_attachment_styles_test.rb

@@ -15,7 +15,7 @@ class PaperclipMissingAttachmentStylesTest < Test::Unit::TestCase
       assert_kind_of Set, Paperclip.classes_with_attachments 
       assert Paperclip.classes_with_attachments.empty?, 'list should be empty'
       rebuild_model
-      assert_equal [Dummy].to_set, Paperclip.classes_with_attachments
+      assert_equal ['Dummy'].to_set, Paperclip.classes_with_attachments
     end
 
     should "enable to get and set path to registered styles file" do

data/test/storage/s3_test.rb

@@ -173,15 +173,23 @@ class S3Test < Test::Unit::TestCase
       AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => { :bucket => "prod_bucket" },
-                    :s3_host_alias => Proc.new { |image| "cdn#{image.size.to_i % 4}.example.com" },
+                    :s3_host_alias => Proc.new{|atch| "cdn#{atch.instance.counter % 4}.example.com"},
                     :path => ":attachment/:basename.:extension",
                     :url => ":s3_alias_url"
+      Dummy.class_eval do
+        def counter
+          @counter ||= 0
+          @counter += 1
+          @counter
+        end
+      end
       @dummy = Dummy.new
       @dummy.avatar = StringIO.new(".")
     end
 
     should "return a url based on the host_alias" do
-      assert_match %r{^http://cdn0.example.com/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://cdn1.example.com/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://cdn2.example.com/avatars/stringio.txt}, @dummy.avatar.url
     end
 
     should "still return the bucket name" do
@@ -203,7 +211,7 @@ class S3Test < Test::Unit::TestCase
     end
 
     should "return a relative URL for Rails to calculate assets host" do
-      assert_match %r{^avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^avatars/stringio\.txt}, @dummy.avatar.url
     end
   end
 
@@ -292,7 +300,7 @@ class S3Test < Test::Unit::TestCase
       AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
-                      :production   => {:s3_host_name => "s3-world-end.amazonaws.com"},
+                      :production   => { :s3_host_name => "s3-world-end.amazonaws.com" },
                       :development  => { :s3_host_name => "s3-ap-northeast-1.amazonaws.com" }
                     }
       @dummy = Dummy.new

data/test/style_test.rb

@@ -6,8 +6,9 @@ class StyleTest < Test::Unit::TestCase
   context "A style rule" do
     setup do
       @attachment = attachment :path => ":basename.:extension",
-                               :styles => { :foo => {:geometry => "100x100#", :format => :png} }
-      @style = @attachment.styles[:foo]
+                               :styles => { :foo => {:geometry => "100x100#", :format => :png} },
+                               :whiny => true
+      @style = @attachment.options.styles[:foo]
     end
 
     should "be held as a Style object" do
@@ -23,7 +24,6 @@ class StyleTest < Test::Unit::TestCase
     end
 
     should "be whiny if the attachment is" do
-      @attachment.expects(:whiny).returns(true)
       assert @style.whiny?
     end
 
@@ -46,17 +46,11 @@ class StyleTest < Test::Unit::TestCase
                                }
     end
 
-    should "defer processing of procs until they are needed" do
-      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@geometry")
-      assert_kind_of Proc, @attachment.styles[:bar].instance_variable_get("@geometry")
-      assert_kind_of Proc, @attachment.instance_variable_get("@processors")
-    end
-
     should "call procs when they are needed" do
-      assert_equal "300x300#", @attachment.styles[:foo].geometry
-      assert_equal "300x300#", @attachment.styles[:bar].geometry
-      assert_equal [:test], @attachment.styles[:foo].processors
-      assert_equal [:test], @attachment.styles[:bar].processors
+      assert_equal "300x300#", @attachment.options.styles[:foo].geometry
+      assert_equal "300x300#", @attachment.options.styles[:bar].geometry
+      assert_equal [:test], @attachment.options.styles[:foo].processors
+      assert_equal [:test], @attachment.options.styles[:bar].processors
     end
   end
 
@@ -70,30 +64,30 @@ class StyleTest < Test::Unit::TestCase
                                :styles => styles
     end
     should "have the right number of styles" do
-      assert_kind_of Hash, @attachment.styles
-      assert_equal 3, @attachment.styles.size
+      assert_kind_of Hash, @attachment.options.styles
+      assert_equal 3, @attachment.options.styles.size
     end
 
     should "have styles as Style objects" do
       [:aslist, :ashash, :aslist].each do |s|
-        assert_kind_of Paperclip::Style, @attachment.styles[s]
+        assert_kind_of Paperclip::Style, @attachment.options.styles[s]
       end
     end
 
     should "have the right geometries" do
       [:aslist, :ashash, :aslist].each do |s|
-        assert_equal @attachment.styles[s].geometry, "100x100"
+        assert_equal @attachment.options.styles[s].geometry, "100x100"
       end
     end
 
     should "have the right formats" do
-      assert_equal @attachment.styles[:aslist].format, :png
-      assert_equal @attachment.styles[:ashash].format, :png
-      assert_nil @attachment.styles[:asstring].format
+      assert_equal @attachment.options.styles[:aslist].format, :png
+      assert_equal @attachment.options.styles[:ashash].format, :png
+      assert_nil @attachment.options.styles[:asstring].format
     end
 
     should "retain order" do
-      assert_equal [:aslist, :ashash, :asstring], @attachment.styles.keys
+      assert_equal [:aslist, :ashash, :asstring], @attachment.options.styles.keys
     end
   end
 
@@ -102,7 +96,7 @@ class StyleTest < Test::Unit::TestCase
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
-      @style = @attachment.styles[:thumb]
+      @style = @attachment.options.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
@@ -113,7 +107,7 @@ class StyleTest < Test::Unit::TestCase
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment.expects(:extra_options_for).with(:thumb)
-      @attachment.styles[:thumb].convert_options
+      @attachment.options.styles[:thumb].convert_options
     end
   end
 
@@ -122,7 +116,7 @@ class StyleTest < Test::Unit::TestCase
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
-      @style = @attachment.styles[:thumb]
+      @style = @attachment.options.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
@@ -133,7 +127,7 @@ class StyleTest < Test::Unit::TestCase
 
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
       @attachment.expects(:extra_source_file_options_for).with(:thumb)
-      @attachment.styles[:thumb].source_file_options
+      @attachment.options.styles[:thumb].source_file_options
     end
   end
 
@@ -148,7 +142,7 @@ class StyleTest < Test::Unit::TestCase
                                   }
                                 },
                                :processors => [:thumbnail]
-      @style = @attachment.styles[:foo]
+      @style = @attachment.options.styles[:foo]
     end
 
     should "not get processors from the attachment" do
@@ -176,11 +170,11 @@ class StyleTest < Test::Unit::TestCase
     end
 
     should "defer processing of procs until they are needed" do
-      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@processors")
+      assert_kind_of Proc, @attachment.options.styles[:foo].instance_variable_get("@processors")
     end
 
     should "call procs when they are needed" do
-      assert_equal [:test], @attachment.styles[:foo].processors
+      assert_equal [:test], @attachment.options.styles[:foo].processors
     end
   end
 end