mini_paperclip 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ef73b42c1c7ef6755a3af5907bab7f285f7fdacb4a6d15d283366d4f46d073
-  data.tar.gz: 877efe3a37db1c2f888df9785ad84bc4220507cfc970ec8bc3632ad3bf5908b2
+  metadata.gz: cda880f15d0e468fe2e0468658dbd11bf52a933e79f936fdc1a16ade88536e79
+  data.tar.gz: 9bf633f6dd48be4fc3f41b4539568039ab710a0a61e43e47ea297221599588af
 SHA512:
-  metadata.gz: 0a2395e2c209b4dcee1d518d87bcc972b2c253530edd1926800f2b1e0ab1fc9ab2b3b21c0760248e54d14ea0d74c41e8045d9717870947368e0ca5395d577ec7
-  data.tar.gz: a4dead2af2ebb2c0146b37196b4344683039ba302b0c174a9371b458e4121dd3b4613b5b00622f1d2171c0561d63d44297f5b17d1452b0a817f874c87d108ff5
+  metadata.gz: e0fd8c9651b0bfbb7e9c79faf6476644983a56256ebe856fdb0e379e97b6f35e5b30ec64ab2d8dc474f3f5617965b0bf598d48d712bf211d9d8c30d3162d4697
+  data.tar.gz: 35aeb9655dc45afd56b72ad0e98659218035a26494a345af6352a505d123945c113f1947946341c526e8a2314b6ea2974dd6c2678142105dd4f6e6a459d31d3e

data/lib/mini_paperclip/attachment.rb

@@ -62,63 +62,24 @@ module MiniPaperclip
       @meta_content_type = nil
 
       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 UnsupportedError, "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 UnsupportedError, "attachment for \"#{file[0..100]}\" is not supported"
         end
@@ -129,26 +90,18 @@ module MiniPaperclip
 
     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,13 +110,18 @@ module MiniPaperclip
               else
                 convert.resize(size_arg)
               end
+              convert.layers("optimize") if animated?
               convert << temp.path
             end
             @storage.write(style, temp)
           end
         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
@@ -179,9 +137,81 @@ module MiniPaperclip
       @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
 

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/filesystem.rb

@@ -5,17 +5,9 @@ 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
       end
 
       def file_path(style)
@@ -38,6 +30,10 @@ module MiniPaperclip
         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

@@ -15,19 +15,6 @@ module MiniPaperclip
         )
       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: @attachment.content_type,
-          copy_source: from_attachment.storage.object_key(style),
-          bucket: @config.s3_bucket_name,
-          key: s3_object_key(style),
-        )
-      end
-
       def s3_object_key(style)
         interpolate(@config.url_path, style)
       end
@@ -61,6 +48,18 @@ module MiniPaperclip
           }
         )
       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
 end

data/lib/mini_paperclip/validators/geometry_validator.rb

@@ -23,9 +23,13 @@ module MiniPaperclip
       #     height: { less_than_or_equal_to: 3000 } }
       def validate_each(record, attribute, value)
         return unless value.waiting_write_file
+        value.waiting_write_file.rewind
         image_size = ImageSize.new(value.waiting_write_file)
         # invalid format should not relate geometry
-        return unless image_size.format
+        unless image_size.format
+          MiniPaperclip.config.logger.info("[mini_paperclip] cannot get image_size from #{value.waiting_write_file.inspect}")
+          return
+        end
 
         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)

data/lib/mini_paperclip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -159,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.0.3
 signing_key:
 specification_version: 4
 summary: MiniPaperclip is a mini paperclip