paperclip 4.2.2 → 5.2.1

data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb

@@ -17,22 +17,26 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
 
   it "rejects a class with no validation" do
     expect(matcher).to_not accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it 'rejects a class when the validation fails' do
     Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
     expect(matcher).to_not accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "accepts a class with a matching validation" do
     Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
     expect(matcher).to accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "accepts a class with other validations but matching types" do
     Dummy.validates_presence_of :title
     Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
     expect(matcher).to accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "accepts a class that matches and a matcher that only specifies 'allowing'" do
@@ -40,6 +44,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
     matcher = plain_matcher.allowing(%w(image/png image/jpeg))
 
     expect(matcher).to accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "rejects a class that does not match and a matcher that only specifies 'allowing'" do
@@ -47,6 +52,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
     matcher = plain_matcher.allowing(%w(image/png image/jpeg))
 
     expect(matcher).to_not accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "accepts a class that matches and a matcher that only specifies 'rejecting'" do
@@ -54,6 +60,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
     matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
 
     expect(matcher).to accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   it "rejects a class that does not match and a matcher that only specifies 'rejecting'" do
@@ -61,6 +68,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
     matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
 
     expect(matcher).to_not accept(Dummy)
+    expect { matcher.failure_message }.to_not raise_error
   end
 
   context "using an :if to control the validation" do
@@ -75,12 +83,14 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
       dummy = Dummy.new
       dummy.go = true
       expect(matcher).to accept(dummy)
+      expect { matcher.failure_message }.to_not raise_error
     end
 
     it "does not run the validation if the control is false" do
       dummy = Dummy.new
       dummy.go = false
       expect(matcher).to_not accept(dummy)
+      expect { matcher.failure_message }.to_not raise_error
     end
   end
 

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -3,32 +3,32 @@ require 'spec_helper'
 describe Paperclip::MediaTypeSpoofDetector do
   it 'rejects a file that is named .html and identifies as PNG' do
     file = File.open(fixture_file("5k.png"))
-    assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html").spoofed?
+    assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html", "image/png").spoofed?
   end
 
   it 'does not reject a file that is named .jpg and identifies as PNG' do
     file = File.open(fixture_file("5k.png"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg").spoofed?
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg", "image/png").spoofed?
   end
 
   it 'does not reject a file that is named .html and identifies as HTML' do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html").spoofed?
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "text/html").spoofed?
   end
 
   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
     adapter = Paperclip.io_adapters.for(File.new(fixture_file("5k.png")))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename).spoofed?
+    assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
   end
 
   it 'does not reject when the extension => content_type is in :content_type_mappings' do
@@ -38,19 +38,42 @@ describe Paperclip::MediaTypeSpoofDetector do
       file.puts "Certificate!"
       file.close
       adapter = Paperclip.io_adapters.for(File.new(file.path));
-      assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename).spoofed?
+      assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
     ensure
       Paperclip.options[:content_type_mappings] = {}
     end
   end
 
-  it "rejects a file if named .html and is as HTML, but we're told JPG" do
-    file = File.open(fixture_file("empty.html"))
-    assert Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed?
+  context "file named .html and is as HTML, but we're told JPG" do
+    let(:file) { File.open(fixture_file("empty.html")) }
+    let(:spoofed?) { Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed? }
+
+    it "rejects the file" do
+      assert spoofed?
+    end
+
+    it "logs info about the detected spoof" do
+      Paperclip.expects(:log).with('Content Type Spoof: Filename empty.html (image/jpg from Headers, ["text/html"] from Extension), content type discovered from file command: text/html. See documentation to allow this combination.')
+      spoofed?
+    end
   end
 
-  it "does not reject is content_type is empty but otherwise checks out" do
+  it "does not reject if content_type is empty but otherwise checks out" 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/paperclip_spec.rb

@@ -20,7 +20,7 @@ describe Paperclip do
     it "saves Cocaine::CommandLine.path that set before" do
       Cocaine::CommandLine.path = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
-      assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
+      expect(Cocaine::CommandLine.path).to match("/opt/my_app/bin")
     end
 
     it "does not duplicate Cocaine::CommandLine.path on multiple runs" do
