rmagick 3.2.0 → 4.3.0

data/lib/rvg/embellishable.rb

@@ -5,7 +5,8 @@
 module Magick
   class RVG
     # Parent class of Circle, Ellipse, Text, etc.
-    class Shape #:nodoc:
+    # @private
+    class Shape
       include Stylable
       include Transformable
       include Duplicatable
@@ -30,7 +31,6 @@ module Magick
 
         @primitive = :circle
         @args = [cx, cy, cx + r, cy]
-        self
       end
     end # class Circle
 
@@ -222,7 +222,8 @@ module Magick
         init_viewbox
       end
 
-      def add_primitives(gc) #:nodoc:
+      # @private
+      def add_primitives(gc)
         # Do not render if width or height is 0
         return if @width.zero? || @height.zero?
 
@@ -332,7 +333,7 @@ module Magick
           y = Float(y)
         rescue ArgumentError
           args = [cols, rows, x, y]
-          raise ArgumentError, "at least one argument is not convertable to Float (got #{args.collect(&:class).join(', ')})"
+          raise ArgumentError, "at least one argument is not convertable to Float (got #{args.map(&:class).join(', ')})"
         end
         rvg.corner(x, y)
         @content << rvg

data/lib/rvg/misc.rb

@@ -34,7 +34,7 @@ module Magick
     # Convert an array of method arguments to Float objects. If any
     # cannot be converted, raise ArgumentError and issue a message.
     def self.fmsg(*args)
-      "at least one argument cannot be converted to Float (got #{args.collect(&:class).join(', ')})"
+      "at least one argument cannot be converted to Float (got #{args.map(&:class).join(', ')})"
     end
 
     def self.convert_to_float(*args)
@@ -44,7 +44,7 @@ module Magick
         args.pop
       end
       begin
-        fargs = args.collect { |a| allow_nil && a.nil? ? a : Float(a) }
+        fargs = args.map { |a| allow_nil && a.nil? ? a : Float(a) }
       rescue ArgumentError, TypeError
         raise ArgumentError, fmsg(*args)
       end
@@ -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.inject(0) { |sum, a| sum + a }
+          dx = x_rel_coords.reduce(0) { |sum, a| sum + a }
           dy = y_rel_coords.max
 
           # We're handling the anchoring.
@@ -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.inject(0) { |sum, a| sum + a }
+          dy = y_rel_coords.reduce(0) { |sum, a| sum + a }
 
           # We're handling the anchoring.
           @ctx.gc.push
@@ -478,9 +478,12 @@ module Magick
         }
 
         TEXT_STRATEGIES = {
-          'lr-tb' => LRTextStrategy, 'lr' => LRTextStrategy,
-          'rt-tb' => RLTextStrategy, 'rl' => RLTextStrategy,
-          'tb-rl' => TBTextStrategy, 'tb' => TBTextStrategy
+          'lr-tb' => LRTextStrategy,
+          'lr' => LRTextStrategy,
+          'rt-tb' => RLTextStrategy,
+          'rl' => RLTextStrategy,
+          'tb-rl' => TBTextStrategy,
+          'tb' => TBTextStrategy
         }
 
         def self.degrees_to_radians(deg)
@@ -533,7 +536,7 @@ module Magick
         def baseline_shift(value)
           @text_attrs.baseline_shift = case value
                                        when 'baseline', 'sub', 'super'
-                                         value.intern
+                                         value.to_sym
                                        when /[-+]?\d+%/, Numeric
                                          value
                                        else
@@ -561,14 +564,14 @@ module Magick
         end
 
         def font_stretch(stretch)
-          stretch = FONT_STRETCH.fetch(stretch.intern, Magick::NormalStretch)
+          stretch = FONT_STRETCH.fetch(stretch.to_sym, Magick::NormalStretch)
           @gc.font_stretch(stretch)
           @shadow[-1].font_stretch = stretch
           nil
         end
 
         def font_style(style)
-          style = FONT_STYLE.fetch(style.intern, Magick::NormalStyle)
+          style = FONT_STYLE.fetch(style.to_sym, Magick::NormalStyle)
           @gc.font_style(style)
           @shadow[-1].font_style = style
           nil
@@ -677,7 +680,7 @@ module Magick
         end
 
         def text_anchor(anchor)
-          anchor = anchor.intern
+          anchor = anchor.to_sym
           anchor_enum = TEXT_ANCHOR.fetch(anchor, Magick::StartAnchor)
           @gc.text_anchor(anchor_enum)
           align = ANCHOR_TO_ALIGN.fetch(anchor, Magick::LeftAlign)
@@ -687,7 +690,7 @@ module Magick
         end
 
         def text_decoration(decoration)
-          decoration = TEXT_DECORATION.fetch(decoration.intern, Magick::NoDecoration)
+          decoration = TEXT_DECORATION.fetch(decoration.to_sym, Magick::NoDecoration)
           @gc.decorate(decoration)
           @shadow[-1].decorate = decoration
           nil

data/lib/rvg/paint.rb

@@ -37,7 +37,8 @@ module Magick
         yield(self) if block_given?
       end
 
-      def add_primitives(gc, style) #:nodoc:
+      # @private
+      def add_primitives(gc, style)
         name = __id__.to_s
         gc.pattern(name, @x, @y, @width, @height) do
           add_viewbox_primitives(@width, @height, gc)

data/lib/rvg/pathdata.rb

@@ -15,7 +15,7 @@ module Magick
         return unless coords
         raise ArgumentError, "wrong number of coordinates specified. A multiple of #{req} required, #{req + coords.length} given." if coords.length % req != 0
 
-        coords.each { |c| @path << format('%g', c) }
+        coords.each { |c| @path << sprintf('%g', c) }
       end
 
       public
@@ -30,7 +30,8 @@ module Magick
         @path
       end
 
-      def deep_copy(_h = nil) #:nodoc:
+      # @private
+      def deep_copy(_h = nil)
         @path.dup
       end
 
@@ -38,7 +39,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def moveto(abs, x, y, *coords)
-        @path << format('%s%g,%g ', (abs ? 'M' : 'm'), x, y)
+        @path << sprintf('%s%g,%g ', (abs ? 'M' : 'm'), x, y)
         # "subsequent pairs are treated as implicit lineto commands"
         add_points(2, *coords)
       end
@@ -54,7 +55,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def lineto(abs, x, y, *coords)
-        @path << format('%s%g,%g ', (abs ? 'L' : 'l'), x, y)
+        @path << sprintf('%s%g,%g ', (abs ? 'L' : 'l'), x, y)
         # "a number of coordinate pairs may be specified to draw a polyline"
         add_points(2, *coords)
       end
@@ -63,14 +64,14 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def hlineto(abs, x)
-        @path << format('%s%g ', (abs ? 'H' : 'h'), x)
+        @path << sprintf('%s%g ', (abs ? 'H' : 'h'), x)
       end
 
       # Add a <tt>vertical lineto</tt> command. If <tt>abs</tt> is
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def vlineto(abs, y)
-        @path << format('%s%g ', (abs ? 'V' : 'v'), y)
+        @path << sprintf('%s%g ', (abs ? 'V' : 'v'), y)
       end
 
       # Add a <tt>curveto</tt> (<em>cubic Bezier</em>) command.
@@ -78,7 +79,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def curveto(abs, x1, y1, x2, y2, x, y, *coords)
-        @path << format('%s%g,%g %g,%g %g,%g ', (abs ? 'C' : 'c'), x1, y1, x2, y2, x, y)
+        @path << sprintf('%s%g,%g %g,%g %g,%g ', (abs ? 'C' : 'c'), x1, y1, x2, y2, x, y)
         # "multiple sets of coordinates may be specified to draw a polybezier"
         add_points(6, *coords)
       end
@@ -88,7 +89,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def smooth_curveto(abs, x2, y2, x, y, *coords)
-        @path << format('%s%g,%g %g,%g ', (abs ? 'S' : 's'), x2, y2, x, y)
+        @path << sprintf('%s%g,%g %g,%g ', (abs ? 'S' : 's'), x2, y2, x, y)
         # "multiple sets of coordinates may be specified to draw a polybezier"
         add_points(4, *coords)
       end
