paperclip 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa18c86bf030ee0f661dc1161c300704284df4ea
-  data.tar.gz: e6e4a743830550b454d82f8790cda44dadbff165
+  metadata.gz: 72ed4f4157aa2c718080d5b5d894e37c2b86a4c6
+  data.tar.gz: 72263210049548eb829d3f96d0b993efc694fd98
 SHA512:
-  metadata.gz: 87f896288a2cfa5a420b238029ed57cd469306174552c6bd0cea587f5c9b5431b10afff9b12ffe0b63bbd42249a0928783c9681ac5e93fb1cf9894daed0d7635
-  data.tar.gz: cb3f3bdfc812816830a3533bd6edc690d795ec22279b9e8f7f9b940db7a3db7301924c174129454a4f4cc60b689936c6b4c5ea69aec230f728c3414a14150744
+  metadata.gz: 8b07767ba93123c263864238d2ec34ef09233edf4239a9ac12eb43e98b5fe2ba8b363fdf3abe0c7ac1ff6c11ff75b8f65e2f47cc505e53bf64d8fb48b97d9584
+  data.tar.gz: 6bbd4475d481df757ef709c0a1f035799d493955f17900e437c9409c1ee4ba4869ff1376c9a196c073b5b22fad84838a1ffb54a82e51d188bee5f7550ee95b44

data/Appraisals

@@ -1,5 +1,5 @@
 appraise "3.2" do
-  gem "rails", "~> 3.2.15"
+  gem "rails", "~> 3.2.0"
   gem "paperclip", :path => "../"
 end
 

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'sqlite3', '1.3.8', :platforms => :ruby
+gem 'sqlite3', '~> 1.3.8', :platforms => :ruby
 
 gem 'jruby-openssl', :platforms => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby

data/NEWS