@@ -29,7 +29,9 @@ describe Paperclip do
       Paperclip.options[:command_path] = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
       Paperclip.run("convert", "more_stuff")
-      assert_equal 1, [Cocaine::CommandLine.path].flatten.size
+
+      cmd_path = Paperclip.options[:command_path]
+      assert_equal 1, Cocaine::CommandLine.path.scan(cmd_path).count
     end
   end
 
@@ -123,33 +125,6 @@ describe Paperclip do
       end
     end
 
-    if using_protected_attributes?
-      context "that is attr_protected" do
-        before do
-          Dummy.class_eval do
-            attr_protected :avatar
-          end
-          @dummy = Dummy.new
-        end
-
-        it "does not assign the avatar on mass-set" do
-          @dummy.attributes = { other: "I'm set!",
-                                avatar: @file }
-
-          assert_equal "I'm set!", @dummy.other
-          assert ! @dummy.avatar?
-        end
-
-        it "allows assigment on normal set" do
-          @dummy.other  = "I'm set!"
-          @dummy.avatar = @file
-
-          assert_equal "I'm set!", @dummy.other
-          assert @dummy.avatar?
-        end
-      end
-    end
-
     context "with a subclass" do
       before do
         class ::SubDummy < Dummy; end

data/spec/paperclip/plural_cache_spec.rb

@@ -3,34 +3,35 @@ require 'spec_helper'
 describe 'Plural cache' do
   it 'caches pluralizations' do
     cache = Paperclip::Interpolations::PluralCache.new
-    word = "box"
+    symbol = :box
 
-    word.expects(:pluralize).returns("boxes").once
-
-    cache.pluralize(word)
-    cache.pluralize(word)
+    first = cache.pluralize_symbol(symbol)
+    second = cache.pluralize_symbol(symbol)
+    expect(first).to equal(second)
   end
 
   it 'caches pluralizations and underscores' do
+    class BigBox ; end
     cache = Paperclip::Interpolations::PluralCache.new
-    word = "BigBox"
-
-    word.expects(:pluralize).returns(word).once
-    word.expects(:underscore).returns(word).once
+    klass = BigBox
 
-    cache.underscore_and_pluralize(word)
-    cache.underscore_and_pluralize(word)
+    first = cache.underscore_and_pluralize_class(klass)
+    second = cache.underscore_and_pluralize_class(klass)
+    expect(first).to equal(second)
   end
 
   it 'pluralizes words' do
     cache = Paperclip::Interpolations::PluralCache.new
-    word = "box"
-    assert_equal "boxes", cache.pluralize(word)
+    symbol = :box
+
+    expect(cache.pluralize_symbol(symbol)).to eq("boxes")
   end
 
-  it 'pluralizes and underscore words' do
+  it 'pluralizes and underscore class names' do
+    class BigBox ; end
     cache = Paperclip::Interpolations::PluralCache.new
-    word = "BigBox"
-    assert_equal "big_boxes", cache.underscore_and_pluralize(word)
+    klass = BigBox
+
+    expect(cache.underscore_and_pluralize_class(klass)).to eq("big_boxes")
   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

data/spec/paperclip/storage/fog_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-require 'fog'
+require 'fog/aws'
+require 'fog/local'
 require 'timecop'
 
 describe Paperclip::Storage::Fog do
@@ -182,6 +183,13 @@ describe Paperclip::Storage::Fog do
         tempfile.close
       end
 
+      it 'is able to be handled when missing while copying to a local file' do
+        tempfile = Tempfile.new("known_location")
+        tempfile.binmode
+        assert_equal false, @dummy.avatar.copy_to_local_file(:original, tempfile.path)
+        tempfile.close
+      end
+
       it "passes the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]
@@ -265,6 +273,22 @@ describe Paperclip::Storage::Fog do
         end
       end
 
+      context "with fog_public as a proc" do
+        let(:proc) { ->(attachment) { !attachment } }
+
+        before do
+          rebuild_model(@options.merge(fog_public: proc))
+          @dummy = Dummy.new
+          @dummy.avatar = StringIO.new(".")
+          @dummy.save
+        end
+
+        it "sets the @fog_public instance variable to false" do
+          assert_equal proc, @dummy.avatar.instance_variable_get("@options")[:fog_public]
+          assert_equal false, @dummy.avatar.fog_public
+        end
+      end
+
       context "with styles set and fog_public set to false" do
         before do
           rebuild_model(@options.merge(fog_public: false, styles: { medium: "300x300>", thumb: "100x100>" }))
@@ -320,6 +344,9 @@ describe Paperclip::Storage::Fog do
         it "honors the scheme in public url" do
           assert_match(/^http:\/\//, @dummy.avatar.url)
         end
+        it "honors the scheme in expiring url" do
+          assert_match(/^http:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with scheme not set" do
@@ -334,15 +361,20 @@ describe Paperclip::Storage::Fog do
         it "provides HTTPS public url" do
           assert_match(/^https:\/\//, @dummy.avatar.url)
         end
+        it "provides HTTPS expiring url" do
+          assert_match(/^https:\/\//, @dummy.avatar.expiring_url)
+        end
       end
 
       context "with a valid bucket name for a subdomain" do
+        before { @dummy.stubs(:new_record?).returns(false) }
+
         it "provides an url in subdomain style" do
           assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
         end
 
         it "provides an url that expires in subdomain style" do
-          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
       end
 
@@ -390,7 +422,7 @@ describe Paperclip::Storage::Fog do
         end
 
         it "provides a url that expires in folder style" do
-          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
 
       end
@@ -409,6 +441,9 @@ describe Paperclip::Storage::Fog do
           assert @connection.directories.get(@dynamic_fog_directory).inspect
         end
 
+        it "provides an url using dynamic bucket name" do
+          assert_match(/^https:\/\/dynamicpaperclip.s3.amazonaws.com\/avatars\/5k.png\?\d*$/, @dummy.avatar.url)
+        end
       end
 
       context "with a proc for the fog_host evaluating a model method" do
@@ -475,6 +510,25 @@ describe Paperclip::Storage::Fog do
           assert_equal @dummy.avatar.fog_credentials, @dynamic_fog_credentials
         end
       end
+
+      context "with custom fog_options" do
+        before do
+          rebuild_model(
+            @options.merge(fog_options: { multipart_chunk_size: 104857600 }),
+          )
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        it "applies the options to the fog #create call" do
+          files = stub
+          @dummy.avatar.stubs(:directory).returns stub(files: files)
+          files.expects(:create).with(
+            has_entries(multipart_chunk_size: 104857600),
+          )
+          @dummy.save
+        end
+      end
     end
 
   end
@@ -492,6 +546,7 @@ describe Paperclip::Storage::Fog do
       @file = File.new(fixture_file('5k.png'), 'rb')
       @dummy = Dummy.new
       @dummy.avatar = @file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     after do

data/spec/paperclip/storage/s3_live_spec.rb

@@ -8,9 +8,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         @file = File.new(fixture_file("5k.png"))
@@ -45,9 +46,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         @dummy = Dummy.new
@@ -64,9 +66,10 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
         Dummy.delete_all
@@ -105,9 +108,12 @@ unless ENV["S3_BUCKET"].blank?
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
           storage: :s3,
           bucket: ENV["S3_BUCKET"],
+          s3_region: ENV["S3_REGION"],
+          url: ":s3_domain_url",
+          path: "/:class/:attachment/:id_partition/:style/:filename",
           s3_credentials: {
-            aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+            access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+            secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
           }
 
         Dummy.delete_all
@@ -136,7 +142,7 @@ unless ENV["S3_BUCKET"].blank?
       it "is destroyable" do
         url = @dummy.avatar.url
         @dummy.destroy
-        assert_not_found_response url
+        assert_forbidden_response url
       end
     end
 
@@ -146,12 +152,12 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
-                        aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-                        aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+                        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       },
-                      s3_server_side_encryption: :aes256
-
+                      s3_server_side_encryption: "AES256"
         Dummy.delete_all
         @dummy = Dummy.new
       end
@@ -173,7 +179,7 @@ unless ENV["S3_BUCKET"].blank?
           end
 
           it "is encrypted on S3" do
-            assert @dummy.avatar.s3_object.server_side_encryption == :aes256
+            assert @dummy.avatar.s3_object.server_side_encryption == "AES256"
           end
         end
       end