middleman-imageoptim 0.1.4 → 0.2.0

data/lib/middleman_extension.rb

@@ -1 +1 @@
-require "middleman-imageoptim"
+require 'middleman-imageoptim'

data/middleman-imageoptim.gemspec

@@ -1,28 +1,31 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require File.expand_path('../lib/middleman-imageoptim/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = Middleman::Imageoptim::PACKAGE
   gem.version       = Middleman::Imageoptim::VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.authors       = ["Justin Morris"]
-  gem.email         = ["desk@pixelbloom.com"]
-  gem.homepage      = "https://github.com/plasticine/middleman-imageoptim"
-  gem.summary       = %q{Small images are small! Compress yours during middleman build.}
-  gem.description   = %q{Small images are small! Compress yours during middleman build.}
+  gem.authors       = ['Justin Morris']
+  gem.email         = ['desk@pixelbloom.com']
+  gem.homepage      = 'https://github.com/plasticine/middleman-imageoptim'
+  gem.summary       = 'Small images are small! Compress yours during middleman build.'
+  gem.description   = 'Small images are small! Compress yours during middleman build.'
   gem.license       = 'MIT'
   gem.files         = `git ls-files`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ["lib"]
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.require_paths = ['lib']
 
-  gem.add_dependency "middleman-core", [">= 3.0"]
-  gem.add_dependency "image_optim", "~> 0.9.1"
+  gem.add_dependency 'middleman-core', ['>= 3.0']
+  gem.add_dependency 'image_optim', '~> 0.20.2'
+  gem.add_dependency 'image_optim_pack', '~> 0.2.1'
 
-  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"
+  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'cucumber'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '>= 3.0.0'
+  gem.add_development_dependency 'rspec-its'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'simplecov'
 end

data/script/spec

@@ -1,11 +1,26 @@
 #!/usr/bin/env bash
 
-export COVERAGE=true
+set -eo pipefail
 
-bundle --binstubs | grep -v '^Using'
+prepare() {
+  bundle --binstubs | grep -v '^Using'
+  rm -rf coverage
+}
 
-rm -rf coverage
+check_style() {
+  rubocop
+}
 
-bin/rake
+run_tests() {
+  bin/rake spec:unit
+  bin/rake spec:features
+}
 
-script/quality
+main() {
+  prepare
+  check_style
+  run_tests
+
+}
+
+main $@

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
-if ENV['COVERAGE']
-  require_relative 'use_coveralls' if ENV['TRAVIS']
-  require_relative 'use_simplecov'
-end
+require 'rspec/its'
+require 'simplecov'
+require 'middleman-imageoptim'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
   config.order = 'random'
+  config.raise_errors_for_deprecations!
 end

data/spec/unit/options_spec.rb

@@ -1,77 +1,126 @@
-require_relative "../../lib/middleman-imageoptim/options"
+require 'spec_helper'
+require_relative '../../lib/middleman-imageoptim/options'
 
 describe Middleman::Imageoptim::Options do
-  subject { Middleman::Imageoptim::Options.new(options_hash) }
   let(:options_hash) { {} }
+  let(:instance) { described_class.new(options_hash) }
+  subject { instance }
 
-  describe "default options" do
-    its(:verbose) { should be_false }
-    its(:nice) { should be_true }
-    its(:threads) { should be_true }
-    its(:image_extensions) { should == ['.png', '.jpg', '.gif'] }
-    its(:pngcrush_options) { should == {:chunks => ['alla'], :fix => false, :brute => false} }
-    its(:pngout_options) { should == {:copy_chunks => false, :strategy => 0} }
-    its(:optipng_options) { should == {:level => 6, :interlace => false} }
-    its(:advpng_options) { should == {:level => 4} }
-    its(:jpegoptim_options) { should == {:strip => ['all'], :max_quality => 100} }
-    its(:jpegtran_options) { should == {:copy_chunks => false, :progressive => true, :jpegrescan => true} }
-    its(:gifsicle_options) { should == {:interlace => false} }
+  describe 'default options' do
+    its(:verbose) { should be_falsey }
+    its(:nice) { should be_truthy }
+    its(:threads) { should be_truthy }
+    its(:skip_missing_workers) { should be_truthy }
+    its(:allow_lossy) { should be_falsey }
+    its(:image_extensions) { should == ['.png', '.jpg', '.jpeg', '.gif', '.svg'] }
+    its(:pngcrush) { should == { chunks: ['alla'], fix: false, brute: false } }
+    its(:pngout) { should == { copy_chunks: false, strategy: 0 } }
+    its(:optipng) { should == { level: 6, interlace: false } }
+    its(:advpng) { should == { level: 4 } }
+    its(:jpegoptim) { should == { strip: ['all'], max_quality: 100 } }
+    its(:jpegtran) { should == { copy_chunks: false, progressive: true, jpegrescan: true } }
+    its(:gifsicle) { should == { interlace: false } }
+    its(:svgo) { should == {} }
   end
 
-  describe "with user options" do
-    describe "#verbose" do
-      let(:options_hash) { {verbose: true} }
-      subject { options.verbose().should be_true }
+  describe 'getting options for imageoptim' do
+    describe '#imageoptim_options' do
+      subject { instance.imageoptim_options }
+      let(:options_hash) do
+        { verbose: true, manifest: false, image_extensions: ['.gif'] }
+      end
+      it do
+        is_expected.to eql(
+          advpng: { level: 4 },
+          allow_lossy: false,
+          gifsicle: { interlace: false },
+          jpegoptim: { strip: ['all'], max_quality: 100 },
+          jpegtran: { copy_chunks: false, progressive: true, jpegrescan: true },
+          nice: true,
+          optipng: { level: 6, interlace: false },
+          pack: true,
+          pngcrush: { chunks: ['alla'], fix: false, brute: false },
+          pngout: { copy_chunks: false, strategy: 0 },
+          skip_missing_workers: true,
+          svgo: {},
+          threads: true,
+          verbose: true
+        )
+      end
+    end
+  end
+
+  describe 'with user options' do
+    describe '#verbose' do
+      subject { instance.verbose }
+      let(:options_hash) { { verbose: true } }
+      it { is_expected.to be_truthy }
+    end
+
+    describe '#nice' do
+      subject { instance.nice }
+      let(:options_hash) { { nice: false } }
+      it { is_expected.to be_falsey }
     end
 
-    describe "#nice" do
-      let(:options_hash) { {nice: false} }
-      subject { options.nice().should be_false }
+    describe '#threads' do
+      subject { instance.threads }
+      let(:options_hash) { { threads: false } }
+      it { is_expected.to be_falsey }
     end
 
-    describe "#threads" do
-      let(:options_hash) { {threads: false} }
-      subject { options.threads().should be_false }
+    describe '#image_extensions' do
+      subject { instance.image_extensions }
+      let(:options_hash) { { image_extensions: ['.gif'] } }
+      it { is_expected.to eq(['.gif']) }
     end
 
-    describe "#image_extensions" do
-      let(:options_hash) { {image_extensions: ['.gif']} }
-      subject { options.image_extensions().should == ['.gif'] }
+    describe '#pngcrush_options' do
+      subject { instance.pngcrush }
+      let(:options_hash) { { pngcrush: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#pngcrush_options" do
-      let(:options_hash) { {pngcrush_options: {foo: 'bar'}} }
-      subject { options.pngcrush_options().should == {foo: 'bar'} }
+    describe '#pngout' do
+      subject { instance.pngout }
+      let(:options_hash) { { pngout: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#pngout_options" do
-      let(:options_hash) { {pngout_options: {foo: 'bar'}} }
-      subject { options.pngout_options().should == {foo: 'bar'} }
+    describe '#optipng' do
+      subject { instance.optipng }
+      let(:options_hash) { { optipng: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#optipng_options" do
-      let(:options_hash) { {optipng_options: {foo: 'bar'}} }
-      subject { options.optipng_options().should == {foo: 'bar'} }
+    describe '#advpng' do
+      subject { instance.advpng }
+      let(:options_hash) { { advpng: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#advpng_options" do
-      let(:options_hash) { {advpng_options: {foo: 'bar'}} }
-      subject { options.advpng_options().should == {foo: 'bar'} }
+    describe '#jpegoptim' do
+      subject { instance.jpegoptim }
+      let(:options_hash) { { jpegoptim: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#jpegoptim_options" do
-      let(:options_hash) { {jpegoptim_options: {foo: 'bar'}} }
-      subject { options.jpegoptim_options().should == {foo: 'bar'} }
+    describe '#jpegtran' do
+      subject { instance.jpegtran }
+      let(:options_hash) { { jpegtran: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#jpegtran_options" do
-      let(:options_hash) { {jpegtran_options: {foo: 'bar'}} }
-      subject { options.jpegtran_options().should == {foo: 'bar'} }
+    describe '#gifsicle' do
+      subject { instance.gifsicle }
+      let(:options_hash) { { gifsicle: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
 
-    describe "#gifsicle_options" do
-      let(:options_hash) { {gifsicle_options: {foo: 'bar'}} }
-      subject { options.gifsicle_options().should == {foo: 'bar'} }
+    describe '#svgo' do
+      subject { instance.svgo }
+      let(:options_hash) { { svgo: { foo: 'bar' } } }
+      it { is_expected.to eq(foo: 'bar') }
     end
   end
 end

data/spec/unit/utils_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require_relative '../../lib/middleman-imageoptim/utils'
+
+describe Middleman::Imageoptim::Utils do
+  let(:size_src) { 1000 }
+  let(:size_dst) { 1000 }
+
+  describe '#size_change_word' do
+    subject { described_class.size_change_word(size_src, size_dst) }
+
+    context 'the destination file is the same size as the source file' do
+      it 'should be the same size' do
+        expect(subject).to eq('no change')
+      end
+    end
+
+    context 'the destination file is smaller' do
+      let(:size_dst) { 500 }
+      it 'should be smaller' do
+        expect(subject).to eq('smaller')
+      end
+    end
+
+    context 'the destination file is larger' do
+      let(:size_dst) { 1500 }
+      it 'should be larger' do
+        expect(subject).to eq('larger')
+      end
+    end
+  end
+
+  describe '#percentage_change' do
+    subject { described_class.percentage_change(size_src, size_dst) }
+
+    context 'the destination file is the same size as the source file' do
+      it 'should be the same size' do
+        expect(subject).to eq('0.00%')
+      end
+    end
+
+    context 'the destination file is smaller' do
+      let(:size_dst) { 500 }
+      it 'should be smaller' do
+        expect(subject).to eq('50.00%')
+      end
+    end
+
+    context 'the destination file is larger' do
+      let(:size_dst) { 1500 }
+      it 'should be larger' do
+        expect(subject).to eq('-50.00%')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-imageoptim
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -30,16 +30,30 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.20.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.20.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: image_optim_pack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,7 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -129,28 +171,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
 - .gitignore
 - .rspec
+- .rubocop.yml
+- .rubocop_todo.yml
+- .simplecov
 - .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- features/manifest.feature
+- features/optimization.feature
+- features/permissions.feature
+- features/support/env.rb
+- features/support/step_definitions.rb
+- fixtures/basic-app/config-disabled-manifest.rb
+- fixtures/basic-app/config.rb
+- fixtures/basic-app/source/images/oh_my_glob.gif
+- fixtures/basic-app/source/images/table.jpg
 - lib/middleman-imageoptim.rb
 - lib/middleman-imageoptim/extension.rb
+- lib/middleman-imageoptim/manifest.rb
+- lib/middleman-imageoptim/manifest_resource.rb
 - lib/middleman-imageoptim/optimizer.rb
 - lib/middleman-imageoptim/options.rb
+- lib/middleman-imageoptim/resource_list.rb
+- lib/middleman-imageoptim/utils.rb
 - 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
+- spec/unit/utils_spec.rb
 homepage: https://github.com/plasticine/middleman-imageoptim
 licenses:
 - MIT
@@ -171,9 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Small images are small! Compress yours during middleman build.
 test_files: []
-has_rdoc: