tristandunn-paperclip 2.3.1 → 2.3.1.1

data/test/fixtures/s3.yml

@@ -2,3 +2,7 @@ development:
   key: 54321
 production:
   key: 12345
+test:
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

data/test/helper.rb

@@ -1,9 +1,11 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
 require 'tempfile'
 
+gem 'jferris-mocha'
+require 'mocha'
+
 gem 'sqlite3-ruby'
 
 require 'active_record'
@@ -97,3 +99,10 @@ end
 def attachment options
   Paperclip::Attachment.new(:avatar, FakeModel.new, options)
 end
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end

data/test/interpolations_test.rb

@@ -7,7 +7,7 @@ class InterpolationsTest < Test::Unit::TestCase
     assert ! methods.include?(:[]=)
     assert ! methods.include?(:all)
     methods.each do |m|
-      assert Paperclip::Interpolations.respond_to? m
+      assert Paperclip::Interpolations.respond_to?(m)
     end
   end
 
@@ -19,6 +19,10 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal RAILS_ENV, Paperclip::Interpolations.rails_env(:attachment, :style)
   end
 
+  should "return the class of the Interpolations module when called with no params" do
+    assert_equal Module, Paperclip::Interpolations.class
+  end
+
   should "return the class of the instance" do
     attachment = mock
     attachment.expects(:instance).returns(attachment)

data/test/iostream_test.rb

@@ -58,8 +58,15 @@ class IOStreamTest < Test::Unit::TestCase
         assert @tempfile = @file.to_tempfile
       end
 
-      should "convert it to a Tempfile" do
-        assert @tempfile.is_a?(Tempfile)
+      should "convert it to a Paperclip Tempfile" do
+        assert @tempfile.is_a?(Paperclip::Tempfile)
+      end
+
+      should "have the name be based on the original_filename" do
+        name = File.basename(@file.path)
+        extension = File.extname(name)
+        basename = File.basename(name, extension)
+        assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
       end
 
       should "have the Tempfile contain the same data as the file" do

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -5,6 +5,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
+        d.string :avatar_content_type
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -3,7 +3,9 @@ require 'test/helper'
 class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
   context "validate_attachment_presence" do
     setup do
-      reset_table("dummies"){|d| d.string :avatar_file_name }
+      reset_table("dummies") do |d|
+        d.string :avatar_file_name
+      end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar
       @matcher     = self.class.validate_attachment_presence(:avatar)

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -5,6 +5,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     setup do
       reset_table("dummies") do |d|
         d.string :avatar_file_name
+        d.integer :avatar_file_size
       end
       @dummy_class = reset_class "Dummy"
       @dummy_class.has_attached_file :avatar

data/test/paperclip_test.rb

@@ -185,45 +185,23 @@ class PaperclipTest < Test::Unit::TestCase
       should "be valid" do
         assert @dummy.valid?
       end
-
-      context "then has a validation added that makes it invalid" do
-        setup do
-          assert @dummy.save
-          Dummy.class_eval do
-            validates_attachment_content_type :avatar, :content_type => ["text/plain"]
-          end
-          @dummy2 = Dummy.find(@dummy.id)
-        end
-
-        should "be invalid when reloaded" do
-          assert ! @dummy2.valid?, @dummy2.errors.inspect
-        end
-
-        should "be able to call #valid? twice without having duplicate errors" do
-          @dummy2.avatar.valid?
-          first_errors = @dummy2.avatar.errors
-          @dummy2.avatar.valid?
-          assert_equal first_errors, @dummy2.avatar.errors
-        end
-      end
     end
 
     context "a validation with an if guard clause" do
       setup do
         Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
         @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
       end
 
       should "attempt validation if the guard returns true" do
         @dummy.expects(:foo).returns(true)
-        @dummy.avatar.expects(:validate_presence).returns(nil)
-        @dummy.valid?
+        assert ! @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(false)
-        @dummy.avatar.expects(:validate_presence).never
-        @dummy.valid?
+        assert @dummy.valid?
       end
     end
 
@@ -231,18 +209,17 @@ class PaperclipTest < Test::Unit::TestCase
       setup do
         Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
         @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
       end
 
       should "attempt validation if the guard returns true" do
         @dummy.expects(:foo).returns(false)
