rmagick 5.4.4 → 6.0.0

data/lib/rmagick_internal.rb

@@ -10,7 +10,7 @@
 #               to the classes.
 #==============================================================================
 
-if RUBY_PLATFORM =~ /mingw/i
+if RUBY_PLATFORM.match?(/mingw/i)
   begin
     require 'ruby_installer'
     ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
@@ -51,11 +51,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 +140,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)
@@ -226,18 +226,29 @@ module Magick
     private
 
     def enquote(str)
-      if str.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(str)
+      str = to_string(str)
+      if str.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(str)
         str
       else
         '"' + str + '"'
       end
     end
 
-    def check_opacity(opacity)
-      return if opacity.is_a?(String) && opacity['%']
+    def to_opacity(opacity)
+      return opacity if opacity.is_a?(String) && opacity.end_with?('%')
 
       value = Float(opacity)
       Kernel.raise ArgumentError, 'opacity must be >= 0 and <= 1.0' if value < 0 || value > 1.0
+
+      value
+    end
+
+    def to_string(obj)
+      return obj if obj.is_a?(String)
+      return obj.to_s if obj.is_a?(Symbol)
+      return obj.to_str if obj.respond_to?(:to_str)
+
+      Kernel.raise TypeError, "no implicit conversion of #{obj.class} into String"
     end
 
     public
@@ -266,7 +277,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'
@@ -281,17 +292,19 @@ module Magick
 
     # Invoke a clip-path defined by def_clip_path.
     def clip_path(name)
-      primitive "clip-path #{name}"
+      primitive "clip-path #{to_string(name)}"
     end
 
     # Define the clipping rule.
     def clip_rule(rule)
+      rule = to_string(rule)
       Kernel.raise ArgumentError, "Unknown clipping rule #{rule}" unless %w[evenodd nonzero].include?(rule.downcase)
       primitive "clip-rule #{rule}"
     end
 
     # Define the clip units
     def clip_units(unit)
+      unit = to_string(unit)
       Kernel.raise ArgumentError, "Unknown clip unit #{unit}" unless %w[userspace userspaceonuse objectboundingbox].include?(unit.downcase)
       primitive "clip-units #{unit}"
     end
@@ -320,7 +333,7 @@ module Magick
     # (pop) graphic-context".
     def define_clip_path(name)
       push('defs')
-      push("clip-path \"#{name}\"")
+      push("clip-path #{enquote(name)}")
       push('graphic-context')
       yield
     ensure
@@ -340,7 +353,7 @@ module Magick
     # Let anything through, but the only defined argument
     # is "UTF-8". All others are apparently ignored.
     def encoding(encoding)
-      primitive "encoding #{encoding}"
+      primitive "encoding #{to_string(encoding)}"
     end
 
     # Specify object fill, a color name or pattern name
@@ -352,22 +365,23 @@ module Magick
 
     # Specify fill opacity (use "xx%" to indicate percentage)
     def fill_opacity(opacity)
-      check_opacity(opacity)
+      opacity = to_opacity(opacity)
       primitive "fill-opacity #{opacity}"
     end
 
     def fill_rule(rule)
+      rule = to_string(rule)
       Kernel.raise ArgumentError, "Unknown fill rule #{rule}" unless %w[evenodd nonzero].include?(rule.downcase)
       primitive "fill-rule #{rule}"
     end
 
     # Specify text drawing font
     def font(name)
-      primitive "font \'#{name}\'"
+      primitive "font #{enquote(name)}"
     end
 
     def font_family(name)
-      primitive "font-family \'#{name}\'"
+      primitive "font-family #{enquote(name)}"
     end
 
     def font_stretch(stretch)
@@ -405,38 +419,17 @@ module Magick
 
     # IM 6.5.5-8 and later
     def interline_spacing(space)
-      begin
-        Float(space)
-      rescue ArgumentError
-        Kernel.raise ArgumentError, 'invalid value for interline_spacing'
-      rescue TypeError
-        Kernel.raise TypeError, "can't convert #{space.class} into Float"
-      end
-      primitive "interline-spacing #{space}"
+      primitive "interline-spacing #{Float(space)}"
     end
 
     # IM 6.4.8-3 and later
     def interword_spacing(space)
-      begin
-        Float(space)
-      rescue ArgumentError
-        Kernel.raise ArgumentError, 'invalid value for interword_spacing'
-      rescue TypeError
-        Kernel.raise TypeError, "can't convert #{space.class} into Float"
-      end
-      primitive "interword-spacing #{space}"
+      primitive "interword-spacing #{Float(space)}"
     end
 
     # IM 6.4.8-3 and later
     def kerning(space)
-      begin
-        Float(space)
-      rescue ArgumentError
-        Kernel.raise ArgumentError, 'invalid value for kerning'
-      rescue TypeError
-        Kernel.raise TypeError, "can't convert #{space.class} into Float"
-      end
-      primitive "kerning #{space}"
+      primitive "kerning #{Float(space)}"
     end
 
     # Draw a line
@@ -447,7 +440,7 @@ module Magick
     # Specify drawing fill and stroke opacities. If the value is a string
     # ending with a %, the number will be multiplied by 0.01.
     def opacity(opacity)
-      check_opacity(opacity)
+      opacity = to_opacity(opacity)
       primitive "opacity #{opacity}"
     end
 
@@ -455,7 +448,7 @@ module Magick
     # primitive requires that the commands be surrounded by quotes or
     # apostrophes. Here we simply use apostrophes.
     def path(cmds)
-      primitive "path '" + cmds + "'"
+      primitive "path #{enquote(cmds)}"
     end
 
     # Define a pattern. In the block, call primitive methods to
@@ -463,7 +456,7 @@ module Magick
     # as the argument to the 'fill' or 'stroke' methods
     def pattern(name, x, y, width, height)
       push('defs')
-      push("pattern #{name} " + sprintf('%g %g %g %g', x, y, width, height))
+      push("pattern #{to_string(name)} " + sprintf('%g %g %g %g', x, y, width, height))
       push('graphic-context')
       yield
     ensure
@@ -486,7 +479,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'
@@ -496,7 +489,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'
@@ -511,11 +504,10 @@ module Magick
     # pop('pattern')
 
     def pop(*what)
-      if what.length.zero?
+      if what.empty?
         primitive 'pop graphic-context'
       else
-        # to_s allows a Symbol to be used instead of a String
-        primitive 'pop ' + what.map(&:to_s).join(' ')
+        primitive 'pop ' + what.map { |x| to_string(x) }.join(' ')
       end
     end
 
@@ -525,11 +517,10 @@ module Magick
     # push('gradient')
     # push('pattern')
     def push(*what)
-      if what.length.zero?
+      if what.empty?
         primitive 'push graphic-context'
       else
-        # to_s allows a Symbol to be used instead of a String
-        primitive 'push ' + what.map(&:to_s).join(' ')
+        primitive 'push ' + what.map { |x| to_string(x) }.join(' ')
       end
     end
 
@@ -582,10 +573,10 @@ module Magick
 
     # Specify a stroke dash pattern
     def stroke_dasharray(*list)
-      if list.length.zero?
+      if list.empty?
         primitive 'stroke-dasharray none'
       else
-        list.each do |x|
+        list.map! { |x| Float(x) }.each do |x|
           Kernel.raise ArgumentError, "dash array elements must be > 0 (#{x} given)" if x <= 0
         end
         primitive "stroke-dasharray #{list.join(',')}"
@@ -598,16 +589,19 @@ module Magick
     end
 
     def stroke_linecap(value)
+      value = to_string(value)
       Kernel.raise ArgumentError, "Unknown linecap type: #{value}" unless %w[butt round square].include?(value.downcase)
       primitive "stroke-linecap #{value}"
     end
 
     def stroke_linejoin(value)
+      value = to_string(value)
       Kernel.raise ArgumentError, "Unknown linejoin type: #{value}" unless %w[round miter bevel].include?(value.downcase)
       primitive "stroke-linejoin #{value}"
     end
 
     def stroke_miterlimit(value)
+      value = Float(value)
       Kernel.raise ArgumentError, 'miterlimit must be >= 1' if value < 1
       primitive "stroke-miterlimit #{value}"
     end
@@ -615,7 +609,7 @@ module Magick
     # Specify opacity of stroke drawing color
     #  (use "xx%" to indicate percentage)
     def stroke_opacity(opacity)
-      check_opacity(opacity)
+      opacity = to_opacity(opacity)
       primitive "stroke-opacity #{opacity}"
     end
 
@@ -626,8 +620,9 @@ module Magick
 
     # Draw text at position x,y. Add quotes to text that is not already quoted.
     def text(x, y, text)
-      Kernel.raise ArgumentError, 'missing text argument' if text.to_s.empty?
-      if text.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(text)
+      text = to_string(text)
+      Kernel.raise ArgumentError, 'missing text argument' if text.empty?
+      if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
       # text already quoted
       elsif !text['\'']
         text = '\'' + text + '\''
@@ -674,6 +669,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'
@@ -771,6 +767,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
@@ -842,9 +839,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|
@@ -858,14 +855,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
@@ -1080,13 +1075,13 @@ module Magick
         %i[red green blue opacity].each do |c|
           module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
             def #{c}
