workspace-media 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9f38a74821f07bf754d56f85f10ae86455296e
-  data.tar.gz: 0de1057bbcae94e5c5b4fdfbbff92ee8ef36b377
+  metadata.gz: f051d57f039398dbe338d8c99ca85d4666aba3c6
+  data.tar.gz: 63288e8b21f0993813e841bf2904cf49d783de18
 SHA512:
-  metadata.gz: 15e105a18bf8e188e238d13e59462c0810ac4253bb144c7f7488b558124632cdfc1f4b2afade93ca811e1870007f07f8e1c680ae51c9b3d9509ab9942ef12e82
-  data.tar.gz: 17662040b8d4c20b3460f124f134f5c9cc42563b3d519e7b04377e032632bb48204e036213dbc4ae83988f2888f31ea680164e12e1f9af89e8ff01a6065be002
+  metadata.gz: 2d5c39f30be004d2c435a2a1000a189f316c470e19b9f21da6e33ca7095c66a945dfa6682c2febf9a5224ab45551d2106350e0f8013eee248524829eb1a81995
+  data.tar.gz: 7fa5e6be831f04a59f6ea72488fe401ad0ee13466f68a82d6dccd8fa22e55b0e57cee9d72e31ae1a30bfbc1b826bb5d84ab6fd8bace592434f2b77447cfb8d3e

data/workspace-media.rb

@@ -17,9 +17,8 @@ module Workspace
 
     def image_size
       image = Magick::Image.read(to_s).first
-      size = { width: image.columns, height: image.rows }
-      image.destroy!
-      size
+      { width: image.columns, height: image.rows }
+    ensure image&.destroy!
     end
 
     def fit(width: nil, height: nil, quality: 85)
@@ -30,36 +29,24 @@ module Workspace
       image.change_geometry!("#{width}x^#{height}") { |cols, rows| image.thumbnail!(cols, rows) }
       image.crop!(0, 0, width, height)
       image.write(to_s) { self.quality = quality }
-      image.destroy!
       self
+    ensure image&.destroy!
     end
 
-    def optimize!(options = {})
+    def optimize!(image_max_width: nil, quality: 85, convert_jpg: true, optimize: true)
       return false if !exists? or !image?
-      optimize_png!(options) if ["png"].include?(extension)
-      optimize_jpg!(options) if ["jpg", "jpeg"].include?(extension)
-      Piet.optimize(to_s, verbose: false)
-      self
-    end
-
-    private
-
-    def optimize_jpg!(image_max_width: 2048, quality: 85)
-      image = Magick::Image.read(to_s).first
-      image.change_geometry!("#{image_max_width}>x") { |cols, rows, img| img.resize!(cols, rows) } if image.columns > image_max_width
-      image.write(to_s) { self.quality = quality }
-      image.destroy!
-    end
-
-    def optimize_png!(image_max_width: 2048, quality: 85)
       image = Magick::Image.read(to_s).first
-      image.change_geometry!("#{image_max_width}>x") { |cols, rows, img| img.resize!(cols, rows) } if image.columns > image_max_width
-      if !image.alpha? or image.resize(1, 1).pixel_color(0, 0).opacity == 0
+      if !image_max_width.nil? and image.columns > image_max_width
+        image.change_geometry!("#{image_max_width}>x") { |cols, rows, img| img.resize!(cols, rows) }
+      end
+      if mimetype == "image/png" and convert_jpg and (!image.alpha? or image.resize(1, 1).pixel_color(0, 0).opacity == 0)
         image.format = "JPG"
         rename("#{basename}.jpg")
       end
       image.write(to_s) { self.quality = quality }
-      image.destroy!
+      Piet.optimize(to_s, verbose: false) if optimize
+      self
+    ensure image&.destroy!
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workspace-media
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tobias Strebitzer