rmagick 2.16.0 → 3.0.0

data/lib/rvg/clippath.rb

@@ -23,16 +23,14 @@ module Magick
       # Attach the clipping path to an object with the :clip_path style.
       def initialize(clip_path_units = 'userSpaceOnUse')
         super()
-        unless ['userSpaceOnUse', 'objectBoundingBox'].include?(clip_path_units)
-          fail ArgumentError, "undefined value for clip path units: #{clip_path_units}"
-        end
+        raise ArgumentError, "undefined value for clip path units: #{clip_path_units}" unless %w[userSpaceOnUse objectBoundingBox].include?(clip_path_units)
 
         @clip_path_units = clip_path_units
         @content = Content.new
         yield(self) if block_given?
       end
 
-      def add_primitives(gc, style) #:nodoc:
+      def add_primitives(gc, _style) #:nodoc:
         name = __id__.to_s
         gc.define_clip_path(name) do
           gc.clip_units(@clip_path_units)

data/lib/rvg/container.rb

@@ -6,30 +6,33 @@ module Magick
   class RVG
     # Content is simply an Array with a deep_copy method.
     # When unit-testing, it also has a deep_equal method.
-    class Content < Array       #:nodoc:
+    class Content < Array #:nodoc:
       def deep_copy(h = {})
         me = __id__
         copy = h[me]
         unless copy
           copy = self.class.new
           each do |c|
-            copy << case
-            when c.nil?
-              nil
-            when c.respond_to?(:deep_copy)
-              c.deep_copy(h)
-            when c.respond_to?(:dup)
-              c.dup rescue c
-            else
-              c
-            end
+            copy << if c.nil?
+                      nil
+                    elsif c.respond_to?(:deep_copy)
+                      c.deep_copy(h)
+                    elsif c.respond_to?(:dup)
+                      begin
+                        c.dup
+                      rescue StandardError
+                        c
+                      end
+                    else
+                      c
+                    end
           end
           copy.freeze if frozen?
           h[me] = copy
         end
         copy
       end
-    end  # class Content
+    end # class Content
 
     # Define a collection of shapes, text, etc. that can be reused.
     # Group objects are _containers_. That is, styles and transforms defined
@@ -49,11 +52,11 @@ module Magick
     #       grp.circle(10, 20, 20).styles(:stroke=>'blue')
     #   end
     class Group
-        include Stylable
-        include Transformable
-        include Embellishable
-        include Describable
-        include Duplicatable
+      include Stylable
+      include Transformable
+      include Embellishable
+      include Describable
+      include Duplicatable
 
       def initialize
         super
@@ -61,7 +64,7 @@ module Magick
         yield(self) if block_given?
       end
 
-      def add_primitives(gc)  #:nodoc:
+      def add_primitives(gc) #:nodoc:
         gc.push
         add_transform_primitives(gc)
         add_style_primitives(gc)
@@ -70,16 +73,16 @@ module Magick
       end
 
       # Translate container according to #use arguments
-      def ref(x, y, width, height)    #:nodoc:
+      def ref(x, y, _width, _height) #:nodoc:
         translate(x, y) if x != 0 || y != 0
       end
 
       # Append an arbitrary object to the group's content. Called
       # by #use to insert a non-container object into a group.
-      def <<(obj)  #:nodoc:
+      def <<(obj) #:nodoc:
         @content << obj
       end
-    end  # class Group
+    end # class Group
 
     # A Use object allows the re-use of RVG and RVG::Group
     # objects within a container. Create a Use object with the
@@ -110,7 +113,7 @@ module Magick
         @element.ref(x, y, width, height)
       end
 
-      def add_primitives(gc)  #:nodoc:
+      def add_primitives(gc) #:nodoc:
         gc.push
         add_transform_primitives(gc)
         add_style_primitives(gc)

data/lib/rvg/deep_equal.rb

@@ -30,17 +30,17 @@ module Magick
               end
             else
               case itv
-                when Float, Symbol, TrueClass, FalseClass, Fixnum, NilClass
-                  return false if itv != otv
-                else
-                  if itv.equal?(otv)
-                    puts "#{iv} is dup-able but self.#{iv} and other.#{iv} are the same object."
-                    return false
-                  end
-                  if itv != otv
-                    puts "Not equal.\nself.#{iv}=#{itv.inspect}\nother.#{iv}=#{otv.inspect}"
-                    return false
-                  end
+              when Float, Symbol, TrueClass, FalseClass, Fixnum, NilClass
+                return false if itv != otv
+              else
+                if itv.equal?(otv)
+                  puts "#{iv} is dup-able but self.#{iv} and other.#{iv} are the same object."
+                  return false
+                end
+                if itv != otv
+                  puts "Not equal.\nself.#{iv}=#{itv.inspect}\nother.#{iv}=#{otv.inspect}"
+                  return false
+                end
               end
             end
           end

data/lib/rvg/describable.rb

@@ -11,7 +11,7 @@ module Magick
     module Describable
       private
 
