middleman-imageoptim 0.1.0 → 0.1.1

data/.cane

@@ -0,0 +1,4 @@
+--abc-max 10
+--gte coverage/covered_percent,74
+--no-style
+--color

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 pkg
 .bundle
 bin
+coverage

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+bundler_args: --binstubs
+rvm:
+  - 2.0.0
+  - 1.9.3
+after_success:
+  - script/quality
+matrix:
+  include:
+    - rvm: 2.0.0
+      env: COVERAGE=true

data/README.md

@@ -4,6 +4,11 @@
 
 Serving big images is fo numb-skulls! Compress and optimise your imagery during `middleman build` by running [image_optim](https://github.com/toy/image_optim) over it. Yay-hooray!
 
+[![Build Status](https://travis-ci.org/plasticine/middleman-imageoptim.png?branch=master)](https://travis-ci.org/plasticine/middleman-imageoptim)
+[![Coverage Status](https://coveralls.io/repos/plasticine/middleman-imageoptim/badge.png)](https://coveralls.io/r/plasticine/middleman-imageoptim)
+[![Gem Version](https://badge.fury.io/rb/middleman-imageoptim.png)](http://badge.fury.io/rb/middleman-imageoptim)
+[![Dependency Status](https://gemnasium.com/plasticine/middleman-imageoptim.png)](https://gemnasium.com/plasticine/middleman-imageoptim)
+
 ![](http://cl.ly/image/0h0b330F2p3C/Terminal%20%E2%80%94%20zsh%20%E2%80%94%20109%C3%9712.png)
 
 ## Installation
@@ -11,7 +16,7 @@ Serving big images is fo numb-skulls! Compress and optimise your imagery during
 Go set up the [image_optim](https://github.com/toy/image_optim) external utilities, then;
 
 ```ruby
-gem "middleman-imageoptim", "~> 0.1.0"
+gem "middleman-imageoptim", "~> 0.1.1"
 ```
 
 ## Usage
@@ -51,7 +56,10 @@ end
 
 ## Changelog
 
+##### `0.1.1`
+- remove legacy requirement for padrino
+
 ##### `0.1.0`
 - complete refactor and clean-up
 - introduced an options class. options now work (lol, yay!), thanks @andrew-aladev for your help there
-- change of extension activation name from `:image_optim to `:imageoptim` for consistency with internal naming
+- change of extension activation name from `:image_optim` to `:imageoptim` for consistency with internal naming

data/Rakefile

@@ -12,8 +12,9 @@ namespace :spec do
     desc "Run cane to check quality metrics"
     Cane::RakeTask.new(:quality) do |cane|
       cane.abc_max = 10
-      cane.add_threshold 'coverage/covered_percent', :>=, 100
+      cane.add_threshold 'coverage/covered_percent', :>=, 74
       cane.no_style = true
+      cane.abc_exclude = %w(Middleman::Imageoptim::Optimizer#optimizer)
     end
 
     task :default => :quality

data/lib/middleman-imageoptim/extension.rb

@@ -1,6 +1,8 @@
 require "middleman-core"
 
 module Middleman
+
+  # Middleman extension entry point
   module Imageoptim
     class << self
       def registered(app, options_hash = {}, &block)

data/lib/middleman-imageoptim/optimizer.rb

@@ -2,11 +2,10 @@ module Middleman
   module Imageoptim
     require "image_optim"
     require "fileutils"
-    require "padrino-helpers"
 
+    # Optimizer class that accepts an options object and processes files and
+    # passes them off to image_optim to be processed
     class Optimizer
-      include ::Padrino::Helpers::NumberHelpers
-
       def initialize(app, builder, options)
         @app           = app
         @builder       = builder
@@ -19,7 +18,7 @@ module Middleman
         optimizer.optimize_images(images_to_optimize) {|src_file, dst_file|
           if dst_file
             @total_savings += (src_file.size - dst_file.size)
-            say_status "#{src_file} (#{percentage_change(src_file.size, dst_file.size)} / #{format_size((src_file.size - dst_file.size))} #{size_change_word(src_file.size, dst_file.size)})"
+            say_file_size_stats(src_file, dst_file)
             FileUtils.mv dst_file, src_file
           elsif @options.verbose
             say_status "[skipped] #{src_file}"
@@ -28,16 +27,6 @@ module Middleman
         say_status "Total image savings: #{format_size(@total_savings)}"
       end
 
-      def say_status(status)
-        if @builder
-          @builder.say_status :image_optim, status
-        end
-      end
-
-      def file_paths
-        ::Middleman::Util.all_files_under(@app.inst.build_dir)
-      end
-
       def filter_file_paths(paths)
         paths.select {|path|
           is_image_extension(path.extname) && image_is_optimizable(path)
@@ -52,10 +41,6 @@ module Middleman
         optimizer.optimizable?(path)
       end
 
-      def format_size(bytes)
-        number_to_human_size(bytes)
-      end
-
       def size_change_word(size_src, size_dst)
         size_difference = (size_src - size_dst)
         if size_difference > 0
@@ -71,6 +56,25 @@ module Middleman
         '%.2f%%' % [100 - 100.0 * size_dst / size_src]
       end
 
+      private
+
+      def file_paths
+        ::Middleman::Util.all_files_under(@app.inst.build_dir)
+      end
+
+      def say_file_size_stats(src_file, dst_file)
+        file_percent_change = percentage_change(src_file.size, dst_file.size)
+        file_size_change = format_size((src_file.size - dst_file.size))
+        file_size_change_type = size_change_word(src_file.size, dst_file.size)
+        say_status "#{src_file} (#{file_percent_change} / #{file_size_change} #{file_size_change_type})"
+      end
+
+      def say_status(status)
+        if @builder
+          @builder.say_status :image_optim, status
+        end
+      end
+
       def optimizer
         @optimizer ||= ImageOptim.new(
           :nice      => @options.nice,
@@ -84,6 +88,21 @@ module Middleman
           :gifsicle  => @options.gifsicle_options
         )
       end
+
+      def format_size(bytes)
+        units = %W(B KiB MiB GiB TiB)
+
+        if bytes.to_i < 1024
+          exponent = 0
+        else
+          max_exp  = UNITS.size - 1
+          exponent = (Math.log(bytes) / Math.log(1024)).to_i
+          exponent = max_exp if exponent > max_exp
+          bytes  /= 1024 ** exponent
+        end
+
+        "#{bytes}#{UNITS[exponent]}"
+      end
     end
   end
 end

data/lib/middleman-imageoptim/options.rb

@@ -1,5 +1,8 @@
 module Middleman
   module Imageoptim
+
+    # An options store that handles default options will accept user defined
+    # overrides
     class Options
       attr_accessor :user_options
       attr_reader :verbose, :nice, :threads, :image_extensions,

data/lib/middleman-imageoptim/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   module Imageoptim
     PACKAGE = 'middleman-imageoptim'
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/middleman-imageoptim.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "middleman-core", [">= 3.0"]
   gem.add_dependency "image_optim", "~> 0.9.1"
 
-  gem.add_development_dependency "padrino-helpers"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "cucumber"
   gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "coveralls"
   gem.add_development_dependency "cane"
 end

data/script/quality

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+function run_command {
+  $1 || exit 1
+}
+
+run_command "rake spec:quality"

data/script/spec

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+export COVERAGE=true
+
+bundle --binstubs | grep -v '^Using'
+
+rm -rf coverage
+
+bin/rake
+
+script/quality

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 if ENV['COVERAGE']
+  require_relative 'use_coveralls' if ENV['TRAVIS']
   require_relative 'use_simplecov'
 end
 

data/spec/use_coveralls.rb

@@ -0,0 +1,2 @@
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-imageoptim
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: padrino-helpers
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -146,8 +146,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .cane
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -159,9 +161,12 @@ files:
 - lib/middleman-imageoptim/version.rb
 - lib/middleman_extension.rb
 - middleman-imageoptim.gemspec
+- script/quality
+- script/spec
 - spec/spec_helper.rb
 - spec/unit/optimizer_spec.rb
 - spec/unit/options_spec.rb
+- spec/use_coveralls.rb
 - spec/use_simplecov.rb
 homepage: https://github.com/plasticine/middleman-imageoptim
 licenses: []
@@ -177,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1391481925218508789
+      hash: 3808513596251224587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1391481925218508789
+      hash: 3808513596251224587
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23