kt-paperclip 6.3.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c273bab6a78348400356b49b6a713a1119b599d79bfa87c0eefa5660636fd0
-  data.tar.gz: 46d706576d7f48a94e68c6cfbb6eedd7456df6f18a7f3e68b938649acbe69c6e
+  metadata.gz: 5feef0e82a301e5ec7bface30f82007d82864dbad49f6ffe9f521522dc4cbf42
+  data.tar.gz: 2f0e12df815225d400486c6dbe8779ab9eb665afca82f529c0a94fcd7c607ab5
 SHA512:
-  metadata.gz: 924cf86607996af398c917feb50929ca1398a4749cb97dc707605f9d7f59773d407b3e7aafc05e590769df670ab7c555e2c0f5fc082c79dbecb6532b3280ac9e
-  data.tar.gz: 220f2c1f42cbf52e54c033da40e4f034d4771fb021b56eba3a8c5619e7ba41c01034ed3d8b84bcefd8339b936f9e5cf6f177e99788d02fe1cda3bedc74798ab7
+  metadata.gz: 9ded6bae6f8422c9f51aa9ec0d0b098af61f0a502468550afcbfece6e9516e1e4ce4d8b7989f472c92802cdbb17fa5dd33d98c5372161728b22c6ab57801304d
+  data.tar.gz: d3562d3f7e7e5fd35535972157e5d668ad9f2294db4d906e2307227c5c648c63dff231d28809df6d1a670a69f0c21d1e661fa8c0e475256bd8168f8bacb3b233

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [ssinghi, shalinibhawsingka-kreeti]

data/.hound.yml

@@ -1040,7 +1040,7 @@ Lint/UselessAssignment:
   Description: Checks for useless assignment to a local variable.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars
   Enabled: true
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Description: Checks for comparison of something with itself.
   Enabled: true
 Lint/UselessElseWithoutRescue:

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 script: "bundle exec rake clean spec cucumber"
 
@@ -36,3 +37,9 @@ matrix:
       rvm: 2.3
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/4.2.gemfile
+      rvm: 2.7
+    - gemfile: gemfiles/5.0.gemfile
+      rvm: 2.7
+    - gemfile: gemfiles/5.1.gemfile
+      rvm: 2.7

data/README.md

@@ -171,7 +171,7 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "kt-paperclip", "~> 6.2.0"
+gem "kt-paperclip", "~> 6.3"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:

data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb

@@ -9,8 +9,8 @@ module Paperclip
     REGEXP = /\Ahttps?:\/\//.freeze
 
     def initialize(target, options = {})
-      escaped = URI.escape(target)
-      super(URI(target == URI.unescape(target) ? escaped : target), options)
+      escaped = Paperclip::UrlGenerator.escape(target)
+      super(URI(target == Paperclip::UrlGenerator.unescape(target) ? escaped : target), options)
     end
   end
 end

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -50,10 +50,20 @@ module Paperclip
       "index.html"
     end
 
-    def download_content
-      options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+    if RUBY_VERSION < '2.5'
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
 
-      open(@target, **options)
+        # rubocop:disable Security/Open
+        open(@target, options)
+        # rubocop:enable Security/Open
+      end
+    else
+      def download_content
+        options = { read_timeout: Paperclip.options[:read_timeout] }.compact
+
+        URI.open(@target, options)
+      end
     end
 
     def copy_to_tempfile(src)

data/lib/paperclip/schema.rb

@@ -26,7 +26,7 @@ module Paperclip
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
             column_options = options.merge(options[column_name.to_sym] || {})
-            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, column_options)
+            add_column(table_name, "#{attachment_name}_#{column_name}", column_type, **column_options)
           end
         end
       end
@@ -55,7 +55,7 @@ module Paperclip
         attachment_names.each do |attachment_name|
           COLUMNS.each_pair do |column_name, column_type|
             column_options = options.merge(options[column_name.to_sym] || {})
-            column("#{attachment_name}_#{column_name}", column_type, column_options)
+            column("#{attachment_name}_#{column_name}", column_type, **column_options)
           end
         end
       end

data/lib/paperclip/url_generator.rb

@@ -3,6 +3,13 @@ require "active_support/core_ext/module/delegation"
 
 module Paperclip
   class UrlGenerator
+    class << self
+      def encoder
+        @encoder ||= URI::RFC2396_Parser.new
+      end
+      delegate :escape, :unescape, to: :encoder
+    end
+
     def initialize(attachment)
       @attachment = attachment
     end
@@ -65,7 +72,7 @@ module Paperclip
       if url.respond_to?(:escape)
         url.escape
       else
-        URI.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
+        self.class.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
       end
     end
 

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "6.3.0" unless defined?(Paperclip::VERSION)
+  VERSION = "6.4.1" unless defined?(Paperclip::VERSION)
 end

data/paperclip.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.author            = "Surendra Singhi"
   s.email             = ["ssinghi@kreeti.com"]
-  s.homepage          = "https://github.com/kreeti/paperclip"
+  s.homepage          = "https://github.com/kreeti/kt-paperclip"
   s.summary           = "File attachments as attributes for ActiveRecord"
   s.description       = "Easy upload management for ActiveRecord"
   s.license           = "MIT"

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -16,54 +16,59 @@ describe Paperclip::HttpUrlProxyAdapter do
   context "a new instance" do
     before do
       @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
-      @subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
     end
 
+    subject { Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5) }
+
     after do
-      @subject.close
+      subject.close
     end
 
     it "returns a file name" do
-      assert_equal "thoughtbot-logo.png", @subject.original_filename
+      expect(subject.original_filename).to(eq("thoughtbot-logo.png"))
     end
 
     it "closes open handle after reading" do
-      assert_equal true, @open_return.closed?
+      expect { subject }.to(change { @open_return.closed? }.from(false).to(true))
     end
 
     it "returns a content type" do
-      assert_equal "image/png", @subject.content_type
+      expect(subject.content_type).to(eq("image/png"))
     end
 
     it "returns the size of the data" do
-      assert_equal @open_return.size, @subject.size
+      expect(subject.size).to(eq(@open_return.size))
     end
 
     it "generates an MD5 hash of the contents" do
-      assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
+      expect(subject.fingerprint).to(eq(Digest::MD5.hexdigest("xxx")))
     end
 
     it "generates correct fingerprint after read" do
-      fingerprint = Digest::MD5.hexdigest(@subject.read)
-      assert_equal fingerprint, @subject.fingerprint
+      fingerprint = Digest::MD5.hexdigest(subject.read)
+      expect(subject.fingerprint).to(eq(fingerprint))
     end
 
     it "generates same fingerprint" do
-      assert_equal @subject.fingerprint, @subject.fingerprint
+      expect(subject.fingerprint).to(eq(subject.fingerprint))
     end
 
     it "returns the data contained in the StringIO" do
-      assert_equal "xxx", @subject.read
+      expect(subject.read).to(eq("xxx"))
     end
 
     it "accepts a content_type" do
-      @subject.content_type = "image/png"
-      assert_equal "image/png", @subject.content_type
+      subject.content_type = "image/png"
+      expect(subject.content_type).to(eq("image/png"))
     end
 
     it "accepts an original_filename" do
-      @subject.original_filename = "image.png"
-      assert_equal "image.png", @subject.original_filename
+      subject.original_filename = "image.png"
+      expect(subject.original_filename).to(eq("image.png"))
+    end
+
+    it "doesn't emit deprecation warnings" do
+      expect { subject }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
     end
   end
 

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -193,9 +193,18 @@ describe Paperclip::UriAdapter do
 
   describe "#download_content" do
     before do
-      allow_any_instance_of(Paperclip::UriAdapter).to receive(:open).and_return(@open_return)
+      allowed_mock =
+        if RUBY_VERSION < '2.5'
+          allow_any_instance_of(Paperclip::UriAdapter)
+        else
+          allow(URI)
+        end
+
+      allowed_mock.to receive(:open).and_return(@open_return)
+
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
+      @uri_opener = RUBY_VERSION < '2.5' ? @subject : URI
     end
 
     after do
@@ -204,7 +213,7 @@ describe Paperclip::UriAdapter do
 
     context "with default read_timeout" do
       it "calls open without options" do
-        expect(@subject).to receive(:open).with(@uri, {}).at_least(1).times
+        expect(@uri_opener).to receive(:open).with(@uri, {}).at_least(1).times
       end
     end
 
@@ -214,7 +223,8 @@ describe Paperclip::UriAdapter do
       end
 
       it "calls open with read_timeout option" do
-        expect(@subject).to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
+        expect(@uri_opener)
+          .to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
       end
     end
   end

data/spec/paperclip/storage/s3_spec.rb

@@ -805,9 +805,7 @@ describe Paperclip::Storage::S3 do
                         s3_region: "ap-northeast-1",
                         s3_host_name: "s3-ap-northeast-1.amazonaws.com"
                       },
-                      test: {
-                        s3_region: ""
-                      }
+                      test: {}
                     }
       @dummy = Dummy.new
     end

data/spec/paperclip/url_generator_spec.rb

@@ -194,6 +194,16 @@ describe Paperclip::UrlGenerator do
            "expected the interpolator to be passed #{expected.inspect} but it wasn't"
   end
 
+  it "doesn't emit deprecation warnings" do
+    expected = "the expected result"
+    mock_interpolator = MockInterpolator.new(result: expected)
+    options = { interpolator: mock_interpolator }
+    mock_attachment = MockAttachment.new(options)
+    url_generator = Paperclip::UrlGenerator.new(mock_attachment)
+
+    expect { url_generator.for(:style_name, escape: true) }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
+  end
+
   describe "should be able to escape (, ), [, and ]." do
     def generate(expected, updated_at = nil)
       mock_interpolator = MockInterpolator.new(result: expected)

data/spec/support/model_reconstruction.rb

@@ -28,7 +28,7 @@ module ModelReconstruction
 
   def reset_table(_table_name, &block)
     block ||= lambda { |_table| true }
-    ActiveRecord::Base.connection.create_table :dummies, { force: true }, &block
+    ActiveRecord::Base.connection.create_table :dummies, **{ force: true }, &block
   end
 
   def modify_table(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.1
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -354,6 +354,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/custom.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
@@ -546,7 +547,7 @@ files:
 - spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb
-homepage: https://github.com/kreeti/paperclip
+homepage: https://github.com/kreeti/kt-paperclip
 licenses:
 - MIT
 metadata: {}
@@ -583,8 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord