middleman-webp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8dc469ed517f77130ab6e9e9bcce14553fe30b
-  data.tar.gz: 5e4b7f341b270b426ec5ff840a978b2de819919e
+  metadata.gz: f8d1995720a8e7bc350a39670a5f4c4d6df21728
+  data.tar.gz: e4a889e73b614e54de3e5abf796077a60a0fc06d
 SHA512:
-  metadata.gz: 38398c88e7565d7c8c53ff9cd6f230d7565087ced45bf910cfd04841cdffc3cc0a07446eb867402f7d3a7ec712992bb1b9bf96671bac5c03cb54fe7fb86ebaa5
-  data.tar.gz: a19c29547c2c7b4dd8f0e86cc728f22f6f7ffd451b41ad9be017452144f15103efc3ef9e43005a6cbf41803f223b5ce45f8c06055f83027312426a97410ac536
+  metadata.gz: 0293029f3349059f58a6b1fbfeb1f2b74832dcef81c768b1be3c83b74dc3f938537371dfddacd23e3a9a4a1faf2873ff4ebb2ff89f0a0915ad78aae29221f464
+  data.tar.gz: 7ede1788f640466e05e08cfaf9ae044a0cc29b71da1e31daa652226b53af5188ccc7eed71ae9cadabf3ebe65cc4c26cb794381016ad45ab99884c5161bdad90c

data/lib/middleman-webp/converter.rb

@@ -12,14 +12,17 @@ module Middleman
       end
 
       def convert
-        @total = 0
+        @original_size = 0
+        @converted_size = 0
         convert_images(image_files) do |src, dst|
           next reject_file(dst) if dst.size >= src.size
 
-          @total += (src.size - dst.size)
-          @builder.say_status :webp, "#{dst.path} (#{change_percentage(src,dst)} smaller)"
+          @original_size += src.size
+          @converted_size += dst.size
+          @builder.say_status :webp, "#{dst.path} (#{change_percentage(src.size,dst.size)} smaller)"
         end
-        @builder.say_status(:webp, "Total conversion savings: #{number_to_human_size(@total)}", :blue)
+        savings = @original_size - @converted_size
+        @builder.say_status(:webp, "Total conversion savings: #{number_to_human_size(savings)} (#{change_percentage(@original_size, @converted_size)})", :blue)
       end
 
       def convert_images(paths, &after_conversion)
@@ -50,8 +53,8 @@ module Middleman
       #
       # src - File instance of the source
       # dst - File instance of the destination
-      def change_percentage(src, dst)
-        "%g %%" % ("%.2f" % [100 - 100.0 * dst.size / src.size])
+      def change_percentage(src_size, dst_size)
+        "%g %%" % ("%.2f" % [100 - 100.0 * dst_size / src_size])
       end
 
       def destination_path(src_path)

data/lib/middleman-webp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Webp
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/unit/converter_spec.rb

@@ -9,15 +9,11 @@ describe Middleman::WebP::Converter do
 
   describe "#change_percentage" do
     it "returns how many percents smaller destination file is" do
-      src = stub(:size => 10000)
-      dst = stub(:size => 8746)
-      @converter.change_percentage(src, dst).must_equal "12.54 %"
+      @converter.change_percentage(10000, 8746).must_equal "12.54 %"
     end
 
     it "omits zeroes in the end of decimal part" do
-      src = stub(:size => 100)
-      dst = stub(:size => 76)
-      @converter.change_percentage(src, dst).must_equal "24 %"
+      @converter.change_percentage(100, 76).must_equal "24 %"
     end
   end
 

metadata

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