paperclip 5.0.0.beta2 → 5.3.0

data/spec/paperclip/url_generator_spec.rb

@@ -4,11 +4,10 @@ require 'spec_helper'
 describe Paperclip::UrlGenerator do
   it "uses the given interpolator" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
+    mock_attachment = MockAttachment.new(interpolator: mock_interpolator)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment,
-                                                { interpolator: mock_interpolator })
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     result = url_generator.for(:style_name, {})
 
     assert_equal expected, result
@@ -17,12 +16,12 @@ describe Paperclip::UrlGenerator do
   end
 
   it "uses the default URL when no file is assigned" do
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new
     default_url = "the default url"
-    options = { interpolator: mock_interpolator, default_url: default_url}
+    options = { interpolator: mock_interpolator, default_url: default_url }
+    mock_attachment = MockAttachment.new(options)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(default_url),
@@ -30,12 +29,12 @@ describe Paperclip::UrlGenerator do
   end
 
   it "executes the default URL lambda when no file is assigned" do
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new
     default_url = lambda {|attachment| "the #{attachment.class.name} default url" }
     options = { interpolator: mock_interpolator, default_url: default_url}
+    mock_attachment = MockAttachment.new(options)
 
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?("the MockAttachment default url"),
@@ -44,12 +43,16 @@ describe Paperclip::UrlGenerator do
 
   it "executes the method named by the symbol as the default URL when no file is assigned" do
     mock_model = FakeModel.new
-    mock_attachment = MockAttachment.new(model: mock_model)
-    mock_interpolator = MockInterpolator.new
     default_url = :to_s
-    options = { interpolator: mock_interpolator, default_url: default_url}
-
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_interpolator = MockInterpolator.new
+    options = {
+      interpolator: mock_interpolator,
+      default_url: default_url,
+      model: mock_model,
+    }
+    mock_attachment = MockAttachment.new(options)
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(mock_model.to_s),
@@ -58,10 +61,10 @@ describe Paperclip::UrlGenerator do
 
   it "URL-escapes spaces if asked to" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: true})
 
@@ -74,10 +77,10 @@ describe Paperclip::UrlGenerator do
         "the escaped result"
       end
     end.new
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: true})
 
@@ -86,10 +89,10 @@ describe Paperclip::UrlGenerator do
 
   it "leaves spaces unescaped as asked to" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {escape: false})
 
@@ -98,10 +101,10 @@ describe Paperclip::UrlGenerator do
 
   it "defaults to leaving spaces unescaped" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new
     mock_interpolator = MockInterpolator.new(result: expected)
     options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {})
 
@@ -111,9 +114,9 @@ describe Paperclip::UrlGenerator do
   it "produces URLs without the updated_at value when the object does not respond to updated_at" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(responds_to_updated_at: false)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, responds_to_updated_at: false }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -123,9 +126,13 @@ describe Paperclip::UrlGenerator do
   it "produces URLs without the updated_at value when the updated_at value is nil" do
     expected = "the expected result"
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(responds_to_updated_at: true, updated_at: nil)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = {
+      responds_to_updated_at: true,
+      updated_at: nil,
+      interpolator: mock_interpolator,
+    }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -136,9 +143,9 @@ describe Paperclip::UrlGenerator do
     expected = "the expected result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -149,9 +156,9 @@ describe Paperclip::UrlGenerator do
     expected = "the?expected=result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: true})
 
@@ -162,9 +169,9 @@ describe Paperclip::UrlGenerator do
     expected = "the expected result"
     updated_at = 1231231234
     mock_interpolator = MockInterpolator.new(result: expected)
-    mock_attachment = MockAttachment.new(updated_at: updated_at)
-    options = { interpolator: mock_interpolator }
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = { interpolator: mock_interpolator, updated_at: updated_at }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
 
     result = url_generator.for(:style_name, {timestamp: false})
 
@@ -173,11 +180,15 @@ describe Paperclip::UrlGenerator do
 
   it "produces the correct URL when the instance has a file name" do
     expected = "the expected result"
-    mock_attachment = MockAttachment.new(original_filename: 'exists')
     mock_interpolator = MockInterpolator.new
-    options = { interpolator: mock_interpolator, url: expected}
-
-    url_generator = Paperclip::UrlGenerator.new(mock_attachment, options)
+    options = {
+      interpolator: mock_interpolator,
+      url: expected,
+      original_filename: "exists",
+    }
+    mock_attachment = MockAttachment.new(options)
+
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
     url_generator.for(:style_name, {})
 
     assert mock_interpolator.has_interpolated_pattern?(expected),
@@ -186,10 +197,10 @@ describe Paperclip::UrlGenerator do
 
   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)
+      options = { interpolator: mock_interpolator, updated_at: updated_at }
+      mock_attachment = MockAttachment.new(options)
+      url_generator = Paperclip::UrlGenerator.new(mock_attachment)
       def url_generator.respond_to(params)
         false if params == :escape
       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
 
@@ -30,8 +31,8 @@ describe Paperclip::Validators do
     before do
       rebuild_class
       Dummy.validates_attachment :avatar, file_type_ignorance: true, file_name: [
-          { matches: /\A.*\.jpe?g\Z/i, message: :invalid_extension },
-          { matches: /\A.{,8}\..+\Z/i, message: [:too_long, count: 8] },
+          { matches: /\A.*\.jpe?g\z/i, message: :invalid_extension },
+          { matches: /\A.{,8}\..+\z/i, message: [:too_long, count: 8] },
       ]
     end
 

data/spec/spec_helper.rb

@@ -22,7 +22,8 @@ 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"
+if ActiveRecord::VERSION::STRING >= "4.2" &&
+    ActiveRecord::VERSION::STRING < "5.0"
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 Paperclip.options[:logger] = ActiveRecord::Base.logger
@@ -38,6 +39,7 @@ RSpec.configure do |config|
   config.include TestData
   config.include Reporting
   config.extend VersionHelper
+  config.extend ConditionalFilterHelper
   config.mock_framework = :mocha
   config.before(:all) do
     rebuild_model

data/spec/support/assertions.rb

@@ -48,13 +48,16 @@ module Assertions
   end
 
   def assert_success_response(url)
+    url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
-      assert_equal "200", response.code,
+      assert_equal "200",
+        response.code,
         "Expected HTTP response code 200, got #{response.code}"
     end
   end
 
   def assert_not_found_response(url)
+    url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "404", response.code,
         "Expected HTTP response code 404, got #{response.code}"
@@ -62,6 +65,7 @@ module Assertions
   end
 
   def assert_forbidden_response(url)
+    url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "403", response.code,
         "Expected HTTP response code 403, got #{response.code}"

data/spec/support/conditional_filter_helper.rb

@@ -0,0 +1,5 @@
+module ConditionalFilterHelper
+  def aws_accelerate_available?
+    (Gem::Version.new(Aws::VERSION) >= Gem::Version.new("2.3.0"))
+  end
+end

data/spec/support/mock_attachment.rb

@@ -1,7 +1,9 @@
 class MockAttachment
   attr_accessor :updated_at, :original_filename
+  attr_reader :options
 
   def initialize(options = {})
+    @options = options
     @model = options[:model]
     @responds_to_updated_at = options[:responds_to_updated_at]
     @updated_at = options[:updated_at]

data/spec/support/mock_url_generator_builder.rb

@@ -2,9 +2,9 @@ class MockUrlGeneratorBuilder
   def initializer
   end
 
-  def new(attachment, attachment_options)
+  def new(attachment)
     @attachment = attachment
-    @attachment_options = attachment_options
+    @attachment_options = @attachment.options
     self
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta2
+  version: 5.3.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.34
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.34
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -185,19 +185,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber-expressions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -338,20 +352,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +387,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -417,12 +418,8 @@ files:
 - features/support/paths.rb
 - features/support/rails.rb
 - features/support/selectors.rb
-- 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
+- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -535,6 +532,7 @@ files:
 - spec/paperclip/storage/s3_spec.rb
 - spec/paperclip/style_spec.rb
 - spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
 - spec/paperclip/thumbnail_spec.rb
 - spec/paperclip/url_generator_spec.rb
 - spec/paperclip/validators/attachment_content_type_validator_spec.rb
@@ -545,6 +543,7 @@ files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
+- spec/support/conditional_filter_helper.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -580,7 +579,7 @@ licenses:
 metadata: {}
 post_install_message: |
   ##################################################
-  #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER       #
+  #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER      #
   ##################################################
 
   Paperclip is now compatible with aws-sdk >= 2.0.0.
@@ -606,13 +605,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
@@ -681,6 +680,7 @@ test_files:
 - spec/paperclip/storage/s3_spec.rb
 - spec/paperclip/style_spec.rb
 - spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
 - spec/paperclip/thumbnail_spec.rb
 - spec/paperclip/url_generator_spec.rb
 - spec/paperclip/validators/attachment_content_type_validator_spec.rb
@@ -691,6 +691,7 @@ test_files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
+- spec/support/conditional_filter_helper.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png