rmagick 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd337e9bbc5418733d68fb0b173aae4c8cf672e6184eff29d48cc5d959cc06b
-  data.tar.gz: befad5f9253eb21d4002d26f640b3c9ef724079992513f50416f784e141ae19e
+  metadata.gz: 96745ee737289beea230f6938180f10253f9690f28c21a03b07ea7df164e5846
+  data.tar.gz: 8351b6da6dda4c130f02dbb277d51eb3fe7ba36bd79b01808fd01c35a2c94fc0
 SHA512:
-  metadata.gz: 657c9b91d6c0294737254d219c096d778bbefdd49f281eb5ba8dca547aa2834aaaa671a8d35f9c759088878df296b7b0a165e4d8c2506f7d4a1b1928250ad85f
-  data.tar.gz: b9b4938b08d4f0af87d09500e04164ece6da1e383449831d3f36491140fb8ffda46a18df552972061d932584e849776ad1f9d386a9354faf36f600138cec319d
+  metadata.gz: aaa120df0f261f860032f3246e6545e3bbe410dfe9af5ed4b9f134d0ac486f4fb39f7c1e5dcb0812b18fdd1ac58a4ebb19607165cdf9d4accbeae652adbc08b9
+  data.tar.gz: d93e71faffdbf46febc6f26701fac9fa87e2f48ab683aab3333455388a17bc7ebe8da23875cf37844e53b38530b5d6429e489cf392bb12b773184857f3e4fcf2

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-17"
+      "IMAGEMAGICK_VERSION": "6.9.13-25"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "7.1.1-39"
+      "IMAGEMAGICK_VERSION": "7.1.1-47"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.github/ISSUE_TEMPLATE/report.yml

@@ -0,0 +1,40 @@
+name: Report
+description: Create a report.
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A description of the bug or feature.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: |
+        List of steps, sample code, failing test or link to a project that reproduces the behavior.
+        Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: System Configuration
+      description: Tell us about the environment where you are experiencing the bug.
+      value: |
+        - ImageMagick version:
+        - RMagick version:
+        - Ruby version:
+        - Environment (Operating system, version and so on):
+        - Additional information:
+      render: markdown
+    validations:
+      required: true
+  - type: textarea
+    id: addtional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false

data/.github/workflows/ci.yml

@@ -82,8 +82,8 @@ jobs:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 6.9.13-17, major-minor: '6.9' }
-          - { full: 7.1.1-39, major-minor: '7.1' }
+          - { full: 6.9.13-25, major-minor: '6.9' }
+          - { full: 7.1.1-47, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -115,8 +115,8 @@ jobs:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 6.9.13-17, major-minor: '6.9' }
-          - { full: 7.1.1-39, major-minor: '7.1' }
+          - { full: 6.9.13-25, major-minor: '6.9' }
+          - { full: 7.1.1-47, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -141,19 +141,27 @@ jobs:
         bundle exec rake
 
   test-windows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os.target }}
     timeout-minutes: 20
     strategy:
       matrix:
         ruby-version: ['3.4']
         imagemagick-version:
-          - { full: 6.9.13-17, major-minor: '6.9' }
-          - { full: 7.1.1-39, major-minor: '7.1' }
+          - { full: 6.9.13-25, major-minor: '6.9' }
+          - { full: 7.1.1-47, major-minor: '7.1' }
+        os:
+          - { target: windows-latest, arch: 'x64' }
+          - { target: windows-11-arm, arch: 'arm64' }
+        exclude:
+          # ImageMagick 6 has not provided ARM binary. Ref. https://legacy.imagemagick.org/archive/binaries/
+          - imagemagick-version: { full: 6.9.13-25, major-minor: '6.9' }
+            os: { target: windows-11-arm, arch: 'arm64' }
+
     env:
-      bundled_im_dir: C:\Program Files\ImageMagick-7.1.1-Q16-HDRI
-      install_im_dir: D:\ImageMagick
+      bundled_im_dir: ${{ matrix.os.arch == 'x64' && 'C:\Program Files\ImageMagick-7.1.1-Q16-HDRI' || 'C:\Program Files (x86)\ImageMagick-7.1.1-Q16-HDRI' }}
+      install_im_dir: C:\ImageMagick
 
-    name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
+    name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v4
     - name: Setup environment variable
@@ -171,7 +179,8 @@ jobs:
       # https://github.com/rmagick/ImageMagick-binaries
       run: |
         $imagemagick_version = "${{ matrix.imagemagick-version.full }}"
