rmagick 5.4.4 → 5.5.0

data/lib/rmagick_internal.rb

@@ -226,6 +226,7 @@ module Magick
     private
 
     def enquote(str)
+      str = to_string(str)
       if str.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(str)
         str
       else
@@ -233,11 +234,21 @@ module Magick
       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
@@ -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
@@ -514,8 +507,7 @@ module Magick
       if what.length.zero?
         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
 
@@ -528,8 +520,7 @@ module Magick
       if what.length.zero?
         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
 
@@ -585,7 +576,7 @@ module Magick
       if list.length.zero?
         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,7 +620,8 @@ 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?
+      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['\'']
@@ -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
@@ -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?
 
@@ -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
@@ -1614,7 +1615,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.send(meth_id, *args, &block)
+        img.object_id == new_img.object_id ? self : new_img
       else
         super
       end
@@ -1801,7 +1804,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
@@ -1852,7 +1854,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/embellishable.rb

@@ -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

data/lib/rvg/misc.rb

@@ -452,10 +452,10 @@ module Magick
         }
 
         FONT_WEIGHT = {
-          'normal' => Magick::NormalWeight,
-          'bold' => Magick::BoldWeight,
-          'bolder' => Magick::BolderWeight,
-          'lighter' => Magick::LighterWeight
+          normal: Magick::NormalWeight,
+          bold: Magick::BoldWeight,
+          bolder: Magick::BolderWeight,
+          lighter: Magick::LighterWeight
         }
 
         TEXT_ANCHOR = {
@@ -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 = FONT_WEIGHT.fetch(weight) { |key| key }
+          weight = weight.is_a?(Numeric) ? weight : FONT_WEIGHT.fetch(weight.to_sym, Magick::NormalWeight)
           @gc.font_weight(weight)
           @shadow[-1].font_weight = weight
           nil
@@ -646,7 +646,7 @@ module Magick
 
         def skewX(degrees)
           degrees = Magick::RVG.convert_one_to_float(degrees)
-          @gc.skewX(degrees)
+          @gc.skewx(degrees)
           @ry = Math.tan(GraphicContext.degrees_to_radians(degrees))
           concat_matrix
           nil
@@ -654,7 +654,7 @@ module Magick
 
         def skewY(degrees)
           degrees = Magick::RVG.convert_one_to_float(degrees)
-          @gc.skewY(degrees)
+          @gc.skewy(degrees)
           @rx = Math.tan(GraphicContext.degrees_to_radians(degrees))
           concat_matrix
           nil

data/lib/rvg/rvg.rb

@@ -90,6 +90,8 @@ module Magick
                        end
                        bg_image
                      end
+                   else
+                     @background_image.copy
                    end
                  else
                    @background_image.copy

data/lib/rvg/stretchable.rb

@@ -137,8 +137,8 @@ module Magick
         rescue ArgumentError
           raise ArgumentError, "arguments must be convertable to float (got #{x.class}, #{y.class}, #{width.class}, #{height.class})"
         end
-        raise(ArgumentError, "viewbox width must be > 0 (#{width} given)") unless width >= 0
-        raise(ArgumentError, "viewbox height must be > 0 (#{height} given)") unless height >= 0
+        raise(ArgumentError, "viewbox width must be > 0 (#{@vbx_width} given)") unless @vbx_width >= 0
+        raise(ArgumentError, "viewbox height must be > 0 (#{@vbx_height} given)") unless @vbx_height >= 0
 
         # return the user-coordinate space attributes if defined
         class << self

data/lib/rvg/transformable.rb

@@ -89,7 +89,7 @@ module Magick
             cx = Float(args[0])
             cy = Float(args[1])
             @transforms << [:translate, [cx, cy]]
-            @transforms << [:rotate, [angle]]
+            @transforms << [:rotate, [Float(angle)]]
             @transforms << [:translate, [-cx, -cy]]
           else
             raise ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"

data/rmagick.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  file_exclusion_regex = %r{\A(doc|benchmarks|examples|spec|lib/rvg/to_c.rb)}
+  file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/
   files = tracked_files.reject { |file| file[file_exclusion_regex] }
 
   s.files = files
@@ -26,16 +26,4 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'pkg-config', '~> 1.4'
   s.add_runtime_dependency 'observer', '~> 0.1'
-
-  s.add_development_dependency 'pry', '~> 0.14'
-  s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rspec', '~> 3.8'
-  s.add_development_dependency 'rspec_junit_formatter', '~> 0.6.0'
-  if RUBY_PLATFORM !~ /mswin|mingw/
-    s.add_development_dependency 'rubocop', '~> 0.81.0'
-    s.add_development_dependency 'rubocop-rspec', '~> 1.38.1'
-    s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  end
-  s.add_development_dependency 'simplecov', '~> 0.16.1'
-  s.add_development_dependency 'yard', '~> 0.9.24'
 end

data/sig/rmagick/_draw_common_methods.rbs

@@ -0,0 +1,64 @@
+module Magick
+  interface _DrawCommonMethods
+    def affine: (magick_real sx, magick_real rx, magick_real ry, magick_real sy, magick_real tx, magick_real ty) -> self
+    def alpha: (magick_real x, magick_real y, PaintMethod method) -> self
+    def arc: (magick_real start_x, magick_real start_y, magick_real end_x, magick_real end_y, magick_real start_degrees, magick_real end_degrees) -> self
+    def bezier: (*magick_real points) -> self
+    def circle: (magick_real origin_x, magick_real origin_y, magick_real perim_x, magick_real perim_y) -> self
+    def clip_path: (interned name) -> self
+    def clip_rule: (interned rule) -> self
+    def clip_units: (interned unit) -> self
+    def color: (magick_real x, magick_real y, PaintMethod method) -> self
+    def decorate: (DecorationType decoration) -> self
+    def define_clip_path: (interned name) { () -> void } -> void
+    def ellipse: (magick_real origin_x, magick_real origin_y, magick_real width, magick_real height, magick_real arc_start, magick_real arc_end) -> self
+    def encoding: (interned encoding) -> self
+    def fill: (interned colorspec) -> self
+    alias fill_color fill
+    alias fill_pattern fill
+    def fill_opacity: (magick_percentage opacity) -> self
+    def fill_rule: (interned rule) -> self
+    def gravity: (GravityType grav) -> self
+    def image: (CompositeOperator composite, magick_real x, magick_real y, magick_real width, magick_real height, String image_file_path) -> self
+    def interline_spacing: (magick_real space) -> self
+    def interword_spacing: (magick_real space) -> self
+    def kerning: (magick_real space) -> self
+    def line: (magick_real start_x, magick_real start_y, magick_real end_x, magick_real end_y) -> self
+    def opacity: (magick_percentage opacity) -> self
+    def path: (interned cmds) -> self
+    def pattern: (interned name, magick_real x, magick_real y, magick_real width, magick_real height) { () -> void } -> void
+    def point: (magick_real x, magick_real y) -> self
+    def pointsize: (magick_real points) -> self
+    def polygon: (*magick_real points) -> self
+    def polyline: (*magick_real points) -> self
+    def rectangle: (magick_real upper_left_x, magick_real upper_left_y, magick_real lower_right_x, magick_real lower_right_y) -> self
+    def roundrectangle: (magick_real center_x, magick_real center_y, magick_real width, magick_real height, magick_real corner_width, magick_real corner_height) -> self
+    def skewx: (magick_real angle) -> self
+    def skewy: (magick_real angle) -> self
+    def stroke: (interned colorspec) -> self
+    alias stroke_color stroke
+    alias stroke_pattern stroke
+    def stroke_antialias: (bool `bool`) -> self
+    def stroke_dasharray: (*magick_real list) -> self
+    def stroke_dashoffset: (?magick_real value) -> self
+    def stroke_linecap: (interned value) -> self
+    def stroke_linejoin: (interned value) -> self
+    def stroke_miterlimit: (magick_real value) -> self
+    def stroke_opacity: (magick_percentage opacity) -> self
+    def text_align: (AlignType alignment) -> self
+    def text_antialias: (bool boolean) -> self
+    def text_undercolor: (String color) -> self
+
+    def annotate: (magick_image image_arg, int width_arg, int height_arg, int x_arg, int y_arg, string text) -> self
+                | (magick_image image_arg, int width_arg, int height_arg, int x_arg, int y_arg, string text) { (self) -> void } -> self
+    def composite: (magick_real x, magick_real y, magick_real width, magick_real height, magick_image image, ?CompositeOperator composite_op) -> self
+    def draw: (magick_image image_arg) -> self
+    def get_type_metrics: (magick_image image, string text) -> TypeMetric
+                        | (string text) -> TypeMetric
+    def get_multiline_type_metrics: (magick_image image, string text) -> TypeMetric
+                                  | (string text) -> TypeMetric
+    def marshal_dump: () -> Hash[Symbol, untyped]
+    def marshal_load: (Hash[Symbol, untyped] ddraw) -> self
+    def primitive: (string primitive) -> self
+  end
+end