rvg.rb in rmagick-3.0.0

- old
+ new

@@ -58,11 +58,11 @@
 
     # background_fill defaults to 'none'. If background_fill has been set to something
     # 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::TransparentOpacity)
       else
         color = @background_fill
         color.opacity = (1.0 - @background_fill_opacity) * Magick::TransparentOpacity
       end
       color
@@ -70,32 +70,32 @@
 
     def new_canvas
       if @background_pattern
         canvas = Magick::Image.new(@width, @height, @background_pattern)
       elsif @background_image
-        if @width != @background_image.columns || @height != @background_image.rows
-          canvas = case @background_position
-            when :scaled
-              @background_image.resize(@width, @height)
-            when :tiled
-              Magick::Image.new(@width, @height, Magick::TextureFill.new(@background_image))
-            when :fit
-              width = @width
-              height = @height
-              bgcolor = bgfill
-              @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_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
-                end
-                bg_image
-              end
-          end
-        else
-          canvas = @background_image.copy
-        end
+        canvas = if @width != @background_image.columns || @height != @background_image.rows
+                   case @background_position
+                   when :scaled
+                     @background_image.resize(@width, @height)
+                   when :tiled
+                     Magick::Image.new(@width, @height, Magick::TextureFill.new(@background_image))
+                   when :fit
+                     width = @width
+                     height = @height
+                     bgcolor = bgfill
+                     @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_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
+                       end
+                       bg_image
+                     end
+                   end
+                 else
+                   @background_image.copy
+                 end
       else
         bgcolor = bgfill
         canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
       end
       canvas[:desc] = @desc if @desc
@@ -108,19 +108,19 @@
       def print_gc(gc)
         primitives = gc.inspect.split(/\n/)
         indent = 0
         primitives.each do |cmd|
           indent -= 1 if cmd['pop ']
-          print(('   '*indent), cmd, "\n")
+          print(('   ' * indent), cmd, "\n")
           indent += 1 if cmd['push ']
         end
       end
     end
 
     public
 
-    WORD_SEP = / /     # Regexp to separate words
+    WORD_SEP = / / # Regexp to separate words
 
     # The background image specified by background_image=
     attr_reader :background_image
     # The background image layout specified by background_position=
     attr_reader :background_position
@@ -137,13 +137,12 @@
     attr_reader :width, :height
 
     # Sets an image to use as the canvas background. See background_position= for layout options.
     def background_image=(bg_image)
       warn 'background_image= has no effect in nested RVG objects' if @nested
-      if bg_image && !bg_image.is_a?(Magick::Image)
-        fail ArgumentError, "background image must be an Image (got #{bg_image.class})"
-      end
+      raise ArgumentError, "background image must be an Image (got #{bg_image.class})" if bg_image && !bg_image.is_a?(Magick::Image)
+
       @background_image = bg_image
     end
 
     # Sets an object to use to fill the canvas background.
     # The object must have a <tt>fill</tt> method. See the <b>Fill Classes</b>
@@ -160,13 +159,12 @@
     #        image proportions. Center the image on the canvas. Color any part of
     #        the canvas not covered by the image with the background color.
     def background_position=(pos)
       warn 'background_position= has no effect in nested RVG objects' if @nested
       bg_pos = pos.to_s.downcase
-      unless ['scaled', 'tiled', 'fit'].include?(bg_pos)
-        fail ArgumentError, "background position must be `scaled', `tiled', or `fit' (#{pos} given)"
-      end
+      raise ArgumentError, "background position must be `scaled', `tiled', or `fit' (#{pos} given)" unless %w[scaled tiled fit].include?(bg_pos)
+
       @background_position = bg_pos.to_sym
     end
 
     # Sets the canvas background color. Either a Magick::Pixel or a color name.
     # The default fill is "none", that is, transparent black.
@@ -177,11 +175,11 @@
           @background_fill = Magick::Pixel.from_color(color)
         rescue Magick::ImageMagickError
           raise ArgumentError, "unknown color `#{color}'"
         rescue TypeError
           raise TypeError, "cannot convert #{color.class} into Pixel"
-        rescue
+        rescue StandardError
           raise ArgumentError, "argument must be a color name or a Pixel (got #{color.class})"
         end
       else
         @background_fill = color
       end
@@ -217,11 +215,11 @@
       @width = width
       @height = height
       @content = Content.new
       @canvas = nil
       @background_fill = nil
-      @background_fill_opacity = 1.0  # applies only if background_fill= is used
+      @background_fill_opacity = 1.0 # applies only if background_fill= is used
       @background_position = :scaled
       @background_pattern, @background_image, @desc, @title, @metadata = nil
       @x = 0.0
       @y = 0.0
       @nested = false
@@ -229,53 +227,52 @@
     end
 
     # Construct a canvas or reuse an existing canvas.
     # Execute drawing commands. Return the canvas.
     def draw
-      fail StandardError, 'draw not permitted in nested RVG objects' if @nested
-      @canvas ||= new_canvas    # allow drawing over existing canvas
+      raise StandardError, 'draw not permitted in nested RVG objects' if @nested
+
+      @canvas ||= new_canvas # allow drawing over existing canvas
       gc = Utility::GraphicContext.new
       add_outermost_primitives(gc)
       pp(self) if ENV['debug_rvg']
       print_gc(gc) if ENV['debug_prim']
       gc.draw(@canvas)
       @canvas
     end
 
     # 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:
+    def ref(x, y, rw, rh) #:nodoc:
       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:
+    def corner(x, y) #:nodoc:
       @nested = true
       @x = Float(x)
       @y = Float(y)
       translate(@x, @y) if @x != 0.0 || @y != 0.0
     end
 
     # Primitives for the outermost RVG object
-    def add_outermost_primitives(gc)    #:nodoc:
+    def add_outermost_primitives(gc) #:nodoc:
       add_transform_primitives(gc)
       gc.push
       add_viewbox_primitives(@width, @height, gc)
       add_style_primitives(gc)
       @content.each { |element| element.add_primitives(gc) }
       gc.pop
       self
     end
 
     # Primitives for nested RVG objects
-    def add_primitives(gc)  #:nodoc:
-      if @width.nil? || @height.nil?
-        fail ArgumentError, 'RVG width or height undefined'
-      elsif @width == 0 || @height == 0
-        return self
-      end
+    def add_primitives(gc) #:nodoc:
+      raise ArgumentError, 'RVG width or height undefined' if @width.nil? || @height.nil?
+      return self if @width.zero? || @height.zero?
+
       gc.push
       add_outermost_primitives(gc)
       gc.pop
     end
   end # end class RVG