-        $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
+        $arch = "${{ matrix.os.arch }}"
+        $installer_name = "ImageMagick-$($imagemagick_version)-Q16-$($arch)-dll.exe"
         $url = "https://github.com/rmagick/ImageMagick-binaries/raw/main/$($installer_name)"
         Invoke-WebRequest -Uri $url -OutFile $installer_name
         Start-Process -FilePath $installer_name -ArgumentList "/DIR=${{ env.install_im_dir }} /VERYSILENT /NORESTART /TASKS=install_Devel"

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from:
   - .rubocop_todo.yml
 
-require:
+plugins:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-on-rbs
@@ -23,9 +23,6 @@ AllCops:
 Layout/MultilineAssignmentLayout:
   EnforcedStyle: same_line
 
-RSpec/FilePath:
-  CustomTransform: { Magick: rmagick }
-
 Style/FormatString:
   EnforcedStyle: sprintf
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-11-04 02:41:41 UTC using RuboCop version 1.68.0.
+# on 2025-06-08 04:42:31 UTC using RuboCop version 1.76.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
@@ -79,7 +79,7 @@ Layout/MultilineMethodArgumentLineBreaks:
 Layout/RedundantLineBreak:
   Enabled: false
 
-# Offense count: 1911
+# Offense count: 1912
 # This cop supports safe autocorrection (--autocorrect).
 Layout/SingleLineBlockChain:
   Enabled: false
@@ -120,7 +120,7 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 5522
+# Offense count: 5523
 # Configuration parameters: Only, Ignore.
 Lint/ConstantResolution:
   Enabled: false
@@ -241,8 +241,9 @@ Naming/ClassAndModuleCamelCase:
     - 'lib/rmagick_internal.rb'
 
 # Offense count: 4
-# Configuration parameters: EnforcedStyle, AllowedPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
 # SupportedStyles: snake_case, camelCase
+# ForbiddenIdentifiers: __id__, __send__
 Naming/MethodName:
   Exclude:
     - 'lib/rvg/misc.rb'
@@ -269,25 +270,25 @@ Naming/MethodParameterName:
     - 'lib/rvg/transformable.rb'
     - 'lib/rvg/units.rb'
 
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods.
+# AllowedMethods: call
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/rvg/deep_equal.rb'
+
 # Offense count: 432
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 126
 
-# Offense count: 540
+# Offense count: 541
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
 # DisallowedExamples: works
 RSpec/ExampleWording:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/magick_spec.rb'
-
 # Offense count: 1
 RSpec/IdenticalEqualityAssertion:
   Exclude:
@@ -369,11 +370,10 @@ Style/ClassMethodsDefinitions:
 Style/CommentedKeyword:
   Enabled: false
 
-# Offense count: 128
+# Offense count: 124
 # Configuration parameters: IgnoreModules.
 Style/ConstantVisibility:
   Exclude:
-    - 'examples/histogram.rb'
     - 'ext/RMagick/extconf.rb'
     - 'lib/rmagick/version.rb'
     - 'lib/rmagick_internal.rb'
@@ -406,7 +406,7 @@ Style/FetchEnvVar:
 
 # Offense count: 191
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   EnforcedStyle: unannotated
@@ -457,7 +457,7 @@ Style/InvertibleUnlessCondition:
     - 'lib/rvg/embellishable.rb'
     - 'lib/rvg/stretchable.rb'
 
-# Offense count: 4514
+# Offense count: 4515
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
@@ -586,7 +586,7 @@ Style/YodaExpression:
 
 # Offense count: 134
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 217

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.1.2
+
+Improvements
+
+- Improve Magick::Draw#primitive performance (#1697)
+
 ## RMagick 6.1.1
 
 Bug Fixes

data/Gemfile

@@ -14,9 +14,9 @@ gem 'yard', '~> 0.9.36'
 
 gem 'rubocop', '~> 1.63'
 gem 'rubocop-performance', '~> 1.21'
-gem 'rubocop-rspec', '~> 2.29'
+gem 'rubocop-rspec', '~> 3.5'
 
-gem 'rubocop-on-rbs', '~> 0.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1')
+gem 'rubocop-on-rbs', '~> 1.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2')
 
 gem 'rbs', '~> 3.4'
 gem 'steep', '~> 1.6'

data/README.md

