rmagick 5.5.0 → 6.0.1

data/lib/rmagick_internal.rb

@@ -10,13 +10,10 @@
 #               to the classes.
 #==============================================================================
 
-if RUBY_PLATFORM =~ /mingw/i
-  begin
-    require 'ruby_installer'
-    ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
-      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
-    end
-  rescue LoadError
+if RUBY_PLATFORM.match?(/mingw/i)
+  require 'ruby_installer'
+  ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
+    RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
   end
 end
 
@@ -51,11 +48,11 @@ module Magick
     #   p Magick.formats
     #   => {"3FR"=>" r-+", "3G2"=>" r-+", "3GP"=>" r-+", "A"=>"*rw+",
     #   ...
-    def formats
+    def formats(&block)
       formats = init_formats
 
-      if block_given?
-        formats.each { |k, v| yield k, v }
+      if block
+        formats.each(&block)
         self
       else
         formats
@@ -140,7 +137,7 @@ module Magick
 
     # Convert object to a geometry string
     def to_s
-      str = String.new
+      str = +''
       if @width > 0
         fmt = @width.truncate == @width ? '%d' : '%.2f'
         str << sprintf(fmt, @width)
@@ -227,7 +224,7 @@ module Magick
 
     def enquote(str)
       str = to_string(str)
-      if str.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(str)
+      if str.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(str)
         str
       else
         '"' + str + '"'
@@ -277,7 +274,7 @@ module Magick
 
     # Draw a bezier curve.
     def bezier(*points)
-      if points.length.zero?
+      if points.empty?
         Kernel.raise ArgumentError, 'no points specified'
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of arguments specified'
@@ -479,7 +476,7 @@ module Magick
 
     # Draw a polygon
     def polygon(*points)
-      if points.length.zero?
+      if points.empty?
         Kernel.raise ArgumentError, 'no points specified'
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of points specified'
@@ -489,7 +486,7 @@ module Magick
 
     # Draw a polyline
     def polyline(*points)
-      if points.length.zero?
+      if points.empty?
         Kernel.raise ArgumentError, 'no points specified'
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of points specified'
@@ -504,7 +501,7 @@ module Magick
     # pop('pattern')
 
     def pop(*what)
-      if what.length.zero?
+      if what.empty?
         primitive 'pop graphic-context'
       else
         primitive 'pop ' + what.map { |x| to_string(x) }.join(' ')
@@ -517,7 +514,7 @@ module Magick
     # push('gradient')
     # push('pattern')
     def push(*what)
-      if what.length.zero?
+      if what.empty?
         primitive 'push graphic-context'
       else
         primitive 'push ' + what.map { |x| to_string(x) }.join(' ')
@@ -573,7 +570,7 @@ module Magick
 
     # Specify a stroke dash pattern
     def stroke_dasharray(*list)
-      if list.length.zero?
+      if list.empty?
         primitive 'stroke-dasharray none'
       else
         list.map! { |x| Float(x) }.each do |x|
@@ -622,7 +619,7 @@ module Magick
     def text(x, y, text)
       text = to_string(text)
       Kernel.raise ArgumentError, 'missing text argument' if text.empty?
-      if text.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(text)
+      if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
       # text already quoted
       elsif !text['\'']
         text = '\'' + text + '\''
@@ -669,6 +666,7 @@ module Magick
 
   # Define IPTC record number:dataset tags for use with Image#get_iptc_dataset
   module IPTC
+    # rubocop:disable Naming/ConstantName
     module Envelope
       Model_Version                          = '1:00'
       Destination                            = '1:05'
@@ -766,6 +764,7 @@ module Magick
     module Post_ObjectData_Descriptor
       Confirmed_ObjectData_Size              = '9:10'
     end
+    # rubocop:enable Naming/ConstantName
   end # module Magick::IPTC
 
   # Ruby-level Magick::Image methods
@@ -837,9 +836,9 @@ module Magick
     # arrays.
     def get_exif_by_entry(*entry)
       ary = []
-      if entry.length.zero?
+      if entry.empty?
         exif_data = self['EXIF:*']
-        exif_data.split("\n").each { |exif| ary.push(exif.split('=')) } if exif_data
+        exif_data&.split("\n")&.each { |exif| ary.push(exif.split('=')) }
       else
         get_exif_by_entry # ensure properties is populated with exif data
         entry.each do |name|
@@ -853,14 +852,12 @@ module Magick
     # Retrieve EXIF data by tag number or all tag/value pairs. The return value is a hash.
     def get_exif_by_number(*tag)
       hash = {}
-      if tag.length.zero?
+      if tag.empty?
         exif_data = self['EXIF:!']
-        if exif_data
-          exif_data.split("\n").each do |exif|
-            tag, value = exif.split('=')
-            tag = tag[1, 4].hex
-            hash[tag] = value
-          end
+        exif_data&.split("\n")&.each do |exif|
+          tag, value = exif.split('=')
+          tag = tag[1, 4].hex
+          hash[tag] = value
         end
       else
         get_exif_by_number # ensure properties is populated with exif data
@@ -1288,10 +1285,10 @@ module Magick
     # Allow scene to be set to nil
     def scene=(n)
       if n.nil?
-        Kernel.raise IndexError, 'scene number out of bounds' unless @images.length.zero?
+        Kernel.raise IndexError, 'scene number out of bounds' unless @images.empty?
         @scene = nil
         return
-      elsif @images.length.zero?
+      elsif @images.empty?
         Kernel.raise IndexError, 'scene number out of bounds'
       end
 
@@ -1368,7 +1365,7 @@ module Magick
 
     def []=(*args)
       obj = @images.[]=(*args)
-      if obj && obj.respond_to?(:each)
+      if obj.respond_to?(:each)
         assert_image_array(obj)
         set_current obj.last.__id__
       elsif obj
@@ -1522,7 +1519,7 @@ module Magick
     end
 
     def fill(*args, &block)
-      assert_image args[0] unless block_given?
+      assert_image args[0] unless block
       current = get_current
       @images.fill(*args, &block)
       assert_image_array self
@@ -1542,7 +1539,7 @@ module Magick
     alias select find_all
 
     def from_blob(*blobs, &block)
-      Kernel.raise ArgumentError, 'no blobs given' if blobs.length.zero?
+      Kernel.raise ArgumentError, 'no blobs given' if blobs.empty?
       blobs.each do |b|
         Magick::Image.from_blob(b, &block).each { |n| @images << n }
       end
@@ -1571,9 +1568,8 @@ module Magick
 
     # Call inspect for all the images
     def inspect
-      img = []
-      @images.each { |image| img << image.inspect }
-      img = '[' + img.join(",\n") + "]\nscene=#{@scene}"
+      img = @images.map(&:inspect)
+      '[' + img.join(",\n") + "]\nscene=#{@scene}"
     end
 
     # Set the number of iterations of an animated GIF
@@ -1584,7 +1580,7 @@ module Magick
     end
 
     def last(*args)
-      if args.length.zero?
+      if args.empty?
         a = @images.last
       else
         a = @images.last(*args)
@@ -1616,8 +1612,8 @@ module Magick
     def method_missing(meth_id, *args, &block)
       if @scene
         img = @images[@scene]
-        new_img = img.send(meth_id, *args, &block)
-        img.object_id == new_img.object_id ? self : new_img
+        new_img = img.public_send(meth_id, *args, &block)
+        img.equal?(new_img) ? self : new_img
       else
         super
       end
@@ -1646,7 +1642,7 @@ module Magick
 
     # Ping files and concatenate the new images
     def ping(*files, &block)
-      Kernel.raise ArgumentError, 'no files given' if files.length.zero?
+      Kernel.raise ArgumentError, 'no files given' if files.empty?
       files.each do |f|
         Magick::Image.ping(f, &block).each { |n| @images << n }
       end
@@ -1672,7 +1668,7 @@ module Magick
 
     # Read files and concatenate the new images
     def read(*files, &block)
-      Kernel.raise ArgumentError, 'no files given' if files.length.zero?
+      Kernel.raise ArgumentError, 'no files given' if files.empty?
       files.each do |f|
         Magick::Image.read(f, &block).each { |n| @images << n }
       end
@@ -1735,8 +1731,8 @@ module Magick
       self
     end
 
-    def reverse_each
-      @images.reverse_each { |image| yield(image) }
+    def reverse_each(&block)
+      @images.reverse_each(&block)
       self
     end
 
@@ -1775,9 +1771,7 @@ module Magick
     end
 
     def to_a
-      a = []
-      @images.each { |image| a << image }
-      a
+      @images.map { |image| image }
     end
 
     def uniq
@@ -1811,6 +1805,15 @@ module Magick
     end
     alias indexes values_at
     alias indices values_at
+
+    def destroy!
+      @images.each(&:destroy!)
+      self
+    end
+
+    def destroyed?
+      @images.all?(&:destroyed?)
+    end
   end # Magick::ImageList
 
   class Pixel

data/lib/rvg/container.rb

@@ -108,11 +108,11 @@ module Magick
         # If the element is not a group, defs, symbol, or rvg,
         # wrap a group around it so it can get a transform and
         # possibly a new viewport.
-        if !element.respond_to?(:ref)
+        if element.respond_to?(:ref)
+          @element = element.deep_copy
+        else
           @element = Group.new
           @element << element.deep_copy
-        else
-          @element = element.deep_copy
         end
         @element.ref(x, y, width, height)
       end

data/lib/rvg/embellishable.rb

@@ -109,7 +109,7 @@ module Magick
           short = n > 0 ? y_coords : x_coords
           olen = short.length
           n.abs.times { |x| short << short[x % olen] }
-          points = x_coords.zip(y_coords).flatten
+          points = x_coords.zip(y_coords).flatten!
         end
         n = points.length
         raise ArgumentError, "insufficient/odd number of points specified: #{n}" if n < 4 || n.odd?

data/lib/rvg/misc.rb

@@ -72,7 +72,7 @@ module Magick
         end
 
         def enquote(text)
-          return text if text.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(text)
+          return text if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
 
           if !text['\'']
             text = '\'' + text + '\''
@@ -87,7 +87,7 @@ module Magick
 
           # escape existing braces, surround with braces
           text.gsub!(/[}]/) { |b| '\\' + b }
-          '{' +  text + '}'
+          '{' + text + '}'
         end
 
         def glyph_metrics(glyph_orientation, glyph)
@@ -114,7 +114,7 @@ module Magick
               y_rel_coords << wy
             end
             first_word = false
-            word.split('').each do |glyph|
+            word.chars.each do |glyph|
               wx, wy = get_letter_spacing(glyph)
               x_rel_coords << wx
               y_rel_coords << wy
@@ -173,7 +173,7 @@ module Magick
 
         def render(x, y, text)
           x_rel_coords, y_rel_coords = text_rel_coords(text)
-          dx = x_rel_coords.reduce(0) { |sum, a| sum + a }
+          dx = x_rel_coords.sum
           dy = y_rel_coords.max
 
           # We're handling the anchoring.
@@ -203,7 +203,7 @@ module Magick
           text.split(::Magick::RVG::WORD_SEP).each do |word|
             x += x_rel_coords.shift unless first_word
             first_word = false
-            word.split('').each do |glyph|
+            word.chars.each do |glyph|
               render_glyph(@ctx.text_attrs.glyph_orientation_horizontal, x, y, glyph)
               x += x_rel_coords.shift
             end
@@ -234,7 +234,7 @@ module Magick
         def render(x, y, text)
           x_rel_coords, y_rel_coords = text_rel_coords(text)
           dx = x_rel_coords.max
-          dy = y_rel_coords.reduce(0) { |sum, a| sum + a }
+          dy = y_rel_coords.sum
 
           # We're handling the anchoring.
           @ctx.gc.push
@@ -271,7 +271,7 @@ module Magick
               x_rel_coords.shift
             end
             first_word = false
-            word.split('').each do |glyph|
+            word.chars.each do |glyph|
               case @ctx.text_attrs.glyph_orientation_vertical.to_i
               when 0, 90, 270
                 x_shift = (dx - x_rel_coords.shift) / 2
@@ -579,7 +579,7 @@ module Magick
 
         def font_weight(weight)
           # If the arg is not in the hash use it directly. Handles numeric values.
-          weight = weight.is_a?(Numeric) ? weight : FONT_WEIGHT.fetch(weight.to_sym, Magick::NormalWeight)
+          weight = FONT_WEIGHT.fetch(weight.to_sym, Magick::NormalWeight) unless weight.is_a?(Numeric)
           @gc.font_weight(weight)
           @shadow[-1].font_weight = weight
           nil
@@ -668,7 +668,7 @@ module Magick
         end
 
         def text(x, y, text)
-          return if text.length.zero?
+          return if text.empty?
 
           text_renderer = if @text_attrs.non_default?
                             TEXT_STRATEGIES[@text_attrs.writing_mode].new(self)

data/lib/rvg/rvg.rb

@@ -41,8 +41,6 @@ require 'rvg/clippath'
 require 'rvg/paint'
 require 'rvg/units'
 
-require 'pp' if ENV['debug_rvg']
-
 # RVG is the main class in this library. All graphic elements
 # must be contained within an RVG object.
 module Magick
@@ -108,7 +106,7 @@ module Magick
 
     if ENV['debug_prim']
       def print_gc(gc)
-        primitives = gc.inspect.split(/\n/)
+        primitives = gc.inspect.split("\n")
         indent = 0
         primitives.each do |cmd|
           indent -= 1 if cmd['pop ']
@@ -172,7 +170,9 @@ module Magick
     # The default fill is "none", that is, transparent black.
     def background_fill=(color)
       warn 'background_fill= has no effect in nested RVG objects' if @nested
-      if !color.is_a?(Magick::Pixel)
+      if color.is_a?(Magick::Pixel)
+        @background_fill = color
+      else
         begin
           @background_fill = Magick::Pixel.from_color(color)
         rescue Magick::ImageMagickError
@@ -182,8 +182,6 @@ module Magick
         rescue StandardError
           raise ArgumentError, "argument must be a color name or a Pixel (got #{color.class})"
         end
-      else
-        @background_fill = color
       end
     end
 

data/lib/rvg/stylable.rb

@@ -4,7 +4,7 @@
 #++
 module Magick
   class RVG
-    #:stopdoc:
+    # :stopdoc:
     STYLES = %i[
       clip_path clip_rule fill fill_opacity fill_rule font
       font_family font_size font_stretch font_style font_weight
@@ -49,7 +49,7 @@ module Magick
       end
     end # class Styles
 
-    #:startdoc:
+    # :startdoc:
 
     # This module is mixed into classes that can have styles.
     module Stylable

data/lib/rvg/units.rb

@@ -5,6 +5,7 @@ module Magick
     # Define RVG.dpi and RVG.dpi=. Add conversions to Integer and Float classes
     class << self
       attr_reader :dpi
+
       def dpi=(n)
         unless defined?(@dpi)
           [Float, Integer].each do |c|

data/rmagick.gemspec

@@ -5,7 +5,6 @@ require './lib/rmagick/version'
 Gem::Specification.new do |s|
   s.name = 'rmagick'
   s.version = Magick::VERSION
-  s.date = Date.today.to_s
   s.summary = 'Ruby binding to ImageMagick'
   s.description = 'RMagick is an interface between Ruby and ImageMagick.'
   s.authors = ['Tim Hunter', 'Omer Bar-or', 'Benjamin Thomas', 'Moncef Maiza']
@@ -13,6 +12,10 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rmagick/rmagick'
   s.license = 'MIT'
 
+  s.metadata['bug_tracker_uri'] = 'https://github.com/rmagick/rmagick/issues'
+  s.metadata['documentation_uri'] = 'https://rmagick.github.io/'
+  s.metadata['changelog_uri'] = 'https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md'
+
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/
   files = tracked_files.reject { |file| file[file_exclusion_regex] }
@@ -24,6 +27,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
-  s.add_runtime_dependency 'pkg-config', '~> 1.4'
   s.add_runtime_dependency 'observer', '~> 0.1'
+  s.add_runtime_dependency 'pkg-config', '~> 1.4'
 end

data/sig/rmagick/_image_common_methods.rbs

@@ -222,8 +222,6 @@ module Magick
     def delete_compose_mask: () -> self
     def delete_profile: (string name) -> self
     def despeckle: () -> Image
-    def destroy!: () -> self
-    def destroyed?: () -> bool
     def difference: (magick_image other) -> [Float, Float, Float]
     def dispatch: (int x, int y, int columns, int rows, string map, ?bool float) -> Array[Integer]
     def displace: (magick_image displacement_map, magick_real x_amp, ?magick_real y_amp, ?GravityType gravity, ?int x_offset, ?int y_offset) -> Image

data/sig/rmagick/enum.rbs

@@ -83,7 +83,12 @@ module Magick
   BlackChannel: ChannelType
   IndexChannel: ChannelType
   GrayChannel: ChannelType
+  CompositeChannels: ChannelType
   AllChannels: ChannelType
+  TrueAlphaChannel: ChannelType
+  RGBChannels: ChannelType
+  GrayChannels: ChannelType
+  SyncChannels: ChannelType
   AlphaChannel: ChannelType
   DefaultChannels: ChannelType
   HueChannel: ChannelType
@@ -270,6 +275,7 @@ module Magick
     extend _EnumClassMethod[DisposeType]
   end
 
+  UnrecognizedDispose: DisposeType
   UndefinedDispose: DisposeType
   BackgroundDispose: DisposeType
   NoneDispose: DisposeType

data/sig/rmagick/image.rbs

@@ -40,6 +40,8 @@ module Magick
                | () { (Image::Info) -> void} -> String?
     def write: (File | string file) -> self
              | (File | string file) { (Image::Info) -> void} -> self
+    def destroy!: () -> self
+    def destroyed?: () -> bool
 
     class View
       attr_reader x: real

data/sig/rmagick/image_list.rbs

@@ -155,6 +155,8 @@ module Magick
                | () { (Image::Info) -> void} -> String?
     def write: (File | string file) -> self
              | (File | string file) { (Image::Info) -> void } -> self
+    def destroy!: () -> self
+    def destroyed?: () -> bool
 
     class Montage
       def initialize: () -> void

metadata

@@ -1,46 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Tim Hunter
 - Omer Bar-or
 - Benjamin Thomas
 - Moncef Maiza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-06 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pkg-config
+  name: observer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: observer
+  name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.4'
 description: RMagick is an interface between Ruby and ImageMagick.
 email: github@benjaminfleischer.com
 executables: []
@@ -137,8 +137,11 @@ files:
 homepage: https://github.com/rmagick/rmagick
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/rmagick/rmagick/issues
+  documentation_uri: https://rmagick.github.io/
+  changelog_uri: https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,16 +150,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ImageMagick 6.7.7 or later
-rubygems_version: 3.4.10
-signing_key: 
+- ImageMagick 6.8.9 or later
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []