rmagick 2.16.0 → 3.0.0

data/examples/identify.rb

@@ -31,68 +31,66 @@ module Magick
         puts "\t\tGray: #{channel_depth(Magick::GrayChannel)}-bits\n"
         puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
       end
-      scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::MAGICKCORE_QUANTUM_DEPTH-channel_depth))
+      scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::MAGICKCORE_QUANTUM_DEPTH - channel_depth))
       puts "\tChannel statistics:\n"
       case color_space
       when Magick::RGBColorspace
         puts "\t\tRed:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[0]/scale, channel_extrema(Magick::RedChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[1]/scale, channel_extrema(Magick::RedChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[0]/scale, channel_mean(Magick::RedChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[1]/scale, channel_mean(Magick::RedChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::RedChannel)[0] / scale, channel_extrema(Magick::RedChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::RedChannel)[1] / scale, channel_extrema(Magick::RedChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::RedChannel)[0] / scale, channel_mean(Magick::RedChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::RedChannel)[1] / scale, channel_mean(Magick::RedChannel)[1] / Magick::QuantumRange)
         puts "\t\tGreen:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[0]/scale, channel_extrema(Magick::GreenChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[1]/scale, channel_extrema(Magick::GreenChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[0]/scale, channel_mean(Magick::GreenChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[1]/scale, channel_mean(Magick::GreenChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::GreenChannel)[0] / scale, channel_extrema(Magick::GreenChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::GreenChannel)[1] / scale, channel_extrema(Magick::GreenChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::GreenChannel)[0] / scale, channel_mean(Magick::GreenChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::GreenChannel)[1] / scale, channel_mean(Magick::GreenChannel)[1] / Magick::QuantumRange)
         puts "\t\tBlue:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[0]/scale, channel_extrema(Magick::BlueChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[1]/scale, channel_extrema(Magick::BlueChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[0]/scale, channel_mean(Magick::BlueChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[1]/scale, channel_mean(Magick::BlueChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::BlueChannel)[0] / scale, channel_extrema(Magick::BlueChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::BlueChannel)[1] / scale, channel_extrema(Magick::BlueChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::BlueChannel)[0] / scale, channel_mean(Magick::BlueChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::BlueChannel)[1] / scale, channel_mean(Magick::BlueChannel)[1] / Magick::QuantumRange)
       when Magick::CMYKColorspace
         puts "\t\tCyan:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[0]/scale, channel_extrema(Magick::CyanChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[1]/scale, channel_extrema(Magick::CyanChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[0]/scale, channel_mean(Magick::CyanChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[1]/scale, channel_mean(Magick::CyanChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::CyanChannel)[0] / scale, channel_extrema(Magick::CyanChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::CyanChannel)[1] / scale, channel_extrema(Magick::CyanChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::CyanChannel)[0] / scale, channel_mean(Magick::CyanChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::CyanChannel)[1] / scale, channel_mean(Magick::CyanChannel)[1] / Magick::QuantumRange)
         puts "\t\tMagenta:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[0]/scale, channel_extrema(Magick::MagentaChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[1]/scale, channel_extrema(Magick::MagentaChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[0]/scale, channel_mean(Magick::MagentaChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[1]/scale, channel_mean(Magick::MagentaChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[0] / scale, channel_extrema(Magick::MagentaChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[1] / scale, channel_extrema(Magick::MagentaChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::MagentaChannel)[0] / scale, channel_mean(Magick::MagentaChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::MagentaChannel)[1] / scale, channel_mean(Magick::MagentaChannel)[1] / Magick::QuantumRange)
         puts "\t\tYellow:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[0]/scale, channel_extrema(Magick::YellowChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[1]/scale, channel_extrema(Magick::YellowChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[0]/scale, channel_mean(Magick::YellowChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[1]/scale, channel_mean(Magick::YellowChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::YellowChannel)[0] / scale, channel_extrema(Magick::YellowChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::YellowChannel)[1] / scale, channel_extrema(Magick::YellowChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::YellowChannel)[0] / scale, channel_mean(Magick::YellowChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::YellowChannel)[1] / scale, channel_mean(Magick::YellowChannel)[1] / Magick::QuantumRange)
         puts "\t\tBlack:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[0]/scale, channel_extrema(Magick::BlackChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[1]/scale, channel_extrema(Magick::BlackChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[0]/scale, channel_mean(Magick::BlackChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[1]/scale, channel_mean(Magick::BlackChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::BlackChannel)[0] / scale, channel_extrema(Magick::BlackChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::BlackChannel)[1] / scale, channel_extrema(Magick::BlackChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::BlackChannel)[0] / scale, channel_mean(Magick::BlackChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::BlackChannel)[1] / scale, channel_mean(Magick::BlackChannel)[1] / Magick::QuantumRange)
       when Magick::GrayColorspace
         puts "\t\tGray:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[0]/scale, channel_extrema(Magick::GrayChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[1]/scale, channel_extrema(Magick::GrayChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[0]/scale, channel_mean(Magick::GrayChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[1]/scale, channel_mean(Magick::GrayChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::GrayChannel)[0] / scale, channel_extrema(Magick::GrayChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::GrayChannel)[1] / scale, channel_extrema(Magick::GrayChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::GrayChannel)[0] / scale, channel_mean(Magick::GrayChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::GrayChannel)[1] / scale, channel_mean(Magick::GrayChannel)[1] / Magick::QuantumRange)
       end
       if matte
         puts "\t\tOpacity:\n"
-        puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0]/scale, channel_extrema(Magick::OpacityChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1]/scale, channel_extrema(Magick::OpacityChannel)[1]/Magick::QuantumRange)
-        puts "\t\t\tMean:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[0]/scale, channel_mean(Magick::OpacityChannel)[0]/Magick::QuantumRange)
-        puts "\t\t\tStandard deviation:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[1]/scale, channel_mean(Magick::OpacityChannel)[1]/Magick::QuantumRange)
+        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0] / scale, channel_extrema(Magick::OpacityChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1] / scale, channel_extrema(Magick::OpacityChannel)[1] / Magick::QuantumRange)
+        puts "\t\t\tMean:" + format("%u (%g)\n", channel_mean(Magick::OpacityChannel)[0] / scale, channel_mean(Magick::OpacityChannel)[0] / Magick::QuantumRange)
+        puts "\t\t\tStandard deviation:" + format("%u (%g)\n", channel_mean(Magick::OpacityChannel)[1] / scale, channel_mean(Magick::OpacityChannel)[1] / Magick::QuantumRange)
       end
       if class_type == Magick::DirectClass
         puts "\tColors: #{total_colors}\n"
