paperclip 2.1.2 → 2.1.5

data/test/paperclip_test.rb

@@ -0,0 +1,186 @@
+require 'test/helper'
+
+class PaperclipTest < Test::Unit::TestCase
+  context "Calling Paperclip.run" do
+    should "execute the right command" do
+      Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
+      Paperclip.expects(:bit_bucket).returns("/dev/null")
+      Paperclip.expects(:"`").with("/usr/bin/convert one.jpg two.jpg 2>/dev/null")
+      Paperclip.run("convert", "one.jpg two.jpg")
+    end
+  end
+
+  context "Paperclip.bit_bucket" do
+    context "on systems without /dev/null" do
+      setup do
+        File.expects(:exists?).with("/dev/null").returns(false)
+      end
+      
+      should "return 'NUL'" do
+        assert_equal "NUL", Paperclip.bit_bucket
+      end
+    end
+
+    context "on systems with /dev/null" do
+      setup do
+        File.expects(:exists?).with("/dev/null").returns(true)
+      end
+      
+      should "return '/dev/null'" do
+        assert_equal "/dev/null", Paperclip.bit_bucket
+      end
+    end
+  end
+
+  context "An ActiveRecord model with an 'avatar' attachment" do
+    setup do
+      rebuild_model :path => "tmp/:class/omg/:style.:extension"
+      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+    end
+
+    should "not error when trying to also create a 'blah' attachment" do
+      assert_nothing_raised do
+        Dummy.class_eval do
+          has_attached_file :blah
+        end
+      end
+    end
+
+    context "that is attr_protected" do
+      setup do
+        Dummy.class_eval do
+          attr_protected :avatar
+        end
+        @dummy = Dummy.new
+      end
+
+      should "not assign the avatar on mass-set" do
+        @dummy.logger.expects(:debug)
+
+        @dummy.attributes = { :other => "I'm set!",
+                              :avatar => @file }
+        
+        assert_equal "I'm set!", @dummy.other
+        assert ! @dummy.avatar?
+      end
+
+      should "still allow assigment on normal set" do
+        @dummy.logger.expects(:debug).times(0)
+
+        @dummy.other  = "I'm set!"
+        @dummy.avatar = @file
+        
+        assert_equal "I'm set!", @dummy.other
+        assert @dummy.avatar?
+      end
+    end
+
+    context "with a subclass" do
+      setup do
+        class ::SubDummy < Dummy; end
+      end
+
+      should "be able to use the attachment from the subclass" do
+        assert_nothing_raised do
+          @subdummy = SubDummy.create(:avatar => @file)
+        end
+      end
+
+      should "be able to see the attachment definition from the subclass's class" do
+        assert_equal "tmp/:class/omg/:style.:extension", SubDummy.attachment_definitions[:avatar][:path]
+      end
+
+      teardown do
+        Object.send(:remove_const, "SubDummy") rescue nil
+      end
+    end
+
+    should "have an #avatar method" do
+      assert Dummy.new.respond_to?(:avatar)
+    end
+
+    should "have an #avatar= method" do
+      assert Dummy.new.respond_to?(:avatar=)
+    end
+
+    context "that is valid" do
+      setup do
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      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
+
+    def self.should_validate validation, options, valid_file, invalid_file
+      context "with #{validation} validation and #{options.inspect} options" do
+        setup do
+          Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
+          @dummy = Dummy.new
+        end
+        context "and assigned a valid file" do
+          setup do
+            @dummy.avatar = valid_file
+            @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)
+          end
+        end
+        context "and assigned an invalid file" do
+          setup do
+            @dummy.avatar = invalid_file
+            @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)
+          end
+        end
+      end
+    end
+
+    [[:presence,      {},                              "5k.png",   nil],
+     [:size,          {:in => 1..10240},               nil,        "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"],
+     [:content_type,  {:content_type => "text/plain"}, "text.txt", "5k.png"],
+     [:content_type,  {:content_type => %r{image/.*}}, "5k.png",   "text.txt"]].each do |args|
+      validation, options, valid_file, invalid_file = args
+      valid_file   &&= File.open(File.join(FIXTURES_DIR, valid_file), "rb")
+      invalid_file &&= File.open(File.join(FIXTURES_DIR, invalid_file), "rb")
+      
+      should_validate validation, options, valid_file, invalid_file
+    end
+
+  end
+end

