paperclip 4.2.4 → 4.3.0

data/spec/paperclip/attachment_definitions_spec.rb

@@ -8,6 +8,6 @@ describe "Attachment Definitions" do
     Dummy.do_not_validate_attachment_file_type :avatar
     expected = {avatar: {path: "abc"}, other_attachment: {url: "123"}}
 
-    assert_equal expected, Dummy.attachment_definitions
+    expect(Dummy.attachment_definitions).to eq expected
   end
 end

data/spec/paperclip/attachment_registry_spec.rb

@@ -31,8 +31,8 @@ describe 'Attachment Registry' do
     it 'calls the block with the class, attachment name, and options' do
       foo = Class.new
       expected_accumulations = [
-        [foo, :avatar, { yo: 'greeting' }],
-        [foo, :greeter, { ciao: 'greeting' }]
+        [foo, :avatar, { yo: "greeting" }],
+        [foo, :greeter, { ciao: "greeting" }]
       ]
       expected_accumulations.each do |args|
         Paperclip::AttachmentRegistry.register(*args)
@@ -50,25 +50,64 @@ describe 'Attachment Registry' do
   context '.definitions_for' do
     it 'produces the attachment name and options' do
       expected_definitions = {
-        avatar: { yo: 'greeting' },
-        greeter: { ciao: 'greeting' }
+        avatar: { yo: "greeting" },
+        greeter: { ciao: "greeting" }
       }
       foo = Class.new
-      Paperclip::AttachmentRegistry.register(foo, :avatar, { yo: 'greeting' })
-      Paperclip::AttachmentRegistry.register(foo, :greeter, { ciao: 'greeting' })
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        yo: "greeting"
+      )
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :greeter,
+        ciao: "greeting"
+      )
 
       definitions = Paperclip::AttachmentRegistry.definitions_for(foo)
 
       assert_equal expected_definitions, definitions
     end
 
-    it "produces defintions for subclasses" do
-      expected_definitions = { avatar: { yo: 'greeting' } }
-      Foo = Class.new
-      Bar = Class.new(Foo)
-      Paperclip::AttachmentRegistry.register(Foo, :avatar, expected_definitions[:avatar])
+    it 'produces defintions for subclasses' do
+      expected_definitions = { avatar: { yo: "greeting" } }
+      foo = Class.new
+      bar = Class.new(foo)
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        expected_definitions[:avatar]
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
+
+      assert_equal expected_definitions, definitions
+    end
 
-      definitions = Paperclip::AttachmentRegistry.definitions_for(Bar)
+    it 'produces defintions for subclasses but deep merging them' do
+      foo_definitions = { avatar: { yo: "greeting" } }
+      bar_definitions = { avatar: { ciao: "greeting" } }
+      expected_definitions = {
+        avatar: {
+          yo: "greeting",
+          ciao: "greeting"
+        }
+      }
+      foo = Class.new
+      bar = Class.new(foo)
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        foo_definitions[:avatar]
+      )
+      Paperclip::AttachmentRegistry.register(
+        bar,
+        :avatar,
+        bar_definitions[:avatar]
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
 
       assert_equal expected_definitions, definitions
     end
@@ -77,7 +116,11 @@ describe 'Attachment Registry' do
   context '.clear' do
     it 'removes all of the existing attachment definitions' do
       foo = Class.new
-      Paperclip::AttachmentRegistry.register(foo, :greeter, { ciao: 'greeting' })
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :greeter,
+        ciao: "greeting"
+      )
 
       Paperclip::AttachmentRegistry.clear
 

data/spec/paperclip/attachment_spec.rb

@@ -13,7 +13,7 @@ describe Paperclip::Attachment do
   it "is present when the file is set" do
     rebuild_class
     dummy = Dummy.new
-    dummy.avatar = File.new(fixture_file("50x50.png"), "rb") 
+    dummy.avatar = File.new(fixture_file("50x50.png"), "rb")
     expect(dummy.avatar).to_not be_blank
     expect(dummy.avatar).to be_present
   end
@@ -34,9 +34,9 @@ describe Paperclip::Attachment do
   it "does not delete styles that don't get reprocessed" do
     file = File.new(fixture_file("50x50.png"), 'rb')
     rebuild_class styles: {
-      small: '100x>',
-      large: '500x>',
-      original: '42x42#' 
+      small: "100x>",
+      large: "500x>",
+      original: "42x42#"
     }
 
     dummy = Dummy.new
@@ -75,7 +75,11 @@ describe Paperclip::Attachment do
 
   it "handles a boolean second argument to #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name, :instance, url_generator: mock_url_generator_builder)
+    attachment = Paperclip::Attachment.new(
+      :name,
+      FakeModel.new,
+      url_generator: mock_url_generator_builder
+      )
 
     attachment.url(:style_name, true)
     expect(mock_url_generator_builder.has_generated_url_with_options?(timestamp: true, escape: true)).to eq true
@@ -86,7 +90,11 @@ describe Paperclip::Attachment do
 
   it "passes the style and options through to the URL generator on #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name, :instance, url_generator: mock_url_generator_builder)
+    attachment = Paperclip::Attachment.new(
+      :name,
+      FakeModel.new,
+      url_generator: mock_url_generator_builder
+      )
 
     attachment.url(:style_name, options: :values)
     expect(mock_url_generator_builder.has_generated_url_with_options?(options: :values)).to eq true
@@ -95,7 +103,7 @@ describe Paperclip::Attachment do
   it "passes default options through when #url is given one argument" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            use_timestamp: true)
 
@@ -106,7 +114,7 @@ describe Paperclip::Attachment do
   it "passes default style and options through when #url is given no arguments" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            default_style: 'default style',
                                            url_generator: mock_url_generator_builder,
                                            use_timestamp: true)
@@ -119,7 +127,7 @@ describe Paperclip::Attachment do
   it "passes the option timestamp: true if :use_timestamp is true and :timestamp is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            use_timestamp: true)
 
@@ -130,7 +138,7 @@ describe Paperclip::Attachment do
   it "passes the option timestamp: false if :use_timestamp is false and :timestamp is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            use_timestamp: false)
 
@@ -141,7 +149,7 @@ describe Paperclip::Attachment do
   it "does not change the :timestamp if :timestamp is passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            use_timestamp: false)
 
@@ -152,7 +160,7 @@ describe Paperclip::Attachment do
   it "renders JSON as default style" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            default_style: 'default style',
                                            url_generator: mock_url_generator_builder)
 
@@ -163,7 +171,7 @@ describe Paperclip::Attachment do
   it "passes the option escape: true if :escape_url is true and :escape is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            escape_url: true)
 
@@ -174,7 +182,7 @@ describe Paperclip::Attachment do
   it "passes the option escape: false if :escape_url is false and :escape is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
+                                           FakeModel.new,
                                            url_generator: mock_url_generator_builder,
                                            escape_url: false)
 
@@ -212,6 +220,7 @@ describe Paperclip::Attachment do
     dummy = Dummy.new
     dummy.id = 1234
     dummy.avatar_file_name = "fake.jpg"