@@ -98,7 +99,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def quadratic_curveto(abs, x1, y1, x, y, *coords)
-        @path << format('%s%g,%g %g,%g ', (abs ? 'Q' : 'q'), x1, y1, x, y)
+        @path << sprintf('%s%g,%g %g,%g ', (abs ? 'Q' : 'q'), x1, y1, x, y)
         add_points(4, *coords)
       end
 
@@ -107,7 +108,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def smooth_quadratic_curveto(abs, x, y, *coords)
-        @path << format('%s%g,%g ', (abs ? 'T' : 't'), x, y)
+        @path << sprintf('%s%g,%g ', (abs ? 'T' : 't'), x, y)
         add_points(2, *coords)
       end
 
@@ -117,7 +118,7 @@ module Magick
       # the coordinates are relative.
 
       def arc(abs, rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
-        @path << format('%s%g,%g %g %d %d %g,%g ', (abs ? 'A' : 'a'), rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
+        @path << sprintf('%s%g,%g %g %d %d %g,%g ', (abs ? 'A' : 'a'), rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
       end
     end # class PathData
   end # class RVG

data/lib/rvg/rvg.rb

@@ -60,10 +60,10 @@ module Magick
     # else, combine it with the background_fill_opacity.
     def bgfill
       if @background_fill.nil?
-        color = Magick::Pixel.new(0, 0, 0, Magick::TransparentOpacity)
+        color = Magick::Pixel.new(0, 0, 0, Magick::OpaqueAlpha)
       else
         color = @background_fill
-        color.opacity = (1.0 - @background_fill_opacity) * Magick::TransparentOpacity
+        color.alpha = @background_fill_opacity * Magick::OpaqueAlpha
       end
       color
     end
@@ -85,7 +85,7 @@ module Magick
                      @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
                        bg_image = @background_image.resize(new_cols, new_rows)
                        if bg_image.columns != width || bg_image.rows != height
-                         bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
+                         bg = Magick::Image.new(width, height) { |options| options.background_color = bgcolor }
                          bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
                        end
                        bg_image
@@ -96,7 +96,7 @@ module Magick
                  end
       else
         bgcolor = bgfill
-        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
+        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { |options| options.background_color = bgcolor }
       end
       canvas[:desc] = @desc if @desc
       canvas[:title] = @title if @title
@@ -242,14 +242,16 @@ module Magick
 
     # Accept #use arguments. Use (x,y) to generate an additional translate.
     # Override @width and @height if new values are supplied.
-    def ref(x, y, rw, rh) #:nodoc:
+    # @private
+    def ref(x, y, rw, rh)
       translate(x, y) if x != 0 || y != 0
       @width = rw if rw
       @height = rh if rh
     end
 
     # Used by Magick::Embellishable.rvg to set non-0 x- and y-coordinates
-    def corner(x, y) #:nodoc:
+    # @private
+    def corner(x, y)
       @nested = true
       @x = Float(x)
       @y = Float(y)
@@ -257,7 +259,8 @@ module Magick
     end
 
     # Primitives for the outermost RVG object
-    def add_outermost_primitives(gc) #:nodoc:
+    # @private
+    def add_outermost_primitives(gc)
       add_transform_primitives(gc)
       gc.push
       add_viewbox_primitives(@width, @height, gc)
@@ -268,7 +271,8 @@ module Magick
     end
 
     # Primitives for nested RVG objects
-    def add_primitives(gc) #:nodoc:
+    # @private
+    def add_primitives(gc)
       raise ArgumentError, 'RVG width or height undefined' if @width.nil? || @height.nil?
       return self if @width.zero? || @height.zero?
 

data/lib/rvg/stylable.rb

@@ -5,13 +5,15 @@
 module Magick
   class RVG
     #:stopdoc:
-    STYLES = %i[clip_path clip_rule fill fill_opacity fill_rule font
-                font_family font_size font_stretch font_style font_weight
-                opacity stroke stroke_dasharray stroke_dashoffset stroke_linecap
-                stroke_linejoin stroke_miterlimit stroke_opacity stroke_width
-                text_anchor text_decoration
-                glyph_orientation_vertical glyph_orientation_horizontal
-                letter_spacing word_spacing baseline_shift writing_mode]
+    STYLES = %i[
+      clip_path clip_rule fill fill_opacity fill_rule font
+      font_family font_size font_stretch font_style font_weight
+      opacity stroke stroke_dasharray stroke_dashoffset stroke_linecap
+      stroke_linejoin stroke_miterlimit stroke_opacity stroke_width
+      text_anchor text_decoration
+      glyph_orientation_vertical glyph_orientation_horizontal
+      letter_spacing word_spacing baseline_shift writing_mode
+    ]
 
     Styles = Struct.new(*STYLES)
 

data/lib/rvg/text.rb

@@ -12,7 +12,7 @@ module Magick
 
       private
 
-      def initialize(text) #:nodoc:
+      def initialize(text)
         super()
         @text = text.to_s if text
         @dx = @dy = 0
@@ -48,7 +48,8 @@ module Magick
       end
 
       # We do our own transformations.
-      def add_primitives(gc) #:nodoc:
+      # @private
+      def add_primitives(gc)
         return if !@text && @tspans.empty?
 
         gc.push
@@ -73,7 +74,8 @@ module Magick
     end # class TextBase
 
     # Tspan and Tref shared methods - read/update @cx, @cy in parent Text object.
-    module TextLink #:nodoc:
+    # @private
+    module TextLink
       def add_primitives(gc)
         @parent.cx = @x if @x
         @parent.cy = @y if @y
@@ -97,7 +99,8 @@ module Magick
       end
     end # module TextLink
 
-    class Tref < TextBase #:nodoc:
+    # @private
+    class Tref < TextBase
       include TextLink
 
       def initialize(obj, x, y, parent)
@@ -108,7 +111,8 @@ module Magick
       end
     end # class Tref
 
-    class Tspan < TextBase #:nodoc:
+    # @private
+    class Tspan < TextBase
       include TextLink
 
       attr_accessor :parent
@@ -125,7 +129,8 @@ module Magick
     end # class Tspan
 
     class Text < TextBase
-      attr_accessor :cx, :cy #:nodoc:
+      # @private
+      attr_accessor :cx, :cy
 
       # Define a text string starting at [<tt>x</tt>, <tt>y</tt>].
       # Use the RVG::TextConstructors#text method to create Text objects in a container.

data/lib/rvg/transformable.rb

@@ -6,7 +6,8 @@ module Magick
   class RVG
     # Transforms is an Array with a deep_copy method.
     # During unit-testing it also has a deep_equal method.
-    class Transforms < Array #:nodoc:
+    # @private
+    class Transforms < Array
       def deep_copy(_h = nil)
         copy = self.class.new
         each { |transform| copy << [transform[0], transform[1].dup] }
@@ -94,7 +95,7 @@ module Magick
             raise ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"
           end
         rescue ArgumentError
-          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].collect(&:class).join(', ')})"
+          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].map(&:class).join(', ')})"
         end
         yield(self) if block_given?
         self

data/lib/rvg/units.rb

@@ -8,7 +8,7 @@ module Magick
       def dpi=(n)
         unless defined?(@dpi)
           [Float, Integer].each do |c|
-            c.class_eval <<-END_DEFS
+            c.class_eval <<-END_DEFS, __FILE__, __LINE__ + 1
               # the default measurement - 1px is 1 pixel
               def px
                 self

data/rmagick.gemspec

@@ -14,26 +14,25 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  file_exclusion_regex = %r{(\Alib/rvg/to_c.rb)}
-  files         = tracked_files.reject { |file| file[file_exclusion_regex] }
-  test_files    = files.grep(%r{^(test|spec|features)/})
-  executables   = files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  file_exclusion_regex = %r{\A(doc|benchmarks|examples|spec|lib/rvg/to_c.rb)}
+  files = tracked_files.reject { |file| file[file_exclusion_regex] }
 
-  s.files                       = files
-  s.test_files                  = test_files
-  s.executables                 = executables
+  s.files = files
   s.require_paths << 'ext' << 'deprecated'
 
-  s.rubyforge_project = 'rmagick'
   s.extensions = %w[ext/RMagick/extconf.rb]
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
+  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.4.1'
-  s.add_development_dependency 'rubocop', '~> 0.64.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.32.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 'test-unit', '~> 2.5'
+  s.add_development_dependency 'yard', '~> 0.9.24'
 end