-                return collect { |p| p.#{c} }
+              return collect { |p| p.#{c} }
             end
             def #{c}=(v)
-                each { |p| p.#{c} = v }
-                changed
-                notify_observers(self)
-                nil
+              each { |p| p.#{c} = v }
+              changed
+              notify_observers(self)
+              v
             end
           END_EVAL
         end
@@ -1293,10 +1288,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
 
@@ -1310,17 +1305,11 @@ module Magick
     %w[& + - |].each do |op|
       module_eval <<-END_BINOPS, __FILE__, __LINE__ + 1
         def #{op}(other)
+          assert_image_array(other)
           ilist = self.class.new
-          begin
-            a = other #{op} @images
-          rescue TypeError
-            Kernel.raise ArgumentError, "Magick::ImageList expected, got " + other.class.to_s
-          end
+          a = other #{op} @images
           current = get_current()
-          a.each do |image|
-            assert_image image
-            ilist << image
-          end
+          a.each { |image| ilist << image }
           ilist.set_current current
           return ilist
         end
@@ -1349,16 +1338,18 @@ module Magick
     #   return if A.scene != B.scene
     #   return A.length <=> B.length
     def <=>(other)
-      Kernel.raise TypeError, "#{self.class} required (#{other.class} given)" unless other.is_a? self.class
+      return unless other.is_a? self.class
+
       size = [length, other.length].min
       size.times do |x|
         r = self[x] <=> other[x]
         return r unless r.zero?
       end
+
       return 0 if @scene.nil? && other.scene.nil?
+      return if @scene.nil? && !other.scene.nil?
+      return if !@scene.nil? && other.scene.nil?
 
-      Kernel.raise TypeError, "cannot convert nil into #{other.scene.class}" if @scene.nil? && !other.scene.nil?
-      Kernel.raise TypeError, "cannot convert nil into #{scene.class}" if !@scene.nil? && other.scene.nil?
       r = scene <=> other.scene
       return r unless r.zero?
 
@@ -1377,7 +1368,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
@@ -1390,7 +1381,7 @@ module Magick
 
     %i[
       at each each_index empty? fetch
-      first hash include? index length rindex sort!
+      first hash include? index length rindex
     ].each do |mth|
       module_eval <<-END_SIMPLE_DELEGATES, __FILE__, __LINE__ + 1
         def #{mth}(*args, &block)
@@ -1400,6 +1391,11 @@ module Magick
     end
     alias size length
 
+    def sort!(*args, &block)
+      @images.sort!(*args, &block)
+      self
+    end
+
     def clear
       @scene = nil
       @images.clear
@@ -1447,7 +1443,7 @@ module Magick
     alias map! collect!
     alias __map__! collect!
 
-    # ImageMagic used affinity in 6.4.3, switch to remap in 6.4.4.
+    # ImageMagick used affinity in 6.4.3, switch to remap in 6.4.4.
     alias affinity remap
 
     def compact
@@ -1510,7 +1506,12 @@ module Magick
     end
 
     def eql?(other)
-      assert_image_array other
+      begin
+        assert_image_array other
+      rescue ArgumentError
+        return false
+      end
+
       eql = other.eql?(@images)
       begin # "other" is another ImageList
         eql &&= @scene == other.scene
@@ -1521,7 +1522,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
@@ -1541,7 +1542,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
@@ -1570,9 +1571,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
@@ -1583,7 +1583,7 @@ module Magick
     end
 
     def last(*args)
-      if args.length.zero?
+      if args.empty?
         a = @images.last
       else
         a = @images.last(*args)
@@ -1614,7 +1614,9 @@ module Magick
     # it up the line. Catch a NameError and emit a useful message.
     def method_missing(meth_id, *args, &block)
       if @scene
-        @images[@scene].send(meth_id, *args, &block)
+        img = @images[@scene]
+        new_img = img.public_send(meth_id, *args, &block)
+        img.object_id == new_img.object_id ? self : new_img
       else
         super
       end
@@ -1643,7 +1645,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
@@ -1669,7 +1671,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
@@ -1732,8 +1734,8 @@ module Magick
       self
     end
 
-    def reverse_each
-      @images.reverse_each { |image| yield(image) }
+    def reverse_each(&block)
+      @images.reverse_each(&block)
       self
     end
 
@@ -1772,9 +1774,7 @@ module Magick
     end
 
     def to_a
-      a = []
-      @images.each { |image| a << image }
-      a
+      @images.map { |image| image }
     end
 
     def uniq
@@ -1801,7 +1801,6 @@ module Magick
     end
 
     def values_at(*args)
-      a = @images.values_at(*args)
       a = self.class.new
       @images.values_at(*args).each { |image| a << image }
       a.scene = a.length - 1
@@ -1809,6 +1808,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
@@ -1852,7 +1860,7 @@ module Magick
   class HatchFill
     def initialize(bgcolor, hatchcolor = 'white', dist = 10)
       @bgcolor = bgcolor
-      @hatchpixel = Pixel.from_color(hatchcolor)
+      @hatchpixel = hatchcolor.is_a?(Pixel) ? hatchcolor : Pixel.from_color(hatchcolor)
       @dist = dist
     end
 

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?
@@ -162,6 +162,8 @@ module Magick
                (@width - @image.columns * scale) / 2.0
              when /\AxMax/
                @width - @image.columns * scale
+             else
+               0
              end
 
         ty = case @align
@@ -171,6 +173,8 @@ module Magick
                (@height - @image.rows * scale) / 2.0
              when /YMax\z/
                @height - @image.rows * scale
+             else
+               0
              end
         [tx, ty]
       end
@@ -182,7 +186,7 @@ module Magick
           width = @width
           height = @height
         elsif @meet_or_slice == 'meet'
-          scale = [@width / @image.columns, @height / @image.rows].min
+          scale = [@width / @image.columns, @height / @image.rows].min || 1.0
           width = @image.columns
           height = @image.rows
         else
@@ -193,7 +197,7 @@ module Magick
           end
 
           gc.clip_path(name)
-          scale = [@width / @image.columns, @height / @image.rows].max
+          scale = [@width / @image.columns, @height / @image.rows].max || 1.0
           width = @image.columns
           height = @image.rows
         end