rmagick 2.16.0 → 3.0.0

data/doc/ex/get_type_metrics.rb

@@ -14,10 +14,11 @@ module Magick
     # The placement & orientation is affected by the
     # current user coordinate system.
     def brace(w, h)
-      fail(ArgumentError, 'width must be != 0') unless w != 0
-      fail(ArgumentError, 'height must be != 0') unless h != 0
-      path("M0,0 Q#{w},0 #{w/2.0},#{-h/4.0} T#{w},#{-h/2.0}" \
-           "Q0,#{-h/2.0} #{w/2.0},#{-(3.0*h/4.0)} T0,#{-h}")
+      raise(ArgumentError, 'width must be != 0') unless w != 0
+      raise(ArgumentError, 'height must be != 0') unless h != 0
+
+      path("M0,0 Q#{w},0 #{w / 2.0},#{-h / 4.0} T#{w},#{-h / 2.0}" \
+           "Q0,#{-h / 2.0} #{w / 2.0},#{-(3.0 * h / 4.0)} T0,#{-h}")
     end
   end
 end
@@ -53,32 +54,32 @@ gc.circle(0, 0, 0, 2)
 
 # All our lines will be medium-gray, dashed, and thin.
 gc.stroke('gray50')
-gc.stroke_dasharray(5,2)
+gc.stroke_dasharray(5, 2)
 gc.stroke_width(1)
 gc.fill('none')
 
 # baseline
-gc.line(-10, 0, metrics.width+20, 0)
+gc.line(-10, 0, metrics.width + 20, 0)
 
 # a vertical line through the origin
-gc.line(0, -metrics.descent-metrics.height-10, 0, -metrics.descent+15)
+gc.line(0, -metrics.descent - metrics.height - 10, 0, -metrics.descent + 15)
 
 # descent
-gc.line(-10, -metrics.descent, metrics.width+20, -metrics.descent)
+gc.line(-10, -metrics.descent, metrics.width + 20, -metrics.descent)
 
 # ascent
-gc.line(-10, -metrics.ascent, metrics.width+20, -metrics.ascent)
+gc.line(-10, -metrics.ascent, metrics.width + 20, -metrics.ascent)
 
 # height
-gc.line(-10, -metrics.descent-metrics.height,
-        metrics.width+10, -metrics.descent-metrics.height)
+gc.line(-10, -metrics.descent - metrics.height,
+        metrics.width + 10, -metrics.descent - metrics.height)
 
 # width
-gc.line(metrics.width, -metrics.descent-metrics.height-10,
-        metrics.width, -metrics.descent+20)
+gc.line(metrics.width, -metrics.descent - metrics.height - 10,
+        metrics.width, -metrics.descent + 20)
 
 # max_advance
-gc.line(metrics.max_advance, -10, metrics.max_advance, -metrics.descent+20)
+gc.line(metrics.max_advance, -10, metrics.max_advance, -metrics.descent + 20)
 
 gc.draw(canvas)
 
@@ -94,33 +95,33 @@ gc.translate(Origin_x, Origin_y)
 
 # between origin and descent
 gc.push
-gc.translate(metrics.width+23, 0)
+gc.translate(metrics.width + 23, 0)
 gc.brace(10, metrics.descent)
 gc.pop
 
 # between origin and ascent
 gc.push
-gc.translate(metrics.width+23, 0)
+gc.translate(metrics.width + 23, 0)
 gc.brace(10, metrics.ascent)
 gc.pop
 
 # between origin and height
 gc.push
-gc.translate(-13, -metrics.descent-metrics.height)
+gc.translate(-13, -metrics.descent - metrics.height)
 gc.rotate(180)
 gc.brace(10, metrics.height)
 gc.pop
 
 # between origin and width
 gc.push
-gc.translate(metrics.width, -metrics.descent-metrics.height-10-3)
+gc.translate(metrics.width, -metrics.descent - metrics.height - 10 - 3)
 gc.rotate(-90)
 gc.brace(10, metrics.width)
 gc.pop
 
 # between origin and max_advance
 gc.push
-gc.translate(0, -metrics.descent+15)
+gc.translate(0, -metrics.descent + 15)
 gc.rotate(90)
 gc.brace(10, metrics.max_advance)
 gc.pop
@@ -130,12 +131,12 @@ gc.font_weight(Magick::NormalWeight)
 gc.font_style(Magick::NormalStyle)
 gc.stroke('none')
 gc.fill('black')
-gc.text(metrics.width+40, -(metrics.ascent/2)+4, 'ascent')
-gc.text(metrics.width+40, -(metrics.descent/2)+4, 'descent')
-gc.text(-60, -metrics.descent-metrics.height/2+4, 'height')
-gc.text((metrics.width/2)-15, -metrics.descent-metrics.height-25, 'width')
-gc.text((metrics.max_advance)/2-38, -metrics.descent+35, 'max_advance')
+gc.text(metrics.width + 40, -(metrics.ascent / 2) + 4, 'ascent')
+gc.text(metrics.width + 40, -(metrics.descent / 2) + 4, 'descent')
+gc.text(-60, -metrics.descent - metrics.height / 2 + 4, 'height')
+gc.text((metrics.width / 2) - 15, -metrics.descent - metrics.height - 25, 'width')
+gc.text(metrics.max_advance / 2 - 38, -metrics.descent + 35, 'max_advance')
 
 gc.draw(canvas)
-canvas.border!(1,1,'blue')
+canvas.border!(1, 1, 'blue')
 canvas.write('get_type_metrics.gif')

data/doc/ex/gradientfill.rb

@@ -15,13 +15,13 @@ img = Magick::Image.new(Cols, Rows, fill)
 # Annotate the filled image with the code that created the fill.
 
 ann = Magick::Draw.new
-ann.annotate(img, 0,0,0,0, "GradientFill.new(0, 0, 0, #{Rows}, '#{Start}', '#{End}')") do
+ann.annotate(img, 0, 0, 0, 0, "GradientFill.new(0, 0, 0, #{Rows}, '#{Start}', '#{End}')") do
   self.gravity = Magick::CenterGravity
   self.fill = 'white'
   self.stroke = 'transparent'
   self.pointsize = 14
 end
 
-#img.display
+# img.display
 img.write('gradientfill.gif')
 exit

data/doc/ex/grav.rb

@@ -3,16 +3,16 @@
 require 'rmagick'
 
 imgl = Magick::ImageList.new
-imgl.new_image(400,200, Magick::HatchFill.new('white', 'lightcyan2'))
+imgl.new_image(400, 200, Magick::HatchFill.new('white', 'lightcyan2'))
 
 gc = Magick::Draw.new
 
 # Draw blue lines to indicate positioning
 gc.stroke('blue')
 gc.fill('transparent')
-gc.rectangle(20,20, 380,180)
-gc.line(200,20, 200,180)
-gc.line(20,100, 380,100)
+gc.rectangle(20, 20, 380, 180)
+gc.line(200, 20, 200, 180)
+gc.line(20, 100, 380, 100)
 
 # Draw text at all 9 compass points.
 gc.font_weight(Magick::NormalWeight)
@@ -20,26 +20,26 @@ gc.font_style(Magick::NormalStyle)
 gc.stroke('transparent')
 gc.fill('black')
 gc.gravity(Magick::NorthWestGravity)
-gc.text(20,20, 'NorthWestGravity')
+gc.text(20, 20, 'NorthWestGravity')
 gc.gravity(Magick::NorthGravity)
-gc.text( 0,20, 'NorthGravity')
+gc.text(0, 20, 'NorthGravity')
 gc.gravity(Magick::NorthEastGravity)
-gc.text(20,20, 'NorthEastGravity')
+gc.text(20, 20, 'NorthEastGravity')
 gc.gravity(Magick::WestGravity)
 gc.text(20, 0, 'WestGravity')
 gc.gravity(Magick::CenterGravity)
-gc.text( 0, 0, 'CenterGravity')
+gc.text(0, 0, 'CenterGravity')
 gc.gravity(Magick::EastGravity)
 gc.text(20, 0, 'EastGravity')
 gc.gravity(Magick::SouthWestGravity)