@@ -1,8 +1,13 @@
-New in 4.2.2:
+4.2.3:
+
+* Fix dependency specifications (didn't work with Rails 4.1)
+* Fix paperclip tests in CI
+
+4.2.2:
 
 * Security fix: Fix a potential security issue with spoofing
 
-New in 4.2.1:
+4.2.1:
 
 * Improvement: Added `validate_media_type` options to allow/bypass spoof check
 * Improvement: Added incremental backoff when AWS gives us a SlowDown error.
@@ -19,7 +24,7 @@ New in 4.2.1:
 * Test Fix: Improves speed and reliability of the specs
 * Bug Fix: #original_filename= does not error when passed `nil`
 
-New in 4.2.0:
+4.2.0:
 
 * Improvement: Converted test suite from test/unit to RSpec
 * Improvement: Refactored Paperclip::Attachment#assign
@@ -35,7 +40,7 @@ New in 4.2.0:
 * Improvement: Allow `nil` geometry strings
 * Improvement: Use `eager_load!`
 
-New in 4.1.1:
+4.1.1:
 
 * Improvement: Add default translations for spoof validation
 * Bug Fix: Don't check for spoofs if the file hasn't changed
@@ -46,7 +51,7 @@ New in 4.1.1:
 * Improvement: Allow travis-ci to finish-fast
 
 
-New in 4.1.0:
+4.1.0:
 
 * Improvement: Add :content_type_mappings to correct for missing spoof types
 * Improvement: Credit Egor Homakov with discovering the content_type spoof bug
@@ -54,7 +59,7 @@ New in 4.1.0:
 * Improvement: Make MIME type optional for Data URIs.
 * Improvement: Add default format for styles
 
-New in 4.0.0:
+4.0.0:
 
 * Security: Attachments are checked to make sure they're not pulling a fast one.
 * Security: It is now *enforced* that every attachment has a file/mime validation.
@@ -62,7 +67,7 @@ New in 4.0.0:
 * Improvement: Added bullets to the 3.5.3 list of changes. Very important.
 * Improvement: Updated the copyright to 2014
 
-New in 3.5.3:
+3.5.3:
 
 * Improvement: After three long, hard years... we know how to upgrade
 * Bug Fix: #expiring_url returns 'missing' urls if nothing is attached
@@ -84,14 +89,14 @@ New in 3.5.3:
 * Test Improvement: Ensure more files are properly closed during tests
 * Test Bug Fix: Return the gemfile's syntax to normal
 
-New in 3.5.2:
+3.5.2:
 
 * Security: Force cocaine to at least 0.5.3 to include a security fix
 * Improvement: Fixed some README exmaples
 * Feature: Added HTTP URL Proxy Adapter, can assign string URLs as attachments
 * Improvement: Put validation errors on the base attribute and the sub-attribute
 
-New in 3.5.1:
+3.5.1:
 
 * Bug Fix: Returned the class-level `attachment_definitions` method for compatability.
 * Improvement: Ensured compatability with Rails 4
@@ -99,7 +104,7 @@ New in 3.5.1:
 * Bug Fix: #1296, where validations were generating errors
 * Improvement: Specify MIT license in the gemspec
 
-New in 3.5.0:
+3.5.0:
 
 * Feature: Handle Base64-encoded data URIs as uploads
 * Feature: Add a FilenameCleaner class to allow custom filename sanitation
@@ -115,7 +120,7 @@ New in 3.5.0:
 * Improvement: Added Ruby 2.0.0 as a supported platform and removed 1.8.7
 * Improvement: Fixed some incompatabilities in the test suite
 
-New in 3.4.2:
+3.4.2:
 
 * Improvement: Use https for Gemfile urls
 * Improvement: Updated and more correct documentation
@@ -125,7 +130,7 @@ New in 3.4.2:
 * Improvement: Remove path clash checking, as it's unnecessary
 * Bug Fix: Do not rely on checking version numbers for aws-sdk
 
-New in 3.4.1:
+3.4.1:
 
 * Improvement: Various documentation fixes and improvements
 * Bug Fix: Clearing an attachment with `preserve_files` on should still clear the attachment
@@ -138,7 +143,7 @@ New in 3.4.1:
 * Improvement: Update to latest cocaine
 * Improvement: Update copyrights, various typos
 
-New in 3.4.0:
+3.4.0:
 
 * Bug Fix: Allow UploadedFileAdapter to force the use of `file`
 * Bug Fix: Close the file handle when dealing with URIs
@@ -168,11 +173,11 @@ New In 3.3.1:
 
 * Bug Fix: Moved Filesystem's copy_to_local_file to the right place.
 
-New in 3.3.0:
+3.3.0:
 
 * Improvement: Upgrade cocaine to 0.4
 
-New in 3.2.0:
+3.2.0:
 
 * Bug Fix: Use the new correct Amazon S3 encryption header.
 * Bug Fix: The rake task respects the updated_at column.
@@ -181,14 +186,14 @@ New in 3.2.0:
 * Feature: Automatically rotate images.
 * Feature: Reduce class-oriented programming of the attachment definitions.
 
-New in 3.1.4:
+3.1.4:
 
 * Bug Fix: Allow user to be able to set path without `:style` attribute and not raising an error.
   This is a regression introduced in 3.1.3, and that feature will be postponed to another minor
   release instead.
 * Feature: Allow for URI Adapter as an optional paperclip io adapter.
 
-New in 3.1.3:
+3.1.3:
 
 * Bug Fix: Copy empty attachment between instances is now working.
 * Bug Fix: Correctly rescue Fog error.
@@ -200,17 +205,17 @@ New in 3.1.3:
 * Bug Fix: Paperclip now gracefully handles msising file command.
 * Bug Fix: `StringIOAdapter` now accepts content type.
 
-New in 3.1.2:
+3.1.2:
 
 * Bug Fix: #remove_attachment on 3.1.0 and 3.1.1 mistakenly trying to remove the column that has
   the same name as data type (such as :string, :datetime, :interger.) You're advised to update to
   Paperclip 3.1.2 as soon as possible.
 
-New in 3.1.1:
+3.1.1:
 
 * Bug Fix: Paperclip will only load Paperclip::Schema only when Active Record is available.
 
-New in 3.1.0:
+3.1.0:
 
 * Feature: Paperclip now support new migration syntax (sexy migration) that reads better:
 
@@ -249,11 +254,11 @@ New in 3.1.0:
   the best_content_type to throw an error on trying nil.content_type.
 * Bug Fix: Fix problem when the gem cannot be installed on the system that has Asepsis installed.
 
-New in 3.0.4:
+3.0.4:
 
 * Feature: Adds support for S3 scheme-less URL generation.
 
-New in 3.0.3:
+3.0.3:
 
 * Bug Fix: ThumbnailProcessor now correctly detects and preserve animated GIF.
 * Bug Fix: File extension is now preserved in generated Tempfile from adapter.
@@ -276,7 +281,7 @@ New in 3.0.3:
 * Bug Fix: Fix attachment.reprocess! when using storage providers fog and s3.
 * Bug Fix: Fix a problem with incorrect content_type detected with 'file' command for an empty file on Mac.
 
-New in 3.0.2:
+3.0.2:
 
 * API CHANGE: Generated migration class name is now plural (AddAttachmentToUsers instead of AddAttachmentToUser)
 * API CHANGE: Remove Rails plugin initialization code.
@@ -285,13 +290,13 @@ New in 3.0.2:
 * Bug Fix: Fix a problem when there's no logger specified.
 * Bug Fix: Fix a problem when attaching Rack::Test::UploadedFile instance.
 
-New in 3.0.1:
+3.0.1:
 
 * Feature: Introduce Paperlip IO adapter.
 * Bug Fix: Regression in AttachmentContentTypeValidator has been fixed.
 * API CHANGE: #to_file has been removed. Use the #copy_to_local_file method instead.
 
-New in 3.0.0:
+3.0.0:
 
 * API CHANGE: Paperclip now requires at least Ruby on Rails version 3.0.0
 * API CHANGE: The default :url and :path have changed. The new scheme avoids
@@ -310,7 +315,7 @@ New in 3.0.0:
 * Bug Fix: File given to S3 and Fog storage will now be rewinded after flush_write.
 * Feature: You can now pass addional parameter to S3 expiring URL, such as :content_type.
 
-New in 2.7.0:
+2.7.0:
 
 * Bug Fix: Checking the existence of a file on S3 handles all AWS errors.
 * Bug Fix: Clear the fingerprint when removing an attachment.
@@ -319,25 +324,25 @@ New in 2.7.0:
 * Compatibility: Support for ActiveSupport < 2.3.12.
 * Compatibility: Support for Rails 3.2.
 
-New in 2.6.0:
+2.6.0:
 
 * Bug Fix: Files are re-wound after reading.
 * Feature: Remove Rails dependency from specs that need Paperclip.
 * Feature: Validation matchers support conditionals.
 
-New in 2.5.2:
+2.5.2:
 
 * Bug Fix: Can be installed on Windows.
 * Feature: The Fog bucket name, authentication, and host can be determined at runtime via Proc.
 * Feature: Special characters are replaced with underscores in #url and #path.
 
-New in 2.5.1:
+2.5.1:
 
 * Feature: After we've computed the content type, pass it to Fog.
 * Feature: S3 encryption with the new :s3_server_side_encryption option.
 * Feature: Works without ActiveRecord, allowing for e.g. mongo backends.
 
-New in 2.5.0:
+2.5.0:
 
 * Performance: Only connect to S3 when absolutely needed.
 * Bug Fix: STI with cached classes respect new options.

data/gemfiles/3.2.gemfile

@@ -2,13 +2,13 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "1.3.8", :platforms => :ruby
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "jruby-openssl", :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
-gem "rails", "~> 3.2.15"
+gem "rails", "~> 3.2.0"
 gem "paperclip", :path => "../"
 
 group :development, :test do

data/gemfiles/4.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "1.3.8", :platforms => :ruby
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "jruby-openssl", :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx

data/gemfiles/4.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "1.3.8", :platforms => :ruby
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "jruby-openssl", :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx

data/gemfiles/4.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "1.3.8", :platforms => :ruby
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "jruby-openssl", :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -20,19 +20,19 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.requirements << "ImageMagick"
-  s.required_ruby_version = ">= 1.9.2"
+  s.required_ruby_version = ">= 2.0.0"
 
-  s.add_dependency('activemodel', '>= 3.0.0')
-  s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('cocaine', '~> 0.5.3')
+  s.add_dependency('activemodel', '>= 3.2.0')
+  s.add_dependency('activesupport', '>= 3.2.0')
+  s.add_dependency('cocaine', '~> 0.5.5')
   s.add_dependency('mime-types')
 
-  s.add_development_dependency('activerecord', '>= 3.0.0')
+  s.add_development_dependency('activerecord', '>= 3.2.0')
   s.add_development_dependency('shoulda')
   s.add_development_dependency('rspec')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 1.5.7')
+  s.add_development_dependency('aws-sdk', '>= 1.5.7', "<= 2.0")
   s.add_development_dependency('bourne')
   s.add_development_dependency('cucumber', '~> 1.3.11')
   s.add_development_dependency('aruba')
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')
   s.add_development_dependency('railties')
-  s.add_development_dependency('actionmailer', '>= 3.0.0')
+  s.add_development_dependency('actionmailer', '>= 3.2.0')
   s.add_development_dependency('generator_spec')
   s.add_development_dependency('timecop')
 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, "", "").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", "").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,7 +38,7 @@ 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
@@ -49,7 +49,7 @@ describe Paperclip::MediaTypeSpoofDetector do
     assert Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed?
   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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.7
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,6 +153,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.7
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +316,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -553,7 +559,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="