image_optim 0.31.2 → 0.31.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7197f37a1a5cd0a61248ccd4ef6b08f2c05ff8f084866da48f76b038bac4e4ec
-  data.tar.gz: 7be50ee48142fd8775022855624a7ea642436b11d8ca260f322742a7814d513a
+  metadata.gz: edffa5fea26babe4654e681a829753b7df3d5d80a158a7b3d2974e97b46a49a5
+  data.tar.gz: 467cdc261c726ac97b5252b6b93507e4fac6e5d3804bd7fc17636ba32a6f565a
 SHA512:
-  metadata.gz: 02dbbb2520b6250fc2a5262c2c0524a42519e3a969683efe95b384f0e0cc5b4247638e74e5766ce016ccc462f3646f3ab7e7bf363299b1f6e79894b59af69df2
-  data.tar.gz: 6673410e57ba7e01f0f146678f2b74e8bbdcd97ccccb320679f24acb860ea46be229b2184383ee59e5a7bac6a4977f506e113a68bf53f975c1b296e9e28310d1
+  metadata.gz: '0379e12d0d4ef8dd0af9e047a728bc9acf0177136b83b9b4aced834238067d0ab3248350bc1813cc76b33eaa3fc5751032a72c14f03a81d3dad9eed61abb0b99'
+  data.tar.gz: 68489aa06564d6f8555adf409c23454fb4b9d57fa74117cd9b1174787ad65bc56a101a8cce9e455ba0e3474f1a1b7e8c8b9707549768be1bb3a94a063c200721

data/.github/workflows/check.yml

@@ -20,12 +20,12 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
-        - jruby-9.2
+        - '3.2'
         - jruby-9.3
         - jruby-9.4
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
@@ -43,9 +43,11 @@ jobs:
         - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
       fail-fast: false
+    continue-on-error: ${{ matrix.ruby == '3.2' }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
@@ -70,10 +72,10 @@ jobs:
     env:
       CC_TEST_REPORTER_ID: b433c6540d220a2da0663670c9b260806bafdb3a43c6f22b2e81bfb1f87b12fe
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1'
+        ruby-version: '3'
         bundler-cache: true
     - run: sudo npm install -g svgo
     - run: curl -L "https://github.com/shssoichiro/oxipng/releases/download/v4.0.3/oxipng-4.0.3-x86_64-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin --strip-components 1 --wildcards '*oxipng'

data/.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         language: [ 'ruby' ]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - uses: github/codeql-action/init@v1
       with:

data/.github/workflows/rubocop.yml

@@ -8,9 +8,9 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1'
+        ruby-version: '3'
         bundler-cache: true
     - run: bundle exec rubocop

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.31.3 (2023-02-17)
+
+* Support Psych4/Ruby 3.1 changes to use safe_yaml methods by default [#203](https://github.com/toy/image_optim/issues/203) [#204](https://github.com/toy/image_optim/pull/204) [@oscillot](https://github.com/oscillot) [@toy](https://github.com/toy)
+
 ## v0.31.2 (2022-11-27)
 
 * Support jruby 9.4 [@toy](https://github.com/toy)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2022 Ivan Kuchin
+Copyright (c) 2012-2023 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,7 +1,7 @@
 [![Gem Version](https://img.shields.io/gem/v/image_optim?logo=rubygems)](https://rubygems.org/gems/image_optim)
-[![Build Status](https://img.shields.io/github/workflow/status/toy/image_optim/check/master?logo=github)](https://github.com/toy/image_optim/actions/workflows/check.yml)
-[![Rubocop](https://img.shields.io/github/workflow/status/toy/image_optim/rubocop/master?label=rubocop&logo=rubocop)](https://github.com/toy/image_optim/actions/workflows/rubocop.yml)
-[![CodeQL](https://img.shields.io/github/workflow/status/toy/image_optim/codeql/master?label=codeql&logo=github)](https://github.com/toy/image_optim/actions/workflows/codeql.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/toy/image_optim/check.yml?logo=github)](https://github.com/toy/image_optim/actions/workflows/check.yml)
+[![Rubocop](https://img.shields.io/github/actions/workflow/status/toy/image_optim/rubocop.yml?label=rubocop&logo=rubocop)](https://github.com/toy/image_optim/actions/workflows/rubocop.yml)
+[![CodeQL](https://img.shields.io/github/actions/workflow/status/toy/image_optim/codeql.yml?label=codeql&logo=github)](https://github.com/toy/image_optim/actions/workflows/codeql.yml)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
 [![Code Climate Coverage](https://img.shields.io/codeclimate/coverage/toy/image_optim?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim)
 [![Depfu](https://img.shields.io/depfu/toy/image_optim)](https://depfu.com/github/toy/image_optim)
@@ -390,4 +390,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2022 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2023 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.31.2'
+  s.version     = '0.31.3'
   s.summary     = %q{Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, oxipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim/cache.rb

@@ -42,7 +42,7 @@ class ImageOptim
       if optimized
         tmp = FSPath.temp_file_path(digest, @cache_dir)
         FileUtils.mv(optimized, tmp)
-        tmp.chmod(0o666 & ~File.umask)
+        tmp.chmod(~File.umask & 0o666)
         tmp.rename(cached)
         cached_path = CachePath.convert(cached)
 

data/lib/image_optim/config.rb

@@ -33,7 +33,7 @@ class ImageOptim
         end
         return {} unless File.size?(full_path)
 
-        config = YAML.load_file(full_path)
+        config = load_yaml_file(full_path)
         unless config.is_a?(Hash)
           fail "expected hash, got #{config.inspect}"
         end
@@ -43,6 +43,14 @@ class ImageOptim
         warn "exception when reading #{full_path}: #{e}"
         {}
       end
+
+      def load_yaml_file(path)
+        if YAML.respond_to?(:safe_load_file)
+          YAML.safe_load_file(path, permitted_classes: [Range])
+        else
+          YAML.load_file(path)
+        end
+      end
     end
 
     # Merge config from files with passed options

data/lib/image_optim/runner/option_parser.rb

@@ -202,13 +202,13 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
       type, marking = case
       when [TrueClass, FalseClass, ImageOptim::TrueFalseNil].include?(type)
         [type, 'B']
-      when Integer >= type
+      when type <= Integer
         [Integer, 'N']
-      when Array >= type
+      when type <= Array
         [Array, 'a,b,c']
-      when String >= type
+      when type <= String
         [String, 'S']
-      when ImageOptim::NonNegativeIntegerRange == type
+      when type == ImageOptim::NonNegativeIntegerRange
         [type, 'M-N']
       else
         fail "Unknown type #{type}"

data/lib/image_optim/runner.rb

@@ -38,7 +38,7 @@ class ImageOptim
         if size_a == size_b
           "------ #{Space::EMPTY_SPACE}"
         else
-          percent = 100 - (100.0 * size_b / size_a)
+          percent = 100 - (size_b * 100.0 / size_a)
           space = Space.space(size_a - size_b)
           format('%5.2f%% %s', percent, space)
         end

data/lib/image_optim/space.rb

@@ -6,7 +6,7 @@ class ImageOptim
     SIZE_SYMBOLS = %w[B K M G T P E].freeze
     BASE = 1024.0
     PRECISION = 1
-    LENGTH = 4 + PRECISION + 1
+    LENGTH = PRECISION + 4 + 1
 
     EMPTY_SPACE = ' ' * LENGTH
 

data/spec/files/config_with_range.yaml

@@ -0,0 +1,3 @@
+range: !ruby/range 80..99
+number: 3
+string: foo

data/spec/image_optim/config_spec.rb

@@ -223,7 +223,7 @@ describe ImageOptim::Config do
         with(path).and_return(full_path)
       expect(File).to receive(:size?).
         with(full_path).and_return(true)
-      expect(YAML).to receive(:load_file).
+      expect(IOConfig).to receive(:load_yaml_file).
         with(full_path).and_return(stringified)
 
       expect(IOConfig.read_options(path)).to eq(symbolized)
@@ -235,7 +235,7 @@ describe ImageOptim::Config do
         with(path).and_return(full_path)
       expect(File).to receive(:size?).
         with(full_path).and_return(true)
-      expect(YAML).to receive(:load_file).
+      expect(IOConfig).to receive(:load_yaml_file).
         with(full_path).and_return([:config])
 
       expect(IOConfig.read_options(path)).to eq({})
@@ -247,10 +247,46 @@ describe ImageOptim::Config do
         with(path).and_return(full_path)
       expect(File).to receive(:size?).
         with(full_path).and_return(true)
-      expect(YAML).to receive(:load_file).
+      expect(IOConfig).to receive(:load_yaml_file).
         with(full_path).and_raise
 
       expect(IOConfig.read_options(path)).to eq({})
     end
   end
+
+  describe '.load_yaml_file' do
+    describe 'selecting method' do
+      let(:path){ 'foo' }
+      let(:result){ 'bar' }
+      let(:yaml){ double }
+
+      before do
+        stub_const('YAML', yaml)
+      end
+
+      it 'uses YAML.safe_load_file if available' do
+        expect(yaml).to receive(:safe_load_file).
+          with(path, permitted_classes: [Range]).and_return(result)
+
+        expect(IOConfig.load_yaml_file(path)).to eq(result)
+      end
+
+      it 'uses YAML.load if safe_load_file is not available' do
+        expect(yaml).to receive(:load_file).
+          with(path).and_return(result)
+
+        expect(IOConfig.load_yaml_file(path)).to eq(result)
+      end
+    end
+
+    it 'handles yaml that includes `!ruby/range`' do
+      path = 'spec/files/config_with_range.yaml'
+
+      expect(IOConfig.load_yaml_file(path)).to eq({
+        'range' => 80..99,
+        'number' => 3,
+        'string' => 'foo',
+      })
+    end
+  end
 end

data/spec/image_optim_spec.rb

@@ -121,9 +121,9 @@ describe ImageOptim do
       it 'sends timeout to every worker' do
         some_path = instance_of(ImageOptim::Path)
 
-        expect(workers[0]).to receive(:optimize).with(some_path, some_path, timeout: timer)
-        expect(workers[1]).to receive(:optimize).with(some_path, some_path, timeout: timer)
-        expect(workers[2]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+        expect(workers[0]).to receive(:optimize).with(some_path, some_path, {timeout: timer})
+        expect(workers[1]).to receive(:optimize).with(some_path, some_path, {timeout: timer})
+        expect(workers[2]).to receive(:optimize).with(some_path, some_path, {timeout: timer})
 
         image_optim.optimize_image(path)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.31.3
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -232,6 +232,7 @@ files:
 - script/template/worker_analysis.erb
 - script/update_worker_options_in_readme
 - script/worker_analysis
+- spec/files/config_with_range.yaml
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
 - spec/image_optim/bin_resolver_spec.rb
@@ -292,7 +293,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim/issues
   changelog_uri: https://github.com/toy/image_optim/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.2
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.31.3
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -319,6 +320,7 @@ summary: Command line tool and ruby interface to optimize (lossless compress, op
   jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, oxipng, pngcrush,
   pngout, pngquant, svgo)
 test_files:
+- spec/files/config_with_range.yaml
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
 - spec/image_optim/bin_resolver_spec.rb