middleman-webp 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0312c82b0f77cec98569fa672f45a4d29fad51b
-  data.tar.gz: b8f4a8c2b7979fc4df338c01beaa35797d9f7e11
+  metadata.gz: 676281da9d58ad178d2534079addaf244b654df8
+  data.tar.gz: abe0ee6f6130466c5366acecb82d86c05cf47480
 SHA512:
-  metadata.gz: 117326ee2862bce2cea57993fa9ef371be0ce9f3e56fde4b87d91de909430265d37001d3ebabb19feef2ede2466791f0739b8aec7f54e51bcc4f02fbfa25f33d
-  data.tar.gz: d3e571fe86ec5c037da91cd477c11bb2cc0608c8c75a6bfddaf00f959b137c1896fcfe54d60e10456ca1c90d2ee9db48aa4cba5ab3c404217fb0c5355bb08295
+  metadata.gz: f4526692069e1d3c85c9bd1b76fb061feef560e49084a28e4efd64a6e74469c6c634cee2d476039d3aa3cff15b6cddf6acd3264258d7157e46cf98ab56bb5c7c
+  data.tar.gz: 859eb337409cb087fd9728a7f9898c9912c3928cbae2b561c21276aabfbf26e38b4d2a57c8ac57f68d8dfbd00bde2dbe004a1b6f36e50825a59d64c0bb545b40

data/.travis.yml

@@ -1,10 +1,11 @@
+sudo: required
+dist: trusty
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.7
+  - 2.2.3
 script: bundle exec rake test
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install webp
+  - sudo apt-get install -y webp

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+
+## 0.4.0
+
+- Middleman 4.0.0 compatibility
+- *Breaks* Middleman 3.*.* support, use gem version 0.3.2 with older
+  Middleman versions
+
 ## 0.3.0
 
 - Add new option: run_before_build with default value false (ie. default

data/README.md

@@ -38,6 +38,11 @@ Add this line to your Middleman site's Gemfile:
 
     gem 'middleman-webp'
 
+You are not able to use latest gem version if you are using **Middleman 3**. In
+that case install gem with following Gemfile statement:
+
+    gem 'middleman-webp', '~> 0.3.2'
+
 And then execute:
 
     $ bundle

data/lib/middleman-webp/converter.rb

@@ -5,15 +5,17 @@ module Middleman
     class Converter
       SUFFIX_RE = /(jpe?g|png|tiff?|gif)$/i
 
-      def initialize(app, options = {}, builder)
+      def initialize(app, options = {}, builder, logger)
         @app = app
         @options = Middleman::WebP::Options.new(options)
         @builder = builder
+        @log = logger
       end
 
       def convert
         @original_size = 0
         @converted_size = 0
+
         convert_images(image_files) do |src, dst|
           if !!@options.allow_skip && dst.size >= src.size
             next reject_file(dst)
@@ -21,8 +23,8 @@ module Middleman
 
           @original_size += src.size
           @converted_size += dst.size
-          @builder.say_status :webp, "#{dst.path} "\
-          "(#{change_percentage(src.size, dst.size)} smaller)"
+          @log.info "#{dst.path} "\
+            "(#{change_percentage(src.size, dst.size)} smaller)"
         end
         print_summary
       end
@@ -32,16 +34,17 @@ module Middleman
           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
+            yield File.new(p), File.new(dst.to_s)
+          rescue StandardError => e
+            @log.error "Converting #{p} failed"
+            @log.debug e.to_s
           end
         end
       end
 
       def exec_convert_tool(src, dst)
         cmd = "#{tool_for(src)} #{@options.for(src)} -quiet #{src} -o #{dst}"
-        @builder.run cmd, verbose: @options.verbose, capture: true
+        @builder.run(cmd, verbose: @options.verbose, capture: true)
       end
 
       # Internal: Return proper tool command based on file type
@@ -52,13 +55,13 @@ module Middleman
       end
 
       def reject_file(file)
-        @builder.say_status :webp, "#{file.path} skipped", :yellow
+        @log.warn "#{file.path} skipped"
         File.unlink(file)
       end
 
       def print_summary
         savings = @original_size - @converted_size
-        @builder.say_status :webp, 'Total conversion savings: '\
+        @log.info 'Total conversion savings: '\
         "#{number_to_human_size(savings)} "\
         "(#{change_percentage(@original_size, @converted_size)})", :blue
       end
@@ -90,7 +93,12 @@ module Middleman
       end
 
       def image_files
-        app_dir = @app.inst.send(@options.run_before_build ? :source_dir : :build_dir)
+        if @options.run_before_build
+          app_dir = Pathname(File.join(@app.root, @app.config[:source]))
+        else
+          app_dir = Pathname(@app.config[:build_dir])
+        end
+
         all = ::Middleman::Util.all_files_under(app_dir)
         images = all.select { |p| p.to_s =~ SUFFIX_RE }
 

data/lib/middleman-webp/extension.rb

@@ -1,4 +1,5 @@
 require 'middleman-core'
+require 'middleman-webp/logger'
 require 'middleman-webp/converter'
 
 require 'shell'
@@ -22,34 +23,45 @@ module Middleman
 
     def before_build(builder)
       return unless options[:run_before_build]
-      return unless dependencies_installed?(builder)
-      Middleman::WebP::Converter.new(@app, options, builder).convert
+
+      initialize_logger builder
+      return unless dependencies_installed?
+      Middleman::WebP::Converter.new(@app, options, builder, @logger).convert
     end
 
     def after_build(builder)
       return if options[:run_before_build]
-      return unless dependencies_installed?(builder)
-      Middleman::WebP::Converter.new(@app, options, builder).convert
+
+      initialize_logger builder
+      return unless dependencies_installed?
+      Middleman::WebP::Converter.new(@app, options, builder, @logger).convert
     end
 
     # Internal: Check that cwebp and gif2webp commandline tools are available.
     #
     # Returns true if all is OK.
-    def dependencies_installed?(builder)
-      sh = Shell.new
-
-      begin
-        sh.find_system_command('gif2webp')
-      rescue Shell::Error::CommandNotFound => e
-        builder.say_status :webp, "#{e.message} Please install latest version of webp library and tools to get gif2webp and be able to convert gif files also.", :red
-      end
-
-      begin
-        true if sh.find_system_command('cwebp')
-      rescue Shell::Error::CommandNotFound => e
-        builder.say_status :webp, "ERROR: #{e.message} Please install cwebp and gif2webp commandline tools first.", :red
-        false
-      end
+    def dependencies_installed?
+      warn_if_gif2webp_missing
+      cwebp_installed?
+    end
+
+    def initialize_logger(builder)
+      @logger = Middleman::WebP::Logger.new(builder, verbose: @options.verbose)
+    end
+
+    private
+
+    def warn_if_gif2webp_missing
+      Shell.new.find_system_command('gif2webp')
+    rescue Shell::Error::CommandNotFound => e
+      @logger.error "#{e.message} Please install latest version of webp library and tools to get gif2webp and be able to convert gif files also."
+    end
+
+    def cwebp_installed?
+      true if Shell.new.find_system_command('cwebp')
+    rescue Shell::Error::CommandNotFound => e
+      @logger.error "ERROR: #{e.message} Please install cwebp and gif2webp commandline tools first."
+      false
     end
   end
 end

data/lib/middleman-webp/logger.rb

@@ -0,0 +1,26 @@
+module Middleman
+  module WebP
+    class Logger
+      def initialize(builder, opts = {})
+        @builder = builder
+        @options = opts
+      end
+
+      def info(msg, color = nil)
+        @builder.thor.say_status :webp, msg, color
+      end
+
+      def error(msg)
+        info msg, :red
+      end
+
+      def warn(msg)
+        info msg, :yellow
+      end
+
+      def debug(msg)
+        info msg if @options[:verbose]
+      end
+    end
+  end
+end

data/lib/middleman-webp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Webp
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/middleman-webp.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "middleman-core", ">= 3.3.0", "< 3.5.0"
+  spec.add_dependency "middleman-core", "~> 4.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "middleman-cli", "~> 4.0.0"
   spec.add_development_dependency "rake"
   #spec.add_development_dependency "simplecov"
   spec.add_development_dependency "mocha"

data/spec/integration/extension_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
+require 'middleman-core'
 require 'middleman-core/cli'
 require_relative '../../lib/middleman-webp/extension'
 
 describe Middleman::WebPExtension do
   before do
     @builder = Middleman::Cli::Build.new
-    @builder.stubs(:say_status).with do |action, msg, opts|
-      action == :webp and msg =~ /Please install latest version of webp/
-    end
+    #@builder.stubs(:thor).with do |action, msg, opts|
+    #  action == :webp and msg =~ /Please install latest version of webp/
+    #end
   end
 
   after do
@@ -21,27 +22,31 @@ describe Middleman::WebPExtension do
   end
 
   describe '#before_build' do
-    it 'does not generate WebP versions using external tools' do
+    it 'does not generate WebP versions by default' do
       app_mock = stub({
                         initialized: '',
                         instance_available: true,
                         after_configuration: nil,
                         before_build: nil,
                         after_build: nil,
-                        inst: stub(source_dir: 'spec/fixtures/ok-source')
+                        root: '.',
+                        config: {source: 'spec/fixtures/ok-source'}
                       })
 
-      @builder.expects(:say_status).never.with do |action, msg, opts|
-        action == :webp and msg =~ /Total conversion savings/
-      end
+      Middleman::WebP::Logger.any_instance.expects(:info).never
+        .with do |msg, color|
+          msg =~ /Total conversion savings/
+        end
 
-      @builder.expects(:say_status).never.with do |action, msg, opts|
-        action == :run and msg =~ /cwebp/
-      end
+      Middleman::WebP::Logger.any_instance.expects(:info).never
+        .with do |msg|
+          msg =~ /cwebp/
+        end
 
-      @builder.expects(:say_status).never.with do |action, msg, opts|
-        action == :webp and msg =~ /\.webp \([0-9.]+ % smaller\)/
-      end
+      Middleman::WebP::Logger.any_instance.expects(:info).never
+        .with do |msg|
+          msg =~ /\.webp \([0-9.]+ % smaller\)/
+        end
 
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.before_build(@builder)
@@ -56,19 +61,17 @@ describe Middleman::WebPExtension do
                         after_configuration: nil,
                         before_build: nil,
                         after_build: nil,
-                        inst: stub(source_dir: 'spec/fixtures/ok-source')
+                        verbose: true,
+                        root: '.',
+                        config: {source: 'spec/fixtures/ok-source'}
                       })
 
-      @builder.expects(:say_status).once.with do |action, msg, opts|
-        action == :webp and msg =~ /Total conversion savings/
-      end
-
-      @builder.expects(:say_status).twice.with do |action, msg, opts|
-        action == :run and msg =~ /cwebp/
+      Middleman::WebP::Logger.any_instance.expects(:info).once.with do |msg, c|
+        msg =~ /Total conversion savings/
       end
 
-      @builder.expects(:say_status).twice.with do |action, msg, opts|
-        action == :webp and msg =~ /\.webp \([0-9.]+ % smaller\)/
+      Middleman::WebP::Logger.any_instance.expects(:info).twice.with do |msg|
+        msg =~ /\.webp \([0-9.]+ % smaller\)/
       end
 
       @extension = Middleman::WebPExtension.new(app_mock) do |webp|
@@ -82,8 +85,8 @@ describe Middleman::WebPExtension do
 
   describe '#after_build' do
     before do
-      @builder.expects(:say_status).once.with do |action, msg, opts|
-          action == :webp and msg =~ /Total conversion savings/
+      Middleman::WebP::Logger.any_instance.expects(:info).once.with do |msg|
+          msg =~ /Total conversion savings/
         end
     end
 
@@ -94,15 +97,12 @@ describe Middleman::WebPExtension do
                         after_configuration: nil,
                         before_build: nil,
                         after_build: nil,
-                        inst: stub(build_dir: 'spec/fixtures/ok-build')
+                        root: '.',
+                        config: {build_dir: 'spec/fixtures/ok-build'}
                       })
 
-      @builder.expects(:say_status).twice.with do |action, msg, opts|
-        action == :run and msg =~ /cwebp/
-      end
-
-      @builder.expects(:say_status).twice.with do |action, msg, opts|
-        action == :webp and msg =~ /\.webp \([0-9.]+ % smaller\)/
+      Middleman::WebP::Logger.any_instance.expects(:info).twice.with do |msg|
+        msg =~ /\.webp \([0-9.]+ % smaller\)/
       end
 
       @extension = Middleman::WebPExtension.new(app_mock)
