paperclip 2.1.5 → 2.2.0

data/test/helper.rb

@@ -4,6 +4,8 @@ require 'shoulda'
 require 'mocha'
 require 'tempfile'
 
+gem 'sqlite3-ruby'
+
 require 'active_record'
 require 'active_support'
 begin

data/test/integration_test.rb

@@ -29,6 +29,8 @@ class IntegrationTest < Test::Unit::TestCase
       assert @dummy.save
     end
 
+    teardown { @file.close }
+
     should "create its thumbnails properly" do
       assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
     end
@@ -49,6 +51,48 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  context "A model with attachments scoped under an id" do
+    setup do
+      rebuild_model :styles => { :large => "100x100",
+                                 :medium => "50x50" },
+                    :path => ":rails_root/tmp/:id/:attachments/:style.:extension"
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__),
+                                 "fixtures",
+                                 "5k.png"), 'rb')
+      @dummy.avatar = @file
+    end
+
+    teardown { @file.close }
+
+    context "when saved" do
+      setup do
+        @dummy.save
+        @saved_path = @dummy.avatar.path(:large)
+      end
+
+      should "have a large file in the right place" do
+        assert File.exists?(@dummy.avatar.path(:large))
+      end
+
+      context "and deleted" do
+        setup do
+          @dummy.avatar = nil
+          @dummy.save
+        end
+
+        should "not have a large file in the right place anymore" do
+          assert ! File.exists?(@saved_path)
+        end
+
+        should "not have its next two parent directories" do
+          assert ! File.exists?(File.dirname(@saved_path))
+          assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
+        end
+      end
+    end
+  end
+
   context "A model with no attachment validation" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -209,7 +253,7 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
       @dummy.avatar = nil
-      assert @dummy.valid?
+      assert @dummy.valid?, @dummy.errors.inspect 
     end
 
     should "know the difference between good files, bad files, not files, and nil when validating" do
@@ -263,6 +307,25 @@ class IntegrationTest < Test::Unit::TestCase
 
   end
 
+  context "A model with an attachments association and a Paperclip attachment" do
+    setup do
+      Dummy.class_eval do
+        has_many :attachments, :class_name => 'Dummy'
+      end
+
+      @dummy = Dummy.new
+      @dummy.avatar = File.new(File.join(File.dirname(__FILE__),
+                               "fixtures",
+                               "5k.png"), 'rb')
+    end
+
+    should "should not error when saving" do
+      assert_nothing_raised do
+        @dummy.save!
+      end
+    end
+  end
+
   if ENV['S3_TEST_BUCKET']
     def s3_files_for attachment
       [:thumb, :medium, :large, :original].inject({}) do |files, style|

data/test/iostream_test.rb

@@ -14,6 +14,8 @@ class IOStreamTest < Test::Unit::TestCase
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     context "that is sent #stream_to" do
 
       context "and given a String" do

data/test/paperclip_test.rb

@@ -1,15 +1,49 @@
 require 'test/helper'
 
 class PaperclipTest < Test::Unit::TestCase
-  context "Calling Paperclip.run" do
+  [:image_magick_path, :convert_path].each do |path|
+    context "Calling Paperclip.run with an #{path} specified" do
+      setup do
+        Paperclip.options[:image_magick_path] = nil
+        Paperclip.options[:convert_path]      = nil
+        Paperclip.options[path]               = "/usr/bin"
+      end
+
+      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
+  end
+
+  context "Calling Paperclip.run with no path specified" do
+    setup do
+      Paperclip.options[:image_magick_path] = nil
+      Paperclip.options[:convert_path]      = nil
+    end
+
     should "execute the right command" do
-      Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
+      Paperclip.expects(:path_for_command).with("convert").returns("convert")
       Paperclip.expects(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:"`").with("/usr/bin/convert one.jpg two.jpg 2>/dev/null")
+      Paperclip.expects(:"`").with("convert one.jpg two.jpg 2>/dev/null")
       Paperclip.run("convert", "one.jpg two.jpg")
     end
   end
 
+  should "raise when sent #processor and the name of a class that exists but isn't a subclass of Processor" do
+    assert_raises(Paperclip::PaperclipError){ Paperclip.processor(:attachment) }
+  end
+
+  should "raise when sent #processor and the name of a class that doesn't exist" do
+    assert_raises(NameError){ Paperclip.processor(:boogey_man) }
+  end
+
+  should "return a class when sent #processor and the name of a class under Paperclip" do
+    assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
+  end
+
   context "Paperclip.bit_bucket" do
     context "on systems without /dev/null" do
       setup do
@@ -38,6 +72,8 @@ class PaperclipTest < Test::Unit::TestCase
       @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     should "not error when trying to also create a 'blah' attachment" do
       assert_nothing_raised do
         Dummy.class_eval do

data/test/processor_test.rb

@@ -0,0 +1,10 @@
+require 'test/helper'
+
+class ProcessorTest < Test::Unit::TestCase
+  should "instantiate and call #make when sent #make to the class" do
+    processor = mock
+    processor.expects(:make).with()
+    Paperclip::Processor.expects(:new).with(:one, :two).returns(processor)
+    Paperclip::Processor.make(:one, :two)
+  end
+end

data/test/storage_test.rb

@@ -82,6 +82,8 @@ class StorageTest < Test::Unit::TestCase
         @dummy.avatar = @file
       end
 
+      teardown { @file.close }
+
       should "not get a bucket to get a URL" do
         @dummy.avatar.expects(:s3).never
         @dummy.avatar.expects(:s3_bucket).never
@@ -125,6 +127,50 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with S3 storage and specific s3 headers set" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_headers => {'Cache-Control' => 'max-age=31557600'}
+    end
+
+    context "when assigned" do
+      setup do
+        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown { @file.close }
+
+      context "and saved" 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).returns(@key_mock)
+          @key_mock.expects(:data=)
+          @key_mock.expects(:put).with(nil,
+                                       'public-read',
+                                       'Content-type' => 'image/png',
+                                       'Cache-Control' => 'max-age=31557600')
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
   unless ENV["S3_TEST_BUCKET"].blank?
     context "Using S3 for real, an attachment with S3 storage" do
       setup do
@@ -148,6 +194,8 @@ class StorageTest < Test::Unit::TestCase
           @dummy.avatar = @file
         end
 
+        teardown { @file.close }
+
         should "still return a Tempfile when sent #to_io" do
           assert_equal Tempfile, @dummy.avatar.to_io.class
         end

data/test/thumbnail_test.rb

@@ -35,13 +35,15 @@ class ThumbnailTest < Test::Unit::TestCase
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     [["600x600>", "434x66"],
      ["400x400>", "400x61"],
      ["32x32<", "434x66"]
     ].each do |args|
       context "being thumbnailed with a geometry of #{args[0]}" do
         setup do
-          @thumb = Paperclip::Thumbnail.new(@file, args[0])
+          @thumb = Paperclip::Thumbnail.new(@file, :geometry => args[0])
         end
 
         should "start with dimensions of 434x66" do
@@ -68,7 +70,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
     context "being thumbnailed at 100x50 with cropping" do
       setup do
-        @thumb = Paperclip::Thumbnail.new(@file, "100x50#")
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
       end
 
       should "report its correct current and target geometries" do
@@ -80,8 +82,8 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_nil @thumb.format
       end
 
-      should "have whiny_thumbnails turned on by default" do
-        assert @thumb.whiny_thumbnails
+      should "have whiny turned on by default" do
+        assert @thumb.whiny
       end
       
       should "have convert_options set to nil by default" do
@@ -103,7 +105,9 @@ class ThumbnailTest < Test::Unit::TestCase
     
     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)
+        @thumb = Paperclip::Thumbnail.new(@file,
+                                          :geometry        => "100x50#",
+                                          :convert_options => "-strip -depth 8")
       end
 
       should "have convert_options value set" do
@@ -124,7 +128,9 @@ class ThumbnailTest < Test::Unit::TestCase
       
       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)
+          @thumb = Paperclip::Thumbnail.new(@file,
+                                            :geometry => "100x50#",
+                                            :convert_options => "-this-aint-no-option")
         end
 
         should "error when trying to create the thumbnail" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-10 00:00:00 -05:00
+date: 2008-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,10 @@ files:
 - generators/paperclip/templates/paperclip_migration.rb.erb
 - generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
+- lib/paperclip/callback_compatability.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/iostream.rb
+- lib/paperclip/processor.rb
 - lib/paperclip/storage.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
@@ -79,6 +81,7 @@ files:
 - test/integration_test.rb
 - test/iostream_test.rb
 - test/paperclip_test.rb
+- test/processor_test.rb
 - test/s3.yml
 - test/storage_test.rb
 - test/thumbnail_test.rb