-      def initialize(*args, &block)       #:nodoc:
+      def initialize(*args, &block) #:nodoc:
         super
         @title, @desc, @metadata = nil
       end
@@ -42,6 +42,6 @@ module Magick
       def metadata
         @metadata.to_s
       end
-    end     # module Describable
+    end # module Describable
   end # class RVG
 end # module Magick

data/lib/rvg/embellishable.rb

@@ -5,7 +5,7 @@
 module Magick
   class RVG
     # Parent class of Circle, Ellipse, Text, etc.
-    class Shape  #:nodoc:
+    class Shape #:nodoc:
       include Stylable
       include Transformable
       include Duplicatable
@@ -18,7 +18,7 @@ module Magick
         gc.__send__(@primitive, *@args)
         gc.pop
       end
-    end     # class Shape
+    end # class Shape
 
     class Circle < Shape
       # Define a circle with radius +r+ and centered at [<tt>cx</tt>, <tt>cy</tt>].
@@ -26,14 +26,13 @@ module Magick
       def initialize(r, cx = 0, cy = 0)
         super()
         r, cx, cy = Magick::RVG.convert_to_float(r, cx, cy)
-        if r < 0
-          fail ArgumentError, "radius must be >= 0 (#{r} given)"
-        end
+        raise ArgumentError, "radius must be >= 0 (#{r} given)" if r < 0
+
         @primitive = :circle
-        @args = [cx, cy, cx+r, cy]
+        @args = [cx, cy, cx + r, cy]
         self
       end
-    end     # class Circle
+    end # class Circle
 
     class Ellipse < Shape
       # Define an ellipse with a center at [<tt>cx</tt>, <tt>cy</tt>], a horizontal radius +rx+
@@ -42,14 +41,13 @@ module Magick
       def initialize(rx, ry, cx = 0, cy = 0)
         super()
         rx, ry, cx, cy = Magick::RVG.convert_to_float(rx, ry, cx, cy)
-        if rx < 0 || ry < 0
-          fail ArgumentError, "radii must be >= 0 (#{rx}, #{ry} given)"
-        end
+        raise ArgumentError, "radii must be >= 0 (#{rx}, #{ry} given)" if rx < 0 || ry < 0
+
         @primitive = :ellipse
         # Ellipses are always complete.
         @args = [cx, cy, rx, ry, 0, 360]
       end
-    end     # class Ellipse
+    end # class Ellipse
 
     class Line < Shape
       # Define a line from [<tt>x1</tt>, <tt>y1</tt>] to [<tt>x2</tt>, <tt>y2</tt>].
@@ -59,7 +57,7 @@ module Magick
         @primitive = :line
         @args = [x1, y1, x2, y2]
       end
-    end     # class Line
+    end # class Line
 
     class Path < Shape
       # Define an SVG path. The argument can be either a path string
@@ -70,7 +68,7 @@ module Magick
         @primitive = :path
         @args = [path.to_s]
       end
-    end     # class Path
+    end # class Path
 
     class Rect < Shape
       # Define a width x height rectangle. The upper-left corner is at [<tt>x</tt>, <tt>y</tt>].
@@ -79,10 +77,9 @@ module Magick
       def initialize(width, height, x = 0, y = 0)
         super()
         width, height, x, y = Magick::RVG.convert_to_float(width, height, x, y)
-        if width < 0 || height < 0
-          fail ArgumentError, "width, height must be >= 0 (#{width}, #{height} given)"
-        end
-        @args = [x, y, x+width, y+height]
+        raise ArgumentError, "width, height must be >= 0 (#{width}, #{height} given)" if width < 0 || height < 0
+
+        @args = [x, y, x + width, y + height]
         @primitive = :rectangle
       end
 
@@ -90,9 +87,8 @@ module Magick
       # are the x- and y-axis radii. If y is omitted it defaults to x.
       def round(rx, ry = nil)
         rx, ry = Magick::RVG.convert_to_float(rx, ry || rx)
-        if rx < 0 || ry < 0
-          fail ArgumentError, "rx, ry must be >= 0 (#{rx}, #{ry} given)"
-        end
+        raise ArgumentError, "rx, ry must be >= 0 (#{rx}, #{ry} given)" if rx < 0 || ry < 0
+
         @args << rx << ry
         @primitive = :roundrectangle
         self
@@ -102,24 +98,22 @@ module Magick
     class PolyShape < Shape
       def polypoints(points)
         case points.length
-          when 1
-            points = Array(points[0])
-          when 2
-            x_coords = Array(points[0])
-            y_coords = Array(points[1])
-            unless x_coords.length > 0 && y_coords.length > 0
-              fail ArgumentError, 'array arguments must contain at least one point'
-            end
-            n = x_coords.length - y_coords.length
-            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
+        when 1
+          points = Array(points[0])
+        when 2
+          x_coords = Array(points[0])
+          y_coords = Array(points[1])
+          raise ArgumentError, 'array arguments must contain at least one point' unless !x_coords.empty? && !y_coords.empty?
+
+          n = x_coords.length - y_coords.length
+          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
         end
         n = points.length
-        if n < 4 || n.odd?
-          fail ArgumentError, "insufficient/odd number of points specified: #{n}"
-        end
+        raise ArgumentError, "insufficient/odd number of points specified: #{n}" if n < 4 || n.odd?
+
         Magick::RVG.convert_to_float(*points)
       end
     end  # class PolyShape
@@ -136,7 +130,7 @@ module Magick
         @primitive = :polygon
         @args = polypoints(points)
       end
-    end     # class Polygon
+    end # class Polygon
 
     class Polyline < PolyShape
       # Draws a polyline. The arguments are [<tt>x</tt>, <tt>y</tt>] pairs that
@@ -149,7 +143,7 @@ module Magick
         @primitive = :polyline
         @args = Magick::RVG.convert_to_float(*points)
       end
-    end     # class Polyline
+    end # class Polyline
 
     class Image
       include Stylable
@@ -162,22 +156,22 @@ module Magick
 
       def align_to_viewport(scale)
         tx = case @align
-            when 'none', /\AxMin/
-              0
-            when NilClass, /\AxMid/
-              (@width - @image.columns*scale) / 2.0
-            when /\AxMax/
-              @width - @image.columns*scale
-        end
+             when 'none', /\AxMin/
+               0
+             when NilClass, /\AxMid/
+               (@width - @image.columns * scale) / 2.0
+             when /\AxMax/
+               @width - @image.columns * scale
+             end
 
         ty = case @align
-            when 'none', /YMin\z/
-              0
-            when NilClass, /YMid\z/
-              (@height - @image.rows*scale) / 2.0
-            when /YMax\z/
-              @height - @image.rows*scale
-        end
+             when 'none', /YMin\z/
+               0
+             when NilClass, /YMid\z/
+               (@height - @image.rows * scale) / 2.0
+             when /YMax\z/
+               @height - @image.rows * scale
+             end
         [tx, ty]
       end
 
@@ -188,7 +182,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
           width = @image.columns
           height = @image.rows
         else
@@ -199,12 +193,12 @@ module Magick
           end
 
           gc.clip_path(name)
-          scale = [@width/@image.columns, @height/@image.rows].max
+          scale = [@width / @image.columns, @height / @image.rows].max
           width = @image.columns
           height = @image.rows
         end
         tx, ty = align_to_viewport(scale)
-        gc.composite(@x+tx, @y+ty, width*scale, height*scale, @image)
+        gc.composite(@x + tx, @y + ty, width * scale, height * scale, @image)
       end
 
       def init_viewbox
@@ -223,22 +217,22 @@ module Magick
         super()             # run module initializers
         @image = image.copy # use a copy of the image in case app. re-uses the argument
         @x, @y, @width, @height = Magick::RVG.convert_to_float(x, y, width || @image.columns, height || @image.rows)
-        if @width < 0 || @height < 0
-          fail ArgumentError, 'width, height must be >= 0'
-        end
+        raise ArgumentError, 'width, height must be >= 0' if @width < 0 || @height < 0
+
         init_viewbox
       end
 
       def add_primitives(gc) #:nodoc:
         # Do not render if width or height is 0
-        return if @width == 0 || @height == 0
+        return if @width.zero? || @height.zero?
+
         gc.push
         add_transform_primitives(gc)
         add_style_primitives(gc)
         add_composite_primitive(gc)
         gc.pop
       end
-    end     # class Image
+    end # class Image
 
     # Methods that construct basic shapes within a container
     module ShapeConstructors
@@ -307,7 +301,7 @@ module Magick
         @content << polyline
         polyline
       end
-    end     # module ShapeContent
+    end # module ShapeContent
 
     # Methods that reference ("use") other drawable objects within a container
     module UseConstructors
@@ -321,7 +315,7 @@ module Magick
         @content << use
         use
       end
-    end     # module UseConstructors
+    end # module UseConstructors
 
     # Methods that construct container objects within a container
     module StructureConstructors
@@ -338,7 +332,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 {|a| a.class}.join(', ')})"
+          raise ArgumentError, "at least one argument is not convertable to Float (got #{args.collect(&:class).join(', ')})"
         end
         rvg.corner(x, y)
         @content << rvg
@@ -359,7 +353,7 @@ module Magick
         @content << group
         group
       end
-    end     # module StructureConstructors
+    end # module StructureConstructors
 
     # Methods that construct raster image objects within a container
     module ImageConstructors
@@ -375,7 +369,7 @@ module Magick
         @content << img
         img
       end
-    end     # module ImageConstructors
+    end # module ImageConstructors
 
     # Methods that create shapes, text, and other drawable objects
     # within container objects such as ::Magick::RVG and
@@ -386,6 +380,6 @@ module Magick
       include TextConstructors
       include UseConstructors
       include ImageConstructors
-    end     # module Embellishable
+    end # module Embellishable
   end # class RVG
 end # module Magick