image_optim 0.20.2 → 0.21.0

data/spec/image_optim/worker_spec.rb

@@ -63,7 +63,9 @@ describe ImageOptim::Worker do
     it 'creates all workers for which options_proc returns true' do
       workers = Array.new(3){ worker_double }
       klasses = workers.map{ |worker| double(:init => worker) }
-      options_proc = proc{ |klass| klass != klasses[1] ? {} : false }
+      options_proc = proc do |klass|
+        klass == klasses[1] ? {:disable => true} : {}
+      end
 
       allow(Worker).to receive(:klasses).and_return(klasses)
 

data/spec/image_optim_spec.rb

@@ -52,43 +52,6 @@ describe ImageOptim do
   end
 
   describe :optimize_image do
-    def flatten_animation(image)
-      if image.format == :gif
-        flattened = image.temp_path
-        flatten_command = %W[
-          convert
-          #{image.to_s.shellescape}
-          -coalesce
-          -append
-          #{flattened.to_s.shellescape}
-        ].join(' ')
-        expect(Cmd.run(flatten_command)).to be_truthy
-        flattened
-      else
-        image
-      end
-    end
-
-    def nrmse(image_a, image_b)
-      coalesce_a = flatten_animation(image_a)
-      coalesce_b = flatten_animation(image_b)
-      nrmse_command = %W[
-        compare
-        -metric RMSE
-        -alpha Background
-        #{coalesce_a.to_s.shellescape}
-        #{coalesce_b.to_s.shellescape}
-        /dev/null
-        2>&1
-      ].join(' ')
-      output = Cmd.capture(nrmse_command)
-      if [0, 1].include?($CHILD_STATUS.exitstatus)
-        output[/\((\d+(\.\d+)?)\)/, 1].to_f
-      else
-        fail "compare #{image_a} with #{image_b} failed with `#{output}`"
-      end
-    end
-
     define :have_same_data_as do |expected|
       match{ |actual| actual.binread == expected.binread }
     end
@@ -97,21 +60,6 @@ describe ImageOptim do
       match(&:size?)
     end
 
-    define :be_smaller_than do |expected|
-      match{ |actual| actual.size < expected.size }
-    end
-
-    define :be_similar_to do |expected, max_difference|
-      match do |actual|
-        @diff = nrmse(actual, expected)
-        @diff <= max_difference
-      end
-      failure_message do |actual|
-        "expected #{actual} to have at most #{max_difference} difference from "\
-            "#{expected}, got normalized root-mean-square error of #{@diff}"
-      end
-    end
-
     describe 'optimizing images' do
       rotated = images_dir / 'orient/original.jpg'
       rotate_images = images_dir.glob('orient/?.jpg')

data/spec/spec_helper.rb

@@ -10,3 +10,55 @@ end
 RSpec.configure do |c|
   c.alias_example_to :they
 end
+
+def flatten_animation(image)
+  if image.format == :gif
+    flattened = image.temp_path
+    flatten_command = %W[
+      convert
+      #{image.to_s.shellescape}
+      -coalesce
+      -append
+      #{flattened.to_s.shellescape}
+    ].join(' ')
+    expect(ImageOptim::Cmd.run(flatten_command)).to be_truthy
+    flattened
+  else
+    image
+  end
+end
+
+def nrmse(image_a, image_b)
+  coalesce_a = flatten_animation(image_a)
+  coalesce_b = flatten_animation(image_b)
+  nrmse_command = %W[
+    compare
+    -metric RMSE
+    -alpha Background
+    #{coalesce_a.to_s.shellescape}
+    #{coalesce_b.to_s.shellescape}
+    /dev/null
+    2>&1
+  ].join(' ')
+  output = ImageOptim::Cmd.capture(nrmse_command)
+  if [0, 1].include?($CHILD_STATUS.exitstatus)
+    output[/\((\d+(\.\d+)?)\)/, 1].to_f
+  else
+    fail "compare #{image_a} with #{image_b} failed with `#{output}`"
+  end
+end
+
+RSpec::Matchers.define :be_smaller_than do |expected|
+  match{ |actual| actual.size < expected.size }
+end
+
+RSpec::Matchers.define :be_similar_to do |expected, max_difference|
+  match do |actual|
+    @diff = nrmse(actual, expected)
+    @diff <= max_difference
+  end
+  failure_message do |actual|
+    "expected #{actual} to have at most #{max_difference} difference from "\
+        "#{expected}, got normalized root-mean-square error of #{@diff}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: progress
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.27'
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -134,20 +137,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.27'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - ! '!='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.30.1
 description: 
 email: 
 executables:
@@ -163,6 +155,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.markdown
+- Vagrantfile
 - bin/image_optim
 - image_optim.gemspec
 - lib/image_optim.rb
@@ -200,9 +193,11 @@ files:
 - lib/image_optim/worker/pngout.rb
 - lib/image_optim/worker/pngquant.rb
 - lib/image_optim/worker/svgo.rb
+- script/template/jquery-2.1.3.min.js
+- script/template/sortable-0.6.0.min.js
+- script/template/worker_analysis.erb
 - script/update_worker_options_in_readme
 - script/worker_analysis
-- script/worker_analysis.haml
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
 - spec/image_optim/bin_resolver_spec.rb
@@ -211,6 +206,7 @@ files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/railtie_spec.rb
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
@@ -236,6 +232,7 @@ files:
 - spec/images/orient/original.jpg
 - spec/images/quant/64.png
 - spec/images/quant/generate
+- spec/images/rails.png
 - spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
@@ -262,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_optim
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg)
@@ -277,6 +274,7 @@ test_files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/railtie_spec.rb
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
@@ -302,6 +300,7 @@ test_files:
 - spec/images/orient/original.jpg
 - spec/images/quant/64.png
 - spec/images/quant/generate
+- spec/images/rails.png
 - spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png

data/script/worker_analysis.haml

@@ -1,174 +0,0 @@
-!!! 5
-%html
-  %head
-    %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
-    %title Worker Analysis
-    :css
-      body {
-        font: 14px "Myriad Pro", "Helvetica", Arial, sans-serif;
-        margin: 20px;
-        padding: 0;
-      }
-
-      .formats {
-        display: block;
-        font-size: 1.5em;
-        margin: 1em 0;
-        font-weight: bold;
-      }
-
-      table {
-        border-collapse: collapse;
-        border-spacing: 0;
-      }
-      th, td {
-        border: 1px solid #ccc;
-        padding: 6px 8px 2px;
-      }
-      th {
-        text-align: left;
-        border-color: #999;
-      }
-      th:not([data-sortable="false"]) {
-        cursor: pointer;
-        padding-right: 18px;
-      }
-      th:after {
-        position: absolute;
-        width: 18px;
-        height: 14px;
-        line-height: 14px;
-        font-size: 0.8em;
-        color: #999;
-        visibility: hidden;
-        text-align: center;
-      }
-      th[data-sorted="true"]:after {
-        visibility: visible;
-      }
-      th[data-sorted-direction="descending"]:after {
-        content: "▼";
-      }
-      th[data-sorted-direction="ascending"]:after {
-        content: "▲";
-      }
-      table[data-sortable] tbody tr:hover {
-        background: #ddf;
-      }
-      body:not(.show-unused) tr.unused, tr.filtered-out {
-        display: none;
-      }
-
-      input { display: block; width: 30%; }
-      input[type=checkbox] { display: inline; width: auto; }
-
-      .number {
-        text-align: right;
-      }
-
-      .warn-low {
-        background: rgba(255, 0, 0, 0.1);
-      }
-      .warn-medium {
-        background: rgba(255, 0, 0, 0.4);
-      }
-      .warn-high {
-        background: rgba(255, 0, 0, 0.8);
-      }
-
-      .worker-name,
-      .worker-success-count {
-        display: inline-block;
-        border-radius: 8px;
-      }
-      .worker-name {
-        background: #ddd;
-        padding: 2px 5px 0;
-        border: 1px solid #999;
-        margin: -3px 0 1px 0;
-      }
-      .worker-success-count {
-        font-size: 0.9em;
-        line-height: 1em;
-        background: #dfd;
-        padding: 1px 2px 0;
-        border: 1px solid #9b9;
-      }
-      .worker-name.unused {
-        text-decoration: line-through;
-      }
-    :javascript
-      /*! sortable.js 0.6.0 */
-      (function(){var a,b,c,d,e,f,g;a="table[data-sortable]",d=/^-?[£$¤]?[\d,.]+%?$/,g=/^\s+|\s+$/g,f="ontouchstart"in document.documentElement,c=f?"touchstart":"click",b=function(a,b,c){return null!=a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent("on"+b,c)},e={init:function(b){var c,d,f,g,h;for(null==b&&(b={}),null==b.selector&&(b.selector=a),d=document.querySelectorAll(b.selector),h=[],f=0,g=d.length;g>f;f++)c=d[f],h.push(e.initTable(c));return h},initTable:function(a){var b,c,d,f,g,h;if(1===(null!=(h=a.tHead)?h.rows.length:void 0)&&"true"!==a.getAttribute("data-sortable-initialized")){for(a.setAttribute("data-sortable-initialized","true"),d=a.querySelectorAll("th"),b=f=0,g=d.length;g>f;b=++f)c=d[b],"false"!==c.getAttribute("data-sortable")&&e.setupClickableTH(a,c,b);return a}},setupClickableTH:function(a,d,f){var g;return g=e.getColumnType(a,f),"click"===c&&b(d,"mousedown",function(){return event.preventDefault?event.preventDefault():event.returnValue=!1}),b(d,c,function(){var b,c,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v;for("true"===this.getAttribute("data-sorted")?(l=this.getAttribute("data-sorted-direction"),b="ascending"===l?"descending":"ascending"):b=this.getAttribute("data-default-direction")||g.defaultSortDirection,n=this.parentNode.querySelectorAll("th"),o=0,r=n.length;r>o;o++)d=n[o],d.setAttribute("data-sorted","false"),d.removeAttribute("data-sorted-direction");for(this.setAttribute("data-sorted","true"),this.setAttribute("data-sorted-direction",b),m=a.tBodies[0],i=[],u=m.rows,c=p=0,s=u.length;s>p;c=++p)h=u[c],i.push([e.getNodeValue(h.cells[f]),h,c]);for(k="descending"===b?-1:1,i.sort(function(a,b){var c;return c=g.compare(a,b),0!==c?c*k:a[2]-b[2]}),v=[],q=0,t=i.length;t>q;q++)j=i[q],v.push(m.appendChild(j[1]));return v})},getColumnType:function(a,b){var c,f,g,h,i;for(i=a.tBodies[0].rows,g=0,h=i.length;h>g;g++)if(c=i[g],f=e.getNodeValue(c.cells[b]),""!==f){if(f.match(d))return e.types.numeric;if(!isNaN(Date.parse(f)))return e.types.date}return e.types.alpha},getNodeValue:function(a){return a?null!==a.getAttribute("data-value")?a.getAttribute("data-value"):"undefined"!=typeof a.innerText?a.innerText.replace(g,""):a.textContent.replace(g,""):""},types:{numeric:{defaultSortDirection:"descending",compare:function(a,b){var c,d;return c=parseFloat(a[0].replace(/[^0-9.-]/g,""),10),d=parseFloat(b[0].replace(/[^0-9.-]/g,""),10),isNaN(c)&&(c=0),isNaN(d)&&(d=0),c-d}},alpha:{defaultSortDirection:"ascending",compare:function(a,b){return a[0].localeCompare(b[0])}},date:{defaultSortDirection:"ascending",compare:function(a,b){var c,d;return c=Date.parse(a[0]),d=Date.parse(b[0]),isNaN(c)&&(c=0),isNaN(d)&&(d=0),c-d}}}},setTimeout(e.init,0),window.Sortable=e}).call(this);
-    :javascript
-      function toggleShowUnused(){
-        var checked = document.getElementById('toggle-show-unused').checked
-        document.body.classList[checked ? 'add' : 'remove']('show-unused')
-      }
-      function filterTable(){
-        var filter = new RegExp(document.getElementById('filter').value)
-        var rows = document.querySelectorAll('tbody.filterable tr')
-        for (var i = 0, _i = rows.length; i < _i; i++) {
-          var row = rows[i]
-          if (!row.hasAttribute('data-filter-text')) {
-            var text = row.textContent.replace(/\s+/g, ' ')
-            row.setAttribute('data-filter-text', text)
-          }
-          var show = filter.test(row.getAttribute('data-filter-text'))
-          row.classList[show ? 'remove' : 'add']('filtered-out')
-        }
-      }
-  %body
-    .formats
-      - format_links.each do |format, link|
-        - if stats_format == format
-          %span= format
-        - else
-          %a(href="#{link}")= format
-    %table
-      %tr
-        %td.warn-low Max difference >= 0.001
-        %td.warn-medium Max difference >= 0.01
-        %td.warn-high Max difference >= 0.1
-    %p
-      %label
-        %input#toggle-show-unused(type="checkbox" onchange="toggleShowUnused()")
-        Show chains with workers failed for every image
-    %p
-      %label(for="filter")
-        Filter chains by regexp
-        %input#filter(type="text" onkeyup="filterTable()")
-    %p
-      Images: #{stats.each_chain.first.entry_count},
-      size: #{stats.each_chain.first.original_size}
-    %table(data-sortable)
-      %thead
-        %tr
-          %th Chain
-          %th(data-default-direction="ascending"
-              data-sorted="true"
-              data-sorted-direction="ascending") Optimized size
-          %th(data-default-direction="ascending") Ratio
-          %th(data-default-direction="ascending") Avg ratio
-          %th(data-default-direction="ascending") Time (s)
-          %th(data-default-direction="ascending") Avg difference
-          %th(data-default-direction="ascending") Max difference
-          %th Speed (B/s)
-      %tbody.filterable
-        - stats.each_chain do |chain|
-          %tr{class: chain.unused_workers && 'unused'}
-            %td
-              - chain.worker_stats.each do |worker_stat|
-                .worker-name{:class => worker_stat.unused? && 'unused'}
-                  = worker_stat.name
-                  - unless worker_stat.unused?
-                    .worker-success-count(title="successfull count")
-                      = worker_stat.success_count
-            %td.number= chain.optimized_size
-            %td.number= format '%.5f', chain.ratio
-            %td.number= format '%.5f', chain.avg_ratio
-            %td.number= format '%.2f', chain.time
-            %td.number= format '%.5f', chain.avg_difference
-            %td.number{class: chain.warn_level && "warn-#{chain.warn_level}"}
-              = format '%.5f', chain.max_difference
-            %td.number= format '%.2f', chain.speed