data/test/s3.yml

@@ -1,2 +0,0 @@
-access_key_id: 11196XQ35WGRKEVQN782
-secret_access_key: TczVRadcH5sealaWUMpbY/Hnex90iCmJ3LDM5w74

data/test/{test_storage.rb → storage_test.rb}

@@ -1,9 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'right_aws'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'geometry.rb')
+require 'test/helper'
 
 class StorageTest < Test::Unit::TestCase
   context "Parsing S3 credentials" do
@@ -42,6 +37,25 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "Parsing S3 credentials with a bucket in them" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {
+                      :production   => { :bucket => "prod_bucket" },
+                      :development  => { :bucket => "dev_bucket" }
+                    }
+      @dummy = Dummy.new
+    end
+
+    should "get the right bucket in production", :before => lambda{ ENV.expects(:[]).returns('production') } do
+      assert_equal "prod_bucket", @dummy.avatar.bucket_name
+    end
+
+    should "get the right bucket in development", :before => lambda{ ENV.expects(:[]).returns('development') } do
+      assert_equal "dev_bucket", @dummy.avatar.bucket_name
+    end
+  end
+
   context "An attachment with S3 storage" do
     setup do
       rebuild_model :storage => :s3,
@@ -63,7 +77,7 @@ class StorageTest < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'))
+        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -71,7 +85,7 @@ class StorageTest < Test::Unit::TestCase
       should "not get a bucket to get a URL" do
         @dummy.avatar.expects(:s3).never
         @dummy.avatar.expects(:s3_bucket).never