-gc.text(20,20, 'SouthWestGravity')
+gc.text(20, 20, 'SouthWestGravity')
 gc.gravity(Magick::SouthGravity)
-gc.text( 0,20, 'SouthGravity')
+gc.text(0, 20, 'SouthGravity')
 gc.gravity(Magick::SouthEastGravity)
-gc.text(20,20, 'SouthEastGravity')
+gc.text(20, 20, 'SouthEastGravity')
 gc.draw(imgl)
 
-imgl.border!(1,1, 'lightcyan2')
+imgl.border!(1, 1, 'lightcyan2')
 
 imgl.write('grav.gif')
 exit

data/doc/ex/gravity.rb

@@ -9,15 +9,14 @@ x = 100
 y = 100
 
 begin
-
   pic = Magick::ImageList.new
 
   lines = Magick::Draw.new
   lines.stroke '#600'
   lines.fill_opacity 0
-  lines.line 300,100, 300,500
-  lines.line 100,300, 500,300
-  lines.rectangle 100,100, 500,500
+  lines.line 300, 100, 300, 500
+  lines.line 100, 300, 500, 300
+  lines.rectangle 100, 100, 500, 500
 
   draw = Magick::Draw.new
   draw.pointsize = 30
@@ -30,49 +29,48 @@ begin
 
     lines.draw pic
 
-    draw.annotate(pic, 0,0,x,y, 'NorthWest') do
+    draw.annotate(pic, 0, 0, x, y, 'NorthWest') do
       self.gravity = Magick::NorthWestGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,0,y, 'North') do
+    draw.annotate(pic, 0, 0, 0, y, 'North') do
       self.gravity = Magick::NorthGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,x,y, 'NorthEast') do
+    draw.annotate(pic, 0, 0, x, y, 'NorthEast') do
       self.gravity = Magick::NorthEastGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,x,0, 'East') do
+    draw.annotate(pic, 0, 0, x, 0, 'East') do
       self.gravity = Magick::EastGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,0,0, 'Center') do
+    draw.annotate(pic, 0, 0, 0, 0, 'Center') do
       self.gravity = Magick::CenterGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,x,y, 'SouthEast') do
+    draw.annotate(pic, 0, 0, x, y, 'SouthEast') do
       self.gravity = Magick::SouthEastGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,0,y, 'South') do
+    draw.annotate(pic, 0, 0, 0, y, 'South') do
       self.gravity = Magick::SouthGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,x,y, 'SouthWest') do
+    draw.annotate(pic, 0, 0, x, y, 'SouthWest') do
       self.gravity = Magick::SouthWestGravity
       self.rotation = angle
     end
-    draw.annotate(pic, 0,0,x,0, 'West') do
+    draw.annotate(pic, 0, 0, x, 0, 'West') do
       self.gravity = Magick::WestGravity
       self.rotation = angle
     end
   end
 
-  puts "Writing image \"rm_gravity_out.miff\"..."
+  puts 'Writing image "rm_gravity_out.miff"...'
   pic.delay = 20
   pic.write './rm_gravity_out.miff'
-
-rescue
+rescue StandardError
   puts "#{$ERROR_INFO} exception raised."
   exit 1
 end

data/doc/ex/group.rb

@@ -2,23 +2,23 @@ require 'rvg/rvg'
 
 Magick::RVG.dpi = 90
 
-rvg = Magick::RVG.new(6.cm, 4.cm).viewbox(0,0,600,400) do |canvas|
+rvg = Magick::RVG.new(6.cm, 4.cm).viewbox(0, 0, 600, 400) do |canvas|
   canvas.background_fill = 'white'
-  canvas.rect(595,395,1,1).styles(:stroke=>'blue', :fill=>'none', :stroke_width=>2)
+  canvas.rect(595, 395, 1, 1).styles(stroke: 'blue', fill: 'none', stroke_width: 2)
 
   # Define a stick figure.
-  stick = Magick::RVG::Group.new.styles(:stroke=>'black', :fill=>'none', :stroke_width=>6) do |fig|
-    fig.circle(42, 50, 50).styles(:stroke=>'red')
-    fig.polyline(30,40, 50,40, 45,60, 50,40, 65,40).styles(:stroke_width=>4)
-    fig.polyline(10,100, 50,130, 90,100)
-    fig.line(50,97, 50, 155)
-    fig.polyline(10,200, 50,155, 90,200)
+  stick = Magick::RVG::Group.new.styles(stroke: 'black', fill: 'none', stroke_width: 6) do |fig|
+    fig.circle(42, 50, 50).styles(stroke: 'red')
+    fig.polyline(30, 40, 50, 40, 45, 60, 50, 40, 65, 40).styles(stroke_width: 4)
+    fig.polyline(10, 100, 50, 130, 90, 100)
+    fig.line(50, 97, 50, 155)
+    fig.polyline(10, 200, 50, 155, 90, 200)
   end
 
   # Draw 12 copies.
-  2.times do|y|
-    6.times do|x|
-      canvas.use(stick, x*100, y*200)
+  2.times do |y|
+    6.times do |x|
+      canvas.use(stick, x * 100, y * 200)
     end
   end
 end

data/doc/ex/hatchfill.rb

@@ -16,12 +16,12 @@ img.new_image(Cols, Rows, fill)
 # Annotate the filled image with the code that created the fill.
 
 ann = Magick::Draw.new
-ann.annotate(img, 0,0,0,0, "HatchFill.new('#{Background}', '#{Foreground}')") do
+ann.annotate(img, 0, 0, 0, 0, "HatchFill.new('#{Background}', '#{Foreground}')") do
   self.gravity = Magick::CenterGravity
   self.fill = 'black'
   self.stroke = 'transparent'
   self.pointsize = 14
 end
-#img.display
+# img.display
 img.write('hatchfill.gif')
 exit

data/doc/ex/image.rb

@@ -2,36 +2,36 @@ require 'rvg/rvg'
 
 rvg = Magick::RVG.new(525, 270) do |canvas|
   canvas.background_fill = 'white'
-  canvas.rect(524, 269).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>1)
+  canvas.rect(524, 269).styles(fill: 'none', stroke: 'blue', stroke_width: 1)
 
   hat = ::Magick::Image.read('images/Flower_Hat.jpg').first
 
   canvas.image(hat, 100, 75, 25, 40).preserve_aspect_ratio('none')
-  canvas.rect(100, 75, 25, 40).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 25, 40).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 150, 40).preserve_aspect_ratio('xMinYMin', 'meet')
-  canvas.rect(100, 75, 150, 40).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 150, 40).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 275, 40).preserve_aspect_ratio('xMidYMid', 'meet')
-  canvas.rect(100, 75, 275, 40).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 275, 40).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 400, 40).preserve_aspect_ratio('xMaxYMax', 'meet')
-  canvas.rect(100, 75, 400, 40).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 400, 40).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 150, 155).preserve_aspect_ratio('xMinYMin', 'slice')
-  canvas.rect(100, 75, 150, 155).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 150, 155).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 275, 155).preserve_aspect_ratio('xMidYMid', 'slice')
-  canvas.rect(100, 75, 275, 155).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 275, 155).styles(fill: 'none', stroke: 'blue')
 
   canvas.image(hat, 100, 75, 400, 155).preserve_aspect_ratio('xMaxYMax', 'slice')
-  canvas.rect(100, 75, 400, 155).styles(:fill => 'none', :stroke => 'blue')
+  canvas.rect(100, 75, 400, 155).styles(fill: 'none', stroke: 'blue')
 
   canvas.line(150, 20, 305, 20)
   canvas.line(345, 20, 500, 20)
   canvas.line(150, 250, 305, 250)
   canvas.line(340, 250, 500, 250)
-  canvas.g.styles(:stroke=>'none', :font_weight=>'normal', :font_style=>'normal') do |t|
+  canvas.g.styles(stroke: 'none', font_weight: 'normal', font_style: 'normal') do |t|
     t.text(310, 23, 'meet')
     t.text(60, 140, 'none')
     t.text(170, 140, 'xMinYMin')

