paperclip 4.3.0 → 5.0.0

data/spec/paperclip/validators/attachment_size_validator_spec.rb

@@ -12,14 +12,6 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     ))
   end
 
-  def self.storage_units
-    if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
-      { 5120 => '5 KB',       10240 => '10 KB' }
-    else
-      { 5120 => '5120 Bytes', 10240 => '10240 Bytes' }
-    end
-  end
-
   def self.should_allow_attachment_file_size(size)
     context "when the attachment size is #{size}" do
       it "adds error to dummy object" do
@@ -158,8 +150,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
 
     context "given :less_than and :greater_than" do
@@ -169,8 +163,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
   end
 
@@ -181,10 +177,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           less_than: 10.kilobytes
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be less than #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be greater than #{storage_units[5120]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be less than 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be greater than 5 KB"
+      )
     end
 
     context "given a size range" do
@@ -192,10 +193,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
         build_validator in: (5.kilobytes..10.kilobytes)
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
     end
   end
 

data/spec/paperclip/validators_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Paperclip::Validators do
   context "using the helper" do
     before do
+      rebuild_class
       Dummy.validates_attachment :avatar, presence: true, content_type: { content_type: "image/jpeg" }, size: { in: 0..10240 }
     end
 
@@ -64,12 +65,11 @@ describe Paperclip::Validators do
       assert_raises(RuntimeError){ dummy.valid? }
     end
 
-    it 'allows you to attach a file that does not violates these validations' do
+    it 'allows you to attach a file that does not violate these validations' do
       dummy = Dummy.new(avatar: File.new(fixture_file('rotated.jpg')))
-      expect(dummy.errors.keys).to match_array []
+      expect(dummy.errors.full_messages).to be_empty
       assert dummy.valid?
     end
-
   end
 
   context "using the helper with a conditional" do

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'active_support/core_ext'
 require 'mocha/api'
 require 'bourne'
 require 'ostruct'
+require 'pathname'
+require 'activerecord-import'
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
@@ -20,6 +22,9 @@ FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
+unless ActiveRecord::VERSION::STRING < "4.2"
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
 Dir[File.join(ROOT, 'spec', 'support', '**', '*.rb')].each{|f| require f }
@@ -31,8 +36,8 @@ RSpec.configure do |config|
   config.include Assertions
   config.include ModelReconstruction
   config.include TestData
+  config.include Reporting
   config.extend VersionHelper
-  config.extend RailsHelpers::ClassMethods
   config.mock_framework = :mocha
   config.before(:all) do
     rebuild_model

data/spec/support/assertions.rb

@@ -61,6 +61,13 @@ module Assertions
     end
   end
 
+  def assert_forbidden_response(url)
+    Net::HTTP.get_response(URI.parse(url)) do |response|
+      assert_equal "403", response.code,
+        "Expected HTTP response code 403, got #{response.code}"
+    end
+  end
+
   def assert_frame_dimensions(range, frames)
     frames.each_with_index do |frame, frame_index|
       frame.split('x').each_with_index do |dimension, dimension_index |

data/spec/support/model_reconstruction.rb

@@ -10,7 +10,15 @@ module ModelReconstruction
 
     klass.reset_column_information
     klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
-    klass.connection.schema_cache.clear_table_cache!(klass.table_name) if klass.connection.respond_to?(:schema_cache)
+
+    if klass.connection.respond_to?(:schema_cache)
+      if ActiveRecord::VERSION::STRING >= "5.0"
+        klass.connection.schema_cache.clear_data_source_cache!(klass.table_name)
+      else
+        klass.connection.schema_cache.clear_table_cache!(klass.table_name)
+      end
+    end
+
     klass
   end
 

data/spec/support/reporting.rb

@@ -0,0 +1,11 @@
+module Reporting
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +156,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
-    - - "<="
+        version: 2.0.34
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
-    - - "<="
+        version: 2.0.34
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,20 @@ dependencies:
         version: 1.3.18
 - !ruby/object:Gem::Dependency
   name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,7 +241,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,7 +255,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,19 +269,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-local
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -330,14 +344,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +400,6 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING
-- cucumber/paperclip_steps.rb
 - features/basic_integration.feature
 - features/migration.feature
 - features/rake_tasks.feature
@@ -404,9 +417,12 @@ files:
 - features/support/paths.rb
 - features/support/rails.rb
 - features/support/selectors.rb
-- gemfiles/3.2.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
+- gemfiles/4.2.awsv2.0.gemfile
+- gemfiles/4.2.awsv2.1.gemfile
+- gemfiles/4.2.awsv2.gemfile
+- gemfiles/5.0.awsv2.0.gemfile
+- gemfiles/5.0.awsv2.1.gemfile
+- gemfiles/5.0.awsv2.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -438,14 +454,7 @@ files:
 - lib/paperclip/io_adapters/stringio_adapter.rb
 - lib/paperclip/io_adapters/uploaded_file_adapter.rb
 - lib/paperclip/io_adapters/uri_adapter.rb
-- 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
@@ -490,6 +499,7 @@ files:
 - spec/paperclip/geometry_detector_spec.rb
 - spec/paperclip/geometry_parser_spec.rb
 - spec/paperclip/geometry_spec.rb
+- spec/paperclip/glue_spec.rb
 - spec/paperclip/has_attached_file_spec.rb
 - spec/paperclip/integration_spec.rb
 - spec/paperclip/interpolations_spec.rb
@@ -561,14 +571,31 @@ files:
 - spec/support/mock_interpolator.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
-- spec/support/rails_helpers.rb
+- spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  ##################################################
+  #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER       #
+  ##################################################
+
+  Paperclip is now compatible with aws-sdk >= 2.0.0.
+
+  If you are using S3 storage, aws-sdk >= 2.0.0 requires you to make a few small
+  changes:
+
+  * You must set the `s3_region`
+  * If you are explicitly setting permissions anywhere, such as in an initializer,
+    note that the format of the permissions changed from using an underscore to
+    using a hyphen. For example, `:public_read` needs to be changed to
+    `public-read`.
+
+  For a walkthrough of upgrading from 4 to 5 and aws-sdk >= 2.0 you can watch
+  http://rubythursday.com/episodes/ruby-snack-27-upgrade-paperclip-and-aws-sdk-in-prep-for-rails-5
 rdoc_options: []
 require_paths:
 - lib
@@ -576,7 +603,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -585,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
@@ -618,6 +645,7 @@ test_files:
 - spec/paperclip/geometry_detector_spec.rb
 - spec/paperclip/geometry_parser_spec.rb
 - spec/paperclip/geometry_spec.rb
+- spec/paperclip/glue_spec.rb
 - spec/paperclip/has_attached_file_spec.rb
 - spec/paperclip/integration_spec.rb
 - spec/paperclip/interpolations_spec.rb
@@ -689,7 +717,6 @@ test_files:
 - spec/support/mock_interpolator.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
-- spec/support/rails_helpers.rb
+- spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb
-has_rdoc: 

data/cucumber/paperclip_steps.rb

@@ -1,6 +0,0 @@
-When /^I attach an? "([^\"]*)" "([^\"]*)" file to an? "([^\"]*)" on S3$/ do |attachment, extension, model|
-  stub_paperclip_s3(model, attachment, extension)
-  attach_file attachment,
-              "features/support/paperclip/#{model.gsub(" ", "_").underscore}/#{attachment}.#{extension}"
-end
-

data/gemfiles/3.2.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-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 "paperclip", :path => "../"
-
-group :development, :test do
-  gem "mime-types", "~> 1.16"
-  gem "builder"
-  gem "rubocop", :require => false
-end
-
-gemspec :path => "../"

data/lib/paperclip/locales/de.yml

@@ -1,18 +0,0 @@
-de:
-  errors:
-    messages:
-      in_between: "muss zwischen %{min} und %{max} sein"
-      spoofed_media_type: "trägt eine Dateiendung, die nicht mit dem Inhalt der Datei übereinstimmt"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/es.yml

@@ -1,18 +0,0 @@
-es:
-  errors:
-    messages:
-      in_between: "debe estar entre %{min} y %{max}"
-      spoofed_media_type: "tiene una extensión que no coincide con su contenido"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/ja.yml

@@ -1,18 +0,0 @@
-ja:
-  errors:
-    messages:
-      in_between: "の容量は%{min}以上%{max}以下にしてください。"
-      spoofed_media_type: "の拡張子と内容が一致していません。"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/pt-BR.yml

@@ -1,18 +0,0 @@
-pt-BR:
-  errors:
-    messages:
-      in_between: "deve ter entre %{min} e %{max}"
-      spoofed_media_type: "tem uma extensão que não corresponde ao seu conteúdo"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/zh-CN.yml

@@ -1,18 +0,0 @@
-zh-CN:
-  errors:
-    messages:
-      in_between: "文件大小必须介于 %{min} 到 %{max} 之间"
-      spoofed_media_type: "扩展名与内容类型不符"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/zh-HK.yml

@@ -1,18 +0,0 @@
-zh-HK:
-  errors:
-    messages:
-      in_between: "必須介於%{min}到%{max}之間"
-      spoofed_media_type: "副檔名與內容類型不匹配"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/lib/paperclip/locales/zh-TW.yml

@@ -1,18 +0,0 @@
-zh-TW:
-  errors:
-    messages:
-      in_between: "檔案大小必須介於 %{min} 到 %{max} 之間"
-      spoofed_media_type: "副檔名與內容類型不符"
-
-  number:
-    human:
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"

data/spec/support/rails_helpers.rb

@@ -1,7 +0,0 @@
-module RailsHelpers
-  module ClassMethods
-    def using_protected_attributes?
-      ActiveRecord::VERSION::MAJOR < 4
-    end
-  end
-end