cloudfuji_paperclip 2.4.6 → 3.0.3

data/test/generator_test.rb

@@ -0,0 +1,78 @@
+require './test/helper'
+require 'rails/generators'
+require 'generators/paperclip/paperclip_generator'
+
+class GeneratorTest < Rails::Generators::TestCase
+  tests PaperclipGenerator
+  destination File.expand_path("../tmp", File.dirname(__FILE__))
+  setup :prepare_destination
+
+  context 'running migration' do
+    context 'with single attachment name' do
+      setup do
+        run_generator %w(user avatar)
+      end
+
+      should 'create a correct migration file' do
+        assert_migration 'db/migrate/add_attachment_avatar_to_users.rb' do |migration|
+          assert_match /class AddAttachmentAvatarToUsers/, migration
+
+          assert_class_method :up, migration do |up|
+            assert_match /add_column :users, :avatar_file_name, :string/, up
+            assert_match /add_column :users, :avatar_content_type, :string/, up
+            assert_match /add_column :users, :avatar_file_size, :integer/, up
+            assert_match /add_column :users, :avatar_updated_at, :datetime/, up
+          end
+
+          assert_class_method :down, migration do |down|
+            assert_match /remove_column :users, :avatar_file_name/, down
+            assert_match /remove_column :users, :avatar_content_type/, down
+            assert_match /remove_column :users, :avatar_file_size/, down
+            assert_match /remove_column :users, :avatar_updated_at/, down
+          end
+        end
+      end
+    end
+
+    context 'with multiple attachment names' do
+      setup do
+        run_generator %w(user avatar photo)
+      end
+
+      should 'create a correct migration file' do
+        assert_migration 'db/migrate/add_attachment_avatar_photo_to_users.rb' do |migration|
+          assert_match /class AddAttachmentAvatarPhotoToUsers/, migration
+
+          assert_class_method :up, migration do |up|
+            assert_match /add_column :users, :avatar_file_name, :string/, up
+            assert_match /add_column :users, :avatar_content_type, :string/, up
+            assert_match /add_column :users, :avatar_file_size, :integer/, up
+            assert_match /add_column :users, :avatar_updated_at, :datetime/, up
+            assert_match /add_column :users, :photo_file_name, :string/, up
+            assert_match /add_column :users, :photo_content_type, :string/, up
+            assert_match /add_column :users, :photo_file_size, :integer/, up
+            assert_match /add_column :users, :photo_updated_at, :datetime/, up
+          end
+
+          assert_class_method :down, migration do |down|
+            assert_match /remove_column :users, :avatar_file_name/, down
+            assert_match /remove_column :users, :avatar_content_type/, down
+            assert_match /remove_column :users, :avatar_file_size/, down
+            assert_match /remove_column :users, :avatar_updated_at/, down
+            assert_match /remove_column :users, :photo_file_name/, down
+            assert_match /remove_column :users, :photo_content_type/, down
+            assert_match /remove_column :users, :photo_file_size/, down
+            assert_match /remove_column :users, :photo_updated_at/, down
+          end
+        end
+      end
+    end
+
+    context 'without required arguments' do
+      should 'not create the migration' do
+        silence_stream(STDERR) { run_generator %w() }
+        assert_no_migration 'db/migrate/add_attachment_avatar_to_users.rb'
+      end
+    end
+  end
+end

data/test/geometry_test.rb

@@ -117,30 +117,30 @@ class GeometryTest < Test::Unit::TestCase
 
     should "not generate from a bad file" do
       file = "/home/This File Does Not Exist.omg"
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a blank filename" do
       file = ""
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a nil file" do
       file = nil
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a file with no path" do
       file = mock("file", :path => "")
       file.stubs(:respond_to?).with(:path).returns(true)
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "let us know when a command isn't found versus a processing error" do
       old_path = ENV['PATH']
       begin
         ENV['PATH'] = ''
-        assert_raises(Paperclip::CommandNotFoundError) do
+        assert_raises(Paperclip::Errors::CommandNotFoundError) do
           file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
           @geo = Paperclip::Geometry.from_file(file)
         end

data/test/helper.rb

@@ -5,14 +5,15 @@ require 'test/unit'
 
 require 'shoulda'
 require 'mocha'
+require 'bourne'
 
 require 'active_record'
 require 'active_record/version'
 require 'active_support'
+require 'active_support/core_ext'
 require 'mime/types'
 require 'pathname'
-
-require 'pathname'
+require 'ostruct'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
@@ -26,13 +27,6 @@ end
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
-end
-
 class Test::Unit::TestCase
   def setup
     silence_warnings do
@@ -54,15 +48,26 @@ ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FIL
 ActiveRecord::Base.establish_connection(config['test'])
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
-Dir[File.join(File.dirname(__FILE__), 'support','*')].each do |f|
-  require f
+def require_everything_in_directory(directory_name)
+  Dir[File.join(File.dirname(__FILE__), directory_name, '*')].each do |f|
+    require f
+  end
 end
 
+require_everything_in_directory('support')
+
 def reset_class class_name
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-  klass.class_eval{ include Paperclip::Glue }
+
+  klass.class_eval do
+    include Paperclip::Glue
+  end
+
+  klass.reset_column_information
+  klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
+  klass.connection.schema_cache.clear_table_cache!(klass.table_name) if klass.connection.respond_to?(:schema_cache)
   klass
 end
 
@@ -89,15 +94,10 @@ def rebuild_model options = {}
 end
 
 def rebuild_class options = {}
-  ActiveRecord::Base.send(:include, Paperclip::Glue)
-  Object.send(:remove_const, "Dummy") rescue nil
-  Object.const_set("Dummy", Class.new(ActiveRecord::Base))
-  Paperclip.reset_duplicate_clash_check!
-  Dummy.class_eval do
-    include Paperclip::Glue
-    has_attached_file :avatar, options
+  reset_class("Dummy").tap do |klass|
+    klass.has_attached_file :avatar, options
+    Paperclip.reset_duplicate_clash_check!
   end
-  Dummy.reset_column_information
 end
 
 class FakeModel
@@ -114,10 +114,9 @@ class FakeModel
 
   def run_paperclip_callbacks name, *args
   end
-
 end
 
-def attachment options
+def attachment(options={})
   Paperclip::Attachment.new(:avatar, FakeModel.new, options)
 end
 

data/test/identity_adapter_test.rb

@@ -0,0 +1,8 @@
+require './test/helper'
+
+class IdentityAdapterTest < Test::Unit::TestCase
+  should "respond to #new by returning the argument" do
+    adapter = Paperclip::IdentityAdapter.new
+    assert_equal :target, adapter.new(:target)
+  end
+end

data/test/integration_test.rb

@@ -10,6 +10,8 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
+    teardown { @file.close }
+
     should "not exceed the open file limit" do
        assert_nothing_raised do
          dummies = Dummy.find(:all)
@@ -40,12 +42,16 @@ class IntegrationTest < Test::Unit::TestCase
 
       should "not raise an error" do
         assert_nothing_raised do
-          @dummy.avatar.reprocess!
+          silence_stream(STDERR) do
+            @dummy.avatar.reprocess!
+          end
         end
       end
 
       should "return false" do
-        assert ! @dummy.avatar.reprocess!
+        silence_stream(STDERR) do
+          assert !@dummy.avatar.reprocess!
+        end
       end
 
       teardown { File.chmod(0644, @dummy.avatar.path) }
@@ -54,7 +60,6 @@ class IntegrationTest < Test::Unit::TestCase
     context "redefining its attachment styles" do
       setup do
         Dummy.class_eval do
-          has_attached_file :avatar, :styles => { :thumb => "150x25#" }
           has_attached_file :avatar, :styles => { :thumb => "150x25#", :dynamic => lambda { |a| '50x50#' } }
         end
         @d2 = Dummy.find(@dummy.id)
@@ -71,28 +76,12 @@ class IntegrationTest < Test::Unit::TestCase
       should "change the timestamp" do
         assert_not_equal @original_timestamp, @d2.avatar_updated_at
       end
-
-      should "clean up the old original if it is a tempfile" do
-        original = @d2.avatar.to_file(:original)
-        tf = Paperclip::Tempfile.new('original')
-        tf.binmode
-        original.binmode
-        tf.write(original.read)
-        original.close
-        tf.rewind
-
-        File.expects(:unlink).with(tf.instance_variable_get(:@tmpname))
-
-        @d2.avatar.expects(:to_file).with(:original).returns(tf)
-
-        @d2.avatar.reprocess!
-      end
     end
   end
 
   context "Attachment" do
     setup do
-      @thumb_path = "./test/../public/system/avatars/1/thumb/5k.png"
+      @thumb_path = "./test/../public/system/dummies/avatars/000/000/001/thumb/5k.png"
       File.delete(@thumb_path) if File.exists?(@thumb_path)
       rebuild_model :styles => { :thumb => "50x50#" }
       @dummy = Dummy.new
@@ -121,8 +110,8 @@ class IntegrationTest < Test::Unit::TestCase
 
   context "Attachment with no generated thumbnails" do
     setup do
-      @thumb_small_path = "./test/../public/system/avatars/1/thumb_small/5k.png"
-      @thumb_large_path = "./test/../public/system/avatars/1/thumb_large/5k.png"
+      @thumb_small_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_small/5k.png"
+      @thumb_large_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_large/5k.png"
       File.delete(@thumb_small_path) if File.exists?(@thumb_small_path)
       File.delete(@thumb_large_path) if File.exists?(@thumb_large_path)
       rebuild_model :styles => { :thumb_small => "50x50#", :thumb_large => "60x60#" }
@@ -173,7 +162,7 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     should "report the file size of the processed file and not the original" do
-      assert_not_equal @file.size, @dummy.avatar.size
+      assert_not_equal File.size(@file.path), @dummy.avatar.size
     end
 
     teardown { @file.close }
@@ -225,48 +214,6 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
-  context "A model with no attachment validation" do
-    setup do
-      rebuild_model :styles => { :large => "300x300>",
-                                 :medium => "100x100",
-                                 :thumb => ["32x32#", :gif] },
-                    :default_style => :medium,
-                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      @dummy     = Dummy.new
-    end
-
-    should "have its definition return false when asked about whiny_thumbnails" do
-      assert ! Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-    end
-
-    context "when validates_attachment_thumbnails is called" do
-      setup do
-        Dummy.validates_attachment_thumbnails :avatar
-      end
-
-      should "have its definition return true when asked about whiny_thumbnails" do
-        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-      end
-    end
-
-    context "redefined to have attachment validations" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :whiny_thumbnails => true,
-                      :default_style => :medium,
-                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      end
-
-      should "have its definition return true when asked about whiny_thumbnails" do
-        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-      end
-    end
-  end
-
   context "A model with no convert_options setting" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -331,12 +278,33 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  [000,002,022].each do |umask|
+    context "when the umask is #{umask}" do
+      setup do
+        rebuild_model
+        @dummy = Dummy.new
+        @file  = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+        @umask = File.umask(umask)
+      end
+
+      teardown do
+        File.umask @umask
+        @file.close
+      end
+
+      should "respect the current umask" do
+        @dummy.avatar = @file
+        @dummy.save
+        assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
+      end
+    end
+  end
+
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
                                  :medium => "100x100",
                                  :thumb => ["32x32#", :gif] },
-                    :whiny_thumbnails => true,
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
                     :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
@@ -349,6 +317,8 @@ class IntegrationTest < Test::Unit::TestCase
       assert @dummy.save
     end
 
+    teardown { [@file, @bad_file].each(&:close) }
+
     should "write and delete its files" do
       [["434x66", :original],
        ["300x46", :large],
@@ -367,8 +337,6 @@ class IntegrationTest < Test::Unit::TestCase
       assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path(:medium)}"`.chomp
       assert_equal "32x32",  `identify -format "%wx%h" "#{@d2.avatar.path(:thumb)}"`.chomp
 
-      @dummy.avatar = "not a valid file but not nil"
-      assert_equal File.basename(@file.path), @dummy.avatar_file_name
       assert @dummy.valid?
       assert @dummy.save
 
@@ -407,13 +375,13 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
-    should "know the difference between good files, bad files, and not files" do
-      expected = @dummy.avatar.to_file
-      @dummy.avatar = "not a file"
-      assert @dummy.valid?
-      assert_equal expected.path, @dummy.avatar.path
-      expected.close
+    should "not abide things that don't have adapters" do
+      assert_raises(Paperclip::AdapterRegistry::NoHandlerError) do
+        @dummy.avatar = "not a file"
+      end
+    end
 
+    should "not be ok with bad files" do
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
     end
@@ -429,31 +397,13 @@ class IntegrationTest < Test::Unit::TestCase
 
     should "be able to reload without saving and not have the file disappear" do
       @dummy.avatar = @file
-      assert @dummy.save
+      assert @dummy.save, @dummy.errors.full_messages.inspect
       @dummy.avatar.clear
       assert_nil @dummy.avatar_file_name
       @dummy.reload
       assert_equal "5k.png", @dummy.avatar_file_name
     end
 
-    [000,002,022].each do |umask|
-      context "when the umask is #{umask}" do
-        setup do
-          @umask = File.umask umask
-        end
-
-        teardown do
-          File.umask @umask
-        end
-
-        should "respect the current umask" do
-          @dummy.avatar = @file
-          @dummy.save
-          assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
-        end
-      end
-    end
-
     context "that is assigned its file from another Paperclip attachment" do
       setup do
         @dummy2 = Dummy.new
@@ -462,15 +412,17 @@ class IntegrationTest < Test::Unit::TestCase
         @dummy2.save
       end
 
+      teardown { @file2.close }
+
       should "work when assigned a file" do
         assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                          `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
 
         assert @dummy.avatar = @dummy2.avatar
         @dummy.save
+        assert_equal @dummy.avatar_file_name, @dummy2.avatar_file_name
         assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                      `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
-        assert_equal @dummy.avatar_file_name, @dummy2.avatar_file_name
       end
     end
 
@@ -482,16 +434,13 @@ class IntegrationTest < Test::Unit::TestCase
         has_many :attachments, :class_name => 'Dummy'
       end
 
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
       @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__),
-                               "fixtures",
-                               "5k.png"), 'rb')
+      @dummy.avatar = @file
     end
 
     should "should not error when saving" do
-      assert_nothing_raised do
-        @dummy.save!
-      end
+      @dummy.save!
     end
   end
 
@@ -522,7 +471,6 @@ class IntegrationTest < Test::Unit::TestCase
                                    :medium => "100x100",
                                    :thumb => ["32x32#", :gif] },
                       :storage => :s3,
-                      :whiny_thumbnails => true,
                       :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
                       :default_style => :medium,
                       :bucket => ENV['S3_TEST_BUCKET'],
@@ -538,6 +486,12 @@ class IntegrationTest < Test::Unit::TestCase
         @files_on_s3 = s3_files_for @dummy.avatar
       end
 
+      teardown do
+        @file.close
+        @bad_file.close
+        @files_on_s3.values.each(&:close)
+      end
+
       context 'assigning itself to a new model' do
         setup do
           @d2 = Dummy.new
@@ -551,7 +505,6 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "have the same contents as the original" do
-        @file.rewind
         assert_equal @file.read, @files_on_s3[:original].read
       end