imagetools 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4321ff7a51cd2038d5acb37c21c932d40ce0eb0e7a0f2514e852dd7c36e26617
-  data.tar.gz: dc47c8f323837468154686fed41727a9096560bed0ca0cb00e1f62b675ba44f6
+  metadata.gz: 76f5fa221bbd274c1ef8b9c54195abec9b2081b210355cf345ea7ea1dc047a35
+  data.tar.gz: 4b59da67822eb56fbb35af75f9bf2fec12662147988b7a5f788231f8108ba305
 SHA512:
-  metadata.gz: e8383d80757e294e21277deade67ee1b05b1760918b3b2ef6b76478959244a6b1b39e682630b68b876f87371121df9cc4dc8a6a0db5954bda84ab61346b8101a
-  data.tar.gz: 0a69d98a867405f44dccf7406cc1cd9a9a1e82b2eb2bf5eb979e284ea89aa28878118a75df83ff6e8c36e44b559b6d795fa00aab7ff1198655e1549f65a36da2
+  metadata.gz: 12bfae8ed2f2b75d6d79180c15d50034a996d9c9492d0e4f495a0de615af2a76456e7bb0f5c073c3528aeb559f31777c4bce5c647ccd4a93964a4b69690b42b8
+  data.tar.gz: ff5ef80f32291a7d9197e87ad000950e9136015e621735254d2d539c797e3f1c9b8680301610258388d473222a54110c8b68552ad8fb5a60d18f866806df124a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imagetools (1.1.0)
+    imagetools (1.2.0)
       rmagick (= 3.2.0)
 
 GEM

data/lib/imagetools/imagefilter.rb

@@ -49,13 +49,14 @@ module Imagetools
     
     CONVERT_CMD = "convert"
     DWEBP_CMD = "dwebp"
-    RESIZE_CMD = "mogrify -resize 1280x\\> "
+    #    RESIZE_CMD = "mogrify -resize 1280x\\> "
+    RESIZE_CMD = "mogrify -background white -resize 1280x\\> "    
     ROTATE_CMD = "exiftran -ai "
     COMPRESS_CMD = "jpegoptim --strip-all --max=90 "
     EXTERNAL_CMDS = [RESIZE_CMD, ROTATE_CMD, COMPRESS_CMD]
 
     WEBP_SEARCH = /(.+)\.webp/i
-    WEBP_REPLACE = '\1.jpg'
+    WEBP_REPLACE = '\1.png'
     
     PNG_SEARCH = /(.+)\.png/i
     PNG_REPLACE = '\1.jpg'
@@ -133,7 +134,7 @@ EOM
       filename.sub(OTHER_JPG_SEARCH, OTHER_JPG_REPLACE)
     end
 
-    def self.replace_webp2jpg(filename)
+    def self.replace_webp2png(filename)
       filename.sub(WEBP_SEARCH, WEBP_REPLACE)
     end
     
@@ -173,7 +174,7 @@ EOM
       end
       
       filepath = rename_image(filepath)
-      filepath = webp2jpg(filepath)
+      filepath = webp2png(filepath)
       filepath = png2jpg(filepath)
       filepath = resize_jpg(filepath)
       filepath = rotate_jpg(filepath)
@@ -203,9 +204,9 @@ EOM
       return topath
     end
 
-    def webp2jpg(filepath)
+    def webp2png(filepath)
       fromname = File.basename(filepath)
-      toname = self.class.replace_webp2jpg(fromname)
+      toname = self.class.replace_webp2png(fromname)
       return filepath if fromname == toname
 
       dir = File.dirname(filepath)

data/lib/imagetools/version.rb

@@ -1,3 +1,3 @@
 module Imagetools
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagetools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick