mini_paperclip 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 934c31a21e7ff961a58d0d22023b0d17095b83087a22845b30e85102bba1667b
-  data.tar.gz: 003a3f115224cf645d81fe98dfd1664ea3386aa48f7436791a1bf6b14c0b864a
+  metadata.gz: 6d115f886793d57d62835f40e27768ff04588d3e1f17e7fb430b11f2b146e2ed
+  data.tar.gz: 6d1557f279f9bf007b90d06272e7e19a1829f38b1c0f6a4ce079c06e410fca58
 SHA512:
-  metadata.gz: 60d2cb3ddfcff65b7edcf3519d7752f5a5aafb03bdcf15ba487b6c423af234feb13224b609d5bba1cd3bba3939f70f9aaa8b7a9209ecdef8e414e829a946ea4a
-  data.tar.gz: d16ef4a7638188af8963b87ab41c0045cf1a73547558b0d9864ba7efa713f30e86164c81ae8cb19ecc998c1b250dafa99d2c5556cf27e80eddf8cd53d8a867a4
+  metadata.gz: 8b8c590434edbc1bac00c85028f44d8de3ff67a001643a0613718af5f60bcd06862d012867f3137cb758a48b4db6d8db699df80e3b9838f64dd082e105ddbbf7
+  data.tar.gz: 04524d26fb7e8f96e631c82d1ecce996505b66d60d4c47d0016f48e66ec6cc427eb7a28a7241afa4c894ecb08e4afe92c466bd7d15b4a34d3e5e269dfcc06665

data/.github/workflows/{ruby.yml → ci.yml}

@@ -36,5 +36,8 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: bundle install --gemfile=${{ matrix.gemfile }}
-    - name: Run tests
+    - name: Run tests and Print coverage
+      env:
+        COVERAGE: 1
+        LOGLEVEL: info
       run: bundle exec --gemfile=${{ matrix.gemfile }} rake

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

@@ -71,6 +71,7 @@ MiniPaperclip.config.tap do |config|
   config.s3_acl           # s3 object acl
   config.s3_cache_control # Set this value to Cache-Control header when put-object
   config.interpolates     # minimum templates using by `String#gsub!`
+  config.keep_old_files   # Delete old attached file if it's false (default false)
   config.read_timeout     # timeout when attachment set url
   config.logger           # You can set logger object.
 end
@@ -104,7 +105,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 +117,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: :main
+eval_gemfile 'development.gemfile'

data/lib/mini_paperclip.rb

@@ -8,6 +8,7 @@ require "active_support/number_helper"
 require "mini_magick"
 require "mimemagic"
 require "aws-sdk-s3"
+require "image_size"
 
 require "mini_paperclip/attachment"
 require "mini_paperclip/class_methods"
@@ -23,16 +24,17 @@ 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",
+        keep_old_files: false,
         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?
@@ -61,94 +61,51 @@ module MiniPaperclip
       @waiting_write_file = nil
       @meta_content_type = nil
 
+      if present?
+        push_delete_files
+      end
+
       if file.nil?
-        # clear
-        @record.write_attribute("#{@attachment_name}_file_name", nil)
-        @record.write_attribute("#{@attachment_name}_content_type", nil)
-        @record.write_attribute("#{@attachment_name}_file_size", nil)
-        @record.write_attribute("#{@attachment_name}_updated_at", nil)
+        assign_nil
       elsif file.instance_of?(Attachment)
-        # copy
-        @record.write_attribute("#{@attachment_name}_file_name", file.record.read_attribute("#{@attachment_name}_file_name"))
-        @record.write_attribute("#{@attachment_name}_content_type", file.record.read_attribute("#{@attachment_name}_content_type"))
-        @record.write_attribute("#{@attachment_name}_file_size", file.record.read_attribute("#{@attachment_name}_file_size"))
-        @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
-        @waiting_copy_attachment = file
+        if file.present?
+          assign_attachment(file)
+        else
+          assign_nil
+        end
       elsif file.respond_to?(:original_filename)
-        # e.g. ActionDispatch::Http::UploadedFile
-        @record.write_attribute("#{@attachment_name}_file_name", file.original_filename)
-        @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(file.to_io))
-        @record.write_attribute("#{@attachment_name}_file_size", file.size)
-        @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
-        @waiting_write_file = build_tempfile(file.tap(&:rewind))
-        @meta_content_type = file.content_type
+        assign_uploaded_file(file)
       elsif file.respond_to?(:path)
-        # e.g. File
-        @record.write_attribute("#{@attachment_name}_file_name", File.basename(file.path))
-        @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(file))
-        @record.write_attribute("#{@attachment_name}_file_size", file.size)
-        @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
-        @waiting_write_file = build_tempfile(file.tap(&:rewind))
+        assign_file(file)
       elsif file.instance_of?(String)
         if file.empty?
           # do nothing
         elsif file.start_with?('http')
-          # download from url
-          open_uri_option = {
-            read_timeout: MiniPaperclip.config.read_timeout || 60
-          }
-          uri = URI.parse(file)
-          uri.open(open_uri_option) do |io|
-            @record.write_attribute("#{@attachment_name}_file_name", File.basename(uri.path))
-            @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(io))
-            @record.write_attribute("#{@attachment_name}_file_size", io.size)
-            @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
-            @waiting_write_file = build_tempfile(io.tap(&:rewind))
-            @meta_content_type = io.meta["content-type"]
-          end
+          assign_http(file)
         elsif file.start_with?('data:')
-          # 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"
-          end
-          raw = Base64.decode64(match_data[2])
-          @record.write_attribute("#{@attachment_name}_file_name", nil)
-          @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(StringIO.new(raw)))
-          @record.write_attribute("#{@attachment_name}_file_size", raw.bytesize)
-          @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
-          @waiting_write_file = build_tempfile(StringIO.new(raw))
-          @meta_content_type = match_data[1]
+          assign_data_uri(file)
         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
 
     def process_and_store
       return unless file?
-
-      if @waiting_copy_attachment
-        debug("start attachment copy")
-        @storage.copy(:original, @waiting_copy_attachment)
-        @config.styles&.each do |style, size_arg|
-          @storage.copy(style, @waiting_copy_attachment)
-        end
-        @waiting_copy_attachment = nil
-        return
-      end
-
-      return if @waiting_write_file.nil?
+      return unless @waiting_write_file
 
       begin
         debug("start attachment styles process")
         @storage.write(:original, @waiting_write_file)
         @config.styles&.each do |style, size_arg|
           Tempfile.create([style.to_s, File.extname(@waiting_write_file.path)]) do |temp|
+            temp.binmode
             MiniMagick::Tool::Convert.new do |convert|
               convert << @waiting_write_file.path
+              convert.coalesce if animated?
+              convert.auto_orient
               if size_arg.end_with?('#')
                 # crop option
                 convert.resize("#{size_arg[0..-2]}^")
@@ -157,20 +114,114 @@ module MiniPaperclip
               else
                 convert.resize(size_arg)
               end
+              convert.layers("optimize") if animated?
               convert << temp.path
             end
             @storage.write(style, temp)
           end
         end
+
+        # should delete after write for copy
+        if !@config.keep_old_files
+          do_delete_files
+        end
+  
       ensure
-        @waiting_write_file.close!
+        if @waiting_write_file.respond_to?(:close!)
+          @waiting_write_file.close!
+        elsif @waiting_write_file.respond_to?(:close)
+          @waiting_write_file.close
+        end
       end
       @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
+
+    def animated?
+      content_type == 'image/gif'
+    end
+
     private
 
+    def assign_nil
+      # clear
+      @record.write_attribute("#{@attachment_name}_file_name", nil)
+      @record.write_attribute("#{@attachment_name}_content_type", nil)
+      @record.write_attribute("#{@attachment_name}_file_size", nil)
+      @record.write_attribute("#{@attachment_name}_updated_at", nil)
+    end
+
+    def assign_attachment(attachment)
+      # copy
+      @waiting_write_file = attachment.storage.open(:original)
+      @record.write_attribute("#{@attachment_name}_file_name", attachment.original_filename)
+      @record.write_attribute("#{@attachment_name}_content_type", attachment.content_type)
+      @record.write_attribute("#{@attachment_name}_file_size", attachment.size)
+      @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
+    end
+
+    def assign_uploaded_file(file)
+      # e.g. ActionDispatch::Http::UploadedFile
+      @record.write_attribute("#{@attachment_name}_file_name", file.original_filename)
+      @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(file.to_io))
+      @record.write_attribute("#{@attachment_name}_file_size", file.size)
+      @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
+      @waiting_write_file = build_tempfile(file.tap(&:rewind))
+      @meta_content_type = file.content_type
+    end
+
+    def assign_file(file)
+      # e.g. File
+      @record.write_attribute("#{@attachment_name}_file_name", File.basename(file.path))
+      @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(file))
+      @record.write_attribute("#{@attachment_name}_file_size", file.size)
+      @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
+      @waiting_write_file = build_tempfile(file.tap(&:rewind))
+    end
+
+    def assign_http(url)
+      # download from url
+      open_uri_option = {
+        read_timeout: MiniPaperclip.config.read_timeout || 60
+      }
+      uri = URI.parse(url)
+      uri.open(open_uri_option) do |io|
+        @record.write_attribute("#{@attachment_name}_file_name", File.basename(uri.path))
+        @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(io))
+        @record.write_attribute("#{@attachment_name}_file_size", io.size)
+        @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
+        @waiting_write_file = build_tempfile(io.tap(&:rewind))
+        @meta_content_type = io.meta["content-type"]
+      end
+    end
+
+    def assign_data_uri(data_uri)
+      # data-uri
+      match_data = data_uri.match(/\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m)
+      if match_data.nil?
+        raise UnsupportedError, "attachment for \"#{data_uri[0..100]}\" is not supported"
+      end
+      raw = Base64.decode64(match_data[2])
+      @record.write_attribute("#{@attachment_name}_file_name", nil)
+      @record.write_attribute("#{@attachment_name}_content_type", strict_content_type(StringIO.new(raw)))
+      @record.write_attribute("#{@attachment_name}_file_size", raw.bytesize)
+      @record.write_attribute("#{@attachment_name}_updated_at", Time.current)
+      @waiting_write_file = build_tempfile(StringIO.new(raw))
+      @meta_content_type = match_data[1]
+    end
+
     def strict_content_type(io)
+      io.rewind
       MimeMagic.by_magic(io)&.type
     end
 
@@ -184,7 +235,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

@@ -8,7 +8,7 @@ module MiniPaperclip
           instance_variable_set("@#{attachment_name}", Attachment.new(self, attachment_name, option_config))
       end
       define_method("#{attachment_name}=") do |file|
-        a = Attachment.new(self, attachment_name, option_config)
+        a = public_send(attachment_name)
         a.assign(file)
         instance_variable_set("@#{attachment_name}", a)
       end
@@ -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

@@ -16,6 +16,7 @@ module MiniPaperclip
     :s3_acl,
     :s3_cache_control,
     :interpolates,
+    :keep_old_files,
     :read_timeout,
     :logger,
     keyword_init: true,
@@ -25,7 +26,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/shoulda/matchers/validate_attachment_geometry_matcher.rb

@@ -96,6 +96,7 @@ module MiniPaperclip
 
         def create_dummy_image(width:, height:)
           Tempfile.create(['MiniPaperclip::Shoulda::Matchers::ValidateAttachmentGeometryMatcher', ".#{@format}"]) do |f|
+            f.binmode
             MiniMagick::Tool::Convert.new do |convert|
               convert.size("#{width}x#{height}")
               convert.xc("none")

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

@@ -5,17 +5,10 @@ module MiniPaperclip
     class Filesystem < Base
       def write(style, file)
         path = file_path(style)
-        debug("writing by filesystem to #{path}")
+        debug("writing by filesystem from:#{file.path} to:#{path}")
         FileUtils.mkdir_p(File.dirname(path))
-        FileUtils.cp(file.path, path)
-      end
-
-      def copy(style, from_attachment)
-        raise "not supported" unless from_attachment.storage.instance_of?(Filesystem)
-        to_path = file_path(style)
-        from_path = from_attachment.storage.file_path(style)
-        debug("copying by filesystem from:#{from_path} to:#{to_path}")
-        FileUtils.cp(from_path, to_path)
+        FileUtils.cp(file.path, path) if file.path != path
+        @deletes.delete(path) # cancel deletion if overwrite
       end
 
       def file_path(style)
@@ -29,6 +22,20 @@ 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
+        return if @deletes.empty?
+        debug("deleting by filesystem #{@deletes}")
+        FileUtils.rm_f(@deletes)
+      end
+
+      def open(style, &block)
+        File.open(file_path(style), 'r', &block)
+      end
     end
   end
 end

data/lib/mini_paperclip/storage/s3.rb

@@ -8,24 +8,12 @@ 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),
         )
-      end
-
-      def copy(style, from_attachment)
-        raise "not supported yet" unless from_attachment.storage.instance_of?(S3)
-        debug("copying by S3 to bucket:#{@config.s3_bucket_name},key:#{s3_object_key(style)}")
-        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"),
-          copy_source: from_attachment.storage.object_key(style),
-          bucket: @config.s3_bucket_name,
-          key: s3_object_key(style),
-        )
+        @deletes.delete({ key: s3_object_key(style) }) # cancel deletion if overwrite
       end
 
       def s3_object_key(style)
@@ -38,11 +26,41 @@ module MiniPaperclip
       end
 
       def exists?(style)
-        res = Aws::S3::Client.new.head_object(
+        Aws::S3::Client.new.head_object(
           bucket: @config.s3_bucket_name,
           key: s3_object_key(style),
         )
-        res.content_length.to_i != 0
+        true
+      rescue Aws::S3::Errors::NotFound
+        false
+      end
+
+      def push_delete_file(style)
+        @deletes.push({ key: s3_object_key(style) })
+      end
+
+      def do_delete_files
+        return if @deletes.empty?
+        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
+
+      def open(style)
+        Tempfile.new(['MiniPaperclip::Storage::S3']).tap do |response_target|
+          response_target.binmode
+          Aws::S3::Client.new.get_object(
+            bucket: @config.s3_bucket_name,
+            key: s3_object_key(style),
+            response_target: response_target,
+          )
+          yield response_target if block_given?
+        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

@@ -16,29 +16,33 @@ module MiniPaperclip
           end
         end
       end
+
       # validate_attachment :image,
       #   geometry: {
       #     width: { less_than_or_equal_to: 3000 },
       #     height: { less_than_or_equal_to: 3000 } }
       def validate_each(record, attribute, value)
         return unless value.waiting_write_file
-        geometry_string = MiniMagick::Tool::Identify.new do |identify|
-          identify.format "%w,%h"
-          identify << value.waiting_write_file.path
+        value.waiting_write_file.rewind
+        image_size = ImageSize.new(value.waiting_write_file)
+        # invalid format should not relate geometry
+        unless image_size.format
+          MiniPaperclip.config.logger.info("[mini_paperclip] cannot get image_size from #{value.waiting_write_file.inspect}")
+          return
         end
-        return unless !geometry_string.empty?
-        width, height = geometry_string.split(',').map(&:to_i)
 
         expected_width_less_than_or_equal_to = options.dig(:width, :less_than_or_equal_to)
         expected_height_less_than_or_equal_to = options.dig(:height, :less_than_or_equal_to)
-        unless (!expected_width_less_than_or_equal_to || width <= expected_width_less_than_or_equal_to) &&
-            (!expected_height_less_than_or_equal_to || height <= expected_height_less_than_or_equal_to)
-          record.errors.add(attribute, :geometry, {
-            actual_width: width,
-            actual_height: height,
+        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,
+            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.0"
+  VERSION = "0.3.1"
 end

data/mini_paperclip.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activemodel"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "aws-sdk-s3"
+  spec.add_runtime_dependency "image_size"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Subset from paperclip because paperclip has deprecated
 email:
 - co000ri@gmail.com
@@ -87,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
@@ -97,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
@@ -145,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: MiniPaperclip is a mini paperclip

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