paperclip 4.3.7 → 5.0.0.beta1

data/spec/paperclip/validators_spec.rb

@@ -64,12 +64,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__), '..')))
 
@@ -34,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.7
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-03-23 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
@@ -156,20 +156,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
-    - - "<="
+        version: 2.0.33
+    - - "<"
       - !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.33
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -344,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
@@ -418,9 +418,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
@@ -429,7 +432,6 @@ files:
 - lib/paperclip/attachment_registry.rb
 - lib/paperclip/callbacks.rb
 - lib/paperclip/content_type_detector.rb
-- lib/paperclip/deprecations.rb
 - lib/paperclip/errors.rb
 - lib/paperclip/file_command_content_type_detector.rb
 - lib/paperclip/filename_cleaner.rb
@@ -453,14 +455,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
@@ -500,7 +495,6 @@ files:
 - spec/paperclip/attachment_registry_spec.rb
 - spec/paperclip/attachment_spec.rb
 - spec/paperclip/content_type_detector_spec.rb
-- spec/paperclip/deprecations_spec.rb
 - spec/paperclip/file_command_content_type_detector_spec.rb
 - spec/paperclip/filename_cleaner_spec.rb
 - spec/paperclip/geometry_detector_spec.rb
@@ -552,7 +546,6 @@ files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/deprecations.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -579,14 +572,28 @@ 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`.
 rdoc_options: []
 require_paths:
 - lib
@@ -594,16 +601,16 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
@@ -631,7 +638,6 @@ test_files:
 - spec/paperclip/attachment_registry_spec.rb
 - spec/paperclip/attachment_spec.rb
 - spec/paperclip/content_type_detector_spec.rb
-- spec/paperclip/deprecations_spec.rb
 - spec/paperclip/file_command_content_type_detector_spec.rb
 - spec/paperclip/filename_cleaner_spec.rb
 - spec/paperclip/geometry_detector_spec.rb
@@ -683,7 +689,6 @@ test_files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/deprecations.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -710,6 +715,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

data/lib/paperclip/deprecations.rb

@@ -1,42 +0,0 @@
-require "active_support/deprecation"
-
-module Paperclip
-  class Deprecations
-    class << self
-      def check
-        warn_aws_sdk_v1 if aws_sdk_v1?
-        warn_outdated_rails if active_model_version < "4.2"
-      end
-
-      private
-
-      def active_model_version
-        ::ActiveModel::VERSION::STRING
-      end
-
-      def aws_sdk_v1?
-        defined?(::AWS) && aws_sdk_version < "2"
-      end
-
-      def warn_aws_sdk_v1
-        warn "[paperclip] [deprecation] AWS SDK v1 has been deprecated in " \
-             "paperclip 5. Please consider upgrading to AWS 2 before " \
-             "upgrading paperclip."
-      end
-
-      def warn_outdated_rails
-        warn "[paperclip] [deprecation] Rails 3.2 and 4.1 are unsupported as " \
-             "of Rails 5 release. Please upgrade to Rails 4.2 before " \
-             "upgrading paperclip."
-      end
-
-      def aws_sdk_version
-        ::AWS::VERSION
-      end
-
-      def warn(message)
-        ActiveSupport::Deprecation.warn(message)
-      end
-    end
-  end
-end

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"