middleman-webp 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9d82b95618d8e864d154e41f1f4cb0e5e67dc0
-  data.tar.gz: 3331c52cb2b2ed049368935f1191f4c25e2c19d8
+  metadata.gz: a0b0affadf5badd85debeee5e4c945f5e18dadb9
+  data.tar.gz: 161c2a8925c82eeda8f84699bade12bb8532b0b7
 SHA512:
-  metadata.gz: c3345c377a871f155a3e6fead62be52940c5e59b528bf5952547d03c2d9c139df03a4992672ab3744817abdd82d5221f972294b873c0367b28e5e7c5e98d6875
-  data.tar.gz: e2053e780628973fe0758fc1b22538f777f16819800adc0f5ee786bc1c7eb64bcd9eec50a2bc3b0a1ec2e34ca027c0d418bff37fe594cad7df998912cbf6c656
+  metadata.gz: 674cd611524a0617647a575c9e5646f04754774ed4f2df54cab27333e87588b511f2747b8087a158f036f3bcac675c1ab4edff8cd3b4387df3176bbf9eba61b5
+  data.tar.gz: 6ec3ddc1d381977d35de9dd352c7ef4c5709f26925ecd925b1150e11d91e5aa861954c8b8fe93a9ddefd75ad03f8dbe5ec7bd4307ba98f64a92e56b8f701beb0

data/lib/middleman-webp/converter.rb

@@ -27,9 +27,13 @@ module Middleman
 
       def convert_images(paths, &after_conversion)
         paths.each do |p|
-          dst = destination_path(p)
-          exec_convert_tool(p, dst)
-          yield File.new(p), File.new(dst)
+          begin
+            dst = destination_path(p)
+            exec_convert_tool(p, dst)
+            yield File.new(p), File.new(dst)
+          rescue
+            @builder.say_status :webp, "Converting #{p} failed", :red
+          end
         end
       end
 
@@ -54,7 +58,9 @@ module Middleman
       # src - File instance of the source
       # dst - File instance of the destination
       def change_percentage(src_size, dst_size)
-        "%g %%" % ("%.2f" % [100 - 100.0 * dst_size / src_size])
+        return '0 %' if src_size == 0
+
+        format('%g %%', format('%.2f', 100 - 100.0 * dst_size / src_size))
       end
 
       def destination_path(src_path)
@@ -68,9 +74,12 @@ module Middleman
       end
 
       def number_to_human_size(n)
+        return '0 B' if n == 0
+
         units = %w{B KiB MiB GiB TiB PiB}
         exponent = (Math.log(n) / Math.log(1024)).to_i
-        "%g #{units[exponent]}" % ("%.2f" % (n.to_f / 1024**exponent))
+        format("%g #{units[exponent]}",
+               format('%.2f', n.to_f / 1024**exponent))
       end
     end
   end

data/lib/middleman-webp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Webp
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/spec/unit/converter_spec.rb

@@ -15,6 +15,10 @@ describe Middleman::WebP::Converter do
     it "omits zeroes in the end of decimal part" do
       @converter.change_percentage(100, 76).must_equal "24 %"
     end
+
+    it "returns 0% when original and new size are both 0" do
+      @converter.change_percentage(0, 0).must_equal "0 %"
+    end
   end
 
   describe "#number_to_human_size" do
@@ -23,6 +27,10 @@ describe Middleman::WebP::Converter do
       @converter.number_to_human_size(1234).must_equal "1.21 KiB"
       @converter.number_to_human_size(2_634_234).must_equal "2.51 MiB"
     end
+
+    it 'handles zero size properly' do
+      @converter.number_to_human_size(0).must_equal '0 B'
+    end
   end
 
   describe "#tool_for" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-webp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Juhamatti Niemelä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core