middleman-imageoptim 0.2.1 → 0.3.0

data/gemfiles/{middleman_3.2.gemfile → middleman_4.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "middleman", "~> 3.2.0"
+gem "middleman", "~> 4.2.0"
 
 gemspec :path => "../"

data/gemfiles/middleman_4.2.gemfile.lock

@@ -0,0 +1,225 @@
+PATH
+  remote: ../
+  specs:
+    middleman-imageoptim (0.2.1)
+      image_optim (~> 0.20.2)
+      image_optim_pack (~> 0.2.1)
+      middleman-cli
+      middleman-core (>= 3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    ast (2.3.0)
+    backports (3.6.8)
+    builder (3.2.2)
+    capybara (2.11.0)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.1)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.4)
+    contracts (0.13.0)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    dotenv (2.1.1)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    exifr (1.2.5)
+    fast_blank (1.0.0)
+    fastimage (2.0.1)
+      addressable (~> 2)
+    ffi (1.9.14)
+    fspath (2.1.1)
+    gherkin (4.0.0)
+    haml (4.0.7)
+      tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (3.4.6)
+    i18n (0.7.0)
+    image_optim (0.20.2)
+      exifr (~> 1.1, >= 1.1.3)
+      fspath (~> 2.1)
+      image_size (~> 1.3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_optim_pack (0.2.3)
+      fspath (>= 2.1, < 4)
+      image_optim (~> 0.19)
+    image_size (1.5.0)
+    in_threads (1.3.1)
+    json (2.0.2)
+    kramdown (1.13.2)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    memoist (0.15.0)
+    method_source (0.8.2)
+    middleman (4.2.0)
+      coffee-script (~> 2.2)
+      compass-import-once (= 1.0.5)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-cli (= 4.2.0)
+      middleman-core (= 4.2.0)
+      sass (>= 3.4.0, < 4.0)
+    middleman-cli (4.2.0)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.2.0)
+      activesupport (>= 4.2, < 5.1)
+      addressable (~> 2.3)
+      backports (~> 3.6)
+      bundler (~> 1.1)
+      contracts (~> 0.13.0)
+      dotenv
+      erubis
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
+      i18n (~> 0.7.0)
+      listen (~> 3.0.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.13.0)
+      parallel
+      rack (>= 1.4.5, < 3)
+      sass (>= 3.4)
+      servolux
+      tilt (~> 2.0)
+      uglifier (~> 3.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    padrino-helpers (0.13.3.3)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.13.3.3)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.13.3.3)
+      activesupport (>= 3.1)
+    parallel (1.10.0)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    progress (3.2.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    sass (3.4.23)
+    servolux (0.12.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.1.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba
+  capybara
+  cucumber
+  middleman (~> 4.2.0)
+  middleman-imageoptim!
+  pry
+  rake
+  rspec (>= 3.0.0)
+  rspec-its
+  rubocop
+  simplecov
+
+BUNDLED WITH
+   1.13.7

data/lib/middleman-imageoptim/manifest.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Imageoptim
     class Manifest
-      MANIFEST_FILENAME = 'imageoptim.manifest.yml'
+      MANIFEST_FILENAME = 'imageoptim.manifest.yml'.freeze
 
       attr_reader :app
 
@@ -10,7 +10,15 @@ module Middleman
       end
 
       def path
-        File.join(app.build_dir, MANIFEST_FILENAME)
+        File.join(build_dir, MANIFEST_FILENAME)
+      end
+
+      def build_dir
+        if Gem::Version.new(Middleman::VERSION) >= Gem::Version.new('4.0.0')
+          app.config[:build_dir]
+        else
+          app.build_dir
+        end
       end
 
       def build_and_write(new_resources)

data/lib/middleman-imageoptim/manifest_resource.rb

@@ -1,4 +1,5 @@
 require 'middleman-core/application'
+require 'middleman-core/sitemap/resource'
 
 module Middleman
   module Imageoptim
@@ -25,10 +26,6 @@ module Middleman
         false
       end
 
-      def metadata
-        @local_metadata.dup
-      end
-
       private
 
       def manifest_content

data/lib/middleman-imageoptim/optimizer.rb

@@ -72,11 +72,27 @@ module Middleman
       end
 
       def build_files
-        ::Middleman::Util.all_files_under(app.build_dir)
+        ::Middleman::Util.all_files_under(build_dir)
+      end
+
+      def build_dir
+        if Gem::Version.new(Middleman::VERSION) >= Gem::Version.new('4.0.0')
+          app.config[:build_dir]
+        else
+          app.build_dir
+        end
       end
 
       def say_status(status, interpolations = {})
-        builder.say_status(:imageoptim, status % interpolations) if builder
+        builder_thor.say_status(:imageoptim, status % interpolations) if builder
+      end
+
+      def builder_thor
+        if Gem::Version.new(Middleman::VERSION) >= Gem::Version.new('4.0.0')
+          builder.thor
+        else
+          builder
+        end
       end
 
       def optimizer

data/lib/middleman-imageoptim/options.rb

@@ -7,7 +7,7 @@ module Middleman
       EXTENSION_OPTIONS = [
         :image_extensions,
         :manifest
-      ]
+      ].freeze
       OPTIONS = {
         advpng: { level: 4 },
         allow_lossy: false,
@@ -25,7 +25,7 @@ module Middleman
         svgo: {},
         threads: true,
         verbose: false
-      }
+      }.freeze
 
       attr_accessor *OPTIONS.keys.map(&:to_sym)
 

data/lib/middleman-imageoptim/resource_list.rb

@@ -25,7 +25,7 @@ module Middleman
             Middleman::Sitemap::Resource.new(
               app.sitemap,
               resource.destination_path,
-              File.join(app.build_dir, resource.destination_path)
+              filename(resource.destination_path)
             )
           else
             resource
@@ -35,8 +35,8 @@ module Middleman
 
       def manifest_resource
         resource_args = [app.sitemap, Manifest::MANIFEST_FILENAME]
-        if File.exist?(File.join(app.build_dir, Manifest::MANIFEST_FILENAME))
-          resource_args << File.join(app.build_dir, Manifest::MANIFEST_FILENAME)
+        if File.exist?(filename(Manifest::MANIFEST_FILENAME))
+          resource_args << filename(Manifest::MANIFEST_FILENAME)
         end
         Middleman::Imageoptim::ManifestResource.new(*resource_args)
       end
@@ -65,7 +65,15 @@ module Middleman
       end
 
       def resource_build_path(resource)
-        File.join(app.build_dir, resource.destination_path)
+        filename(resource.destination_path)
+      end
+
+      def filename(filename)
+        if Gem::Version.new(Middleman::VERSION) >= Gem::Version.new('4.0.0')
+          File.join(app.root, app.config[:build_dir], filename)
+        else
+          File.join(app.config[:build_dir], filename)
+        end
       end
     end
   end

data/lib/middleman-imageoptim/utils.rb

@@ -24,7 +24,7 @@ module Middleman
           max_exp  = units.size - 1
           exponent = (Math.log(bytes) / Math.log(1024)).to_i
           exponent = max_exp if exponent > max_exp
-          bytes  /= 1024**exponent
+          bytes /= 1024**exponent
         end
         "#{bytes}#{units[exponent]}"
       end

data/lib/middleman-imageoptim/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   module Imageoptim
-    PACKAGE = 'middleman-imageoptim'
-    VERSION = '0.2.1'
+    PACKAGE = 'middleman-imageoptim'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/middleman-imageoptim.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'middleman-core', ['>= 3.1']
-  gem.add_dependency 'image_optim', '~> 0.20.2'
+  gem.add_dependency 'middleman-cli'
+  gem.add_dependency 'image_optim', '~> 0.25.0'
   gem.add_dependency 'image_optim_pack', '~> 0.2.1'
 
   gem.add_development_dependency 'appraisal'
@@ -28,5 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '>= 3.0.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,181 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: middleman-imageoptim
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2019-03-16 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.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: middleman-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   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: appraisal
   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: aruba
   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: cucumber
   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: pry
   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: rake
   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: 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:
-    - - '>='
+    - - ">="
       - !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: 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: capybara
+  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:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Small images are small! Compress yours during middleman build.
@@ -185,12 +213,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .simplecov
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
@@ -205,14 +233,12 @@ files:
 - fixtures/basic-app/config.rb
 - fixtures/basic-app/source/images/oh_my_glob.gif
 - fixtures/basic-app/source/images/table.jpg
-- gemfiles/middleman_3.1.gemfile
-- gemfiles/middleman_3.1.gemfile.lock
-- gemfiles/middleman_3.2.gemfile
-- gemfiles/middleman_3.2.gemfile.lock
-- gemfiles/middleman_3.3.gemfile
-- gemfiles/middleman_3.3.gemfile.lock
-- gemfiles/middleman_4.0_pre.gemfile
-- gemfiles/middleman_4.0_pre.gemfile.lock
+- gemfiles/middleman_4.0.gemfile
+- gemfiles/middleman_4.0.gemfile.lock
+- gemfiles/middleman_4.1.gemfile
+- gemfiles/middleman_4.1.gemfile.lock
+- gemfiles/middleman_4.2.gemfile
+- gemfiles/middleman_4.2.gemfile.lock
 - lib/middleman-imageoptim.rb
 - lib/middleman-imageoptim/extension.rb
 - lib/middleman-imageoptim/manifest.rb
@@ -239,19 +265,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Small images are small! Compress yours during middleman build.
 test_files: []
-has_rdoc: