middleman-webp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6cebf6f4bd680eae44d288470a613aeb522957193a60a4f11289d6df0ac281b
-  data.tar.gz: 6f549838d63f14529001e24493aca41620baa83041841d02c912686757c69de1
+  metadata.gz: e2d9332e316e367d0a46c912bc49b1fd5e7c3d74281ab525f1ccc510db79f843
+  data.tar.gz: 98293f56a56207ad7547d29ecd64be15a01d11403d7af40b15a9d9274840fc2b
 SHA512:
-  metadata.gz: 725fb936092df4350d64e63a7940f8404d2fa50adf520ae2a39f84170d642470a3319dedab34a5faa1d472728890c6da76296f23082699fee855a7fee49d3185
-  data.tar.gz: 7751fe51a977459985f51c30df472753a9b77de96d8a38b67d017b00f9f8dbb1ae39f1de30fb3299d6c1d18086d653716e278542a50a79c98d5ebff666d02e4c
+  metadata.gz: 735b2569bfbbb132e7cd533fd4fa4258b4bbcb88a5edd68cda2ec23b05d5c71743324a2357f32ed13580e20b4606ff5ced154f002470328ded97e70405b85008
+  data.tar.gz: da7aa0c43e16c6805ba4e95d738480b607b4499684e1feae0dc62864d22f97eeb6b9622309d9d783971571b62b05676ac4c242eeb5bed036873dff2af1e6ceab

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.2
+
+- Fix logic for selecting command line args for the most precise filename
+  pattern, if multiple patterns would match
+
+## 1.0.1
+
+- Add `required_ruby_version` to gemspec.
+
 ## 1.0.0
 
 - Add support for Ruby 2.7, 3,0, 3.1, 3.2

data/lib/middleman-webp/options.rb

@@ -35,7 +35,7 @@ module Middleman
 
         return '' if matching.empty?
 
-        matching.sort { |(ga, _oa), (gb, _ob)| gb.size <=> ga.size }[0][1]
+        matching.max_by { |(pathname_matcher, _oa)| pathname_matcher }[1]
       end
 
       private

data/lib/middleman-webp/pathname_matcher.rb

@@ -1,6 +1,9 @@
 module Middleman
   module WebP
     class PathnameMatcher
+      include Comparable
+      attr_reader :pattern
+
       # Initializes matcher with given pattern.
       #
       # pattern - Pattern to match pathnames against to. May be
@@ -18,6 +21,21 @@ module Middleman
         send match_method, Pathname.new(path)
       end
 
+      # Compares matchers based on their preciness.
+      #
+      # - One with longest pattern is considered to be more precise
+      # - Glob or Regexp patterns are considered more precise than procs.
+      def <=>(other)
+        is_proc_involed = other.pattern.respond_to?(:call) || @pattern.respond_to?(:call)
+        return compare_to_proc(other) if is_proc_involed
+
+        @pattern.to_s.length <=> other.pattern.to_s.length
+      end
+
+      def hash
+        @pattern.hash
+      end
+
       private
 
       def match_method
@@ -42,6 +60,19 @@ module Middleman
       def matches_proc?(path)
         @pattern.call(path.to_s)
       end
+
+      def compare_to_proc(other)
+        i_am_proc = @pattern.respond_to?(:call)
+        other_is_proc = other.pattern.respond_to?(:call)
+
+        if i_am_proc && !other_is_proc
+          return -1
+        elsif !i_am_proc && other_is_proc
+          return 1
+        end
+
+        0
+      end
     end
   end
 end

data/lib/middleman-webp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Webp
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

data/spec/integration/extension_spec.rb

@@ -36,7 +36,7 @@ describe Middleman::WebPExtension do
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.before_build(@builder)
 
-      Dir.glob('spec/fixtures/ok-source/**/*.webp').size.must_equal 0
+      value(Dir.glob('spec/fixtures/ok-source/**/*.webp').size).must_equal 0
     end
 
     it 'generates WebP versions using external tools when option is set' do
@@ -65,7 +65,7 @@ describe Middleman::WebPExtension do
       end
       @extension.before_build(@builder)
 
-      Dir.glob('spec/fixtures/ok-source/**/*.webp').size.must_equal 2
+      value(Dir.glob('spec/fixtures/ok-source/**/*.webp').size).must_equal 2
     end
   end
 
@@ -95,7 +95,7 @@ describe Middleman::WebPExtension do
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.after_build(@builder)
 
-      Dir.glob('spec/fixtures/ok-build/**/*.webp').size.must_equal 2
+      value(Dir.glob('spec/fixtures/ok-build/**/*.webp').size).must_equal 2
     end
 
     it 'shows errors if files couldn\'t be converted' do
@@ -146,7 +146,7 @@ describe Middleman::WebPExtension do
       @extension = Middleman::WebPExtension.new(app_mock)
       @extension.after_build(@builder)
 
-      Dir.glob('spec/fixtures/dummy-build/**/*.webp').size.must_equal 0
+      value(Dir.glob('spec/fixtures/dummy-build/**/*.webp').size).must_equal 0
     end
   end
 end

data/spec/unit/converter_spec.rb

@@ -12,7 +12,7 @@ describe Middleman::WebP::Converter do
   describe '#destination_path' do
     it 'returns file name with same basename and webp suffix' do
       d = @converter.destination_path(Pathname.new('build/images/sample.jpg'))
-      d.to_s.must_equal 'build/images/sample.webp'
+      value(d.to_s).must_equal 'build/images/sample.webp'
     end
   end
 
@@ -24,52 +24,52 @@ describe Middleman::WebP::Converter do
 
     it 'returns file name with same basename and webp suffix' do
       d = @converter.destination_path(Pathname.new('build/images/sample.jpg'))
-      d.to_s.must_equal 'build/images/sample.jpg.webp'
+      value(d.to_s).must_equal 'build/images/sample.jpg.webp'
     end
   end
 
   describe '#change_percentage' do
     it 'returns how many percents smaller destination file is' do
-      @converter.change_percentage(10_000, 8746).must_equal '12.54 %'
+      value(@converter.change_percentage(10_000, 8746)).must_equal '12.54 %'
     end
 
     it 'omits zeroes in the end of decimal part' do
-      @converter.change_percentage(100, 76).must_equal '24 %'
+      value(@converter.change_percentage(100, 76)).must_equal '24 %'
     end
 
     it 'returns 0% when original and new size are both 0' do
-      @converter.change_percentage(0, 0).must_equal '0 %'
+      value(@converter.change_percentage(0, 0)).must_equal '0 %'
     end
   end
 
   describe '#number_to_human_size' do
     it 'uses human readable unit' do
-      @converter.number_to_human_size(100).must_equal '100 B'
-      @converter.number_to_human_size(1234).must_equal '1.21 KiB'
-      @converter.number_to_human_size(2_634_234).must_equal '2.51 MiB'
+      value(@converter.number_to_human_size(100)).must_equal '100 B'
+      value(@converter.number_to_human_size(1234)).must_equal '1.21 KiB'
+      value(@converter.number_to_human_size(2_634_234)).must_equal '2.51 MiB'
     end
 
     it 'handles zero size properly' do
-      @converter.number_to_human_size(0).must_equal '0 B'
+      value(@converter.number_to_human_size(0)).must_equal '0 B'
     end
   end
 
   describe '#tool_for' do
     it 'uses gif2webp for gif files' do
       path = Pathname.new('/some/path/image.gif')
-      @converter.tool_for(path).must_equal 'gif2webp'
+      value(@converter.tool_for(path)).must_equal 'gif2webp'
     end
 
     it 'uses cwebp for jpeg, png and tiff files' do
-      @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'
+      value(@converter.tool_for(Pathname('/some/path/image.jpg'))).must_equal 'cwebp'
+      value(@converter.tool_for(Pathname('/some/path/image.png'))).must_equal 'cwebp'
+      value(@converter.tool_for(Pathname('/some/path/image.tiff'))).must_equal 'cwebp'
     end
   end
 
   describe '#image_files' do
     it 'includes all image files in Middleman build dir' do
-      @converter.image_files.size.must_equal 3
+      value(@converter.image_files.size).must_equal 3
     end
 
     it 'won\'t include ignored files' do
@@ -77,7 +77,7 @@ describe Middleman::WebP::Converter do
                                                   ignore: [/jpg$/, '**/*.gif']
 
       files_to_include = [Pathname('spec/fixtures/dummy-build/empty.png')]
-      @converter.image_files.must_equal files_to_include
+      value(@converter.image_files).must_equal files_to_include
     end
 
     it 'won\'t include files rejected by given proc' do
@@ -86,7 +86,7 @@ describe Middleman::WebP::Converter do
       }
       @converter = Middleman::WebP::Converter.new @app_mock, nil, options
 
-      @converter.image_files.size.must_equal 2
+      value(@converter.image_files.size).must_equal 2
     end
   end
 end

data/spec/unit/extension_spec.rb

@@ -17,7 +17,7 @@ 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?(@builder_mock).must_equal true
+      value(@extension.dependencies_installed?(@builder_mock)).must_equal true
     end
 
     it 'returns false and displays error if cwebp is missing' do
@@ -27,7 +27,7 @@ describe Middleman::WebPExtension do
       @builder_mock.expects(:trigger).once.with do |event|
         event == :error
       end
-      @extension.dependencies_installed?(@builder_mock).must_equal false
+      value(@extension.dependencies_installed?(@builder_mock)).must_equal false
     end
 
     it 'displays error if only gif2webp is missing and returns still true' do
@@ -37,7 +37,7 @@ describe Middleman::WebPExtension do
       @builder_mock.expects(:trigger).once.with do |event, _target, msg|
         event == :webp && msg =~ /gif2webp/
       end
