paperclip 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab7608623c35bf152d8a5277f17938d75e29062a
-  data.tar.gz: 9522d62f5f590d9022abc2a086c5b1c7387a4eb0
+  metadata.gz: 43295d174585b0f901e4582c9a187ac89c8bfcdf
+  data.tar.gz: 48a869b66081613bc8ecef28d9b311007f61f082
 SHA512:
-  metadata.gz: fc30de9ee1182acb5d59ec0f172b5b309b55032fce3b14f466545c3f86d5e4e29deef045673fbd585a5a7a2268ba0172a8a87103135cb5236ace5058ed78fdab
-  data.tar.gz: 6a37ffebe6bfd71e8f4c8937adf6a4cafdf31365acd305274a4b38c631ad4ade53a5aa4bc2b1584a0716a3c2a048ddea0212e42edbbe2392f5e69c496b27bad5
+  metadata.gz: 88697737772a0e776549b80dcf4b45e42aeb57ec3cf3432827356d410c9e2abaf3bb5072be70728798c04bc5ec844715e14de5d013dbe2debe49601c73e4ad1e
+  data.tar.gz: 2ca1c276224bf3134d9df3a3df41a69ff4e19c35374043a2fa3c634529548875bc32b25cfc0bf61b58d792d01f0b740c90c849a794a520b97671e9efe96de3e9

data/NEWS

@@ -1,3 +1,9 @@
+4.3.7 (7/1/2016):
+
+* Add deprecation warnings
+* Improvement: Add `fog_options` configuration to send options to fog when storing files.
+* Improvement: the `URI adapter` now uses the content-disposition header to name the downloaded file.
+
 4.3.6 (3/13/2016):
 
 * Bug Fix: When a spoofed media type is detected, megabytes of mime-types info are added to logs. See https://cwe.mitre.org/data/definitions/779.html.

data/lib/paperclip.rb

@@ -56,6 +56,7 @@ require 'paperclip/has_attached_file'
 require 'paperclip/attachment_registry'
 require 'paperclip/filename_cleaner'
 require 'paperclip/rails_environment'
+require "paperclip/deprecations"
 
 begin
   # Use mime/types/columnar if available, for reduced memory usage
@@ -191,6 +192,7 @@ module Paperclip
     #     end
     #   end
     def has_attached_file(name, options = {})
+      Paperclip::Deprecations.check
       HasAttachedFile.define_on(self, name, options)
     end
   end

data/lib/paperclip/deprecations.rb

@@ -0,0 +1,42 @@
+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/io_adapters/uri_adapter.rb

@@ -2,6 +2,8 @@ require 'open-uri'
 
 module Paperclip
   class UriAdapter < AbstractAdapter
+    attr_writer :content_type
+
     def initialize(target)
       @target = target
       @content = download_content
@@ -9,23 +11,40 @@ module Paperclip
       @tempfile = copy_to_tempfile(@content)
     end
 
-    attr_writer :content_type
-
     private
 
-    def download_content
-      open(@target)
+    def cache_current_values
+      self.content_type = content_type_from_content || "text/html"
+
+      self.original_filename = filename_from_content_disposition ||
+                               filename_from_path ||
+                               default_filename
+      @size = @content.size
     end
 
-    def cache_current_values
-      @original_filename = @target.path.split("/").last
-      @original_filename ||= "index.html"
-      self.original_filename = @original_filename.strip
+    def content_type_from_content
+      if @content.respond_to?(:content_type)
+        @content.content_type
+      end
+    end
 
-      @content_type = @content.content_type if @content.respond_to?(:content_type)
-      @content_type ||= "text/html"
+    def filename_from_content_disposition
+      if @content.meta.has_key?("content-disposition")
+        @content.meta["content-disposition"].
+          match(/filename="([^"]*)"/)[1]
+      end
+    end
 
-      @size = @content.size
+    def filename_from_path
+      @target.path.split("/").last
+    end
+
+    def default_filename
+      "index.html"
+    end
+
+    def download_content
+      open(@target)
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/storage/fog.rb

@@ -33,6 +33,10 @@ module Paperclip
     #   that is the alias to the S3 domain of your bucket, e.g.
     #   'http://images.example.com'. This can also be used in
     #   conjunction with Cloudfront (http://aws.amazon.com/cloudfront)
+    # * +fog_options+: (optional) A hash of options that are passed
+    #   to fog when the file is created. For example, you could set
+    #   the multipart-chunk size to 100MB with a hash:
+    #     { :multipart_chunk_size => 104857600 }
 
     module Fog
       def self.extended base
@@ -98,12 +102,14 @@ module Paperclip
           log("saving #{path(style)}")
           retried = false
           begin
-            directory.files.create(fog_file.merge(
+            attributes = fog_file.merge(
               :body         => file,
               :key          => path(style),
               :public       => fog_public(style),
               :content_type => file.content_type
-            ))
+            )
+            attributes.merge!(@options[:fog_options]) if @options[:fog_options]
+            directory.files.create(attributes)
           rescue Excon::Errors::NotFound
             raise if retried
             retried = true

data/lib/paperclip/version.rb

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

data/spec/paperclip/deprecations_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+require "aws-sdk"
+require "active_support/testing/deprecation"
+
+describe Paperclip::Deprecations do
+  include ActiveSupport::Testing::Deprecation
+
+  describe ".check" do
+    before do
+      ActiveSupport::Deprecation.silenced = false
+    end
+
+    after do
+      ActiveSupport::Deprecation.silenced = true
+    end
+
+    context "when active model version is < 4.2" do
+      it "displays deprecation warning" do
+        Paperclip::Deprecations.stubs(:active_model_version).returns("4.1")
+
+        assert_deprecated("Rails 3.2 and 4.1 are unsupported") do
+          Paperclip::Deprecations.check
+        end
+      end
+    end
+
+    context "when active model version is 4.2" do
+      it "do not display deprecation warning" do
+        Paperclip::Deprecations.stubs(:active_model_version).returns("4.2")
+
+        assert_not_deprecated do
+          Paperclip::Deprecations.check
+        end
+      end
+    end
+
+    context "when aws sdk version is < 2" do
+      before do
+        ::AWS.stub! if !defined?(::AWS)
+      end
+
+      it "displays deprecation warning" do
+        Paperclip::Deprecations.stubs(:aws_sdk_version).returns("1.68.0")
+
+        assert_deprecated("AWS SDK v1 has been deprecated") do
+          Paperclip::Deprecations.check
+        end
+      end
+    end
+
+    context "when aws sdk version is 2" do
+      before do
+        ::AWS.stub! if !defined?(::AWS)
+      end
+
+      it "do not display deprecation warning" do
+        Paperclip::Deprecations.stubs(:aws_sdk_version).returns("2.0.0")
+
+        assert_not_deprecated do
+          Paperclip::Deprecations.check
+        end
+      end
+    end
+  end
+end

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -1,11 +1,16 @@
 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
@@ -60,7 +65,6 @@ 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
@@ -76,7 +80,6 @@ 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,11 +1,19 @@
 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
@@ -56,8 +64,9 @@ 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
@@ -73,7 +82,6 @@ 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
@@ -83,9 +91,26 @@ 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/paperclip_spec.rb

@@ -109,6 +109,7 @@ 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
@@ -150,6 +151,10 @@ describe Paperclip do
       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/fog_spec.rb

@@ -484,6 +484,25 @@ describe Paperclip::Storage::Fog do
           assert_equal @dummy.avatar.fog_credentials, @dynamic_fog_credentials
         end
       end
+
+      context "with custom fog_options" do
+        before do
+          rebuild_model(
+            @options.merge(fog_options: { multipart_chunk_size: 104857600 }),
+          )
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        it "applies the options to the fog #create call" do
+          files = stub
+          @dummy.avatar.stubs(:directory).returns stub(files: files)
+          files.expects(:create).with(
+            has_entries(multipart_chunk_size: 104857600),
+          )
+          @dummy.save
+        end
+      end
     end
 
   end

data/spec/support/deprecations.rb

@@ -0,0 +1,9 @@
+RSpec.configure do |config|
+  config.before(:all) do
+    ActiveSupport::Deprecation.silenced = true
+  end
+  config.before(:each) do
+    Paperclip::Deprecations.stubs(:active_model_version).returns("4.2")
+    Paperclip::Deprecations.stubs(:aws_sdk_version).returns("2.0.0")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -429,6 +429,7 @@ 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
@@ -499,6 +500,7 @@ 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
@@ -550,6 +552,7 @@ 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
@@ -600,7 +603,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
@@ -628,6 +631,7 @@ 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
@@ -679,6 +683,7 @@ 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