rmagick 4.1.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb35ff56e69891085d8751cc08d6f6d4f1e70791afe76012ea869b6922551ab6
-  data.tar.gz: 0b64498e6b29eca46efa64f1011045728c9708d098868f0de0ffdc0d103cfc02
+  metadata.gz: 0f03e7c8f9a11d13e6d238c0f9af950c6024f42318c7f877fdedf8754d08afa9
+  data.tar.gz: 8c37ca64ae0b07f2dbf05b8e1bbe670510ca702434a214bee4346d4e89ea86ca
 SHA512:
-  metadata.gz: 8d9ff646c80d9ee524c001e5da165e5b0712fd8cf662d5a37bcfb28a5453d49ce3859f8b0c1b5324974203deb3b720d0c1ace2a405efae8b1e5e491b30d0a031
-  data.tar.gz: 3e75993a946eb0547d69ef8fa0c66eee8226e72658bc609eba07f405bd6ac22ac4794de5891a21a9466994f1e0254cb7770974666f47d37eba6500ab1962b47a
+  metadata.gz: 64f6253d514ccc95f5dc1d2adcecdee8ccac2590eb113cf1f669b0381656ab3d021f358e394c7477635f2a92a44280ea67fb9c696d6542c6c64329341ba1f746
+  data.tar.gz: 5218852ac35cf26aecb5d8507921da099fb89c642bdf8d3663f2c7022171a9d36a1a96d2b193d688a3be8aa8c6543999e8ea84d1d0f992dbb97ef64cc7d7fe73

data/.github/workflows/ci.yml

@@ -3,10 +3,9 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-    branches:
-      - master
+  workflow_dispatch:
 
 jobs:
   lint:
@@ -17,14 +16,7 @@ jobs:
     - name: Set up Ruby 2.3
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: 2.3
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-linux-2.3-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-linux-2.3-${{ hashFiles('rmagick.gemspec') }}
+        ruby-version: '2.3'
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -35,23 +27,16 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
+          - { full: 6.9.12-15, major-minor: '6.9' }
+          - { full: 7.1.0-0, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
-    - name: Cache ImageMagick
-      uses: actions/cache@v1
-      with:
-        path: ./build-ImageMagick
-        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
-        restore-keys: |
-          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -60,13 +45,6 @@ jobs:
       run: |
         export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
         ./before_install_linux.sh
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-linux-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-linux-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
@@ -74,23 +52,17 @@ jobs:
 
   test-macos:
     runs-on: macos-latest
+    timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7]
+        ruby-version: ['2.6', '2.7', '3.0']
         imagemagick-version:
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
+          - { full: 6.9.12-15, major-minor: '6.9' }
+          - { full: 7.1.0-0, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
-    - name: Cache ImageMagick
-      uses: actions/cache@v1
-      with:
-        path: ./build-ImageMagick
-        key: v1-macos-imagemagick-${{ matrix.imagemagick-version.full }}
-        restore-keys: |
-          v1-macos-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -98,44 +70,7 @@ jobs:
     - name: Update/Install packages
       run: |
         IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }} ./before_install_osx.sh
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-macos-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-macos-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
     - name: Build and test with Rake
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
         bundle exec rake
-
-  test-windows:
-    runs-on: windows-latest
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
-        imagemagick-version:
-          - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-6, major-minor: '6.9' }
-          - { full: 7.0.10-6, major-minor: '7.0' }
-    name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-    - name: Install ImageMagick
-      run: |
-        $imagemagick_version = "${{ matrix.imagemagick-version.full }}"
-        $imagemagick_version_without_patch = $imagemagick_version.split("-")[0]
-        $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
-        $url = "https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/$($installer_name)"
-        choco install wget ghostscript
-        wget $url --progress=dot
-        cmd.exe /D /S /C "$($installer_name) /DIR=D:\ImageMagick /VERYSILENT /TASKS=install_Devel"
-    - name: Build and test with Rake
-      run: |
-        cmd.exe /D /S /C "SET MAKE=make & SET PATH=D:\ImageMagick;%PATH% & bundle install --path=vendor/bundle --retry 3 & bundle exec rake"

data/.rubocop_todo.yml

@@ -1,11 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-02-09 10:55:21 -0800 using RuboCop version 0.68.1.
+# on 2020-10-10 21:34:21 +0900 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'rmagick.gemspec'
+
 # Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: Categories, ExpectedOrder.
