paperclip 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56fec1091044497580e29573ce29fcf2f67ecc9
-  data.tar.gz: d54575168a2aa162c760bae6a3a0a8246db6566b
+  metadata.gz: b280fe3ddac312ba397836a6dbb268f3119b741a
+  data.tar.gz: 9034cfd55c882ef8c2b50ac8e98ccbcd212c746a
 SHA512:
-  metadata.gz: debcaa74f90f8d01bab69a66b721e3b15bc1532584afb3be685259c4a7b565041362fe30df0fda7d747974c3e4195af3cf372bcbf7253e2f729c2cff8934eaf7
-  data.tar.gz: a80c28c4168be7c12d20b11f2de4b077756f4b4bf46bbd005d53e142aa0e61f769a16f8872847853500b43256b6444071c824dde06d475f2823c17f1402c2536
+  metadata.gz: 4def9d053ea08b067da60d48e548bdaeaedd2e8c1e82d3b8228857d253313ea105484d9c894edab7803d4a08569b7fc44d69a05fd221c3e8b234004075ec46be
+  data.tar.gz: d7694572fa8b724c945496299fc916c2e410acf617de7272e7c03218da1140eb8cfc67736a2c02c16afde04b957ad1626ef815a14b2a7c59591c3de5a67ededa

data/.travis.yml

@@ -17,8 +17,10 @@ gemfile:
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: jruby-19mode
     - rvm: rbx-19mode
@@ -26,3 +28,5 @@ matrix:
   exclude:
       - rvm: 1.9.2
         gemfile: gemfiles/4.0.gemfile
+      - rvm: 1.9.2
+        gemfile: gemfiles/4.1.gemfile

data/Appraisals

@@ -17,3 +17,8 @@ appraise "4.0" do
   gem "rails", "~> 4.0.0"
   gem "paperclip", :path => "../"
 end
+
+appraise "4.1" do
+  gem "rails", "~> 4.1.0.beta"
+  gem "paperclip", :path => "../"
+end

data/Gemfile

@@ -7,3 +7,10 @@ gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
 gem 'pry', :platform => :ruby
 gem 'pry-byebug', :platform => :ruby
+
+# Hinting at development dependencies
+# Prevents bundler from taking a long-time to resolve
+group :development, :test do
+  gem 'mime-types', '~> 1.16'
+  gem 'builder', '~> 3.1.4'
+end

data/NEWS

@@ -1,3 +1,14 @@
+New in 4.1.1:
+
+* Improvement: Add defauly translations for spoof validation
+* Bug Fix: Don't check for spoofs if the file hasn't changed
+* Bug Fix: Callback chain terminator is different in Rails 4.1, remove warnings
+* Improvement: Fixed various Ruby warnings
+* Bug Fix: Give bundler a hint, so it doesn't run forever on a fresh bundle
+* Improvement: Documentation fixes
+* Improvement: Allow travis-ci to finish-fast
+
+
 New in 4.1.0:
 
 * Improvement: Add :content_type_mappings to correct for missing spoof types

data/README.md

@@ -64,7 +64,7 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "paperclip", "~> 3.0"
+gem "paperclip", "~> 4.1"
 ```
 
 If you're still using Rails 2.3.x, you should do this instead:
@@ -527,7 +527,7 @@ _NOTE: Because processors operate by turning the original attachment into the
 styles, no processors will be run if there are no styles defined._
 
 If you're interested in caching your thumbnail's width, height and size in the
-database, take a look at the [paperclip-meta](https://github.com/y8/paperclip-meta) gem.
+database, take a look at the [paperclip-meta](https://github.com/teeparham/paperclip-meta) gem.
 
 Also, if you're interested in generating the thumbnail on-the-fly, you might want
 to look into the [attachment_on_the_fly](https://github.com/drpentode/Attachment-on-the-Fly) gem.

data/gemfiles/4.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
+gem "rails", "~> 4.1.0.beta"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

data/lib/paperclip/callbacks.rb

@@ -7,7 +7,7 @@ module Paperclip
 
     module Defining
       def define_paperclip_callbacks(*callbacks)
-        define_callbacks(*[callbacks, {:terminator => "result == false"}].flatten)
+        define_callbacks(*[callbacks, {:terminator => callback_terminator}].flatten)
         callbacks.each do |callback|
           eval <<-end_callbacks
             def before_#{callback}(*args, &blk)
@@ -19,6 +19,16 @@ module Paperclip
           end_callbacks
         end
       end
+
+      private
+
+      def callback_terminator
+        if ::ActiveSupport::VERSION::STRING >= '4.1'
+          lambda { |target, result| result == false }
+        else
+          'result == false'
+        end
+      end
     end
 
     module Running

data/lib/paperclip/has_attached_file.rb

@@ -79,7 +79,8 @@ module Paperclip
     end
 
     def add_required_validations
-      @klass.validates_media_type_spoof_detection @name
+      name = @name
+      @klass.validates_media_type_spoof_detection name, :if => ->{ send(name).dirty? }
     end
 
     def add_active_record_callbacks

data/lib/paperclip/locales/en.yml

@@ -2,6 +2,7 @@ en:
   errors:
     messages:
       in_between: "must be in between %{min} and %{max}"
+      spoofed_media_type: "has an extension that does not match its contents"
 
   number:
     human:

data/lib/paperclip/version.rb

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

data/test/validators/media_type_spoof_detection_validator_test.rb

@@ -6,7 +6,42 @@ class MediaTypeSpoofDetectionValidatorTest < Test::Unit::TestCase
     @dummy = Dummy.new
   end
 
+  def build_validator(options = {})
+    @validator = Paperclip::Validators::MediaTypeSpoofDetectionValidator.new(options.merge(
+      :attributes => :avatar
+    ))
+  end
+
   should "be on the attachment without being explicitly added" do
     assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :media_type_spoof_detection }
   end
+
+  should "return default error message for spoofed media type" do
+    build_validator
+    file = File.new(fixture_file("5k.png"), "rb")
+    @dummy.avatar.assign(file)
+
+    detector = mock("detector", :spoofed? => true)
+    Paperclip::MediaTypeSpoofDetector.stubs(:using).returns(detector)
+    @validator.validate(@dummy)
+
+    assert_equal "has an extension that does not match its contents", @dummy.errors[:avatar].first
+  end
+
+  should "run when attachment is dirty" do
+    build_validator
+    file = File.new(fixture_file("5k.png"), "rb")
+    @dummy.avatar.assign(file)
+    Paperclip::MediaTypeSpoofDetector.stubs(:using).returns(stub(:spoofed? => false))
+
+    @dummy.valid?
+
+    assert_received(Paperclip::MediaTypeSpoofDetector, :using){|e| e.once }
+  end
+
+  should "not run when attachment is not dirty" do
+    Paperclip::MediaTypeSpoofDetector.stubs(:using).never
+    @dummy.valid?
+    assert_received(Paperclip::MediaTypeSpoofDetector, :using){|e| e.never }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -358,6 +358,7 @@ files:
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb