paperclip 4.3.7 → 5.0.0.beta1

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "4.3.7".freeze unless defined? Paperclip::VERSION
+  VERSION = "5.0.0.beta1" unless defined? Paperclip::VERSION
 end

data/paperclip.gemspec

@@ -17,21 +17,25 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  if File.exist?('UPGRADING')
+    s.post_install_message = File.read("UPGRADING")
+  end
+
   s.requirements << "ImageMagick"
-  s.required_ruby_version = ">= 1.9.2"
+  s.required_ruby_version = ">= 2.1.0"
 
-  s.add_dependency('activemodel', '>= 3.2.0')
-  s.add_dependency('activesupport', '>= 3.2.0')
+  s.add_dependency('activemodel', '>= 4.2.0')
+  s.add_dependency('activesupport', '>= 4.2.0')
   s.add_dependency('cocaine', '~> 0.5.5')
   s.add_dependency('mime-types')
-  s.add_dependency('mimemagic', '0.3.0')
+  s.add_dependency('mimemagic', '~> 0.3.0')
 
-  s.add_development_dependency('activerecord', '>= 3.2.0')
+  s.add_development_dependency('activerecord', '>= 4.2.0')
   s.add_development_dependency('shoulda')
   s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 1.5.7', "<= 2.0")
+  s.add_development_dependency('aws-sdk', '>= 2.0.33', '< 3.0')
   s.add_development_dependency('bourne')
   s.add_development_dependency('cucumber', '~> 1.3.18')
   s.add_development_dependency('aruba', '~> 0.9.0')
@@ -45,7 +49,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.2.0')
+  s.add_development_dependency('actionmailer', '>= 4.2.0')
   s.add_development_dependency('generator_spec')
   s.add_development_dependency('timecop')
 end

data/spec/paperclip/attachment_registry_spec.rb

@@ -111,6 +111,34 @@ describe 'Attachment Registry' do
 
       assert_equal expected_definitions, definitions
     end
+
+    it 'allows subclasses to override attachment defitions' do
+      foo_definitions = { avatar: { yo: "greeting" } }
+      bar_definitions = { avatar: { yo: "hello" } }
+
+      expected_definitions = {
+        avatar: {
+          yo: "hello"
+        }
+      }
+
+      foo = Class.new
+      bar = Class.new(foo)
+      Paperclip::AttachmentRegistry.register(
+        foo,
+        :avatar,
+        foo_definitions[:avatar]
+      )
+      Paperclip::AttachmentRegistry.register(
+        bar,
+        :avatar,
+        bar_definitions[:avatar]
+      )
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(bar)
+
+      assert_equal expected_definitions, definitions
+    end
   end
 
   context '.clear' do

data/spec/paperclip/attachment_spec.rb

@@ -700,9 +700,6 @@ describe Paperclip::Attachment do
 
     context "when assigned" do
       it "calls #make on all specified processors" do
-        Paperclip::Thumbnail.stubs(:make).with(any_parameters).returns(@file)
-        Paperclip::Test.stubs(:make).with(any_parameters).returns(@file)
-
         @dummy.avatar = @file
 
         expect(Paperclip::Thumbnail).to have_received(:make)
@@ -717,7 +714,6 @@ describe Paperclip::Attachment do
           convert_options: "",
           source_file_options: ""
         })
-        Paperclip::Thumbnail.stubs(:make).returns(@file)
 
         @dummy.avatar = @file
 
@@ -725,12 +721,36 @@ describe Paperclip::Attachment do
       end
 
       it "calls #make with attachment passed as third argument" do
-        Paperclip::Test.expects(:make).returns(@file)
-
         @dummy.avatar = @file
 
         expect(Paperclip::Test).to have_received(:make).with(anything, anything, @dummy.avatar)
       end
+
+      it "calls #make and unlinks intermediary files afterward" do
+        @dummy.avatar.expects(:unlink_files).with([@file, @file])
+
+        @dummy.avatar = @file
+      end
+    end
+  end
+
+  context "An attachment with a processor that returns original file" do
+    before do
+      class Paperclip::Test < Paperclip::Processor
+        def make; @file; end
+      end
+      rebuild_model processors: [:test], styles: { once: "100x100" }
+      @file = StringIO.new("...")
+      @file.stubs(:close)
+      @dummy = Dummy.new
+    end
+
+    context "when assigned" do
+      it "#calls #make and doesn't unlink the original file" do
+        @dummy.avatar.expects(:unlink_files).with([])
+
+        @dummy.avatar = @file
+      end
     end
   end
 
@@ -1354,6 +1374,12 @@ describe Paperclip::Attachment do
     end
 
     it "does not calculate fingerprint" do
+      Digest::MD5.stubs(:file)
+      @dummy.avatar = @file
+      expect(Digest::MD5).to have_received(:file).never
+    end
+
+    it "does not assign fingerprint" do
       @dummy.avatar = @file
       assert_nil @dummy.avatar.fingerprint
     end

data/spec/paperclip/has_attached_file_spec.rb

@@ -38,6 +38,15 @@ describe Paperclip::HasAttachedFile do
       assert_adding_attachment('avatar').defines_callback('after_commit')
     end
 
+    context 'when the class does not allow after_commit callbacks' do
+      it 'defines an after_destroy callback' do
+        assert_adding_attachment(
+          'avatar',
+          unstub_methods: [:after_commit]
+        ).defines_callback('after_destroy')
+      end
+    end
+
     it 'defines the Paperclip-specific callbacks' do
       assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
     end
@@ -53,20 +62,26 @@ describe Paperclip::HasAttachedFile do
 
   private
 
-  def assert_adding_attachment(attachment_name)
-    AttachmentAdder.new(attachment_name)
+  def assert_adding_attachment(attachment_name, options={})
+    AttachmentAdder.new(attachment_name, options)
   end
 
   class AttachmentAdder
     include Mocha::API
     include RSpec::Matchers
 
-    def initialize(attachment_name)
+    def initialize(attachment_name, options = {})
       @attachment_name = attachment_name
+      @stubbed_class = stub_class
+      if options.present?
+        options[:unstub_methods].each do |method|
+          @stubbed_class.unstub(method)
+        end
+      end
     end
 
     def defines_method(method_name)
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -74,7 +89,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_class_method(method_name)
-      a_class = stub_class
+      a_class = @stubbed_class
       a_class.class.stubs(:define_method)
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
@@ -83,7 +98,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_validation
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -91,7 +106,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def registers_attachment
-      a_class = stub_class
+      a_class = @stubbed_class
       Paperclip::AttachmentRegistry.stubs(:register)
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
@@ -100,7 +115,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_callback(callback_name)
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -132,6 +147,7 @@ describe Paperclip::HasAttachedFile do
            after_save: nil,
            before_destroy: nil,
            after_commit: nil,
+           after_destroy: nil,
            define_paperclip_callbacks: nil,
            extend: nil,
            name: 'Billy',

data/spec/paperclip/integration_spec.rb

@@ -7,9 +7,10 @@ describe 'Paperclip' do
     before do
       rebuild_model
       @file = File.new(fixture_file("5k.png"), 'rb')
-      300.times do |i|
-        Dummy.create! avatar: @file
-      end
+      # Deals with `Too many open files` error
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
     end
 
     after { @file.close }

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -1,16 +1,11 @@
 require 'spec_helper'
 
 describe Paperclip::HttpUrlProxyAdapter do
-  before do
-    @open_return = StringIO.new("xxx")
-    @open_return.stubs(:content_type).returns("image/png")
-    @open_return.stubs(:meta).returns({})
-    Paperclip::HttpUrlProxyAdapter.any_instance.
-      stubs(:download_content).returns(@open_return)
-  end
-
   context "a new instance" do
     before do
+      @open_return = StringIO.new("xxx")
+      @open_return.stubs(:content_type).returns("image/png")
+      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(@open_return)
       @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
       @subject = Paperclip.io_adapters.for(@url)
     end
@@ -65,6 +60,7 @@ describe Paperclip::HttpUrlProxyAdapter do
 
   context "a url with query params" do
     before do
+      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(StringIO.new("x"))
       @url = "https://github.com/thoughtbot/paperclip?file=test"
       @subject = Paperclip.io_adapters.for(@url)
     end
@@ -80,6 +76,7 @@ describe Paperclip::HttpUrlProxyAdapter do
 
   context "a url with restricted characters in the filename" do
     before do
+      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(StringIO.new("x"))
       @url = "https://github.com/thoughtbot/paper:clip.jpg"
       @subject = Paperclip.io_adapters.for(@url)
     end

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -1,19 +1,11 @@
 require 'spec_helper'
 
 describe Paperclip::UriAdapter do
-  let(:content_type) { "image/png" }
-  let(:meta) { {} }
-
-  before do
-    @open_return = StringIO.new("xxx")
-    @open_return.stubs(:content_type).returns(content_type)
-    @open_return.stubs(:meta).returns(meta)
-    Paperclip::UriAdapter.any_instance.
-      stubs(:download_content).returns(@open_return)
-  end
-
   context "a new instance" do
     before do
+      @open_return = StringIO.new("xxx")
+      @open_return.stubs(:content_type).returns("image/png")
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(@open_return)
       @uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -64,9 +56,8 @@ describe Paperclip::UriAdapter do
   end
 
   context "a directory index url" do
-    let(:content_type) { "text/html" }
-
     before do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("http://thoughtbot.com")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -82,6 +73,7 @@ describe Paperclip::UriAdapter do
 
   context "a url with query params" do
     before do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -91,26 +83,9 @@ describe Paperclip::UriAdapter do
     end
   end
 
-  context "a url with content disposition headers" do
-    let(:file_name) { "test_document.pdf" }
-    let(:meta) do
-      {
-        "content-disposition" => "attachment; filename=\"#{file_name}\";",
-      }
-    end
-
-    before do
-      @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
-      @subject = Paperclip.io_adapters.for(@uri)
-    end
-
-    it "returns a file name" do
-      assert_equal file_name, @subject.original_filename
-    end
-  end
-
   context "a url with restricted characters in the filename" do
     before do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
     end

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -44,18 +44,9 @@ describe Paperclip::MediaTypeSpoofDetector do
     end
   end
 
-  context "file named .html and is as HTML, but we're told JPG" do
-    let(:file) { File.open(fixture_file("empty.html")) }
-    let(:spoofed?) { Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed? }
-
-    it "rejects the file" do
-      assert spoofed?
-    end
-
-    it "logs info about the detected spoof" do
-      Paperclip.expects(:log).with('Content Type Spoof: Filename empty.html (image/jpg from Headers, ["text/html"] from Extension), content type discovered from file command: text/html. See documentation to allow this combination.')
-      spoofed?
-    end
+  it "rejects a file if named .html and is as HTML, but we're told JPG" do
+    file = File.open(fixture_file("empty.html"))
+    assert Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "image/jpg").spoofed?
   end
 
   it "does not reject if content_type is empty but otherwise checks out" do

data/spec/paperclip/paperclip_spec.rb

@@ -109,7 +109,6 @@ describe Paperclip do
 
   context "An ActiveRecord model with an 'avatar' attachment" do
     before do
-      Paperclip::Deprecations.stubs(:check)
       rebuild_model path: "tmp/:class/omg/:style.:extension"
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
@@ -124,37 +123,6 @@ describe Paperclip do
       end
     end
 
-    if using_protected_attributes?
-      context "that is attr_protected" do
-        before do
-          Dummy.class_eval do
-            attr_protected :avatar
-          end
-          @dummy = Dummy.new
-        end
-
-        it "does not assign the avatar on mass-set" do
-          @dummy.attributes = { other: "I'm set!",
-                                avatar: @file }
-
-          assert_equal "I'm set!", @dummy.other
-          assert ! @dummy.avatar?
-        end
-
-        it "allows assigment on normal set" do
-          @dummy.other  = "I'm set!"
-          @dummy.avatar = @file
-
-          assert_equal "I'm set!", @dummy.other
-          assert @dummy.avatar?
-        end
-      end
-    end
-
-    it "calls Paperclip::Deprecations.check" do
-      expect(Paperclip::Deprecations).to have_received(:check)
-    end
-
     context "with a subclass" do
       before do
         class ::SubDummy < Dummy; end

data/spec/paperclip/storage/s3_live_spec.rb

@@ -8,6 +8,7 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
@@ -45,6 +46,7 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
@@ -64,6 +66,7 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
@@ -105,6 +108,7 @@ unless ENV["S3_BUCKET"].blank?
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
           storage: :s3,
           bucket: ENV["S3_BUCKET"],
+          s3_region: ENV["S3_REGION"],
           s3_credentials: {
             aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
             aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
@@ -136,7 +140,7 @@ unless ENV["S3_BUCKET"].blank?
       it "is destroyable" do
         url = @dummy.avatar.url
         @dummy.destroy
-        assert_not_found_response url
+        assert_forbidden_response url
       end
     end
 
@@ -146,12 +150,12 @@ unless ENV["S3_BUCKET"].blank?
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       },
-                      s3_server_side_encryption: :aes256
-
+                      s3_server_side_encryption: "AES256"
         Dummy.delete_all
         @dummy = Dummy.new
       end
@@ -173,7 +177,7 @@ unless ENV["S3_BUCKET"].blank?
           end
 
           it "is encrypted on S3" do
-            assert @dummy.avatar.s3_object.server_side_encryption == :aes256
+            assert @dummy.avatar.s3_object.server_side_encryption == "AES256"
           end
         end
       end