@@ -49,16 +57,20 @@ Layout/MultilineMethodArgumentLineBreaks:
     - 'lib/rmagick_internal.rb'
 
 # Offense count: 1
-Lint/EmptyWhen:
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
   Exclude:
-    - 'lib/rvg/misc.rb'
+    - 'rmagick.gemspec'
 
-# Offense count: 2
-Lint/HandleExceptions:
+# Offense count: 1
+Lint/EmptyWhen:
   Exclude:
-    - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/misc.rb'
 
 # Offense count: 94
+# Cop supports --auto-correct.
 Lint/NumberConversion:
   Exclude:
     - 'doc/ex/get_pixels.rb'
@@ -74,21 +86,34 @@ Lint/NumberConversion:
     - 'spec/rmagick/enum/to_i_spec.rb'
     - 'spec/rmagick/image/export_pixels_spec.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantStringCoercion:
+  Exclude:
+    - 'spec/rmagick/font/initialize_spec.rb'
+
 # Offense count: 1
 Lint/RescueException:
   Exclude:
     - 'lib/rmagick_internal.rb'
 
+# Offense count: 1
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/rmagick_internal.rb'
+
 # Offense count: 1
 Lint/UselessComparison:
   Exclude:
     - 'spec/rmagick/enum/case_equality_spec.rb'
 
-# Offense count: 44
+# Offense count: 45
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 537
 
-# Offense count: 75
+# Offense count: 77
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
@@ -102,13 +127,14 @@ Metrics/BlockNesting:
 # Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 467
+  Max: 460
 
 # Offense count: 21
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 42
 
-# Offense count: 57
+# Offense count: 55
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 146
@@ -119,6 +145,7 @@ Metrics/ParameterLists:
   Max: 8
 
 # Offense count: 15
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 40
 
@@ -169,62 +196,29 @@ Naming/FileName:
     - 'doc/ex/quantize-m.rb'
 
 # Offense count: 4
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
     - 'lib/rvg/misc.rb'
     - 'lib/rvg/transformable.rb'
 
-# Offense count: 224
+# Offense count: 222
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
   Enabled: false
 
-# Offense count: 439
+# Offense count: 421
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 556
+# Offense count: 539
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 72
 
-# Offense count: 5
-RSpec/Pending:
-  Exclude:
-    - 'spec/rmagick/draw/marshal_dump_spec.rb'
-    - 'spec/rmagick/image/changed_predicate_spec.rb'
-    - 'spec/rmagick/image/liquid_rescale_spec.rb'
-    - 'spec/rmagick/image/read_spec.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/Date:
-  Exclude:
-    - 'doc/ex/polaroid.rb'
-    - 'rmagick.gemspec'
-
-# Offense count: 7
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
-Rails/Output:
-  Exclude:
-    - 'lib/rvg/deep_equal.rb'
-    - 'lib/rvg/rvg.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'Rakefile'
-    - 'ext/RMagick/extconf.rb'
-
 # Offense count: 4
 Security/MarshalLoad:
   Exclude:
@@ -249,62 +243,105 @@ Style/CaseEquality:
 Style/CommentedKeyword:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 126
 Style/ConstantVisibility:
   Exclude:
+    - 'examples/histogram.rb'
+    - 'ext/RMagick/extconf.rb'
+    - 'lib/rmagick/version.rb'
     - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/misc.rb'
+    - 'lib/rvg/rvg.rb'
+    - 'lib/rvg/stylable.rb'
+    - 'spec/support/helpers.rb'
 
-# Offense count: 802
+# Offense count: 809
 # Cop supports --auto-correct.
 # Configuration parameters: Notice, AutocorrectNotice.
 Style/Copyright:
   Enabled: false
 
-# Offense count: 36
+# Offense count: 37
 Style/Documentation:
   Enabled: false
 
-# Offense count: 77
+# Offense count: 72
 # Configuration parameters: RequireForNonPublicMethods.
 Style/DocumentationMethod:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'Rakefile'
+    - 'doc/ex/ViewBox.rb'
+    - 'doc/ex/sparse_color.rb'
+    - 'examples/histogram.rb'
+    - 'examples/pattern_fill.rb'
+    - 'ext/RMagick/extconf.rb'
+    - 'lib/rmagick_internal.rb'
+    - 'lib/rvg/container.rb'
+    - 'lib/rvg/deep_equal.rb'
+    - 'lib/rvg/embellishable.rb'
+    - 'lib/rvg/misc.rb'
+    - 'lib/rvg/stylable.rb'
+    - 'lib/rvg/transformable.rb'
+    - 'lib/rvg/units.rb'
 
-# Offense count: 192
+# Offense count: 208
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   Exclude:
+    - 'doc/ex/colors.rb'
+    - 'doc/ex/fonts.rb'
+    - 'doc/ex/implode.rb'
+    - 'doc/ex/stegano.rb'
     - 'examples/identify.rb'
-    - 'ext/RMagick/extconf.rb'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/pathdata.rb'
 
-# Offense count: 801
+# Offense count: 808
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 36
+# Offense count: 42
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
     - 'ext/RMagick/extconf.rb'
 
-# Offense count: 4
+# Offense count: 12
+# Cop supports --auto-correct.
+Style/HashEachMethods:
+  Exclude:
+    - 'doc/ex/preview.rb'
+    - 'spec/rmagick/image/auto_orient_spec.rb'
+    - 'spec/rmagick/image/channel_spec.rb'
+    - 'spec/rmagick/image/colorspace_spec.rb'
+    - 'spec/rmagick/image/info/colorspace_spec.rb'
+    - 'spec/rmagick/image/info/compression_spec.rb'
+    - 'spec/rmagick/image/info/dispose_spec.rb'
+    - 'spec/rmagick/image/info/gravity_spec.rb'
+    - 'spec/rmagick/image/info/image_type_spec.rb'
+    - 'spec/rmagick/image/info/interlace_spec.rb'
+    - 'spec/rmagick/image/info/orientation_spec.rb'
+    - 'spec/rmagick/image/info/units_spec.rb'
+
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
     - 'ext/RMagick/extconf.rb'
 
-# Offense count: 170
+# Offense count: 148
 Style/InlineComment:
   Enabled: false
 
-# Offense count: 4963
+# Offense count: 4804
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoreMacros, IgnoredMethods, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
+# Configuration parameters: IgnoreMacros, IgnoredMethods, IgnoredPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
 Style/MethodCallWithArgsParentheses:
   Enabled: false
@@ -343,7 +380,7 @@ Style/MixinUsage:
     - 'examples/thumbnail.rb'
     - 'examples/vignette.rb'
 
-# Offense count: 151
+# Offense count: 152
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -360,10 +397,17 @@ Style/NumericPredicate:
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/embellishable.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'examples/histogram.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/rmagick_internal.rb'
@@ -390,16 +434,16 @@ Style/StringHashKeys:
     - 'lib/rvg/misc.rb'
     - 'spec/rmagick/image/properties_spec.rb'
 
-# Offense count: 158
+# Offense count: 226
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 884
+# Offense count: 975
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 250
+Layout/LineLength:
+  Max: 217

data/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.2.3
+
+Bug Fixes
+
+- Re-add block syntax deprecation warning and fix in RMagick source (#1279) (#1280)
+- Doc: Replace Magick::Montage with Magick::ImageList::Montage (#1281)
+- Update shadow example (#1297)
+- Escape the backslashes in windows error message (#1298)
+- Also set the alpha value of the target pixel (#1299)
+- Set alpha_trait to BlendPixelTrait when the alpha value of the pixel is not opaque. (#1300)
+
+## RMagick 4.2.2
+
+Bug Fixes:
+
+- Remove deprecation warning about block syntax (#1272)
+
+You are still recommended to use the block parameter instead of `self.` but
+we're silencing the deprecation warning until we can get RMagick's code up to
+that standard.
+
+## RMagick 4.2.1
+
+Bug Fixes:
+
+- Fix compilation with optimization on glibc (#1263)
+
+## RMagick 4.2.0
+
+This adds a deprecation warning when using a block for image operations.
+Instead of setting properties on `self`, you should accept a block argument and
+modify that instead. In a future version we we no longer be binding the block
+to the image.
+
+```diff
+- img.to_blob { self.quality = 75 }
++ img.to_blob { |image| image.quality = 75 }
+```
+
+Improvements:
+
+- Updated error messages if runtime ImageMagick version was not matched with when installed rmagick (#1213)
+- Improve Image#resize performance with ImageMagick 7 (#1240)
+- Added new colorspaces (#1252)
+
+Bug Fixes:
+
+- Fix assertion failed in Magick::TextureFill.new with with unexpected argument (#1216)
+- Call with yield when there is a block arguments (#701)
+- Avoid crash with monitor feature on Ruby 3.0  (#1253)
+
 ## RMagick 4.1.2
 
 Bug Fixes: