mini_paperclip 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51135052187a9097d6989759082fcdba81aecfb7259909ba8bbf1dd17bf70036
-  data.tar.gz: 47673d86acfd5538bd0fb43cb373041add3281217ffae31d4bfcb71a7c2cf08b
+  metadata.gz: 29ef73b42c1c7ef6755a3af5907bab7f285f7fdacb4a6d15d283366d4f46d073
+  data.tar.gz: 877efe3a37db1c2f888df9785ad84bc4220507cfc970ec8bc3632ad3bf5908b2
 SHA512:
-  metadata.gz: 703405ef627eecc1df7856f65f9f27877fb675c95b8c2eb9bbe45c998f71cbebba1b37101bf44d8ec9ce64782a0a39caa06cde4752fa6007279366760acb0659
-  data.tar.gz: ded84756cf123fe3ffe82b8c47b59ac30c9ab39785056c4644a21e2ffd0183dd9e2250623f0307de41394c9392a0f650e64af3d0862163b1a5cc73522c0ed8ed
+  metadata.gz: 0a2395e2c209b4dcee1d518d87bcc972b2c253530edd1926800f2b1e0ab1fc9ab2b3b21c0760248e54d14ea0d74c41e8045d9717870947368e0ca5395d577ec7
+  data.tar.gz: a4dead2af2ebb2c0146b37196b4344683039ba302b0c174a9371b458e4121dd3b4613b5b00622f1d2171c0561d63d44297f5b17d1452b0a817f874c87d108ff5

data/.github/workflows/ruby.yml

@@ -27,6 +27,7 @@ jobs:
         gemfile:
           - gemfiles/rails_52.gemfile
           - gemfiles/rails_60.gemfile
+          - gemfiles/rails_head.gemfile
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/temp/
 /tmp/
 Gemfile.lock
