paperclip 3.4.2 → 3.5.0

data/paperclip.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.requirements << "ImageMagick"
   s.required_ruby_version = ">= 1.9.2"
 
-  s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('cocaine', '~> 0.5.0')
   s.add_dependency('mime-types')
 
+  s.add_development_dependency('activerecord', '>= 3.0.0')
   s.add_development_dependency('shoulda')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
@@ -40,13 +40,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber', '~> 1.2.1')
   s.add_development_dependency('aruba')
   s.add_development_dependency('nokogiri')
-  s.add_development_dependency('capybara')
+  # Ruby version < 1.9.3 can't install capybara > 2.0.3.
+  s.add_development_dependency('capybara', '= 2.0.3')
   s.add_development_dependency('bundler')
   s.add_development_dependency('fog', '>= 1.4.0', "< 1.7.0")
   s.add_development_dependency('pry')
+  s.add_development_dependency('pry-debugger')
   s.add_development_dependency('launchy')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')
   s.add_development_dependency('railties')
-  s.add_development_dependency('actionmailer')
+  s.add_development_dependency('actionmailer', '>= 3.0.0')
 end

data/test/attachment_processing_test.rb

@@ -7,23 +7,77 @@ class AttachmentProcessingTest < Test::Unit::TestCase
     rebuild_model
   end
 
-  should 'process attachments given a valid assignment' do
-    file = File.new(fixture_file("5k.png"))
-    Dummy.validates_attachment_content_type :avatar, :content_type => "image/png"
-    instance = Dummy.new
-    attachment = instance.avatar
-    attachment.expects(:post_process)
-
-    attachment.assign(file)
+  context 'using validates_attachment_content_type' do
+    should 'process attachments given a valid assignment' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment_content_type :avatar, :content_type => "image/png"
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles)
+
+      attachment.assign(file)
+    end
+
+    should 'not process attachments given an invalid assignment with :not' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment_content_type :avatar, :not => "image/png"
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles).never
+
+      attachment.assign(file)
+    end
+
+    should 'not process attachments given an invalid assignment with :content_type' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment_content_type :avatar, :content_type => "image/tiff"
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles).never
+
+      attachment.assign(file)
+    end
+
+    should 'when validation :if clause returns false, allow what would be an invalid assignment' do
+      invalid_assignment = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment_content_type :avatar, :content_type => "image/tiff", :if => lambda{false}
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles)
+
+      attachment.assign(invalid_assignment)
+    end
   end
 
-  should 'not process attachments if the assignment does not pass validation' do
-    file = File.new(fixture_file("5k.png"))
-    Dummy.validates_attachment_content_type :avatar, :content_type => "image/tiff"
-    instance = Dummy.new
-    attachment = instance.avatar
-    attachment.expects(:post_process).never
+  context 'using validates_attachment' do
+    should 'process attachments given a valid assignment' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment :avatar, :content_type => {:content_type => "image/png"}
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles)
+
+      attachment.assign(file)
+    end
+
+    should 'not process attachments given an invalid assignment with :not' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment :avatar, :content_type => {:not => "image/png"}
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles).never
+
+      attachment.assign(file)
+    end
+
+    should 'not process attachments given an invalid assignment with :content_type' do
+      file = File.new(fixture_file("5k.png"))
+      Dummy.validates_attachment :avatar, :content_type => {:content_type => "image/tiff"}
+      instance = Dummy.new
+      attachment = instance.avatar
+      attachment.expects(:post_process_styles).never
 
-    attachment.assign(file)
+      attachment.assign(file)
+    end
   end
 end

data/test/attachment_test.rb

@@ -916,6 +916,41 @@ class AttachmentTest < Test::Unit::TestCase
         end
       end
     end
+
+    context 'with specified cleaner' do
+      setup do
+        @old_defaults = Paperclip::Attachment.default_options.dup
+      end
+
+      teardown do
+        Paperclip::Attachment.default_options.merge! @old_defaults
+      end
+
+      should 'call the given proc and take the result as cleaned filename' do
+        Paperclip::Attachment.default_options[:filename_cleaner] = lambda do |str|
+          "from_proc_#{str}"
+        end
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        assert_equal "from_proc_goood.png", @dummy.avatar.original_filename
+      end
+
+      should 'call the given object and take the result as the cleaned filename' do
+        class MyCleaner
+          def call(filename)
+            "foo"
+          end
+        end
+        Paperclip::Attachment.default_options[:filename_cleaner] = MyCleaner.new
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        assert_equal "foo", @dummy.avatar.original_filename
+      end
+    end
   end
 
   context "Attachment with uppercase extension and a default style" do
@@ -985,6 +1020,20 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
+    should 'clear out the previous assignment when assigned nil' do
+      @attachment.assign(@file)
+      original_file = @attachment.queued_for_write[:original]
+      @attachment.assign(nil)
+      assert_nil @attachment.queued_for_write[:original]
+    end
+
+    should 'not do anything when it is assigned an empty string' do
+      @attachment.assign(@file)
+      original_file = @attachment.queued_for_write[:original]
+      @attachment.assign("")
+      assert_equal original_file, @attachment.queued_for_write[:original]
+    end
+
     should "return nil as path when no file assigned" do
       assert_equal nil, @attachment.path
       assert_equal nil, @attachment.path(:blah)

data/test/filename_cleaner_test.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+require './test/helper'
+
+class FilenameCleanerTest < Test::Unit::TestCase
+  should 'convert invalid characters to underscores' do
+    cleaner = Paperclip::FilenameCleaner.new(/[aeiou]/)
+    assert_equal "b_s_b_ll", cleaner.call("baseball")
+  end
+
+  should 'not convert anything if the character regex is nil' do
+    cleaner = Paperclip::FilenameCleaner.new(nil)
+    assert_equal "baseball", cleaner.call("baseball")
+  end
+end

data/test/has_attached_file_test.rb

@@ -0,0 +1,109 @@
+require './test/helper'
+require 'paperclip/has_attached_file'
+
+class HasAttachedFileTest < Test::Unit::TestCase
+  context '#define_on' do
+    should 'define a setter on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar=')
+    end
+
+    should 'define a getter on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar')
+    end
+
+    should 'define a query on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar?')
+    end
+
+    should 'flush errors as part of validations' do
+      assert_adding_attachment('avatar').defines_validation
+    end
+
+    should 'register the attachment with Paperclip::Tasks' do
+      assert_adding_attachment('avatar').registers_with_tasks
+    end
+
+    should 'define an after_save callback' do
+      assert_adding_attachment('avatar').defines_callback('after_save')
+    end
+
+    should 'define a before_destroy callback' do
+      assert_adding_attachment('avatar').defines_callback('before_destroy')
+    end
+
+    should 'define an after_destroy callback' do
+      assert_adding_attachment('avatar').defines_callback('after_destroy')
+    end
+
+    should 'define the Paperclip-specific callbacks' do
+      assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
+    end
+  end
+
+  private
+
+  def assert_adding_attachment(attachment_name)
+    AttachmentAdder.new(attachment_name)
+  end
+
+  class AttachmentAdder
+    include Mocha::API
+    include Test::Unit::Assertions
+
+    def initialize(attachment_name)
+      @attachment_name = attachment_name
+    end
+
+    def defines_method(method_name)
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, :define_method) do |expect|
+        expect.with(method_name)
+      end
+    end
+
+    def defines_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, :validates_each) do |expect|
+        expect.with(@attachment_name)
+      end
+    end
+
+    def registers_with_tasks
+      a_class = stub_class
+      Paperclip::Tasks::Attachments.stubs(:add)
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
+
+      assert_received(Paperclip::Tasks::Attachments, :add) do |expect|
+        expect.with(a_class, @attachment_name, {size: 1})
+      end
+    end
+
+    def defines_callback(callback_name)
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, callback_name.to_sym)
+    end
+
+    private
+
+    def stub_class
+      stub('class',
+           validates_each: nil,
+           define_method: nil,
+           after_save: nil,
+           before_destroy: nil,
+           after_destroy: nil,
+           define_paperclip_callbacks: nil,
+           name: 'Billy')
+    end
+  end
+end

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require 'test/unit'
 
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'bourne'
 
 require 'active_record'

data/test/integration_test.rb

@@ -207,70 +207,6 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
-  context "A model with no 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 => ":rails_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][:convert_options]
-    end
-
-    context "redefined to have convert_options setting" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :convert_options => "-strip -depth 8",
-                      :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 convert_options value when asked about convert_options" do
-        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
-      end
-    end
-  end
-
-  context "A model with no source_file_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 => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      @dummy     = Dummy.new
-    end
-
-    should "have its definition return nil when asked about source_file_options" do
-      assert ! Dummy.attachment_definitions[:avatar][:source_file_options]
-    end
-
-    context "redefined to have source_file_options setting" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :source_file_options => "-density 400",
-                      :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 source_file_options value when asked about source_file_options" do
-        assert_equal "-density 400", Dummy.attachment_definitions[:avatar][:source_file_options]
-      end
-    end
-  end
-
   [000,002,022].each do |umask|
     context "when the umask is #{umask}" do
       setup do
@@ -412,7 +348,7 @@ class IntegrationTest < Test::Unit::TestCase
       Dummy.validates_attachment_presence :avatar
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
-      assert   @d2.valid?, @d2.errors.full_messages.inspect
+      assert  @d2.valid?, @d2.errors.full_messages.inspect
       @d2.avatar = @bad_file
       assert ! @d2.valid?
     end

data/test/io_adapters/abstract_adapter_test.rb

@@ -47,4 +47,12 @@ class AbstractAdapterTest < Test::Unit::TestCase
 
     assert_equal "awesome_file_name.png", @adapter.original_filename
   end
+
+  should 'be an assignment' do
+    assert TestAdapter.new.assignment?
+  end
+
+  should 'not be nil' do
+    assert !TestAdapter.new.nil?
+  end
 end

data/test/io_adapters/data_uri_adapter_test.rb

@@ -0,0 +1,60 @@
+require './test/helper'
+
+class DataUriAdapterTest < Test::Unit::TestCase
+  context "a new instance" do
+    setup do
+      @contents = "data:image/png;base64,dGVzdA=="
+      @subject = Paperclip.io_adapters.for(@contents)
+    end
+
+    should "return a file name" do
+      assert_equal "base64.txt", @subject.original_filename
+    end
+
+    should "return a content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    should "return the size of the data" do
+      assert_equal 4, @subject.size
+    end
+
+    should "generate an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest(Base64.decode64('dGVzdA==')), @subject.fingerprint
+    end
+
+    should "generate correct fingerprint after read" do
+      fingerprint = Digest::MD5.hexdigest(@subject.read)
+      assert_equal fingerprint, @subject.fingerprint
+    end
+
+    should "generate same fingerprint" do
+      assert_equal @subject.fingerprint, @subject.fingerprint
+    end
+
+    should "return the data contained in the StringIO" do
+      assert_equal "test", @subject.read
+    end
+
+    should 'accept a content_type' do
+      @subject.content_type = 'image/png'
+      assert_equal 'image/png', @subject.content_type
+    end
+
+    should 'accept an original_filename' do
+      @subject.original_filename = 'image.png'
+      assert_equal 'image.png', @subject.original_filename
+    end
+
+    should "not generate filenames that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_equal 'image_restricted.png', @subject.original_filename
+    end
+
+    should "not generate paths that include restricted characters" do
+      @subject.original_filename = 'image:restricted.png'
+      assert_no_match /:/, @subject.path
+    end
+
+  end
+end