paperclip 4.2.2 → 5.2.1

data/spec/paperclip/tempfile_factory_spec.rb

@@ -26,4 +26,8 @@ describe Paperclip::TempfileFactory do
    file = subject.generate
    assert File.exist?(file.path)
   end
+
+  it "does not throw Errno::ENAMETOOLONG when it has a really long name" do
+    expect { subject.generate("o" * 255) }.to_not raise_error
+  end
 end

data/spec/paperclip/tempfile_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe Paperclip::Tempfile do
+  context "A Paperclip Tempfile" do
+    before do
+      @tempfile = described_class.new(["file", ".jpg"])
+    end
+
+    after { @tempfile.close }
+
+    it "has its path contain a real extension" do
+      assert_equal ".jpg", File.extname(@tempfile.path)
+    end
+
+    it "is a real Tempfile" do
+      assert @tempfile.is_a?(::Tempfile)
+    end
+  end
+
+  context "Another Paperclip Tempfile" do
+    before do
+      @tempfile = described_class.new("file")
+    end
+
+    after { @tempfile.close }
+
+    it "does not have an extension if not given one" do
+      assert_equal "", File.extname(@tempfile.path)
+    end
+
+    it "is a real Tempfile" do
+      assert @tempfile.is_a?(::Tempfile)
+    end
+  end
+end

data/spec/paperclip/thumbnail_spec.rb

@@ -1,38 +1,6 @@
 require 'spec_helper'
 
 describe Paperclip::Thumbnail do
-  context "A Paperclip Tempfile" do
-    before do
-      @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
-    end
-
-    after { @tempfile.close }
-
-    it "has its path contain a real extension" do
-      assert_equal ".jpg", File.extname(@tempfile.path)
-    end
-
-    it "is a real Tempfile" do
-      assert @tempfile.is_a?(::Tempfile)
-    end
-  end
-
-  context "Another Paperclip Tempfile" do
-    before do
-      @tempfile = Paperclip::Tempfile.new("file")
-    end
-
-    after { @tempfile.close }
-
-    it "does not have an extension if not given one" do
-      assert_equal "", File.extname(@tempfile.path)
-    end
-
-    it "is a real Tempfile" do
-      assert @tempfile.is_a?(::Tempfile)
-    end
-  end
-
   context "An image" do
     before do
       @file = File.new(fixture_file("5k.png"), 'rb')
@@ -480,5 +448,56 @@ describe Paperclip::Thumbnail do
         assert_equal "50x50", `#{cmd}`.chomp
       end
     end
+
+    context "with a specified frame_index" do
+      before do
+        @thumb = Paperclip::Thumbnail.new(
+          @file,
+          geometry: "50x50",
+          frame_index: 5,
+          format: :jpg,
+        )
+      end
+
+      it "creates the thumbnail from the frame index when sent #make" do
+        @thumb.make
+        assert_equal 5, @thumb.frame_index
+      end
+    end
+
+    context "with a specified frame_index out of bounds" do
+      before do
+        @thumb = Paperclip::Thumbnail.new(
+          @file,
+          geometry: "50x50",
+          frame_index: 20,
+          format: :jpg,
+        )
+      end
+
+      it "errors when trying to create the thumbnail" do
+        assert_raises(Paperclip::Error) do
+          silence_stream(STDERR) do
+            @thumb.make
+          end
+        end
+      end
+    end
+  end
+
+  context "with a really long file name" do
+    before do
+      tempfile = Tempfile.new("f")
+      tempfile_additional_chars = tempfile.path.split("/")[-1].length + 15
+      image_file = File.new(fixture_file("5k.png"), "rb")
+      @file = Tempfile.new("f" * (255 - tempfile_additional_chars))
+      @file.write(image_file.read)
+      @file.rewind
+    end
+
+    it "does not throw Errno::ENAMETOOLONG" do
+      thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :gif)
+      expect { thumb.make }.to_not raise_error
+    end
   end
 end

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"),
@@ -43,13 +42,17 @@ describe Paperclip::UrlGenerator do
   end
 
   it "executes the method named by the symbol as the default URL when no file is assigned" do
-    mock_model = MockModel.new
-    mock_attachment = MockAttachment.new(model: mock_model)
-    mock_interpolator = MockInterpolator.new
+    mock_model = FakeModel.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/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
 
@@ -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
 
@@ -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,10 @@ 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'])
+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
 
 Dir[File.join(ROOT, 'spec', 'support', '**', '*.rb')].each{|f| require f }
@@ -31,8 +37,9 @@ RSpec.configure do |config|
   config.include Assertions
   config.include ModelReconstruction
   config.include TestData
+  config.include Reporting
   config.extend VersionHelper
-  config.extend RailsHelpers::ClassMethods
+  config.extend ConditionalFilterHelper
   config.mock_framework = :mocha
   config.before(:all) do
     rebuild_model

data/spec/support/assertions.rb

@@ -48,19 +48,30 @@ 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}"
     end
   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}"
+    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/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/fake_model.rb

@@ -18,4 +18,8 @@ class FakeModel
   def valid?
     errors.empty?
   end
+
+  def new_record?
+    false
+  end
 end

data/spec/support/matchers/have_column.rb

@@ -8,7 +8,16 @@ RSpec::Matchers.define :have_column do |column_name|
     column && column.default.to_s == @default.to_s
   end
 
-  failure_message_for_should do |columns|
-    "expected to find '#{column_name}', default '#{@default}' in #{columns.map{|column| [column.name, column.default] }}"
+  failure_message_method =
+    if RSpec::Version::STRING.to_i >= 3
+      :failure_message
+    else
+      :failure_message_for_should
+    end
+
+  send(failure_message_method) do |columns|
+    "expected to find '#{column_name}', " +
+      "default '#{@default}' " +
+      "in #{columns.map { |column| [column.name, column.default] }}"
   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
 

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