@@ -118,13 +118,14 @@ describe Middleman::WebPExtension do
                         after_configuration: nil,
                         before_build: nil,
                         after_build: nil,
-                        inst: stub(build_dir: 'spec/fixtures/dummy-build')
+                        root: '.',
+                        config: {build_dir: 'spec/fixtures/dummy-build'}
                       })
 
       Middleman::WebP::Converter.any_instance.
         expects(:exec_convert_tool).times(3)
 
-      @builder.expects(:say_status).times(3).with do |action, msg, opts|
+      Middleman::WebP::Logger.any_instance.expects(:error).times(3).with do |msg|
         msg =~ /Converting .*empty\.(jpg|gif|png) failed/
       end
 
@@ -139,7 +140,8 @@ describe Middleman::WebPExtension do
                         after_configuration: nil,
                         before_build: nil,
                         after_build: nil,
-                        inst: stub(build_dir: 'spec/fixtures/dummy-build')
+                        root: '.',
+                        config: {build_dir: 'spec/fixtures/dummy-build'}
                       })
 
       Middleman::WebP::Converter.any_instance.
@@ -154,9 +156,8 @@ describe Middleman::WebPExtension do
         end
       end
 
-      @builder.expects(:say_status).times(3).with do |action, msg, opts|
-        action == :webp and msg =~ /.*empty.webp skipped/
-      end
+      Middleman::WebP::Logger.any_instance.expects(:info).times(3)
+        .with { |msg| msg =~ /.*empty.webp skipped/ }.returns(nil)
 
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.after_build(@builder)

data/spec/unit/converter_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../lib/middleman-webp/converter'
 
 describe Middleman::WebP::Converter do
   before do
-    @app_mock = stub(inst: stub(build_dir: 'spec/fixtures/dummy-build'))
+    @app_mock = stub(config: {build_dir: 'spec/fixtures/dummy-build'})
     @converter = Middleman::WebP::Converter.new(@app_mock, {}, nil)
   end
 
@@ -18,7 +18,7 @@ describe Middleman::WebP::Converter do
 
   describe '#destination_path with append_extension = true' do
     before do
-      @converter = Middleman::WebP::Converter.new(@app_mock, {append_extension: true}, nil)
+      @converter = Middleman::WebP::Converter.new(@app_mock, {append_extension: true}, nil, nil)
     end
 
     it 'returns file name with same basename and webp suffix' do
@@ -60,12 +60,9 @@ describe Middleman::WebP::Converter do
     end
 
     it 'uses cwebp for jpeg, png and tiff files' do
-      path = Pathname.new('/some/path/image.jpg')
-      @converter.tool_for(path).must_equal 'cwebp'
-      path = Pathname.new('/some/path/image.png')
-      @converter.tool_for(path).must_equal 'cwebp'
-      path = Pathname.new('/some/path/image.tiff')
-      @converter.tool_for(path).must_equal 'cwebp'
+      @converter.tool_for(Pathname('/some/path/image.jpg')).must_equal 'cwebp'
+      @converter.tool_for(Pathname('/some/path/image.png')).must_equal 'cwebp'
+      @converter.tool_for(Pathname('/some/path/image.tiff')).must_equal 'cwebp'
     end
   end
 
@@ -77,9 +74,9 @@ describe Middleman::WebP::Converter do
     it 'won\'t include ignored files' do
       @converter = Middleman::WebP::Converter.new(@app_mock, {
                                                     ignore: [/jpg$/, '**/*.gif']
-                                                  }, nil)
+                                                  }, nil, nil)
 
-      files_to_include = [Pathname.new('spec/fixtures/dummy-build/empty.png')]
+      files_to_include = [Pathname('spec/fixtures/dummy-build/empty.png')]
       @converter.image_files.must_equal files_to_include
     end
 
@@ -87,7 +84,7 @@ describe Middleman::WebP::Converter do
       options = {
         ignore: ->(path) { path.end_with? 'jpg' }
       }
-      @converter = Middleman::WebP::Converter.new(@app_mock, options, nil)
+      @converter = Middleman::WebP::Converter.new(@app_mock, options, nil, nil)
 
       @converter.image_files.size.must_equal 2
     end

data/spec/unit/extension_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
-#require 'pathname'
-#require 'middleman-core'
 require_relative '../../lib/middleman-webp/extension'
 
 describe Middleman::WebPExtension do
 
   before do
-    #Middleman::Extension.any_instance.expects(:initialize).returns(true)
     app_mock = stub({
                       initialized: '',
                       instance_available: true,
@@ -15,6 +12,7 @@ describe Middleman::WebPExtension do
                       after_build: nil
                     })
     @extension = Middleman::WebPExtension.new(app_mock)
+    @extension.initialize_logger(stub(thor: {say_status: nil}))
   end
 
   describe '#dependencies_installed?' do
@@ -22,27 +20,23 @@ describe Middleman::WebPExtension do
       Shell.any_instance.expects(:find_system_command).with('cwebp').returns('/usr/bin/cwebp')
       Shell.any_instance.expects(:find_system_command).with('gif2webp').returns('/usr/bin/gif2webp')
 
-      @extension.dependencies_installed?(stub(say_status: '')).must_equal true
+      @extension.dependencies_installed?.must_equal true
     end
 
     it 'returns false and displays error if cwebp is missing' do
       Shell.any_instance.expects(:find_system_command).with('cwebp').raises(Shell::Error::CommandNotFound)
       Shell.any_instance.stubs(:find_system_command).with('gif2webp').returns('/usr/bin/gif2webp')
 
-      builder_mock = stub(:say_status)
-      builder_mock.stubs(:say_status).once
-
-      @extension.dependencies_installed?(builder_mock).must_equal false
+      Middleman::WebP::Logger.any_instance.expects(:error).once
+      @extension.dependencies_installed?.must_equal false
     end
 
     it 'displays error if only gif2webp is missing and returns still true' do
       Shell.any_instance.expects(:find_system_command).with('gif2webp').raises(Shell::Error::CommandNotFound)
       Shell.any_instance.stubs(:find_system_command).with('cwebp').returns('/usr/bin/cwebp')
 
-      builder_mock = stub(:say_status)
-      builder_mock.stubs(:say_status).once
-
-      @extension.dependencies_installed?(builder_mock).must_equal true
+      Middleman::WebP::Logger.any_instance.expects(:error).once
+      @extension.dependencies_installed?.must_equal true
     end
   end
 

data/spec/unit/logger_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'pathname'
+require_relative '../../lib/middleman-webp/logger'
+
+describe Middleman::WebP::Logger do
+  before do
+    @thor_mock = stub({say_status: nil})
+    @logger = Middleman::WebP::Logger.new(stub({thor: @thor_mock}))
+  end
+
+  it "logs info message through Thor with given color" do
+    @thor_mock.expects(:say_status).once.with do |action, msg, color|
+      msg == 'foobar' && color == :blue
+    end
+    @logger.info 'foobar', :blue
+  end
+
+  [[:error, :red], [:warn, :yellow]].each do |(method, color)|
+    it "##{method} logs message with color #{color}" do
+      @thor_mock.expects(:say_status).once.with do |action, msg, col|
+        msg == "#{method} message" && col == color
+      end
+      @logger.send method, "#{method} message"
+    end
+  end
+
+  it "logs error with red" do
+    @thor_mock.expects(:say_status).once.with do |action, msg, color|
+      msg == 'foobar' && color == :red
+    end
+    @logger.error 'foobar'
+  end
+end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: middleman-webp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Juhamatti Niemelä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: middleman-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +97,7 @@ files:
 - lib/middleman-webp.rb
 - lib/middleman-webp/converter.rb
 - lib/middleman-webp/extension.rb
+- lib/middleman-webp/logger.rb
 - lib/middleman-webp/options.rb
 - lib/middleman-webp/pathname_matcher.rb
 - lib/middleman-webp/version.rb
@@ -106,6 +115,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/converter_spec.rb
 - spec/unit/extension_spec.rb
+- spec/unit/logger_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/pathname_matcher_spec.rb
 homepage: http://github.com/iiska/middleman-webp
@@ -128,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: WebP image conversion for Middleman
@@ -145,5 +155,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/converter_spec.rb
 - spec/unit/extension_spec.rb
+- spec/unit/logger_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/pathname_matcher_spec.rb