mini_paperclip 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 934c31a21e7ff961a58d0d22023b0d17095b83087a22845b30e85102bba1667b
-  data.tar.gz: 003a3f115224cf645d81fe98dfd1664ea3386aa48f7436791a1bf6b14c0b864a
+  metadata.gz: 51135052187a9097d6989759082fcdba81aecfb7259909ba8bbf1dd17bf70036
+  data.tar.gz: 47673d86acfd5538bd0fb43cb373041add3281217ffae31d4bfcb71a7c2cf08b
 SHA512:
-  metadata.gz: 60d2cb3ddfcff65b7edcf3519d7752f5a5aafb03bdcf15ba487b6c423af234feb13224b609d5bba1cd3bba3939f70f9aaa8b7a9209ecdef8e414e829a946ea4a
-  data.tar.gz: d16ef4a7638188af8963b87ab41c0045cf1a73547558b0d9864ba7efa713f30e86164c81ae8cb19ecc998c1b250dafa99d2c5556cf27e80eddf8cd53d8a867a4
+  metadata.gz: 703405ef627eecc1df7856f65f9f27877fb675c95b8c2eb9bbe45c998f71cbebba1b37101bf44d8ec9ce64782a0a39caa06cde4752fa6007279366760acb0659
+  data.tar.gz: ded84756cf123fe3ffe82b8c47b59ac30c9ab39785056c4644a21e2ffd0183dd9e2250623f0307de41394c9392a0f650e64af3d0862163b1a5cc73522c0ed8ed

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"

data/lib/mini_paperclip/storage/s3.rb

@@ -38,11 +38,13 @@ 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
     end
   end

data/lib/mini_paperclip/validators/geometry_validator.rb

@@ -16,26 +16,24 @@ 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
-        end
-        return unless !geometry_string.empty?
-        width, height = geometry_string.split(',').map(&:to_i)
+        image_size = ImageSize.new(value.waiting_write_file)
+        # invalid format should not relate geometry
+        return unless image_size.format
 
         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)
+        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: width,
-            actual_height: height,
+            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,
           })

data/lib/mini_paperclip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniPaperclip
-  VERSION = "0.1.0"
+  VERSION = "0.1.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.1.1
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-11-30 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