@@ -104,10 +104,8 @@ brew install imagemagick@6
 
 ### Windows
 1. Install latest Ruby+Devkit package which you can get from [RubyInstaller for Windows](https://rubyinstaller.org).
-2. You might need to configure `PATH` environment variable to where the compiler is located.
-   (Ex: `set PATH=C:\Ruby33-x64\bin;C:\Ruby33-x64\msys64\ucrt64\bin;%PATH%`)
-3. Download `ImageMagick-7.XXXX-Q16-x64-dll.exe` (not, `ImageMagick-7.XXXX-Q16-x64-static.exe`) binary from [Windows Binary Release](https://imagemagick.org/script/download.php#windows), or you can download ImageMagick 6 from [Windows Binary Release](https://legacy.imagemagick.org/script/download.php#windows).
-4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers for C and C++` in an installer for RMagick.
+2. Download `ImageMagick-7.XXXX-Q16-x64-dll.exe` (not, `ImageMagick-7.XXXX-Q16-x64-static.exe`) binary from [Windows Binary Release](https://imagemagick.org/script/download.php#windows), or you can download ImageMagick 6 from [Windows Binary Release](https://legacy.imagemagick.org/script/download.php#windows).
+3. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers for C and C++` in an installer for RMagick.
 <img width="75%" src="https://github.com/rmagick/rmagick/assets/199156/494e7963-cca5-4cb5-b28a-6c4d76adce5d" />
 
 If you want to install ImageMagick using [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), run the following command:
@@ -116,9 +114,18 @@ If you want to install ImageMagick using [winget](https://learn.microsoft.com/en
 winget install ImageMagick.ImageMagick --custom /TASKS=modifypath,install_Devel
 ```
 
+If you want to install ImageMagick using [Chocolatey](https://chocolatey.org/), run the following command:
+
+```sh
+choco install imagemagick -PackageParameters InstallDevelopmentHeaders=true
+```
+
 Installing RMagick
 ------------------
 
+> [!NOTE]
+> When you update the ImageMagick version, we have recommended you should re-install RMagick.
+
 ### Installing via Bundler
 
 Add to your `Gemfile`:
@@ -133,6 +140,11 @@ Then run:
 bundle install
 ```
 
+For Windows, you need to run using [ridk tool](https://github.com/oneclick/rubyinstaller2/wiki/The-ridk-tool):
+```sh
+ridk exec bundle install
+```
+
 ### Installing via RubyGems
 
 Run:
@@ -141,6 +153,11 @@ Run:
 gem install rmagick
 ```
 
+For Windows, you need to run using [ridk tool](https://github.com/oneclick/rubyinstaller2/wiki/The-ridk-tool):
+```sh
+ridk exec gem install rmagick
+```
+
 ### Versioning
 
 RMagick is versioned according to Semantic Versioning. For stable version

data/ext/RMagick/rmdraw.cpp

@@ -1262,11 +1262,11 @@ Draw_primitive(VALUE self, VALUE primitive)
 
     if (draw->primitives == (VALUE)0)
     {
-        draw->primitives = primitive;
+        draw->primitives = rb_str_dup(primitive);
     }
     else
     {
-        draw->primitives = rb_str_plus(draw->primitives, rb_str_new2("\n"));
+        draw->primitives = rb_str_concat(draw->primitives, rb_str_new2("\n"));
         draw->primitives = rb_str_concat(draw->primitives, primitive);
     }
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.1.1'
+  VERSION = '6.1.2'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

data/lib/rvg/rvg.rb

@@ -54,6 +54,8 @@ module Magick
     include Describable
     include Duplicatable
 
+    WORD_SEP = / / # Regexp to separate words
+
     private
 
     # background_fill defaults to 'none'. If background_fill has been set to something
@@ -112,7 +114,7 @@ module Magick
         indent = 0
         primitives.each do |cmd|
           indent -= 1 if cmd['pop ']
-          print(('   ' * indent), cmd, "\n")
+          print('   ' * indent, cmd, "\n")
           indent += 1 if cmd['push ']
         end
       end
@@ -120,8 +122,6 @@ module Magick
 
     public
 
-    WORD_SEP = / / # Regexp to separate words
-
     # The background image specified by background_image=
     attr_reader :background_image
     # The background image layout specified by background_position=

data/sig/rvg/deep_equal.rbs

@@ -3,6 +3,7 @@ module Magick
     interface _DeepEqual
       def deep_equal: (untyped other) -> bool
     end
+
     class PathData
       include _DeepEqual
     end

data/sig/rvg/rvg.rbs

@@ -59,7 +59,6 @@ module Magick
 
     public
 
-
     # Sets an image to use as the canvas background. See background_position= for layout options.
     def background_image=: (Magick::Image? bg_image) -> Magick::Image?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Tim Hunter
@@ -10,7 +10,7 @@ authors:
 - Moncef Maiza
 bindir: bin
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: observer
@@ -54,6 +54,7 @@ files:
 - ".devcontainer/setup-user.sh"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/report.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.8.9 or later
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []