paperclip 4.2.0 → 4.2.1

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "4.2.0" unless defined? Paperclip::VERSION
+  VERSION = "4.2.1" unless defined? Paperclip::VERSION
 end

data/spec/paperclip/has_attached_file_spec.rb

@@ -41,6 +41,14 @@ describe Paperclip::HasAttachedFile do
     it 'defines the Paperclip-specific callbacks' do
       assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
     end
+
+    it 'does not define a media_type check if told not to' do
+      assert_adding_attachment('avatar').does_not_set_up_media_type_check_validation
+    end
+
+    it 'does define a media_type check if told to' do
+      assert_adding_attachment('avatar').sets_up_media_type_check_validation
+    end
   end
 
   private
@@ -99,6 +107,22 @@ describe Paperclip::HasAttachedFile do
       expect(a_class).to have_received(callback_name.to_sym)
     end
 
+    def does_not_set_up_media_type_check_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: false })
+
+      expect(a_class).to have_received(:validates_media_type_spoof_detection).never
+    end
+
+    def sets_up_media_type_check_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, { validate_media_type: true })
+
+      expect(a_class).to have_received(:validates_media_type_spoof_detection)
+    end
+
     private
 
     def stub_class

data/spec/paperclip/interpolations_spec.rb

@@ -55,11 +55,11 @@ describe Paperclip::Interpolations do
 
   it "returns the extension of the file based on the content type" do
     attachment = mock
-    attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:content_type).returns('image/png')
     attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('random')
-    assert_equal "jpeg", interpolations.content_type_extension(attachment, :style)
+    assert_equal "png", interpolations.content_type_extension(attachment, :style)
   end
 
   it "returns the original extension of the file if it matches a content type extension" do
@@ -138,7 +138,14 @@ 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 string" do
+  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
     attachment = mock
     attachment.expects(:id).returns("32fnj23oio2f")
     attachment.expects(:instance).returns(attachment)
@@ -204,7 +211,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

@@ -67,4 +67,11 @@ describe Paperclip::AbstractAdapter do
     @adapter.original_filename = "file.png"
     expect(@adapter.send(:destination).path).to end_with(".png")
   end
+
+  context "#original_filename=" do
+    it "should not fail with a nil original filename" do
+      adapter = TestAdapter.new
+      expect{ adapter.original_filename = nil }.not_to raise_error
+    end
+  end
 end

data/spec/paperclip/meta_class_spec.rb

@@ -4,7 +4,7 @@ describe 'Metaclasses' do
   context "A meta-class of dummy" do
     if active_support_version >= "4.1" || ruby_version < "2.1"
       before do
-        rebuild_model("Dummy")
+        rebuild_model
         reset_class("Dummy")
       end
 

data/spec/paperclip/processor_helpers_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Paperclip::ProcessorHelpers do
+  describe '.load_processor' do
+    context 'when the file exists in lib/paperclip' do
+      it 'loads it correctly' do
+        pathname = Pathname.new('my_app')
+        main_path = 'main_path'
+        alternate_path = 'alternate_path'
+
+        Rails.stubs(:root).returns(pathname)
+        File.expects(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
+        File.expects(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
+        File.expects(:exist?).with(main_path).returns(true)
+        File.expects(:exist?).with(alternate_path).returns(false)
+
+        Paperclip.expects(:require).with(main_path)
+
+        Paperclip.load_processor(:custom)
+      end
+    end
+
+    context 'when the file exists in lib/paperclip_processors' do
+      it 'loads it correctly' do
+        pathname = Pathname.new('my_app')
+        main_path = 'main_path'
+        alternate_path = 'alternate_path'
+
+        Rails.stubs(:root).returns(pathname)
+        File.expects(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
+        File.expects(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
+        File.expects(:exist?).with(main_path).returns(false)
+        File.expects(:exist?).with(alternate_path).returns(true)
+
+        Paperclip.expects(:require).with(alternate_path)
+
+        Paperclip.load_processor(:custom)
+      end
+    end
+
+    context 'when the file does not exist in lib/paperclip_processors' do
+      it 'raises an error' do
+        pathname = Pathname.new('my_app')
+        main_path = 'main_path'
+        alternate_path = 'alternate_path'
+
+        Rails.stubs(:root).returns(pathname)
+        File.stubs(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
+        File.stubs(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
+        File.stubs(:exist?).with(main_path).returns(false)
+        File.stubs(:exist?).with(alternate_path).returns(false)
+
+        assert_raises(LoadError) { Paperclip.processor(:custom) }
+      end
+    end
+  end
+end

data/spec/paperclip/schema_spec.rb

@@ -24,7 +24,6 @@ describe Paperclip::Schema do
             t.has_attached_file :avatar
           end
         end
-        rebuild_class
 
         columns = Dummy.columns.map{ |column| [column.name, column.type] }
 
@@ -48,7 +47,6 @@ describe Paperclip::Schema do
         Dummy.connection.create_table :dummies, force: true do |t|
           t.attachment :avatar
         end
-        rebuild_class
       end
 
       it "creates attachment columns" do
@@ -60,6 +58,23 @@ describe Paperclip::Schema do
         expect(columns).to include(['avatar_updated_at', :datetime])
       end
     end
+
+    context "using #attachment with options" do
+      before do
+        Dummy.connection.create_table :dummies, force: true do |t|
+          t.attachment :avatar, default: 1, file_name: { default: 'default' }
+        end
+      end
+
+      it "sets defaults on columns" do
+        defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size"]
+        columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
+
+        expect(columns).to have_column("avatar_file_name").with_default("default")
+        expect(columns).to have_column("avatar_content_type").with_default("1")
+        expect(columns).to have_column("avatar_file_size").with_default(1)
+      end
+    end
   end
 
   context "within schema statement" do
@@ -71,7 +86,6 @@ describe Paperclip::Schema do
       context "with single attachment" do
         before do
           Dummy.connection.add_attachment :dummies, :avatar
-          rebuild_class
         end
 
         it "creates attachment columns" do
@@ -84,10 +98,24 @@ describe Paperclip::Schema do
         end
       end
 
+      context "with single attachment and options" do
+        before do
+          Dummy.connection.add_attachment :dummies, :avatar, default: '1', file_name: { default: 'default' }
+        end
+
+        it "sets defaults on columns" do
+          defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size"]
+          columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
+
+          expect(columns).to have_column("avatar_file_name").with_default("default")
+          expect(columns).to have_column("avatar_content_type").with_default("1")
+          expect(columns).to have_column("avatar_file_size").with_default(1)
+        end
+      end
+
       context "with multiple attachments" do
         before do
           Dummy.connection.add_attachment :dummies, :avatar, :photo
-          rebuild_class
         end
 
         it "creates attachment columns" do
@@ -104,11 +132,28 @@ describe Paperclip::Schema do
         end
       end
 
+      context "with multiple attachments and options" do
+        before do
+          Dummy.connection.add_attachment :dummies, :avatar, :photo, default: '1', file_name: { default: 'default' }
+        end
+
+        it "sets defaults on columns" do
+          defaults_columns = ["avatar_file_name", "avatar_content_type", "avatar_file_size", "photo_file_name", "photo_content_type", "photo_file_size"]
+          columns = Dummy.columns.select { |e| defaults_columns.include? e.name }
+
+          expect(columns).to have_column("avatar_file_name").with_default("default")
+          expect(columns).to have_column("avatar_content_type").with_default("1")
+          expect(columns).to have_column("avatar_file_size").with_default(1)
+          expect(columns).to have_column("photo_file_name").with_default("default")
+          expect(columns).to have_column("photo_content_type").with_default("1")
+          expect(columns).to have_column("photo_file_size").with_default(1)
+        end
+      end
+
       context "with no attachment" do
         it "raises an error" do
           assert_raises ArgumentError do
             Dummy.connection.add_attachment :dummies
-          rebuild_class
           end
         end
       end
@@ -132,7 +177,6 @@ describe Paperclip::Schema do
           ActiveSupport::Deprecation.silence do
             Dummy.connection.drop_attached_file :dummies, :avatar
           end
-          rebuild_class
 
           columns = Dummy.columns.map{ |column| [column.name, column.type] }
 
@@ -153,7 +197,6 @@ describe Paperclip::Schema do
         context "with single attachment" do
           before do
             Dummy.connection.remove_attachment :dummies, :avatar
-            rebuild_class
           end
 
           it "removes the attachment columns" do
@@ -176,7 +219,6 @@ describe Paperclip::Schema do
             end
 
             Dummy.connection.remove_attachment :dummies, :avatar, :photo
-            rebuild_class
           end
 
           it "removes the attachment columns" do

data/spec/paperclip/storage/fog_spec.rb

@@ -308,13 +308,41 @@ describe Paperclip::Storage::Fog do
         end
       end
 
+      context "with scheme set" do
+        before do
+          rebuild_model(@options.merge(:fog_credentials => @credentials.merge(:scheme => 'http')))
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        it "honors the scheme in public url" do
+          assert_match(/^http:\/\//, @dummy.avatar.url)
+        end
+      end
+
+      context "with scheme not set" do
+        before do
+          rebuild_model(@options)
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        it "provides HTTPS public url" do
+          assert_match(/^https:\/\//, @dummy.avatar.url)
+        end
+      end
+
       context "with a valid bucket name for a subdomain" do
         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\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
       end
 
@@ -362,7 +390,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\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
+          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png.+Expires=.+$/, @dummy.avatar.expiring_url)
         end
 
       end

data/spec/paperclip/storage/s3_spec.rb

@@ -711,6 +711,19 @@ describe Paperclip::Storage::S3 do
           "Expect all the files to be deleted."
       end
 
+      it "will retry to save again but back off on SlowDown" do
+        @dummy.avatar.stubs(:sleep)
+        AWS::S3::S3Object.any_instance.stubs(:write).
+          raises(AWS::S3::Errors::SlowDown.new(stub, stub(status: 503, body: "")))
+
+        expect {@dummy.save}.to raise_error(AWS::S3::Errors::SlowDown)
+        expect(@dummy.avatar).to have_received(:sleep).with(1)
+        expect(@dummy.avatar).to have_received(:sleep).with(2)
+        expect(@dummy.avatar).to have_received(:sleep).with(4)
+        expect(@dummy.avatar).to have_received(:sleep).with(8)
+        expect(@dummy.avatar).to have_received(:sleep).with(16)
+      end
+
       context "and saved" do
         before do
           object = stub
@@ -1461,6 +1474,26 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "path is a proc" do
+    before do
+      rebuild_model storage: :s3,
+        path: ->(attachment) { attachment.instance.attachment_path }
+
+      @dummy = Dummy.new
+      @dummy.class_eval do
+        def attachment_path
+          '/some/dynamic/path'
+        end
+      end
+      @dummy.avatar = stringy_file
+    end
+
+    it "returns a correct path" do
+      assert_match '/some/dynamic/path', @dummy.avatar.path
+    end
+  end
+
+
   private
 
   def rails_env(env)

data/spec/paperclip/url_generator_spec.rb

@@ -183,4 +183,29 @@ describe Paperclip::UrlGenerator do
     assert mock_interpolator.has_interpolated_pattern?(expected),
       "expected the interpolator to be passed #{expected.inspect} but it wasn't"
   end
+
+  describe "should be able to escape (, ), [, and ]." do
+    def generate(expected, updated_at=nil)
+      mock_attachment = MockAttachment.new(updated_at: updated_at)
+      mock_interpolator = MockInterpolator.new(result: expected)
+      options = { interpolator: mock_interpolator }
+      url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+      def url_generator.respond_to(params)
+        false if params == :escape
+      end
+      url_generator.for(:style_name, {escape: true, timestamp: !!updated_at})
+    end
+
+    it "not timestamp" do
+      expected = "the(expected)result[]"
+      assert_equal "the%28expected%29result%5B%5D", generate(expected)
+    end
+
+    it "timestamp" do
+      expected = "the(expected)result[]"
+      updated_at = 1231231234
+      assert_equal "the%28expected%29result%5B%5D?#{updated_at}",
+        generate(expected, updated_at)
+    end
+  end
 end

data/spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb

@@ -16,6 +16,11 @@ describe Paperclip::Validators::MediaTypeSpoofDetectionValidator do
     assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :media_type_spoof_detection }
   end
 
+  it "is not on the attachment when explicitly rejected" do
+    rebuild_model validate_media_type: false
+    assert Dummy.validators_on(:avatar).none?{ |validator| validator.kind == :media_type_spoof_detection }
+  end
+
   it "returns default error message for spoofed media type" do
     build_validator
     file = File.new(fixture_file("5k.png"), "rb")

data/spec/support/matchers/have_column.rb

@@ -0,0 +1,14 @@
+RSpec::Matchers.define :have_column do |column_name|
+  chain :with_default do |default|
+    @default = default
+  end
+
+  match do |columns|
+    column = columns.detect{|column| column.name == column_name }
+    column && column.default.to_s == @default.to_s
+  end
+
+  failure_message_for_should do |columns|
+    "expected to find '#{column_name}', default '#{@default}' in #{columns.map{|column| [column.name, column.default] }}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -385,6 +385,7 @@ files:
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -419,6 +420,11 @@ files:
 - lib/paperclip/locales/de.yml
 - lib/paperclip/locales/en.yml
 - lib/paperclip/locales/es.yml
+- lib/paperclip/locales/ja.yml
+- lib/paperclip/locales/pt-BR.yml
+- lib/paperclip/locales/zh-CN.yml
+- lib/paperclip/locales/zh-HK.yml
+- lib/paperclip/locales/zh-TW.yml
 - lib/paperclip/logger.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
@@ -428,6 +434,7 @@ files:
 - lib/paperclip/media_type_spoof_detector.rb
 - lib/paperclip/missing_attachment_styles.rb
 - lib/paperclip/processor.rb
+- lib/paperclip/processor_helpers.rb
 - lib/paperclip/railtie.rb
 - lib/paperclip/schema.rb
 - lib/paperclip/storage.rb
@@ -485,6 +492,7 @@ files:
 - spec/paperclip/paperclip_missing_attachment_styles_spec.rb
 - spec/paperclip/paperclip_spec.rb
 - spec/paperclip/plural_cache_spec.rb
+- spec/paperclip/processor_helpers_spec.rb
 - spec/paperclip/processor_spec.rb
 - spec/paperclip/rake_spec.rb
 - spec/paperclip/schema_spec.rb
@@ -524,6 +532,7 @@ files:
 - spec/support/fixtures/uppercase.PNG
 - spec/support/matchers/accept.rb
 - spec/support/matchers/exist.rb
+- spec/support/matchers/have_column.rb
 - spec/support/mock_attachment.rb
 - spec/support/mock_interpolator.rb
 - spec/support/mock_model.rb
@@ -610,6 +619,7 @@ test_files:
 - spec/paperclip/paperclip_missing_attachment_styles_spec.rb
 - spec/paperclip/paperclip_spec.rb
 - spec/paperclip/plural_cache_spec.rb
+- spec/paperclip/processor_helpers_spec.rb
 - spec/paperclip/processor_spec.rb
 - spec/paperclip/rake_spec.rb
 - spec/paperclip/schema_spec.rb
@@ -649,6 +659,7 @@ test_files:
 - spec/support/fixtures/uppercase.PNG
 - spec/support/matchers/accept.rb
 - spec/support/matchers/exist.rb
+- spec/support/matchers/have_column.rb
 - spec/support/mock_attachment.rb
 - spec/support/mock_interpolator.rb
 - spec/support/mock_model.rb