-        @dummy.avatar.expects(:validate_presence).returns(nil)
-        @dummy.valid?
+        assert ! @dummy.valid?
       end
 
       should "not attempt validation if the guard returns false" do
         @dummy.expects(:foo).returns(true)
-        @dummy.avatar.expects(:validate_presence).never
-        @dummy.valid?
+        assert @dummy.valid?
       end
     end
 
@@ -259,11 +236,11 @@ class PaperclipTest < Test::Unit::TestCase
           end
           if validation == :presence
             should "have an error on the attachment" do
-              assert @dummy.errors.on(:avatar)
+              assert @dummy.errors.on(:avatar_file_name)
             end
           else
             should "not have an error on the attachment" do
-              assert_nil @dummy.errors.on(:avatar)
+              assert_nil @dummy.errors.on(:avatar_file_name), @dummy.errors.full_messages.join(", ")
             end
           end
         end
@@ -273,10 +250,7 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "not have an error when assigned a valid file" do
-            assert ! @dummy.avatar.errors.key?(validation)
-          end
-          should "not have an error on the attachment" do
-            assert_nil @dummy.errors.on(:avatar)
+            assert_equal 0, @dummy.errors.length, @dummy.errors.full_messages.join(", ")
           end
         end
         context "and assigned an invalid file" do
@@ -285,17 +259,14 @@ class PaperclipTest < Test::Unit::TestCase
             @dummy.valid?
           end
           should "have an error when assigned a valid file" do
-            assert_not_nil @dummy.avatar.errors[validation]
-          end
-          should "have an error on the attachment" do
-            assert @dummy.errors.on(:avatar)
+            assert @dummy.errors.length > 0
           end
         end
       end
     end
 
     [[:presence,      {},                              "5k.png",   nil],
-     [:size,          {:in => 1..10240},               nil,        "12k.png"],
+     [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
      [:size,          {:less_than => 10240},           "5k.png",   "12k.png"],
      [:size,          {:greater_than => 8096},         "12k.png",  "5k.png"],
      [:content_type,  {:content_type => "image/png"},  "5k.png",   "text.txt"],
@@ -307,6 +278,21 @@ class PaperclipTest < Test::Unit::TestCase
       
       should_validate validation, options, valid_file, invalid_file
     end
+    
+    context "with size validation and less_than 10240 option" do
+      context "and assigned an invalid file" do
+        setup do
+          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240)
+          @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
+          @dummy.valid?
+        end
+        
+        should "have a file size min/max error message" do
+          assert_match %r/between 0 and 10240 bytes/, @dummy.errors.on(:avatar_file_size)
+        end
+      end
+    end
 
   end
 end

data/test/storage_test.rb

@@ -1,6 +1,13 @@
 require 'test/helper'
+require 'aws/s3'
 
 class StorageTest < Test::Unit::TestCase
+  def rails_env(env)
+    silence_warnings do
+      Object.const_set(:RAILS_ENV, env)
+    end
+  end
+
   context "Parsing S3 credentials" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -15,25 +22,25 @@ class StorageTest < Test::Unit::TestCase
     end
 
     teardown do
-      Object.const_set("RAILS_ENV", @current_env)
+      rails_env(@current_env)
     end
 
     should "get the correct credentials when RAILS_ENV is production" do
-      Object.const_set('RAILS_ENV', "production")
+      rails_env("production")
       assert_equal({:key => "12345"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
     should "get the correct credentials when RAILS_ENV is development" do
-      Object.const_set('RAILS_ENV', "development")
+      rails_env("development")
       assert_equal({:key => "54321"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
     should "return the argument if the key does not exist" do
-      Object.const_set('RAILS_ENV', "not really an env")
+      rails_env("not really an env")
       assert_equal({:test => "12345"}, @avatar.parse_credentials(:test => "12345"))
     end
   end
@@ -89,6 +96,33 @@ class StorageTest < Test::Unit::TestCase
       assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
     end
   end
+  
+  context "Generating a url with an expiration" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {
+                      :production   => { :bucket => "prod_bucket" },
+                      :development  => { :bucket => "dev_bucket" }
+                    },
+                    :s3_host_alias => "something.something.com",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_alias_url"
+                    
+      rails_env("production")
+      
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+      
+      AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600 })
+      
+      @dummy.avatar.expiring_url
+    end
+    
+    should "should succeed" do
+      assert true
+    end
+  end
 
   context "Parsing S3 credentials with a bucket in them" do
     setup do
@@ -102,15 +136,15 @@ class StorageTest < Test::Unit::TestCase
       @old_env = RAILS_ENV
     end
 
-    teardown{ Object.const_set("RAILS_ENV", @old_env) }
+    teardown{ rails_env(@old_env) }
 
     should "get the right bucket in production" do
-      Object.const_set("RAILS_ENV", "production")
+      rails_env("production")
       assert_equal "prod_bucket", @dummy.avatar.bucket_name
     end
 
     should "get the right bucket in development" do
-      Object.const_set("RAILS_ENV", "development")
+      rails_env("development")
       assert_equal "dev_bucket", @dummy.avatar.bucket_name
     end
   end
@@ -229,6 +263,29 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "with S3 credentials in a YAML file" do
+    setup do
+      ENV['S3_KEY']    = 'env_key'
+      ENV['S3_BUCKET'] = 'env_bucket'
+      ENV['S3_SECRET'] = 'env_secret'
+
+      rails_env('test')
+
+      rebuild_model :storage        => :s3,
+                    :s3_credentials => File.new(File.join(File.dirname(__FILE__), "fixtures/s3.yml"))
+
+      Dummy.delete_all
+
+      @dummy = Dummy.new
+    end
+
+    should "run it the file through ERB" do
+      assert_equal 'env_bucket', @dummy.avatar.bucket_name
+      assert_equal 'env_key', AWS::S3::Base.connection.options[:access_key_id]
+      assert_equal 'env_secret', AWS::S3::Base.connection.options[:secret_access_key]
+    end
+  end
+
   unless ENV["S3_TEST_BUCKET"].blank?
     context "Using S3 for real, an attachment with S3 storage" do
       setup do

data/test/style_test.rb

@@ -0,0 +1,141 @@
+# encoding: utf-8
+require 'test/helper'
+
+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]
+    end
+    
+    should "be held as a Style object" do
+      assert_kind_of Paperclip::Style, @style
+    end
+
+    should "get processors from the attachment definition" do
+      assert_equal [:thumbnail], @style.processors
+    end
+
+    should "have the right geometry" do
+      assert_equal "100x100#", @style.geometry
+    end
+    
+    should "be whiny if the attachment is" do
+      @attachment.expects(:whiny).returns(true)
+      assert @style.whiny?
+    end
+    
+    should "respond to hash notation" do
+      assert_equal [:thumbnail], @style[:processors]
+      assert_equal "100x100#", @style[:geometry]
+    end
+  end
+  
+  context "A style rule with properties supplied as procs" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :whiny_thumbnails => true,
+                               :processors => lambda {|a| [:test]},
+                               :styles => {
+                                 :foo => lambda{|a| "300x300#"},
+                                 :bar => {
+                                   :geometry => lambda{|a| "300x300#"}
+                                 }
+                               }
+    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
+    end
+  end
+
+  context "An attachment with style rules in various forms" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => { 
+                                 :aslist => ["100x100", :png],
+                                 :ashash => {:geometry => "100x100", :format => :png},
+                                 :asstring => "100x100"
+                                }
+    end
+    should "have the right number of styles" do
+      assert_kind_of Hash, @attachment.styles
+      assert_equal 3, @attachment.styles.size
+    end
+    
+    should "have styles as Style objects" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_kind_of Paperclip::Style, @attachment.styles[s]
+      end
+    end
+    
+    should "have the right geometries" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_equal @attachment.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
+    end
+
+  end
+
+  context "An attachment with :convert_options" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {:thumb => "100x100", :large => "400x400"},
+                               :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+    end
+
+    before_should "not have called extra_options_for(:thumb/:large) on initialization" do
+      @attachment.expects(:extra_options_for).never
+    end
+    
+    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
+    end
+  end
+  
+  context "A style rule with its own :processors" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => { 
+                                 :foo => {
+                                   :geometry => "100x100#", 
+                                   :format => :png,
+                                   :processors => [:test]
+                                  } 
+                                },
+                               :processors => [:thumbnail]
+      @style = @attachment.styles[:foo]
+    end
+    
+    should "not get processors from the attachment" do
+      @attachment.expects(:processors).never
+      assert_not_equal [:thumbnail], @style.processors
+    end
+  
+    should "report its own processors" do
+      assert_equal [:test], @style.processors
+    end
+
+  end
+end