+      elsif total_colors <= colors
+        puts "\tColors: #{colors}\n"
       else
-        if total_colors <= colors
-          puts "\tColors: #{colors}\n"
-        else
-          puts "\tColors: #{total_colors}=>#{colors}\n"
-        end
+        puts "\tColors: #{total_colors}=>#{colors}\n"
       end
       # Histogram goes here
       puts "\tMean error per pixel: #{mean_error_per_pixel}\n" if mean_error_per_pixel != 0.0
@@ -103,24 +101,20 @@ module Magick
       chrom = chromaticity
       if chrom.red_primary.x != 0.0 || chrom.green_primary.x != 0.0 || chrom.blue_primary.x != 0.0 || chrom.white_point.x != 0.0
         puts "\tChromaticity:\n"
-        puts "\t\tred primary: (#{sprintf('%g,%g', chrom.red_primary.x, chrom.red_primary.y)})\n"
-        puts "\t\tgreen primary: (#{sprintf('%g,%g', chrom.green_primary.x, chrom.green_primary.y)})\n"
-        puts "\t\tblue primary: (#{sprintf('%g,%g', chrom.blue_primary.x, chrom.blue_primary.y)})\n"
-        puts "\t\twhite point: (#{sprintf('%g,%g', chrom.white_point.x, chrom.white_point.y)})\n"
+        puts "\t\tred primary: (#{format('%g,%g', chrom.red_primary.x, chrom.red_primary.y)})\n"
+        puts "\t\tgreen primary: (#{format('%g,%g', chrom.green_primary.x, chrom.green_primary.y)})\n"
+        puts "\t\tblue primary: (#{format('%g,%g', chrom.blue_primary.x, chrom.blue_primary.y)})\n"
+        puts "\t\twhite point: (#{format('%g,%g', chrom.white_point.x, chrom.white_point.y)})\n"
       end
       ex_info = extract_info
-      if ex_info.width * ex_info.height != 0.0
-        puts "\tTile geometry: #{ex_info.width}x#{ex_info.height}+#{ex_info.x}+#{ex_info.y}\n"
-      end
-      if x_resolution != 0.0 && y_resolution != 0.0
-        puts "\tResolution: #{sprintf('%gx%g', x_resolution, y_resolution)}\n"
-      end
+      puts "\tTile geometry: #{ex_info.width}x#{ex_info.height}+#{ex_info.x}+#{ex_info.y}\n" if ex_info.width * ex_info.height != 0.0
+      puts "\tResolution: #{format('%gx%g', x_resolution, y_resolution)}\n" if x_resolution != 0.0 && y_resolution != 0.0
       puts "\tUnits: #{units}\n"
       size = filesize
-      if size >= 1048576
-        puts "\tFilesize: #{'%.1f' % (size/1048576.0)}mb\n"
+      if size >= 1_048_576
+        puts "\tFilesize: #{format('%.1f', (size / 1_048_576.0))}mb\n"
       elsif size >= 1024
-        puts "\tFilesize: #{'%.0f' % (size/1024.0)}kb\n"
+        puts "\tFilesize: #{format('%.0f', (size / 1024.0))}kb\n"
       else
         puts "\tFilesize: #{size}b\n"
       end
@@ -129,33 +123,30 @@ module Magick
       puts "\tBorder Color: #{border_color}\n"
       puts "\tMatte Color: #{matte_color}\n"
       pg = page
-      if pg.width != 0 || pg.height != 0 || pg.x != 0 || pg.y != 0
-        puts "\tPage geometry: #{pg.width}x#{pg.height}+#{pg.x}+#{pg.y}\n"
-      end
+      puts "\tPage geometry: #{pg.width}x#{pg.height}+#{pg.x}+#{pg.y}\n" if pg.width != 0 || pg.height != 0 || pg.x != 0 || pg.y != 0
       puts "\tDispose: #{dispose}\n"
       puts "\tDelay: #{delay}\n" if delay != 0
       puts "\tIterations: #{iterations}\n" unless iterations == 1
       puts "\tScene: #{scene}\n" if scene != 0
       puts "\tCompression: #{compression}\n"
-      puts "\tQuality: #{quality}\n" unless quality == 0
+      puts "\tQuality: #{quality}\n" unless quality.zero?
       puts "\tOrientation: #{orientation}\n"
       puts "\tMontage: #{montage}\n" if montage
       signature # compute but ignore - will be displayed along with the other properties
       properties.each do |prop, value|
-        next if prop[0,1] == '['
+        next if prop[0, 1] == '['
+
         puts "\t#{prop}: #{value}\n"
       end
       clip_path = self['8BIM:1999,2998:#1']
-      if clip_path
-        puts "\tClipping path: #{clip_path}\n"
-      end
+      puts "\tClipping path: #{clip_path}\n" if clip_path
       each_profile do |name, value|
         puts "\tProfile-#{name}: #{value.length}\n"
-        if name == 'exif'
-          exif_attrs = get_exif_by_entry
-          exif_attrs.each do |attr|
-            puts "\t\t#{attr[0]}: #{attr[1]}\n"
-          end
+        next unless name == 'exif'
+
+        exif_attrs = get_exif_by_entry
+        exif_attrs.each do |attr|
+          puts "\t\t#{attr[0]}: #{attr[1]}\n"
         end
       end
       puts "\tTainted: True\n" if changed?
@@ -166,20 +157,18 @@ module Magick
   end
 end
 
-if ARGV.length == 0
+if ARGV.length.zero?
   puts <<-'END_USAGE'
     This example displays information about the specified image file(s)
     that is similar to ImageMagick/GraphicsMagick's identify command.
 
     Usage:
     ruby identify.rb filename [filename...]
-    END_USAGE
+  END_USAGE
   exit
 end
 
 ilist = Magick::ImageList.new(*ARGV)
-ilist.each do |img|
-  img.identify
-end
+ilist.each(&:identify)
 
 exit

data/examples/image_opacity.rb

@@ -1,4 +1,3 @@
-
 # Ccreate a semi-transparent title for an image.
 
 require 'rmagick'

data/examples/import_export.rb

@@ -22,7 +22,7 @@ begin
     copy.import_pixels(0, r, img.columns, 1, 'RGB', scanline)
   end
 rescue NotImplementedError
-  $stderr.puts 'The export_pixels and import_pixels methods are not supported' \
+  warn 'The export_pixels and import_pixels methods are not supported' \
                ' by this version of ImageMagick/GraphicsMagick'
   exit
 end

data/examples/pattern_fill.rb

@@ -1,4 +1,3 @@
-
 # Demonstrate ImageMagick's new (5.5.7-3 and later) built-in patterns.
 # Create a Fill class that can be reused to fill in new Image backgrounds.
 
@@ -17,7 +16,7 @@ supported patterns as an argument. For example, try "checkerboard".
 END_INFO
 
 class PatternFill < Magick::TextureFill
-  def initialize(name='bricks')
+  def initialize(name = 'bricks')
     @pat_img = Magick::Image.read("pattern:#{name}").first
     super(@pat_img)
   end
@@ -26,13 +25,13 @@ end
 if ARGV[0]
   pattern = ARGV[0]
 else
-  $stderr.puts 'Defaulting to checkerboard pattern.'
+  warn 'Defaulting to checkerboard pattern.'
   pattern = 'checkerboard'
 end
 
 # Create a sample image that is 100x bigger than the pattern.
 attrs = Image.ping("pattern:#{pattern}").first
 
-tryit = Image.new(10*attrs.columns, 10*attrs.rows, PatternFill.new(pattern))
+tryit = Image.new(10 * attrs.columns, 10 * attrs.rows, PatternFill.new(pattern))
 tryit.write('pattern_fill.gif')
 exit

data/examples/rotating_text.rb

@@ -15,10 +15,11 @@ text.pointsize = 28
 text.font_weight = BoldWeight
 text.font_style = ItalicStyle
 text.gravity = CenterGravity
+text.fill = 'white'
 
 # Let's make it interesting. Composite the
 # rotated text over a gradient fill background.
-fill = GradientFill.new(100,100,100,100,'yellow','red')
+fill = GradientFill.new(100, 100, 100, 100, 'yellow', 'red')
 bg = Image.new(200, 200, fill)
 
 # The "none" color is transparent.
@@ -27,9 +28,9 @@ fg = Image.new(bg.columns, bg.rows) { self.background_color = 'none' }
 # Here's where we'll collect the individual frames.
 animation = ImageList.new
 
-0.step(345,15) do |degrees|
+0.step(345, 15) do |degrees|
   frame = fg.copy
-  text.annotate(frame, 0,0,0,0, 'Rotating Text') do
+  text.annotate(frame, 0, 0, 0, 0, 'Rotating Text') do
     self.rotation = degrees
   end
   # Composite the text over the gradient filled background frame.
@@ -38,7 +39,7 @@ end
 
 animation.delay = 8
 
-#animation.animate
+# animation.animate
 puts '...Writing rotating_text.gif'
 animation.write('rotating_text.gif')
 exit

data/examples/spinner.rb

@@ -12,10 +12,10 @@ END_INFO
 
 NFRAMES = 12                    # number of frames in the animation
 DIM = 32                        # width & height of image in pixels
-DELAY = 100.0 / (NFRAMES/2)     # 2 rotations per second
+DELAY = 100.0 / (NFRAMES / 2) # 2 rotations per second
 
 # 'frame' is a single frame in the animation.
-frame = Magick::Image.new(DIM, DIM) {self.background_color = 'transparent'}
+frame = Magick::Image.new(DIM, DIM) { self.background_color = 'transparent' }
 
 # 'spinner' will contain the frames that make up the animated GIF
 spinner = Magick::ImageList.new
@@ -25,19 +25,19 @@ level = Magick::QuantumRange / 2 / NFRAMES
 
 NFRAMES.times do |x|
   gc = Magick::Draw.new
-  gc.translate(DIM/2, DIM/2)
+  gc.translate(DIM / 2, DIM / 2)
   gc.stroke('none')
   intensity = 0.58 * Magick::QuantumRange
   fill_color = Magick::Pixel.new(intensity, intensity, intensity).to_color
   gc.fill(fill_color)
-  angle = x * (360/NFRAMES)
+  angle = x * (360 / NFRAMES)
   NFRAMES.times do
     gc.rotate(angle)
     intensity = [intensity, Magick::QuantumRange].min
     fill_color = Magick::Pixel.new(intensity, intensity, intensity).to_color
     gc.fill(fill_color)
     gc.roundrectangle(7, -1, 15, 0, 1, 1)
-    angle = -(360/NFRAMES)
+    angle = -(360 / NFRAMES)
     intensity += level
   end
   spinner << frame.copy

data/examples/thumbnail.rb

@@ -48,13 +48,13 @@ img.change_geometry!(geom) { |cols, rows| img.thumbnail! cols, rows }
 # for the raised border. A 3-pixel raised edge means that the
 # background needs to be 6 pixels larger in each dimension.
 
-bg = Image.new(size+6, size+6) { self.background_color = 'gray75' }
-bg = bg.raise(3,3)
+bg = Image.new(size + 6, size + 6) { self.background_color = 'gray75' }
+bg = bg.raise(3, 3)
 
 # Just for the purposes of this example, display the thumbnail background on
 # a larger white background.
 
-white_bg = Image.new(size+50, size+50) {self.background_color = 'white'}
+white_bg = Image.new(size + 50, size + 50) { self.background_color = 'white' }
 white_bg = white_bg.composite(bg, CenterGravity, OverCompositeOp)
 
 # Finally, center the thumbnail on the gray background.

data/examples/vignette.rb

@@ -28,13 +28,13 @@ ballerina = Image.read('../doc/ex/images/Ballerina3.jpg')[0]
 # The size of the oval is arbitrary - in this case it's 90% of the
 # size of the image.
 
-oval = Image.new(ballerina.columns, ballerina.rows) {self.background_color = 'black'}
+oval = Image.new(ballerina.columns, ballerina.rows) { self.background_color = 'black' }
 gc = Draw.new
 gc.stroke('white')
 gc.fill('white')
-gc.ellipse(ballerina.columns/2, ballerina.rows/2,
-           ballerina.columns/2-(ballerina.columns*0.10),
-           ballerina.rows/2-(ballerina.rows*0.10), 0, 360)
+gc.ellipse(ballerina.columns / 2, ballerina.rows / 2,
+           ballerina.columns / 2 - (ballerina.columns * 0.10),
+           ballerina.rows / 2 - (ballerina.rows * 0.10), 0, 360)
 gc.draw(oval)
 
 # Add a lot of blurring to the oval. I use blur_image because it's much faster
@@ -72,7 +72,7 @@ end
 # supports 1`level of transparency. Therefore, composite the vignette over a
 # standard "checkerboard" background. The resulting image will be 100% opaque.
 
-checkerboard = Image.read('pattern:checkerboard') {self.size = "#{ballerina.columns}x#{ballerina.rows}"}
+checkerboard = Image.read('pattern:checkerboard') { self.size = "#{ballerina.columns}x#{ballerina.rows}" }
 vignette = checkerboard[0].composite(ballerina, CenterGravity, OverCompositeOp)
 vignette.display
 exit

data/ext/RMagick/extconf.rb

@@ -9,9 +9,10 @@ module RMagick
     require 'rmagick/version'
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
-    MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr('.','').to_i
+    MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr('.', '').to_i
 
     attr_reader :headers
+
     def initialize
       configure_compile_options
       assert_can_compile!
@@ -20,23 +21,23 @@ module RMagick
 
     def configured_compile_options
       {
-        :magick_config => $magick_config,
-        :with_magick_wand => $with_magick_wand,
-        :pkg_config    => $pkg_config,
-        :magick_version => $magick_version,
-        :local_libs     => $LOCAL_LIBS,
-        :cflags         => $CFLAGS,
-        :cppflags       => $CPPFLAGS,
-        :ldflags        => $LDFLAGS,
-        :defs           => $defs,
-        :config_h       => $config_h,
+        magick_config: $magick_config,
+        with_magick_wand: $with_magick_wand,
+        pkg_config: $pkg_config,
+        magick_version: $magick_version,
+        local_libs: $LOCAL_LIBS,
+        cflags: $CFLAGS,
+        cppflags: $CPPFLAGS,
+        ldflags: $LDFLAGS,
+        defs: $defs,
+        config_h: $config_h
       }
     end
 
     def configure_headers
-      #headers = %w{assert.h ctype.h errno.h float.h limits.h math.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h}
-      @headers = %w{assert.h ctype.h stdio.h stdlib.h math.h time.h}
-      headers << 'stdint.h' if have_header('stdint.h')  # defines uint64_t
+      # headers = %w{assert.h ctype.h errno.h float.h limits.h math.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h}
+      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h]
+      headers << 'stdint.h' if have_header('stdint.h') # defines uint64_t
       headers << 'sys/types.h' if have_header('sys/types.h')
 
       if have_header('wand/MagickWand.h')
@@ -53,9 +54,7 @@ module RMagick
         # Check for compiler. Extract first word so ENV['CC'] can be a program name with arguments.
         config = defined?(RbConfig) ? ::RbConfig : ::Config
         cc = (ENV['CC'] || config::CONFIG['CC'] || 'gcc').split(' ').first
-        unless find_executable(cc)
-          exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details."
-        end
+        exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cc)
 
         # ugly way to handle which config tool we're going to use...
         $with_magick_wand = false
@@ -81,9 +80,7 @@ module RMagick
         checking_for("outdated ImageMagick version (<= #{Magick::MIN_IM_VERSION})") do
           Logging.message("Detected ImageMagick version: #{$magick_version}\n")
 
-          if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
-            exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n"
-          end
+          exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n" if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
         end
 
         # From ImageMagick 6.9 binaries are split to two and we have to use
@@ -101,60 +98,56 @@ module RMagick
         if $with_magick_wand
           if $magick_config
             # Save flags
-            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `MagickWand-config --cflags`.chomp
-            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand-config --cppflags`.chomp
-            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `MagickWand-config --ldflags`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `MagickWand-config --libs`.chomp
+            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `MagickWand-config --cflags`.chomp
+            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand-config --cppflags`.chomp
+            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `MagickWand-config --ldflags`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `MagickWand-config --libs`.chomp
           end
 
           if $pkg_config
             # Save flags
-            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `pkg-config --cflags MagickWand`.chomp
-            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
-            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `pkg-config --libs MagickWand`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `pkg-config --libs MagickWand`.chomp
+            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
+            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
+            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp
           end
         else
           if $magick_config
             # Save flags
-            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `Magick-config --cflags`.chomp
-            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `Magick-config --cppflags`.chomp
-            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `Magick-config --ldflags`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `Magick-config --libs`.chomp
+            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `Magick-config --cflags`.chomp
+            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `Magick-config --cppflags`.chomp
+            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `Magick-config --ldflags`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `Magick-config --libs`.chomp
           end
 
           if $pkg_config
             # Save flags
-            $CFLAGS     = ENV['CFLAGS'].to_s   + ' ' + `pkg-config --cflags MagickCore`.chomp
-            $CPPFLAGS   = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp
-            $LDFLAGS    = ENV['LDFLAGS'].to_s  + ' ' + `pkg-config --libs MagickCore`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s     + ' ' + `pkg-config --libs MagickCore`.chomp
+            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp
+            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp
+            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickCore`.chomp
+            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickCore`.chomp
           end
         end
 
-        if RUBY_PLATFORM =~ /darwin/ # osx
-          set_archflags_for_osx
-        end
+        set_archflags_for_osx if RUBY_PLATFORM =~ /darwin/ # osx
 
-      elsif RUBY_PLATFORM =~ /mingw/  # mingw
+      elsif RUBY_PLATFORM =~ /mingw/ # mingw
 
         `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
-        abort 'Unable to get ImageMagick version' unless $1
-        $magick_version = $1
-        unless have_library('CORE_RL_magick_')
-          search_paths_for_library_for_mingw
-        end
+        abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
+        $magick_version = Regexp.last_match(1)
+        search_paths_for_library_for_mingw unless have_library('CORE_RL_magick_')
         have_library('X11')
 
-      else  # mswin
+      else # mswin
 
         `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
-        abort 'Unable to get ImageMagick version' unless $1
-        $magick_version = $1
+        abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
+        $magick_version = Regexp.last_match(1)
         $CFLAGS = '-W3'
-        $CPPFLAGS = %Q{-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\include"}
+        $CPPFLAGS = %(-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\include")
         # The /link option is required by the Makefile but causes warnings in the mkmf.log file.
-        $LDFLAGS = %Q{/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib"}
+        $LDFLAGS = %(/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib")
         $LOCAL_LIBS = 'CORE_RL_magick_.lib'
         have_library('X11')
 
@@ -162,11 +155,11 @@ module RMagick
     end
 
     # Test for a specific value in an enum type
-    def have_enum_value(enum, value, headers=nil, &b)
+    def have_enum_value(enum, value, headers = nil, &b)
       checking_for "#{enum}.#{value}" do
         if try_compile(<<"SRC", &b)
 #{COMMON_HEADERS}
-#{cpp_include(headers)}
+        #{cpp_include(headers)}
 /*top*/
 int main() { #{enum} t = #{value}; t = t; return 0; }
 SRC
@@ -179,7 +172,7 @@ SRC
     end
 
     # Test for multiple values of the same enum type
-    def have_enum_values(enum, values, headers=nil, &b)
+    def have_enum_values(enum, values, headers = nil, &b)
       values.each do |value|
         have_enum_value(enum, value, headers, &b)
       end
@@ -192,7 +185,7 @@ SRC
          File.readlink(config_path) =~ /GraphicsMagick/
         msg = 'Found a graphicsmagick-libmagick-dev-compat installation.'
         Logging.message msg
-        message msg+"\n"
+        message msg + "\n"
         true
       else
         false
@@ -201,7 +194,7 @@ SRC
 
     def exit_failure(msg)
       Logging.message msg
-      message msg+"\n"
+      message msg + "\n"
       exit(1)
     end
 
@@ -211,22 +204,22 @@ SRC
       path = ENV['PATH'].split(File::PATH_SEPARATOR)
       path.each do |dir|
         file = File.join(dir, 'Magick-config')
-        if File.executable? file
-          vers = `#{file} --version`.chomp.strip
-          prefix = `#{file} --prefix`.chomp.strip
-          versions << [vers, prefix, dir]
-        end
+        next unless File.executable? file
+
+        vers = `#{file} --version`.chomp.strip
+        prefix = `#{file} --prefix`.chomp.strip
+        versions << [vers, prefix, dir]
       end
       versions.uniq!
-      if versions.size > 1
-        msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n"
-        versions.each do |vers, prefix, dir|
-          msg << "         #{dir}/Magick-config reports version #{vers} is installed in #{prefix}\n"
-        end
-        msg << "Using #{versions[0][0]} from #{versions[0][1]}.\n\n"
-        Logging.message msg
-        message msg
+      return unless versions.size > 1
+
+      msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n"
+      versions.each do |vers, prefix, dir|
+        msg << "         #{dir}/Magick-config reports version #{vers} is installed in #{prefix}\n"
       end
+      msg << "Using #{versions[0][0]} from #{versions[0][1]}.\n\n"
+      Logging.message msg
+      message msg
     end
 
     # Ubuntu (maybe other systems) comes with a partial installation of
@@ -236,18 +229,18 @@ SRC
     def check_partial_imagemagick_versions
       prefix = config_string('prefix') || ''
       matches = [
-        prefix+'/lib/lib?agick*',
-        prefix+'/include/ImageMagick',
-        prefix+'/bin/Magick-config',
+        prefix + '/lib/lib?agick*',
+        prefix + '/include/ImageMagick',
+        prefix + '/bin/Magick-config'
       ].map do |file_glob|
         Dir.glob(file_glob)
       end
-      matches.delete_if { |arr| arr.empty? }
-      if 0 < matches.length && matches.length < 3
-        msg = "\nWarning: Found a partial ImageMagick installation. Your operating system likely has some built-in ImageMagick libraries but not all of ImageMagick. This will most likely cause problems at both compile and runtime.\nFound partial installation at: "+prefix+"\n"
-        Logging.message msg
-        message msg
-      end
+      matches.delete_if(&:empty?)
+      return unless !matches.empty? && matches.length < 3
+
+      msg = "\nWarning: Found a partial ImageMagick installation. Your operating system likely has some built-in ImageMagick libraries but not all of ImageMagick. This will most likely cause problems at both compile and runtime.\nFound partial installation at: " + prefix + "\n"
+      Logging.message msg
+      message msg
     end
 
     # issue #169
@@ -261,20 +254,16 @@ SRC
       archs = $ARCH_FLAG.scan(/-arch\s+(\S+)/).flatten
 
       archs.each do |arch|
-        if fileinfo.include?(arch)
-          archflags << "-arch #{arch}"
-        end
+        archflags << "-arch #{arch}" if fileinfo.include?(arch)
       end
 
-      if archflags.length != 0
-        $ARCH_FLAG = archflags.join(' ')
-      end
+      $ARCH_FLAG = archflags.join(' ') unless archflags.empty?
     end
 
     def search_paths_for_library_for_mingw
       msg = 'searching PATH for the ImageMagick library...'
       Logging.message msg
-      message msg+"\n"
+      message msg + "\n"
 
       found_lib = false
 
@@ -282,16 +271,17 @@ SRC
       paths.each do |dir|
         lib = File.join(dir, 'lib')
         lib_file = File.join(lib, 'CORE_RL_magick_.lib')
-        if File.exist?(lib_file)
-          $CPPFLAGS = %Q{-I"#{File.join(dir, 'include')}"}
-          $LDFLAGS = %Q{-L"#{lib}"}
-          found_lib = have_library('CORE_RL_magick_')
-          break if found_lib
-        end
+        next unless File.exist?(lib_file)
+
+        $CPPFLAGS = %(-I"#{File.join(dir, 'include')}")
+        $LDFLAGS = %(-L"#{lib}")
+        found_lib = have_library('CORE_RL_magick_')
+        break if found_lib
       end
 
-      unless found_lib
-        exit_failure <<END_MINGW
+      return if found_lib
+
+      exit_failure <<END_MINGW
 Can't install RMagick #{RMAGICK_VERS}.
 Can't find the ImageMagick library.
 Retry with '--with-opt-dir' option.
@@ -299,7 +289,6 @@ Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
 e.g.
   gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
 END_MINGW
-      end
     end
 
     def assert_can_compile!
@@ -309,8 +298,9 @@ END_MINGW
     end
 
     def assert_not_windows!
-      if RUBY_PLATFORM =~ /mswin/
-        abort <<END_MSWIN
+      return unless RUBY_PLATFORM =~ /mswin/
+
+      abort <<END_MSWIN
 +----------------------------------------------------------------------------+
 | This rmagick gem is for use only on Linux, BSD, OS X, and similar systems  |
 | that have a gnu or similar toolchain installed. The rmagick-win32 gem is a |
@@ -319,12 +309,11 @@ END_MINGW
 | See http://rmagick.rubyforge.org/install-faq.html for more information.    |
 +----------------------------------------------------------------------------+
 END_MSWIN
-      end
     end
 
     def assert_minimum_ruby_version!
       unless checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
-        version = RUBY_VERSION.tr('.','').to_i
+        version = RUBY_VERSION.tr('.', '').to_i
         version >= MIN_RUBY_VERS_NO
       end
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n"
@@ -332,71 +321,71 @@ END_MSWIN
     end
 
     def assert_has_dev_libs!
-      if RUBY_PLATFORM !~ /mswin|mingw/
+      return unless RUBY_PLATFORM !~ /mswin|mingw/
 
-        # check for pkg-config if Magick-config doesn't exist
-        if $magick_config && `Magick-config --libs`[/\bl\s*(MagickCore|Magick)6?\b/]
-        elsif $pkg_config && `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
-        else
-            exit_failure "Can't install RMagick #{RMAGICK_VERS}. " \
+      # check for pkg-config if Magick-config doesn't exist
+      if $magick_config && `Magick-config --libs`[/\bl\s*(MagickCore|Magick)6?\b/]
+      elsif $pkg_config && `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
+      else
+        exit_failure "Can't install RMagick #{RMAGICK_VERS}. " \
                    "Can't find the ImageMagick library or one of the dependent libraries. " \
                    "Check the mkmf.log file for more detailed information.\n"
-        end
       end
     end
 
     def create_header_file
       have_func('snprintf', headers)
-      ['AcquireImage',                   # 6.4.1
-       'AffinityImage',                  # 6.4.3-6
-       'AffinityImages',                 # 6.4.3-6
-       'AutoGammaImageChannel',          # 6.5.5-1
-       'AutoLevelImageChannel',          # 6.5.5-1
-       'BlueShiftImage',                 # 6.5.4-3
-       'ColorMatrixImage',               # 6.6.1-0
-       'ConstituteComponentTerminus',    # 6.5.7-9
-       'DeskewImage',                    # 6.4.2-5
-       'DestroyConstitute',              # 6.5.7-9(deprecated)
-       'EncipherImage',                  # 6.3.8-6
-       'EqualizeImageChannel',           # 6.3.6-9
-       'EvaluateImages',                 # 6.8.6-4
-       'FloodfillPaintImage',            # 6.3.7
-       'FunctionImageChannel',           # 6.4.8-8
-       'GetAuthenticIndexQueue',         # 6.4.5-6
-       'GetAuthenticPixels',             # 6.4.5-6
-       'GetImageAlphaChannel',           # 6.3.9-2
-       'GetMagickFeatures',              # 6.5.7-1
-       'GetVirtualPixels',               # 6.4.5-6
-       'LevelImageColors',               # 6.4.2
-       'LevelColorsImageChannel',        # 6.5.6-4
-       'LevelizeImageChannel',           # 6.4.2
-       'LiquidRescaleImage',             # 6.3.8-2
-       'MagickLibAddendum',              # 6.5.9-1
-       'OpaquePaintImageChannel',        # 6.3.7-10
-       'QueueAuthenticPixels',           # 6.4.5-6
-       'RemapImage',                     # 6.4.4-0
-       'RemapImages',                    # 6.4.4-0
-       'RemoveImageArtifact',            # 6.3.6
-       'RotationalBlurImage',            # 6.8.8-9
-       'RotationalBlurImageChannel',     # 6.8.8-9
-       'SelectiveBlurImageChannel',      # 6.5.0-3
-       'SetImageAlphaChannel',           # 6.3.6-9
-       'SetImageArtifact',               # 6.3.6
-       'SetMagickMemoryMethods',         # 6.4.1
-       'SparseColorImage',               # 6.3.6-?
-       'StatisticImage',                 # 6.6.8-6
-       'SyncAuthenticPixels',            # 6.4.5-6
-       'TransformImageColorspace',       # 6.5.1
-       'TransparentPaintImage',          # 6.3.7-10
-       'TransparentPaintImageChroma'     # 6.4.5-6
+      ['AcquireImage', # 6.4.1
+       'AffinityImage', # 6.4.3-6
+       'AffinityImages', # 6.4.3-6
+       'AutoGammaImageChannel', # 6.5.5-1
+       'AutoLevelImageChannel', # 6.5.5-1
+       'BlueShiftImage', # 6.5.4-3
+       'ColorMatrixImage', # 6.6.1-0
+       'ConstituteComponentTerminus', # 6.5.7-9
+       'DeskewImage', # 6.4.2-5
+       'DestroyConstitute', # 6.5.7-9(deprecated)
+       'EncipherImage', # 6.3.8-6
+       'EqualizeImageChannel', # 6.3.6-9
+       'EvaluateImages', # 6.8.6-4
+       'FloodfillPaintImage', # 6.3.7
+       'FunctionImageChannel', # 6.4.8-8
+       'GetAuthenticIndexQueue', # 6.4.5-6
+       'GetAuthenticPixels', # 6.4.5-6
+       'GetImageAlphaChannel', # 6.3.9-2
+       'GetImageChannelEntropy', # 6.9.0-0
+       'GetMagickFeatures', # 6.5.7-1
+       'GetVirtualPixels', # 6.4.5-6
+       'LevelImageColors', # 6.4.2
+       'LevelColorsImageChannel', # 6.5.6-4
+       'LevelizeImageChannel', # 6.4.2
+       'LiquidRescaleImage', # 6.3.8-2
+       'MagickLibAddendum', # 6.5.9-1
+       'OpaquePaintImageChannel', # 6.3.7-10
+       'QueueAuthenticPixels', # 6.4.5-6
+       'RemapImage', # 6.4.4-0
+       'RemapImages', # 6.4.4-0
+       'RemoveImageArtifact', # 6.3.6
+       'RotationalBlurImage', # 6.8.8-9
+       'RotationalBlurImageChannel', # 6.8.8-9
+       'SelectiveBlurImageChannel', # 6.5.0-3
+       'SetImageAlphaChannel', # 6.3.6-9
+       'SetImageArtifact', # 6.3.6
+       'SetMagickMemoryMethods', # 6.4.1
+       'SparseColorImage', # 6.3.6-?
+       'StatisticImage', # 6.6.8-6
+       'SyncAuthenticPixels', # 6.4.5-6
+       'TransformImageColorspace', # 6.5.1
+       'TransparentPaintImage', # 6.3.7-10
+       'TransparentPaintImageChroma' # 6.4.5-6
       ].each do |func|
         have_func(func, headers)
       end
 
-      checking_for('QueryMagickColorname() new signature')  do
+      checking_for('QueryMagickColorname() new signature') do
         if try_compile(<<"SRC")
 #{COMMON_HEADERS}
-#{cpp_include(headers)}
+        #{cpp_include(headers)}
 /*top*/
 int main() {
   MagickBooleanType okay;
@@ -415,94 +404,88 @@ SRC
         end
       end
 
-      have_struct_member('Image', 'type', headers)          # ???
-      have_struct_member('DrawInfo', 'kerning', headers)    # 6.4.7-8
-      have_struct_member('DrawInfo', 'interline_spacing', headers)   # 6.5.5-8
-      have_struct_member('DrawInfo', 'interword_spacing', headers)   # 6.4.8-0
-      have_type('DitherMethod', headers)                    # 6.4.2
-      have_type('MagickFunction', headers)                  # 6.4.8-8
-      have_type('ImageLayerMethod', headers)                # 6.3.6 replaces MagickLayerMethod
+      have_struct_member('Image', 'type', headers) # ???
+      have_struct_member('DrawInfo', 'kerning', headers) # 6.4.7-8
+      have_struct_member('DrawInfo', 'interline_spacing', headers) # 6.5.5-8
+      have_struct_member('DrawInfo', 'interword_spacing', headers) # 6.4.8-0
+      have_type('DitherMethod', headers) # 6.4.2
+      have_type('MagickFunction', headers) # 6.4.8-8
+      have_type('ImageLayerMethod', headers) # 6.3.6 replaces MagickLayerMethod
       have_type('long double', headers)
-      #have_type("unsigned long long", headers)
-      #have_type("uint64_t", headers)
-      #have_type("__int64", headers)
-      #have_type("uintmax_t", headers)
-      #check_sizeof("unsigned long", headers)
-      #check_sizeof("Image *", headers)
-
-      have_enum_values('AlphaChannelType', ['CopyAlphaChannel',                    # 6.4.3-7
-                                            'BackgroundAlphaChannel',              # 6.5.2-5
-                                            'RemoveAlphaChannel'], headers)        # 6.7.5-1
-      have_enum_values('CompositeOperator', ['BlurCompositeOp',                    # 6.5.3-7
-                                             'DistortCompositeOp',                 # 6.5.3-10
-                                             'LinearBurnCompositeOp',              # 6.5.4-3
-                                             'LinearDodgeCompositeOp',             # 6.5.4-3
-                                             'MathematicsCompositeOp',             # 6.5.4-3
-                                             'PegtopLightCompositeOp',             # 6.5.4-3
-                                             'PinLightCompositeOp',                # 6.5.4-3
-                                             'VividLightCompositeOp'], headers)    # 6.5.4-3
-      have_enum_values('CompressionType', ['DXT1Compression',                      # 6.3.9-3
-                                           'DXT3Compression',                      # 6.3.9-3
-                                           'DXT5Compression',                      # 6.3.9-3
-                                           'ZipSCompression',                      # 6.5.5-4
-                                           'PizCompression',                       # 6.5.5-4
-                                           'Pxr24Compression',                     # 6.5.5-4
-                                           'B44Compression',                       # 6.5.5-4
-                                           'B44ACompression'], headers)            # 6.5.5-4
-
-      have_enum_values('DistortImageMethod', ['BarrelDistortion',                  # 6.4.2-5
-                                              'BarrelInverseDistortion',           # 6.4.3-8
-                                              'BilinearForwardDistortion',         # 6.5.1-2
-                                              'BilinearReverseDistortion',         # 6.5.1-2
-                                              'DePolarDistortion',                 # 6.4.2-6
-                                              'PolarDistortion',                   # 6.4.2-6
-                                              'PolynomialDistortion',              # 6.4.2-4
-                                              'ShepardsDistortion'], headers)      # 6.4.2-4
-      have_enum_value('DitherMethod', 'NoDitherMethod', headers)                   # 6.4.3
-      have_enum_values('FilterTypes', ['KaiserFilter',                             # 6.3.6
-                                       'WelshFilter',                              # 6.3.6-4
-                                       'ParzenFilter',                             # 6.3.6-4
-                                       'LagrangeFilter',                           # 6.3.7-2
-                                       'BohmanFilter',                             # 6.3.7-2
-                                       'BartlettFilter',                           # 6.3.7-2
-                                       'SentinelFilter'], headers)                 # 6.3.7-2
-      have_enum_values('MagickEvaluateOperator', ['PowEvaluateOperator',           # 6.4.1-9
-                                                  'LogEvaluateOperator',            # 6.4.2
-                                                  'ThresholdEvaluateOperator',      # 6.4.3
+      # have_type("unsigned long long", headers)
+      # have_type("uint64_t", headers)
+      # have_type("__int64", headers)
+      # have_type("uintmax_t", headers)
+      # check_sizeof("unsigned long", headers)
+      # check_sizeof("Image *", headers)
+
+      have_enum_values('AlphaChannelType', ['CopyAlphaChannel', # 6.4.3-7
+                                            'BackgroundAlphaChannel', # 6.5.2-5
+                                            'RemoveAlphaChannel'], headers) # 6.7.5-1
+      have_enum_values('CompositeOperator', ['BlurCompositeOp', # 6.5.3-7
+                                             'DistortCompositeOp', # 6.5.3-10
+                                             'LinearBurnCompositeOp', # 6.5.4-3
+                                             'LinearDodgeCompositeOp', # 6.5.4-3
+                                             'MathematicsCompositeOp', # 6.5.4-3
+                                             'PegtopLightCompositeOp', # 6.5.4-3
+                                             'PinLightCompositeOp', # 6.5.4-3
+                                             'VividLightCompositeOp'], headers) # 6.5.4-3
+      have_enum_values('CompressionType', ['DXT1Compression', # 6.3.9-3
+                                           'DXT3Compression', # 6.3.9-3
+                                           'DXT5Compression', # 6.3.9-3
+                                           'ZipSCompression', # 6.5.5-4
+                                           'PizCompression', # 6.5.5-4
+                                           'Pxr24Compression', # 6.5.5-4
+                                           'B44Compression', # 6.5.5-4
+                                           'B44ACompression'], headers) # 6.5.5-4
+
+      have_enum_values('DistortImageMethod', ['BarrelDistortion', # 6.4.2-5
+                                              'BarrelInverseDistortion', # 6.4.3-8
+                                              'BilinearForwardDistortion', # 6.5.1-2
+                                              'BilinearReverseDistortion', # 6.5.1-2
+                                              'DePolarDistortion', # 6.4.2-6
+                                              'PolarDistortion', # 6.4.2-6
+                                              'PolynomialDistortion', # 6.4.2-4
+                                              'ShepardsDistortion'], headers) # 6.4.2-4
+      have_enum_value('DitherMethod', 'NoDitherMethod', headers) # 6.4.3
+      have_enum_values('FilterTypes', ['KaiserFilter', # 6.3.6
+                                       'WelshFilter', # 6.3.6-4
+                                       'ParzenFilter', # 6.3.6-4
+                                       'LagrangeFilter', # 6.3.7-2
+                                       'BohmanFilter', # 6.3.7-2
+                                       'BartlettFilter', # 6.3.7-2
+                                       'SentinelFilter'], headers) # 6.3.7-2
+      have_enum_values('MagickEvaluateOperator', ['PowEvaluateOperator', # 6.4.1-9
+                                                  'LogEvaluateOperator', # 6.4.2
+                                                  'ThresholdEvaluateOperator', # 6.4.3
                                                   'ThresholdBlackEvaluateOperator', # 6.4.3
                                                   'ThresholdWhiteEvaluateOperator', # 6.4.3
-                                                  'GaussianNoiseEvaluateOperator',  # 6.4.3
-                                                  'ImpulseNoiseEvaluateOperator',   # 6.4.3
+                                                  'GaussianNoiseEvaluateOperator', # 6.4.3
+                                                  'ImpulseNoiseEvaluateOperator', # 6.4.3
                                                   'LaplacianNoiseEvaluateOperator', # 6.4.3
                                                   'MultiplicativeNoiseEvaluateOperator', # 6.4.3
-                                                  'PoissonNoiseEvaluateOperator',   # 6.4.3
-                                                  'UniformNoiseEvaluateOperator',   # 6.4.3
-                                                  'CosineEvaluateOperator',         # 6.4.8-5
-                                                  'SineEvaluateOperator',           # 6.4.8-5
-                                                  'AddModulusEvaluateOperator'],    # 6.4.8-5
+                                                  'PoissonNoiseEvaluateOperator', # 6.4.3
+                                                  'UniformNoiseEvaluateOperator', # 6.4.3
+                                                  'CosineEvaluateOperator', # 6.4.8-5
+                                                  'SineEvaluateOperator', # 6.4.8-5
+                                                  'AddModulusEvaluateOperator'], # 6.4.8-5
                        headers)
-      have_enum_values('MagickFunction', ['ArcsinFunction',                        # 6.5.2-8
-                                          'ArctanFunction',                        # 6.5.2-8
-                                          'PolynomialFunction',                    # 6.4.8-8
-                                          'SinusoidFunction'], headers)            # 6.4.8-8
-      have_enum_values('ImageLayerMethod', ['FlattenLayer',                           # 6.3.6-2
-                                            'MergeLayer',                             # 6.3.6
-                                            'MosaicLayer',                            # 6.3.6-2
-                                            'TrimBoundsLayer' ], headers)             # 6.4.3-8
-      have_enum_values('VirtualPixelMethod', ['HorizontalTileVirtualPixelMethod',     # 6.4.2-6
-                                              'VerticalTileVirtualPixelMethod',       # 6.4.2-6
+      have_enum_values('MagickFunction', ['ArcsinFunction', # 6.5.2-8
+                                          'ArctanFunction', # 6.5.2-8
+                                          'PolynomialFunction', # 6.4.8-8
+                                          'SinusoidFunction'], headers) # 6.4.8-8
+      have_enum_values('ImageLayerMethod', ['FlattenLayer', # 6.3.6-2
+                                            'MergeLayer', # 6.3.6
+                                            'MosaicLayer', # 6.3.6-2
+                                            'TrimBoundsLayer'], headers) # 6.4.3-8
+      have_enum_values('VirtualPixelMethod', ['HorizontalTileVirtualPixelMethod', # 6.4.2-6
+                                              'VerticalTileVirtualPixelMethod', # 6.4.2-6
                                               'HorizontalTileEdgeVirtualPixelMethod', # 6.5.0-1
-                                              'VerticalTileEdgeVirtualPixelMethod',   # 6.5.0-1
-                                              'CheckerTileVirtualPixelMethod'],       # 6.5.0-1
+                                              'VerticalTileEdgeVirtualPixelMethod', # 6.5.0-1
+                                              'CheckerTileVirtualPixelMethod'], # 6.5.0-1
                        headers)
 
-      # Now test Ruby 1.9.0 features.
-      headers = ['ruby.h']
-      if have_header('ruby/io.h')
-        headers << 'ruby/io.h'
-      else
-        headers << 'rubyio.h'
-      end
+      headers = ['ruby.h', 'ruby/io.h']
 
       have_func('rb_frame_this_func', headers)
 
@@ -531,10 +514,10 @@ SRC
 
 
 #{'=' * 70}
-#{DateTime.now.strftime('%a %d%b%y %T')}
+      #{DateTime.now.strftime('%a %d%b%y %T')}
 This installation of RMagick #{RMAGICK_VERS} is configured for
 Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{$magick_version}
-#{'=' * 70}
+      #{'=' * 70}
 
 
 END_SUMMARY
@@ -549,6 +532,6 @@ extconf = RMagick::Extconf.new
 at_exit do
   msg = "Configured compile options: #{extconf.configured_compile_options}"
   Logging.message msg
-  message msg+"\n"
+  message msg + "\n"
 end
 extconf.create_makefile_file