+/gemfiles/*.gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/Gemfile

@@ -2,11 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in mini_paperclip.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-gem "rack-test"
-gem "webmock"
-gem "tapp"
 gem "activerecord"
-gem "sqlite3"
+eval_gemfile 'gemfiles/development.gemfile'

data/README.md

@@ -104,7 +104,7 @@ end
 
 Interpolate is a simple template system like this.
 
-template: `:class/:attribute/:id/:hash.:extension`
+template: `:class/:attachment/:id/:hash.:extension`
 result: `books/images/1234/abcdef1234567.png`
 
 You can check default interpolates.
@@ -116,8 +116,9 @@ p MiniPaperclip.config.interpolaters
 You can add any interpolate key and process.
 
 ```
-MiniPaperclip.config.interpolates[/:custom_style/] = -> (attachment, style) {
-  "-#{style}"
+MiniPaperclip.config.interpolates[':custom_style'] = -> (style) {
+  # This block is called by the scope in the instance of the Interpolator
+  # You can also call `attachment` and `config` in this block
 }
 ```
 

data/gemfiles/development.gemfile

@@ -0,0 +1,7 @@
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rack-test"
+gem "webmock"
+gem "tapp"
+gem "sqlite3"
+gem "pretty_backtrace"

data/gemfiles/rails_52.gemfile

@@ -1,10 +1,5 @@
 source "https://rubygems.org"
 gemspec path: '../'
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-gem "rack-test"
-gem "webmock"
-gem "tapp"
 gem 'activerecord', '~> 5.2.0'
-gem "sqlite3"
+eval_gemfile 'development.gemfile'

data/gemfiles/rails_60.gemfile

@@ -1,10 +1,5 @@
 source "https://rubygems.org"
 gemspec path: '../'
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-gem "rack-test"
-gem "webmock"
-gem "tapp"
 gem 'activerecord', '~> 6.0.0'
-gem "sqlite3"
+eval_gemfile 'development.gemfile'

data/gemfiles/rails_head.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec path: '../'
+
+gem 'activerecord', git: "https://github.com/rails/rails", branch: :master
+eval_gemfile 'development.gemfile'

data/lib/mini_paperclip.rb

@@ -24,15 +24,15 @@ module MiniPaperclip
       @config ||= Config.new(
         # defaults
         interpolates: {
-          /:class/ => ->(*) { class_result },
-          /:attachment/ => ->(*) { attachment_result },
-          /:hash/ => ->(_, style) { hash_key(style) },
-          /:extension/ => ->(*) { File.extname(@record.read_attribute("#{@attachment_name}_file_name"))[1..-1] },
-          /:id/ => ->(*) { @record.id },
-          /:updated_at/ => ->(*) { @record.read_attribute("#{@attachment_name}_updated_at").to_i },
-          /:style/ => ->(_, style) { style }
+          ':class' => ->(_) { class_result },
+          ':attachment' => ->(_) { attachment_result },
+          ':hash' => ->(style) { hash_key(style) },
+          ':extension' => ->(_) { extension },
+          ':id' => ->(_) { @attachment.record.id },
+          ':updated_at' => ->(_) { attachment.updated_at&.to_i },
+          ':style' => ->(style) { style }
         },
-        hash_data: ":class/:attribute/:id/:style/:updated_at",
+        hash_data: ":class/:attachment/:id/:style/:updated_at",
         url_missing_path: ":attachment/:style/missing.png",
         read_timeout: 60,
         logger: Logger.new($stdout),

data/lib/mini_paperclip/attachment.rb

@@ -2,7 +2,7 @@
 
 module MiniPaperclip
   class Attachment
-    UnsupporedError = Class.new(StandardError)
+    UnsupportedError = Class.new(StandardError)
 
     attr_reader :record, :attachment_name, :config, :storage,
                 :waiting_write_file, :meta_content_type
@@ -15,7 +15,7 @@ module MiniPaperclip
       @meta_content_type = nil
       @dirty = false
       @storage = Storage.const_get(@config.storage.to_s.camelcase)
-                        .new(record, attachment_name, @config)
+                        .new(self, @config)
     end
 
     def original_filename
@@ -31,7 +31,7 @@ module MiniPaperclip
     end
 
     def updated_at
-      @record.read_attribute("#{@attachment_name}_updated_at").to_i
+      @record.read_attribute("#{@attachment_name}_updated_at")
     end
 
     def file?
@@ -110,7 +110,7 @@ module MiniPaperclip
           # data-uri
           match_data = file.match(/\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m)
           if match_data.nil?
-            raise UnsupporedError, "attachment for \"#{file[0..100]}\" is not supported"
+            raise UnsupportedError, "attachment for \"#{file[0..100]}\" is not supported"
           end
           raw = Base64.decode64(match_data[2])
           @record.write_attribute("#{@attachment_name}_file_name", nil)
@@ -120,10 +120,10 @@ module MiniPaperclip
           @waiting_write_file = build_tempfile(StringIO.new(raw))
           @meta_content_type = match_data[1]
         else
-          raise UnsupporedError, "attachment for \"#{file[0..100]}\" is not supported"
+          raise UnsupportedError, "attachment for \"#{file[0..100]}\" is not supported"
         end
       else
-        raise UnsupporedError, "attachment for #{file.class} is not supported"
+        raise UnsupportedError, "attachment for #{file.class} is not supported"
       end
     end
 
@@ -168,6 +168,17 @@ module MiniPaperclip
       @waiting_write_file = nil
     end
 
+    def push_delete_files
+      @storage.push_delete_file(:original)
+      @config.styles&.each_key do |style|
+        @storage.push_delete_file(style)
+      end
+    end
+
+    def do_delete_files
+      @storage.do_delete_files
+    end
+
     private
 
     def strict_content_type(io)
@@ -184,7 +195,7 @@ module MiniPaperclip
     end
 
     def debug(str)
-      MiniPaperclip.config.logger.debug(str)
+      MiniPaperclip.config.logger.debug("[mini_paperclip] #{str}")
     end
   end
 end

data/lib/mini_paperclip/class_methods.rb

@@ -19,6 +19,12 @@ module MiniPaperclip
           end
         end
       end
+      before_destroy do
+        public_send(attachment_name).push_delete_files
+      end
+      after_commit(on: :destroy) do
+        public_send(attachment_name).do_delete_files
+      end
       validates_with Validators::MediaTypeSpoofValidator, {
         attributes: attachment_name,
         if: -> { instance_variable_get("@#{attachment_name}")&.dirty? }

data/lib/mini_paperclip/config.rb

@@ -25,7 +25,7 @@ module MiniPaperclip
     end
 
     def merge!(hash)
-      to_h.deep_merge(hash).each { |k, v| self[k] = v }
+      to_h.deep_merge(hash.to_h).each { |k, v| self[k] = v }
       self
     end
   end

data/lib/mini_paperclip/interpolator.rb

@@ -2,16 +2,17 @@
 
 module MiniPaperclip
   class Interpolator
-    def initialize(record, attachment_name, config)
-      @record = record
-      @attachment_name = attachment_name
+    attr_reader :attachment, :config
+
+    def initialize(attachment, config)
+      @attachment = attachment
       @config = config
     end
 
     def interpolate(template, style)
       template.dup.tap do |t|
         @config.interpolates&.each do |matcher, block|
-          t.gsub!(matcher) { instance_exec(attachment, style, &block) }
+          t.gsub!(matcher) { instance_exec(style, &block) }
         end
       end
     end
@@ -19,23 +20,28 @@ module MiniPaperclip
     private
 
     def class_result
-      @record.class.name.underscore.pluralize
+      @attachment.record.class.name.underscore.pluralize
     end
 
     def attachment_result
-      @attachment_name.to_s.downcase.pluralize
+      @attachment.attachment_name.to_s.downcase.pluralize
     end
 
-    def attachment
-      @record.public_send(@attachment_name)
+    def extension
+      attachment.original_filename &&
+        File.extname(attachment.original_filename)[1..-1]
     end
 
     def hash_key(style)
       OpenSSL::HMAC.hexdigest(
         OpenSSL::Digest::SHA1.new,
         @config.hash_secret,
-        interpolate(@config.hash_data, style),
+        interpolated_hash_data(style),
       )
     end
+
+    def interpolated_hash_data(style)
+      interpolate(@config.hash_data, style)
+    end
   end
 end

data/lib/mini_paperclip/storage/base.rb

@@ -3,13 +3,13 @@
 module MiniPaperclip
   module Storage
     class Base
-      attr_reader :config
+      attr_reader :attachment, :config, :interpolator
 
-      def initialize(record, attachment_name, config)
-        @record = record
-        @attachment_name = attachment_name
+      def initialize(attachment, config)
+        @attachment = attachment
         @config = config
-        @interpolator = Interpolator.new(record, attachment_name, config)
+        @interpolator = Interpolator.new(attachment, config)
+        @deletes = []
       end
 
       def url_for_read(style)
@@ -17,10 +17,10 @@ module MiniPaperclip
       end
 
       def path_for(style)
-        template = if @record.public_send(@attachment_name)&.file?
-          @config.url_path
-        else
+        template = if @attachment.original_filename.nil?
           @config.url_missing_path
+        else
+          @config.url_path
         end
         interpolate(template, style)
       end
@@ -32,7 +32,7 @@ module MiniPaperclip
       private
 
       def debug(str)
-        MiniPaperclip.config.logger.debug(str)
+        MiniPaperclip.config.logger.debug("[mini_paperclip] #{str}")
       end
     end
   end

data/lib/mini_paperclip/storage/filesystem.rb

@@ -29,6 +29,15 @@ module MiniPaperclip
       def exists?(style)
         File.exists?(file_path(style))
       end
+
+      def push_delete_file(style)
+        @deletes.push(file_path(style))
+      end
+
+      def do_delete_files
+        debug("deleting by filesystem #{@deletes}")
+        FileUtils.rm_f(@deletes)
+      end
     end
   end
 end

data/lib/mini_paperclip/storage/s3.rb

@@ -8,7 +8,7 @@ module MiniPaperclip
         Aws::S3::Client.new.put_object(
           acl: @config.s3_acl,
           cache_control: @config.s3_cache_control,
-          content_type: @record.read_attribute("#{@attachment_name}_content_type"),
+          content_type: @attachment.content_type,
           body: file.tap(&:rewind),
           bucket: @config.s3_bucket_name,
           key: s3_object_key(style),
@@ -21,7 +21,7 @@ module MiniPaperclip
         Aws::S3::Client.new.copy_object(
           acl: @config.s3_acl,
           cache_control: @config.s3_cache_control,
-          content_type: @record.read_attribute("#{@attachment_name}_content_type"),
+          content_type: @attachment.content_type,
           copy_source: from_attachment.storage.object_key(style),
           bucket: @config.s3_bucket_name,
           key: s3_object_key(style),
@@ -46,6 +46,21 @@ module MiniPaperclip
       rescue Aws::S3::Errors::NotFound
         false
       end
+
+      def push_delete_file(style)
+        @deletes.push({ key: s3_object_key(style) })
+      end
+
+      def do_delete_files
+        debug("deleting by S3 to bucket:#{@config.s3_bucket_name},objects:#{@deletes}")
+        Aws::S3::Client.new.delete_objects(
+          bucket: @config.s3_bucket_name,
+          delete: {
+            objects: @deletes,
+            quiet: true,
+          }
+        )
+      end
     end
   end
 end

data/lib/mini_paperclip/validators/file_size_validator.rb

@@ -10,8 +10,8 @@ module MiniPaperclip
           if check_value = options[:less_than]
             unless attachment_file_size < check_value
               count = ActiveSupport::NumberHelper.number_to_human_size(check_value)
-              record.errors.add(attribute, :less_than, { count: count })
-              record.errors.add(attachment_file_size_name, :less_than, { count: count })
+              record.errors.add(attribute, :less_than, count: count)
+              record.errors.add(attachment_file_size_name, :less_than, count: count)
             end
           end
         end

data/lib/mini_paperclip/validators/geometry_validator.rb

@@ -31,12 +31,14 @@ module MiniPaperclip
         expected_height_less_than_or_equal_to = options.dig(:height, :less_than_or_equal_to)
         unless (!expected_width_less_than_or_equal_to || image_size.width <= expected_width_less_than_or_equal_to) &&
             (!expected_height_less_than_or_equal_to || image_size.height <= expected_height_less_than_or_equal_to)
-          record.errors.add(attribute, :geometry, {
+          record.errors.add(
+            attribute,
+            :geometry,
             actual_width: image_size.width,
             actual_height: image_size.height,
             expected_width_less_than_or_equal_to: expected_width_less_than_or_equal_to,
             expected_height_less_than_or_equal_to: expected_height_less_than_or_equal_to,
-          })
+          )
         end
       end
     end

data/lib/mini_paperclip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniPaperclip
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -111,10 +111,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/development.gemfile
 - gemfiles/rails_52.gemfile
-- gemfiles/rails_52.gemfile.lock
 - gemfiles/rails_60.gemfile
-- gemfiles/rails_60.gemfile.lock
+- gemfiles/rails_head.gemfile
 - lib/mini_paperclip.rb
 - lib/mini_paperclip/attachment.rb
 - lib/mini_paperclip/class_methods.rb

data/gemfiles/rails_52.gemfile.lock

@@ -1,98 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    mini_paperclip (0.1.0)
-      activemodel
-      activesupport
-      aws-sdk-s3
-      mimemagic
-      mini_magick
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.4.4)
-      activesupport (= 5.2.4.4)
-    activerecord (5.2.4.4)
-      activemodel (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
-      arel (>= 9.0)
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    arel (9.0.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.399.0)
-    aws-sdk-core (3.109.3)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.85.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    diff-lcs (1.4.4)
-    hashdiff (1.0.1)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    mimemagic (0.3.5)
-    mini_magick (4.11.0)
-    minitest (5.14.2)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    sqlite3 (1.4.2)
-    tapp (1.5.1)
-      thor
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    webmock (3.10.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.2.0)
-  mini_paperclip!
-  rack-test
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  sqlite3
-  tapp
-  webmock
-
-BUNDLED WITH
-   2.1.4

data/gemfiles/rails_60.gemfile.lock

@@ -1,98 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    mini_paperclip (0.1.0)
-      activemodel
-      activesupport
-      aws-sdk-s3
-      mimemagic
-      mini_magick
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.399.0)
-    aws-sdk-core (3.109.3)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.85.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    diff-lcs (1.4.4)
-    hashdiff (1.0.1)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    mimemagic (0.3.5)
-    mini_magick (4.11.0)
-    minitest (5.14.2)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    sqlite3 (1.4.2)
-    tapp (1.5.1)
-      thor
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    webmock (3.10.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 6.0.0)
-  mini_paperclip!
-  rack-test
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  sqlite3
-  tapp
-  webmock
-
-BUNDLED WITH
-   2.1.4