dm-paperclip 2.1.2.1 → 2.1.4

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'shoulda'
 require 'mocha'
 require 'tempfile'
 
-require 'data_mapper'
+require 'dm-core'
 require 'dm-validations'
 require 'dm-migrations'
 begin
@@ -15,6 +15,7 @@ end
 
 ROOT       = File.join(File.dirname(__FILE__), '..')
 RAILS_ROOT = ROOT
+RAILS_ENV  = ENV['RAILS_ENV']
 
 Object.const_set("Merb", Class.new())
 Merb.class_eval do
@@ -42,23 +43,6 @@ unless defined?(Mash)
 end
 
 def rebuild_model options = {}
-  DataMapper::Migration.new( 1, :drop_dummies_table ) do
-    up do
-      create_table :dummies do
-        column :id, "integer", true
-        column :other, "varchar(255)"
-        column :avatar_file_name, "varchar(255)"
-        column :avatar_content_type, "varchar(255)"
-        column :avatar_file_size, "integer"
-      end
-    end
-    down do
-      drop_table :dummies
-    end
-    perform_down
-    perform_up
-  end
-
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new())
   Dummy.class_eval do
@@ -69,4 +53,12 @@ def rebuild_model options = {}
     property :other, String
     has_attached_file :avatar, options
   end
+  Dummy.auto_migrate!
 end
+
+def temporary_env(new_env)
+  old_env = defined?(RAILS_ENV) ? RAILS_ENV : nil
+  Object.const_set("RAILS_ENV", new_env)
+  yield
+  Object.const_set("RAILS_ENV", old_env)
+end

data/test/{test_integration.rb → integration_test.rb}

@@ -39,7 +39,7 @@ class IntegrationTest < Test::Unit::TestCase
         Dummy.class_eval do
           has_attached_file :avatar, :styles => { :thumb => "150x25#" }
         end
-        @d2 = Dummy[@dummy.id]
+        @d2 = Dummy.get(@dummy.id)
         @d2.avatar.reprocess!
         @d2.save
       end
@@ -92,6 +92,38 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
   
+  context "A model with no thumbnail_convert_options setting" do
+    setup do
+      rebuild_model :styles => { :large => "300x300>",
+                                 :medium => "100x100",
+                                 :thumb => ["32x32#", :gif] },
+                    :default_style => :medium,
+                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
+                    :path => ":merb_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+      @dummy     = Dummy.new
+    end
+    
+    should "have its definition return nil when asked about convert_options" do
+      assert ! Dummy.attachment_definitions[:avatar][:thumbnail_convert_options]
+    end
+
+    context "redefined to have convert_options setting" do
+      setup do
+        rebuild_model :styles => { :large => "300x300>",
+                                   :medium => "100x100",
+                                   :thumb => ["32x32#", :gif] },
+                      :thumbnail_convert_options => "-strip -depth 8",
+                      :default_style => :medium,
+                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
+                      :path => ":merb_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]
+      end
+    end
+  end
+  
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -122,7 +154,7 @@ class IntegrationTest < Test::Unit::TestCase
 
       saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s).path }
 
-      @d2 = Dummy[@dummy.id]
+      @d2 = Dummy.get(@dummy.id)
       assert_equal "100x15", `identify -format "%wx%h" #{@d2.avatar.to_file.path}`.chomp
       assert_equal "434x66", `identify -format "%wx%h" #{@d2.avatar.to_file(:original).path}`.chomp
       assert_equal "300x46", `identify -format "%wx%h" #{@d2.avatar.to_file(:large).path}`.chomp
@@ -148,12 +180,12 @@ class IntegrationTest < Test::Unit::TestCase
         assert ! File.exists?(p)
       end
 
-      @d2 = Dummy[@dummy.id]
+      @d2 = Dummy.get(@dummy.id)
       assert_nil @d2.avatar_file_name
     end
 
     should "work exactly the same when new as when reloaded" do
-      @d2 = Dummy[@dummy.id]
+      @d2 = Dummy.get(@dummy.id)
 
       assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
       [:thumb, :medium, :large, :original].each do |style|
@@ -184,7 +216,7 @@ class IntegrationTest < Test::Unit::TestCase
 
     should "know the difference between good files, bad files, not files, and nil when validating" do
       Dummy.validates_attachment_presence :avatar
-      @d2 = Dummy[@dummy.id]
+      @d2 = Dummy.get(@dummy.id)
       @d2.avatar = @file
       assert   @d2.valid?
       @d2.avatar = @bad_file
@@ -195,12 +227,42 @@ class IntegrationTest < Test::Unit::TestCase
 
     should "be able to reload without saving an not have the file disappear" do
       @dummy.avatar = @file
-      assert @dummy.save
+      @dummy.save
       @dummy.avatar = nil
       assert_nil @dummy.avatar_file_name
       @dummy.reload
       assert_equal "5k.png", @dummy.avatar_file_name
     end
+    
+    context "that is assigned its file from another Paperclip attachment" do
+      setup do
+        @dummy2 = Dummy.new
+        @file2  = File.new(File.join(FIXTURES_DIR, "12k.png"))
+        assert  @dummy2.avatar = @file2
+        @dummy2.save
+      end
+      
+      should "work when assigned a file" do
+        assert_not_equal `identify -format "%wx%h" #{@dummy.avatar.to_file(:original).path}`,
+                         `identify -format "%wx%h" #{@dummy2.avatar.to_file(:original).path}`
+
+        assert @dummy.avatar = @dummy2.avatar
+        @dummy.save
+        assert_equal `identify -format "%wx%h" #{@dummy.avatar.to_file(:original).path}`,
+                     `identify -format "%wx%h" #{@dummy2.avatar.to_file(:original).path}`
+      end
+      
+      should "work when assigned a nil file" do
+        @dummy2.avatar = nil
+        @dummy2.save
+
+        @dummy.avatar = @dummy2.avatar
+        @dummy.save
+        
+        assert !@dummy.avatar?
+      end
+    end    
+
   end
 
   if ENV['S3_TEST_BUCKET']
@@ -247,7 +309,7 @@ class IntegrationTest < Test::Unit::TestCase
           assert_equal geo, `#{cmd}`.chomp, cmd
         end
 
-        @d2 = Dummy[@dummy.id]
+        @d2 = Dummy.get(@dummy.id)
         @d2_files = s3_files_for @d2.avatar
         [["434x66", :original],
          ["300x46", :large],
@@ -277,12 +339,12 @@ class IntegrationTest < Test::Unit::TestCase
           assert ! key.exists?
         end
 
-        @d2 = Dummy[@dummy.id]
+        @d2 = Dummy.get(@dummy.id)
         assert_nil @d2.avatar_file_name
       end
 
       should "work exactly the same when new as when reloaded" do
-        @d2 = Dummy[@dummy.id]
+        @d2 = Dummy.get(@dummy.id)
 
         assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
         [:thumb, :medium, :large, :original].each do |style|
@@ -311,7 +373,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert @dummy.valid?
 
         Dummy.validates_attachment_presence :avatar
-        @d2 = Dummy[@dummy.id]
+        @d2 = Dummy.get(@dummy.id)
         @d2.avatar = @file
         assert   @d2.valid?
         @d2.avatar = @bad_file
@@ -320,7 +382,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert ! @d2.valid?
       end
 
-      should "be able to reload without saving an not have the file disappear" do
+      should "be able to reload without saving and not have the file disappear" do
         @dummy.avatar = @file
         assert @dummy.save
         @dummy.avatar = nil

data/test/{test_paperclip.rb → paperclip_test.rb}

@@ -1,12 +1,39 @@
 require 'test/helper.rb'
 
 class PaperclipTest < Test::Unit::TestCase
-  context "An ActiveRecord model with an 'avatar' attachment" do
+  context "A DataMapper 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"))
     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
+
+    should "handle multiple classes using attachments" do
+      Object.const_set("DummyTwo", Class.new())
+      DummyTwo.class_eval do
+        include DataMapper::Resource
+        include DataMapper::Validate
+        include Paperclip::Resource
+        property :id, Integer, :serial => true
+        property :other, String
+        has_attached_file :file
+      end
+      
+      assert_equal [:file], DummyTwo.attachment_definitions.keys
+      assert_equal [:avatar], Dummy.attachment_definitions.keys
+
+      Object.send(:remove_const, "DummyTwo") rescue nil
+
+      assert_equal [:avatar], Dummy.attachment_definitions.keys
+    end
+
     context "that is write protected" do
       setup do
         Dummy.class_eval do
@@ -60,6 +87,38 @@ class PaperclipTest < Test::Unit::TestCase
       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.get(@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
+
     [[:presence,      nil,                             "5k.png",   nil],
      [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
      [:size2,         {:in => 1..10240},               nil,        "12k.png"],
@@ -98,21 +157,6 @@ class PaperclipTest < Test::Unit::TestCase
             assert_equal 1, @dummy.errors.length
           end
         end
-        
-#        context "and an invalid file with :message" do
-#          setup do
-#            @file = args[3] && File.new(File.join(FIXTURES_DIR, args[3]))
-#          end
-#
-#          should "have errors" do
-#            if args[1] && args[1][:message] && args[4]
-#              @dummy.avatar = @file
-#              assert ! @dummy.valid?
-#              assert_equal 1, @dummy.errors.length
-#              assert_equal args[4], @dummy.errors[0]
-#            end
-#          end
-#        end
       end
     end
   end

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

@@ -42,6 +42,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,
@@ -71,7 +90,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
@@ -84,6 +103,7 @@ class StorageTest < Test::Unit::TestCase
           @bucket_mock.expects(:key).returns(@key_mock)
           @key_mock.expects(:data=)
           @key_mock.expects(:put)
+          @dummy.id = 1
           @dummy.save
         end
 
@@ -91,6 +111,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
 

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

@@ -90,10 +90,36 @@ 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)}\[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}`
+      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
         @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+".*?"}
+          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
@@ -102,6 +128,18 @@ class ThumbnailTest < Test::Unit::TestCase
         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: dm-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.1.2.1
+  version: 2.1.4
 platform: ruby
 authors: 
 - Ken Robertson
@@ -9,20 +9,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-15 00:00:00 -07:00
+date: 2008-11-29 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: 
-email: ken@invalidlogic.com jyurek@thoughtbot.com
+email: ken@invalidlogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.rdoc
 files: 
-- README.textile
+- README.rdoc
 - LICENSE
 - Rakefile
 - init.rb
@@ -36,20 +36,20 @@ files:
 - lib/dm-paperclip/validations.rb
 - lib/dm-paperclip.rb
 - tasks/paperclip_tasks.rake
+- test/attachment_test.rb
 - 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/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/integration_test.rb
+- test/iostream_test.rb
+- test/paperclip_test.rb
+- test/storage_test.rb
+- test/thumbnail_test.rb
 has_rdoc: true
 homepage: http://invalidlogic.com/dm-paperclip/
 post_install_message: 
@@ -74,15 +74,9 @@ requirements:
 - ImageMagick
 - data_mapper
 rubyforge_project: dm-paperclip
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: File attachments as attributes for DataMapper, based on the original Paperclip by Jon Yurek at Thoughtbot
-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: []
+