-        assert_equal "https://s3.amazonaws.com/testing/avatars/original/5k.png", @dummy.avatar.url
+        assert_match %r{^http://s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
       end
 
       context "and saved" do
@@ -83,7 +97,7 @@ class StorageTest < Test::Unit::TestCase
           @key_mock = stub
           @bucket_mock.expects(:key).returns(@key_mock)
           @key_mock.expects(:data=)
-          @key_mock.expects(:put)
+          @key_mock.expects(:put).with(nil, 'public-read', 'Content-type' => 'image/png')
           @dummy.save
         end
 
@@ -91,6 +105,23 @@ class StorageTest < Test::Unit::TestCase
           assert true
         end
       end
+      
+      context "and remove" do
+        setup do
+          @s3_mock     = stub
+          @bucket_mock = stub
+          RightAws::S3.expects(:new).with("12345", "54321", {}).returns(@s3_mock)
+          @s3_mock.expects(:bucket).with("testing", true, "public-read").returns(@bucket_mock)
+          @key_mock = stub
+          @bucket_mock.expects(:key).at_least(2).returns(@key_mock)
+          @key_mock.expects(:delete)
+          @dummy.destroy_attached_files
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
     end
   end
 
@@ -113,7 +144,7 @@ class StorageTest < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'))
+          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
           @dummy.avatar = @file
         end
 

data/test/{test_thumbnail.rb → thumbnail_test.rb}

@@ -1,11 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-require 'tempfile'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'geometry.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'paperclip', 'thumbnail.rb')
+require 'test/helper'
 
 class ThumbnailTest < Test::Unit::TestCase
 
@@ -39,7 +32,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "An image" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
 
     [["600x600>", "434x66"],
@@ -52,7 +45,7 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "start with dimensions of 434x66" do
-          cmd = %Q[identify -format "%wx%h" #{@file.path}] 
+          cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
@@ -66,7 +59,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
 
           should "be the size we expect it to be" do
-            cmd = %Q[identify -format "%wx%h" #{@thumb_result.path}] 
+            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"] 
             assert_equal args[1], `#{cmd}`.chomp
           end
         end
@@ -90,18 +83,56 @@ class ThumbnailTest < Test::Unit::TestCase
       should "have whiny_thumbnails turned on by default" do
         assert @thumb.whiny_thumbnails
       end
+      
+      should "have convert_options set to nil by default" do
+        assert_equal nil, @thumb.convert_options
+      end
 
       should "send the right command to convert when sent #make" do
-        @thumb.expects(:system).with do |arg|
-          arg.match %r{convert\s+"#{File.expand_path(@thumb.file.path)}"\s+-scale\s+\"x50\"\s+-crop\s+\"100x50\+114\+0\"\s+\+repage\s+".*?"}
+        Paperclip.expects(:"`").with do |arg|
+          arg.match %r{convert\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+\"x50\"\s+-crop\s+\"100x50\+114\+0\"\s+\+repage\s+".*?"}
         end
         @thumb.make
       end
 
       should "create the thumbnail when sent #make" do
         dst = @thumb.make
-        assert_match /100x50/, `identify #{dst.path}`
+        assert_match /100x50/, `identify "#{dst.path}"`
+      end
+    end
+    
+    context "being thumbnailed with convert options set" do
+      setup do
+        @thumb = Paperclip::Thumbnail.new(@file, "100x50#", format=nil, convert_options="-strip -depth 8", whiny_thumbnails=true)
       end
+
+      should "have convert_options value set" do
+        assert_equal "-strip -depth 8", @thumb.convert_options
+      end
+
+      should "send the right command to convert when sent #make" do
+        Paperclip.expects(:"`").with do |arg|
+          arg.match %r{convert\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+"x50"\s+-crop\s+"100x50\+114\+0"\s+\+repage\s+-strip\s+-depth\s+8\s+".*?"}
+        end
+        @thumb.make
+      end
+
+      should "create the thumbnail when sent #make" do
+        dst = @thumb.make
+        assert_match /100x50/, `identify "#{dst.path}"`
+      end
+      
+      context "redefined to have bad convert_options setting" do
+        setup do
+          @thumb = Paperclip::Thumbnail.new(@file, "100x50#", format=nil, convert_options="-this-aint-no-option", whiny_thumbnails=true)
+        end
+
+        should "error when trying to create the thumbnail" do
+          assert_raises(Paperclip::PaperclipError) do
+            @thumb.make
+          end
+        end
+      end      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,10 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-13 00:00:00 -04:00
+date: 2008-12-10 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: right_aws
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: jyurek@thoughtbot.com
 executables: []
@@ -20,18 +49,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
-- README
+- README.rdoc
 - LICENSE
 - Rakefile
 - init.rb
-- generators/paperclip
 - generators/paperclip/paperclip_generator.rb
-- generators/paperclip/templates
-- generators/paperclip/templates/paperclip_migration.rb
+- generators/paperclip/templates/paperclip_migration.rb.erb
 - generators/paperclip/USAGE
-- lib/paperclip
 - lib/paperclip/attachment.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/iostream.rb
@@ -40,25 +66,27 @@ files:
 - lib/paperclip/upfile.rb
 - lib/paperclip.rb
 - tasks/paperclip_tasks.rake
+- test/attachment_test.rb
 - test/database.yml
 - test/debug.log
-- test/fixtures
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
 - test/fixtures/bad.png
 - test/fixtures/text.txt
+- test/geometry_test.rb
 - test/helper.rb
+- test/integration_test.rb
+- test/iostream_test.rb
+- test/paperclip_test.rb
 - test/s3.yml
-- test/test_attachment.rb
-- test/test_geometry.rb
-- test/test_integration.rb
-- test/test_iostream.rb
-- test/test_paperclip.rb
-- test/test_storage.rb
-- test/test_thumbnail.rb
+- test/storage_test.rb
+- test/thumbnail_test.rb
+- shoulda_macros/paperclip.rb
 has_rdoc: true
-homepage: http://www.thoughtbot.com/
+homepage: http://www.thoughtbot.com/projects/paperclip
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -80,15 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.1.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: File attachments as attributes for ActiveRecord
-test_files: 
-- test/test_attachment.rb
-- test/test_geometry.rb
-- test/test_integration.rb
-- test/test_iostream.rb
-- test/test_paperclip.rb
-- test/test_storage.rb
-- test/test_thumbnail.rb
+test_files: []
+