rmagick 5.4.4 → 6.0.0

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
@@ -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 = FONT_WEIGHT.fetch(weight.to_sym, Magick::NormalWeight) unless weight.is_a?(Numeric)
           @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
@@ -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
@@ -90,6 +88,8 @@ module Magick
                        end
                        bg_image
                      end
+                   else
+                     @background_image.copy
                    end
                  else
                    @background_image.copy
@@ -106,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 ']
@@ -170,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
@@ -180,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/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/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/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/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']
@@ -14,7 +13,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
@@ -24,18 +23,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_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'
+  s.add_runtime_dependency 'pkg-config', '~> 1.4'
 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