+    dummy.stubs(:new_record?).returns(false)
     expected_string = '{"avatar":"/system/dummies/avatars/000/001/234/original/fake.jpg"}'
     if ActiveRecord::Base.include_root_in_json # This is true by default in Rails 3, and false in 4
       expected_string = %({"dummy":#{expected_string}})
@@ -251,6 +260,10 @@ describe Paperclip::Attachment do
       it "returns false when asked exists?" do
         assert !@dummy.avatar.exists?
       end
+
+      it "#url returns nil" do
+        assert_nil @dummy.avatar.url
+      end
     end
 
     context "on an Attachment" do
@@ -635,15 +648,40 @@ describe Paperclip::Attachment do
     before do
       rebuild_model processor: [:thumbnail], styles: { small: '' }, whiny_thumbnails: true
       @dummy = Dummy.new
-      Paperclip::Thumbnail.expects(:make).raises(Paperclip::Error, "cannot be processed.")
       @file = StringIO.new("...")
       @file.stubs(:to_tempfile).returns(@file)
-      @dummy.avatar = @file
     end
 
-    it "correctly forwards processing error message to the instance" do
-      @dummy.valid?
-      assert_contains @dummy.errors.full_messages, "Avatar cannot be processed."
+    context "when error is meaningful for the end user" do
+      before do
+        Paperclip::Thumbnail.expects(:make).raises(
+          Paperclip::Errors::NotIdentifiedByImageMagickError,
+          "cannot be processed."
+        )
+      end
+
+      it "correctly forwards processing error message to the instance" do
+        @dummy.avatar = @file
+        @dummy.valid?
+        assert_contains(
+          @dummy.errors.full_messages,
+          "Avatar cannot be processed."
+        )
+      end
+    end
+
+    context "when error is intended for the developer" do
+      before do
+        Paperclip::Thumbnail.expects(:make).raises(
+          Paperclip::Errors::CommandNotFoundError
+        )
+      end
+
+      it "propagates the error" do
+        assert_raises(Paperclip::Errors::CommandNotFoundError) do
+          @dummy.avatar = @file
+        end
+      end
     end
   end
 

data/spec/paperclip/content_type_detector_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Paperclip::ContentTypeDetector do
+  it 'returns a meaningful content type for open xml spreadsheets' do
+    file = File.new(fixture_file("empty.xlsx"))
+    assert_equal "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                 Paperclip::ContentTypeDetector.new(file.path).detect
+  end
+
   it 'gives a sensible default when the name is empty' do
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new("").detect
   end
@@ -13,7 +19,8 @@ describe Paperclip::ContentTypeDetector do
 
   it 'returns content type of file if it is an acceptable type' do
     MIME::Types.stubs(:type_for).returns([MIME::Type.new('application/mp4'), MIME::Type.new('video/mp4'), MIME::Type.new('audio/mp4')])
-    Paperclip.stubs(:run).returns("video/mp4")
+    Paperclip::ContentTypeDetector.any_instance
+      .stubs(:type_from_file_contents).returns("video/mp4")
     @filename = "my_file.mp4"
     assert_equal "video/mp4", Paperclip::ContentTypeDetector.new(@filename).detect
   end

data/spec/paperclip/file_command_content_type_detector_spec.rb

@@ -24,4 +24,3 @@ describe Paperclip::FileCommandContentTypeDetector do
       Paperclip::FileCommandContentTypeDetector.new("windows").detect
   end
 end
-

data/spec/paperclip/interpolations_spec.rb

@@ -138,14 +138,7 @@ describe Paperclip::Interpolations do
     assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
   end
 
-  it "returns the partitioned id of the attachment when the id is a short string" do
-    attachment = mock
-    attachment.expects(:id).returns("fnj23")
-    attachment.expects(:instance).returns(attachment)
-    assert_equal "000/0fn/j23", Paperclip::Interpolations.id_partition(attachment, :style)
-  end
-
-  it "returns the partitioned id of the attachment when the id is a long string" do
+  it "returns the partitioned id of the attachment when the id is a string" do
     attachment = mock
     attachment.expects(:id).returns("32fnj23oio2f")
     attachment.expects(:instance).returns(attachment)
@@ -211,7 +204,7 @@ describe Paperclip::Interpolations do
     attachment.stubs(:original_filename).returns("one")
     assert_equal "one", Paperclip::Interpolations.filename(attachment, :style)
   end
-
+  
   it "returns the basename when the extension contains regexp special characters" do
     attachment = mock
     attachment.stubs(:styles).returns({})

data/spec/paperclip/io_adapters/abstract_adapter_spec.rb

@@ -9,11 +9,12 @@ describe Paperclip::AbstractAdapter do
     end
   end
 
-  context "content type from file command" do
+  context "content type from file contents" do
     before do
       @adapter = TestAdapter.new
       @adapter.stubs(:path).returns("image.png")
       Paperclip.stubs(:run).returns("image/png\n")
+      Paperclip::ContentTypeDetector.any_instance.stubs(:type_from_mime_magic).returns("image/png")
     end
 
     it "returns the content type without newline" do

data/spec/paperclip/io_adapters/file_adapter_spec.rb

@@ -73,10 +73,13 @@ describe Paperclip::FileAdapter do
         end
       end
 
-      context "file with content type derived from file command on *nix" do
+      context "file with content type derived from file contents on *nix" do
         before do
           MIME::Types.stubs(:type_for).returns([])
           Paperclip.stubs(:run).returns("application/vnd.ms-office\n")
+          Paperclip::ContentTypeDetector.any_instance
+            .stubs(:type_from_mime_magic).returns("application/vnd.ms-office")
+
           @subject = Paperclip.io_adapters.for(@file)
         end
 

data/spec/paperclip/io_adapters/stringio_adapter_spec.rb

@@ -20,6 +20,10 @@ describe Paperclip::StringioAdapter do
       assert_equal 6, @subject.size
     end
 
+    it "returns the length of the data" do
+      assert_equal 6, @subject.length
+    end
+
     it "generates an MD5 hash of the contents" do
       assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
     end

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -18,12 +18,12 @@ describe Paperclip::MediaTypeSpoofDetector do
 
   it 'does not reject a file that does not have a name' do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "", "").spoofed?
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "", "text/html").spoofed?
   end
 
   it 'does not reject a file that does have an extension' do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "data", "").spoofed?
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "data", "text/html").spoofed?
   end
 
   it 'does not reject when the supplied file is an IOAdapter' do
@@ -53,4 +53,18 @@ describe Paperclip::MediaTypeSpoofDetector do
     file = File.open(fixture_file("empty.html"))
     assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "").spoofed?
   end
+
+  it 'does allow array as :content_type_mappings' do
+    begin
+      Paperclip.options[:content_type_mappings] = {
+        html: ['binary', 'text/html']
+      }
+      file = File.open(fixture_file('empty.html'))
+      spoofed = Paperclip::MediaTypeSpoofDetector
+                .using(file, "empty.html", "text/html").spoofed?
+      assert !spoofed
+    ensure
+      Paperclip.options[:content_type_mappings] = {}
+    end
+  end
 end

data/spec/paperclip/rails_environment_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Paperclip::RailsEnvironment do
+
+  it "returns nil when Rails isn't defined" do
+    resetting_rails_to(nil) do
+      expect(Paperclip::RailsEnvironment.get).to be_nil
+    end
+  end
+
+  it "returns nil when Rails.env isn't defined" do
+    resetting_rails_to({}) do
+      expect(Paperclip::RailsEnvironment.get).to be_nil
+    end
+  end
+
+  it "returns the value of Rails.env if it is set" do
+    resetting_rails_to(OpenStruct.new(env: "foo")) do
+      expect(Paperclip::RailsEnvironment.get).to eq "foo"
+    end
+  end
+
+  def resetting_rails_to(new_value)
+    begin
+      previous_rails = Object.send(:remove_const, "Rails")
+      Object.const_set("Rails", new_value) unless new_value.nil?
+      yield
+    ensure
+      Object.send(:remove_const, "Rails") if Object.const_defined?("Rails")
+      Object.const_set("Rails", previous_rails)
+    end
+  end
+end