-      @extension.dependencies_installed?(@builder_mock).must_equal true
+      value(@extension.dependencies_installed?(@builder_mock)).must_equal true
     end
   end
 end

data/spec/unit/options_spec.rb

@@ -6,12 +6,12 @@ describe Middleman::WebP::Options do
   describe '#allow_skip' do
     it 'should default to true' do
       options = Middleman::WebP::Options.new
-      options.allow_skip.must_equal(true)
+      value(options.allow_skip).must_equal(true)
     end
 
     it 'should allow setting to true' do
       options = Middleman::WebP::Options.new(allow_skip: false)
-      options.allow_skip.must_equal(false)
+      value(options.allow_skip).must_equal(false)
     end
   end
 
@@ -29,7 +29,7 @@ describe Middleman::WebP::Options do
       options = Middleman::WebP::Options.new options_hash
 
       args = options.for(path)
-      args.must_match(/^(-q 85|-lossless) (-q 85|-lossless)$/)
+      value(args).must_match(/^(-q 85|-lossless) (-q 85|-lossless)$/)
     end
 
     it 'returns empty string when no options are defined' do
@@ -37,7 +37,7 @@ describe Middleman::WebP::Options do
       options = Middleman::WebP::Options.new
 
       args = options.for(path)
-      args.must_be_empty
+      value(args).must_be_empty
     end
 
     it 'returns cwebp args when given file matches option pattern regexp' do
@@ -52,7 +52,25 @@ describe Middleman::WebP::Options do
       options = Middleman::WebP::Options.new options_hash
 
       args = options.for(path)
-      args.must_match(/^-q 85$/)
+      value(args).must_match(/^-q 85$/)
+    end
+
+    it 'selects most precise file pattern to get file specific option overrides correctly' do
+      path = Pathname.new('lizard.jpg')
+      options_hash = {
+        conversion_options: {
+          '*.jpg' => {
+            q: 85
+          },
+          'lizard.jpg' => {
+            q: 100
+          }
+        }
+      }
+      options = Middleman::WebP::Options.new options_hash
+
+      args = options.for(path)
+      value(args).must_match(/^-q 100$/)
     end
   end
 end

data/spec/unit/pathname_matcher_spec.rb

@@ -14,7 +14,7 @@ describe Middleman::WebP::PathnameMatcher do
       patterns.each do |p|
         matcher = Middleman::WebP::PathnameMatcher.new(p)
         files.each do |f|
-          matcher.matches?(f).must_equal true, "Pattern: #{p.inspect}, "\
+          value(matcher.matches?(f)).must_equal true, "Pattern: #{p.inspect}, "\
           "file: #{f.inspect}"
         end
       end
@@ -31,7 +31,7 @@ describe Middleman::WebP::PathnameMatcher do
       patterns.each do |p|
         matcher = Middleman::WebP::PathnameMatcher.new(p)
         files.each do |f|
-          matcher.matches?(f).must_equal false, "Pattern: #{p.inspect}, "\
+          value(matcher.matches?(f)).must_equal false, "Pattern: #{p.inspect}, "\
           "file: #{f.inspect}"
         end
       end
@@ -46,7 +46,7 @@ describe Middleman::WebP::PathnameMatcher do
 
       matcher = Middleman::WebP::PathnameMatcher.new
       paths.each do |p|
-        matcher.matches?(p).must_equal true
+        value(matcher.matches?(p)).must_equal true
       end
     end
 
@@ -54,4 +54,32 @@ describe Middleman::WebP::PathnameMatcher do
       Middleman::WebP::PathnameMatcher.new('*.jpg').matches? nil
     end
   end
+
+  describe '#<=>' do
+    it 'sorts by pattern length' do
+      patterns = ['*.jpg', 'really_long_example_name.jpg', %r{^images/.*\.jpg$}]
+      matchers = patterns.map { |p| Middleman::WebP::PathnameMatcher.new(p) }
+
+      sorted_matchers = matchers.sort
+
+      value(sorted_matchers.map(&:pattern)).must_equal(patterns.sort_by { |p| p.to_s.length })
+    end
+
+    it 'sorts proc pattern smaller than string' do
+      patterns = ['*.jpg', Proc.new { |p| p == 'jpg' }, %r{^images/.*\.jpg$}]
+      matchers = patterns.map { |p| Middleman::WebP::PathnameMatcher.new(p) }
+      min_value = matchers.min
+
+      value(min_value.pattern).must_equal(patterns[1])
+    end
+
+    it 'considers any procs equal' do
+      proc1 = Proc.new { |p| p == 'jpg' }
+      proc2 = Proc.new { |p| p == 'png' }
+      matcher1 = Middleman::WebP::PathnameMatcher.new(proc1)
+      matcher2 = Middleman::WebP::PathnameMatcher.new(proc2)
+
+      value(matcher1 <=> matcher2).must_equal 0
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-webp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Juhamatti Niemelä
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core