data/doc/ex/implode.rb

@@ -14,7 +14,7 @@ frames = Magick::ImageList.new
 implosion = 0.25
 8.times do
   frames << img.implode(implosion)
-  legend.annotate(frames, 0,0,10,20, sprintf('% 4.2f', implosion))
+  legend.annotate(frames, 0, 0, 10, 20, format('% 4.2f', implosion))
   frames.matte = false
   implosion -= 0.10
 end
@@ -22,7 +22,7 @@ end
 7.times do
   implosion += 0.10
   frames << img.implode(implosion)
-  legend.annotate(frames, 0,0,10,20, sprintf('% 4.2f', implosion))
+  legend.annotate(frames, 0, 0, 10, 20, format('% 4.2f', implosion))
   frames.matte = false
 end
 

data/doc/ex/line.rb

@@ -2,7 +2,7 @@
 require 'rmagick'
 
 imgl = Magick::ImageList.new
-imgl.new_image(250, 250, Magick::HatchFill.new('white','LightCyan2'))
+imgl.new_image(250, 250, Magick::HatchFill.new('white', 'LightCyan2'))
 
 gc = Magick::Draw.new
 
@@ -12,30 +12,30 @@ gc.stroke_linejoin('round')
 # Make each line 2 pixels wide.
 gc.stroke('red')
 gc.stroke_width(3)
-gc.line(50,50, 50,200)
+gc.line(50, 50, 50, 200)
 gc.stroke('blue')
-gc.line(50,200, 200,200)
+gc.line(50, 200, 200, 200)
 gc.stroke('green')
-gc.line(200,200, 50,50)
+gc.line(200, 200, 50, 50)
 
 # Identify the endpoints with gray circles
 gc.stroke('gray50')
 gc.stroke_width(1)
 gc.fill_opacity(0)
-gc.circle(50,50, 53,53)
-gc.circle(50,200, 53,203)
-gc.circle(200,200, 203,203)
+gc.circle(50, 50, 53, 53)
+gc.circle(50, 200, 53, 203)
+gc.circle(200, 200, 203, 203)
 
 # Annotate the endpoints
 gc.font_weight(Magick::NormalWeight)
 gc.font_style(Magick::NormalStyle)
 gc.fill('black')
 gc.stroke('transparent')
-gc.text(30,40, "'50,50'")
-gc.text(30,220, "'50,200'")
+gc.text(30, 40, "'50,50'")
+gc.text(30, 220, "'50,200'")
 gc.text(180, 220, "'200,200'")
 
 gc.draw(imgl)
-imgl.border!(1,1, 'LightCyan2')
+imgl.border!(1, 1, 'LightCyan2')
 
 imgl.write('line.gif')

data/doc/ex/line01.rb

@@ -7,14 +7,14 @@ rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
   canvas.desc = 'Example line01 - lines expressed in user coordinates'
 
   # Show outline of canvas using the 'rect' method
-  canvas.rect(1195, 395, 1, 1).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>2)
+  canvas.rect(1195, 395, 1, 1).styles(fill: 'none', stroke: 'blue', stroke_width: 2)
 
-  canvas.g.styles(:stroke=>'green') do |grp|
-    grp.line(100, 300, 300, 100).styles(:stroke_width=>5)
-    grp.line(300, 300, 500, 100).styles(:stroke_width=>10)
-    grp.line(500, 300, 700, 100).styles(:stroke_width=>15)
-    grp.line(700, 300, 900, 100).styles(:stroke_width=>20)
-    grp.line(900, 300, 1100, 100).styles(:stroke_width=>25)
+  canvas.g.styles(stroke: 'green') do |grp|
+    grp.line(100, 300, 300, 100).styles(stroke_width: 5)
+    grp.line(300, 300, 500, 100).styles(stroke_width: 10)
+    grp.line(500, 300, 700, 100).styles(stroke_width: 15)
+    grp.line(700, 300, 900, 100).styles(stroke_width: 20)
+    grp.line(900, 300, 1100, 100).styles(stroke_width: 25)
   end
 end