rmagick 2.16.0 → 3.0.0

data/lib/rvg/transformable.rb

@@ -7,12 +7,12 @@ module Magick
     # Transforms is an Array with a deep_copy method.
     # During unit-testing it also has a deep_equal method.
     class Transforms < Array #:nodoc:
-      def deep_copy(h = nil)
+      def deep_copy(_h = nil)
         copy = self.class.new
         each { |transform| copy << [transform[0], transform[1].dup] }
         copy
       end
-    end     # class Transform
+    end # class Transform
 
     # Transformations are operations on the coordinate system.
     # All the transformations defined within a container (an RVG object
@@ -30,7 +30,7 @@ module Magick
         @transforms.each { |transform| gc.__send__(transform[0], *transform[1]) }
       end
 
-      def initialize(*args, &block)
+      def initialize(*_args)
         super()
         @transforms = Transforms.new
       end
@@ -82,19 +82,19 @@ module Magick
       def rotate(angle, *args)
         begin
           case args.length
-            when 0
-              @transforms << [:rotate, [Float(angle)]]
-            when 2
-              cx = Float(args[0])
-              cy = Float(args[1])
-              @transforms << [:translate, [cx, cy]]
-              @transforms << [:rotate, [angle]]
-              @transforms << [:translate, [-cx, -cy]]
-            else
-              fail ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"
+          when 0
+            @transforms << [:rotate, [Float(angle)]]
+          when 2
+            cx = Float(args[0])
+            cy = Float(args[1])
+            @transforms << [:translate, [cx, cy]]
+            @transforms << [:rotate, [angle]]
+            @transforms << [:translate, [-cx, -cy]]
+          else
+            raise ArgumentError, "wrong number of arguments (#{args.length} for 1 or 3)"
           end
         rescue ArgumentError
-          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].collect {|a| a.class}.join(', ')})"
+          raise ArgumentError, "arguments must be convertable to float (got #{[angle, *args].collect(&:class).join(', ')})"
         end
         yield(self) if block_given?
         self
@@ -121,6 +121,6 @@ module Magick
         yield(self) if block_given?
         self
       end
-    end     # module Transformable
+    end # module Transformable
   end # class RVG
 end # module Magick

data/lib/rvg/units.rb

@@ -54,10 +54,10 @@ module Magick
         end
 
         @dpi = Float(n)
-        return @dpi
+        @dpi
       rescue ArgumentError
         raise TypeError, "Can't convert `#{n}' to Float"
       end
-    end     # class << self
+    end # class << self
   end # class RVG
 end # module Magick

data/rmagick.gemspec

@@ -2,13 +2,6 @@ require 'date'
 require 'English'
 require './lib/rmagick/version'
 
-def v(version)
-  Gem::Version.new(version)
-end
-
-RUBY     = v(RUBY_VERSION.dup)
-RUBYGEMS = v(Gem::VERSION.dup)
-
 Gem::Specification.new do |s|
   s.name = 'rmagick'
   s.version = Magick::VERSION
@@ -22,9 +15,9 @@ Gem::Specification.new do |s|
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   file_exclusion_regex = %r{(\Alib/rvg/to_c.rb)}
-  files         = tracked_files.reject{|file| file[file_exclusion_regex] }
+  files         = tracked_files.reject { |file| file[file_exclusion_regex] }
   test_files    = files.grep(%r{^(test|spec|features)/})
-  executables   = files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  executables   = files.grep(%r{^bin/}).map { |f| File.basename(f) }
 
   s.files                       = files
   s.test_files                  = test_files
@@ -32,32 +25,15 @@ Gem::Specification.new do |s|
   s.require_paths << 'ext' << 'deprecated'
 
   s.rubyforge_project = 'rmagick'
-  s.extensions = %w{ext/RMagick/extconf.rb}
+  s.extensions = %w[ext/RMagick/extconf.rb]
   s.has_rdoc = false
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
-  s.add_development_dependency 'rspec', '~> 3.2.0'
-
-  if RUBY < v('1.9.0')
-    s.add_development_dependency 'rake', '~> 10.0'
-  end
-
-  if RUBY < v('2.0.0')
-    s.add_development_dependency 'json', '~> 1.0'
-  end
-
-  if RUBY >= v('1.9.2')
-    s.add_development_dependency 'rubocop', '~> 0.33.0'
-  end
-
-  if RUBY >= v('2.2.0')
-    s.add_development_dependency 'test-unit', '~> 2'
-  end
-
-  if RUBYGEMS < v('1.8.25')
-    s.add_development_dependency 'rake-compiler', '~> 0.8.0'
-  else
-    s.add_development_dependency 'rake-compiler'
-  end
+  s.add_development_dependency 'rake-compiler', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
+  s.add_development_dependency 'rubocop', '0.64.0'
+  s.add_development_dependency 'simplecov', '~> 0.16.1'
+  s.add_development_dependency 'test-unit', '~> 2.5'
 end

data/spec/rmagick/draw_spec.rb

@@ -81,11 +81,10 @@ RSpec.describe Magick::Draw do
   describe '#marshal_dump', '#marshal_load' do
     it 'marshals without an error' do
       skip 'this spec fails on some versions of ImageMagick'
-      rose = Magick::Image.read('rose:').first
       granite = Magick::Image.read('granite:').first
       s = granite.to_blob { self.format = 'miff' }
       granite = Magick::Image.from_blob(s).first
-      blue_stroke = Magick::Image.new(20,20) { self.background_color = 'blue' }
+      blue_stroke = Magick::Image.new(20, 20) { self.background_color = 'blue' }
       s = blue_stroke.to_blob { self.format = 'miff' }
       blue_stroke = Magick::Image.from_blob(s).first
 
@@ -120,12 +119,12 @@ RSpec.describe Magick::Draw do
 
   describe '#fill_pattern' do
     it 'accepts an Image argument' do
-      img = Magick::Image.new(20,20)
+      img = Magick::Image.new(20, 20)
       expect { draw.fill_pattern = img }.not_to raise_error
     end
 
     it 'accepts an ImageList argument' do
-      img = Magick::Image.new(20,20)
+      img = Magick::Image.new(20, 20)
       ilist = Magick::ImageList.new
       ilist << img
       expect { draw.fill_pattern = ilist }.not_to raise_error
@@ -138,12 +137,12 @@ RSpec.describe Magick::Draw do
 
   describe '#stroke_pattern' do
     it 'accepts an Image argument' do
-      img = Magick::Image.new(20,20)
+      img = Magick::Image.new(20, 20)
       expect { draw.stroke_pattern = img }.not_to raise_error
     end
 
     it 'accepts an ImageList argument' do
-      img = Magick::Image.new(20,20)
+      img = Magick::Image.new(20, 20)
       ilist = Magick::ImageList.new
       ilist << img
       expect { draw.stroke_pattern = ilist }.not_to raise_error

data/spec/rmagick/image/blue_shift_spec.rb

@@ -1,6 +1,5 @@
 RSpec.describe Magick::Image, '#blue_shift' do
-
-  let(:img) { Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first }
+  let(:img) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
 
   it 'returns a new Image' do
     res = img.blue_shift
@@ -12,5 +11,4 @@ RSpec.describe Magick::Image, '#blue_shift' do
     expect { img.blue_shift(2) }.not_to raise_error
     expect { img.blue_shift(2, 3) }.to raise_error(ArgumentError)
   end
-
 end

data/spec/rmagick/image/channel_entropy_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe Magick::Image, '#channel_entropy' do
+  let(:img) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
+
+  it 'returns a channel entropy', supported_after('6.9.0') do
+    res = img.channel_entropy
+    puts "res = #{res.inspect}"
+    expect(res).to eq([0.5285857222715863])
+  end
+end

data/spec/rmagick/image/composite_spec.rb

@@ -1,7 +1,6 @@
 RSpec.describe Magick::Image, '#composite' do
-
-  let(:img1) { Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first }
-  let(:img2) { Magick::Image.read(IMAGES_DIR+'/Button_1.gif').first }
+  let(:img1) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
+  let(:img2) { Magick::Image.read(IMAGES_DIR + '/Button_1.gif').first }
   let(:composite_ops) do
     [
       Magick::UndefinedCompositeOp,
@@ -136,5 +135,4 @@ RSpec.describe Magick::Image, '#composite' do
       img1.composite(img2, Magick::CenterGravity, Magick::OverCompositeOp)
     end.to raise_error(Magick::DestroyedImageError)
   end
-
 end

data/spec/rmagick/image/constitute_spec.rb

@@ -1,6 +1,5 @@
 RSpec.describe Magick::Image, '#constitute' do
-
-  let(:img) { Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first }
+  let(:img) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
   let(:pixels) { img.dispatch(0, 0, img.columns, img.rows, 'RGBA') }
 
   it 'returns an equivalent image to the given pixels' do
@@ -9,7 +8,6 @@ RSpec.describe Magick::Image, '#constitute' do
     # can't compare it directly to the original image.
     expect(res.columns).to eq img.columns
     expect(res.rows).to eq img.rows
-    expect(pixels.all? { |v| 0 <= v && v <= Magick::QuantumRange }).to be true
+    expect(pixels.all? { |v| v >= 0 && v <= Magick::QuantumRange }).to be true
   end
-
 end

data/spec/rmagick/image/dispatch_spec.rb

@@ -1,6 +1,5 @@
 RSpec.describe Magick::Image, '#dispatch' do
-
-  let(:img) { Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first }
+  let(:img) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
 
   it 'expects exactly 5 or 6 arguments' do
     expect { img.dispatch }.to raise_error(ArgumentError)
@@ -14,5 +13,4 @@ RSpec.describe Magick::Image, '#dispatch' do
       img.dispatch(0, 0, 20, 20, 'RGBA', false, false)
     end.to raise_error(ArgumentError)
   end
-
 end

data/spec/rmagick/image/from_blob_spec.rb

@@ -1,6 +1,5 @@
 RSpec.describe Magick::Image, '#from_blob' do
-
-  let(:img) { Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first }
+  let(:img) { Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first }
   let(:blob) { img.to_blob }
 
   it 'returns an image equal to the original' do
@@ -10,5 +9,4 @@ RSpec.describe Magick::Image, '#from_blob' do
     expect(res.first).to be_instance_of(Magick::Image)
     expect(res.first).to eq img
   end
-
 end

data/spec/rmagick/image/ping_spec.rb

@@ -1,7 +1,6 @@
 RSpec.describe Magick::Image, '#ping' do
-
   it 'returns an image from the source, omitting pixel data' do
-    res = Magick::Image.ping(IMAGES_DIR+'/Button_0.gif')
+    res = Magick::Image.ping(IMAGES_DIR + '/Button_0.gif')
     expect(res).to be_instance_of(Array)
     image = res.first
     expect(image).to be_instance_of(Magick::Image)
@@ -10,5 +9,4 @@ RSpec.describe Magick::Image, '#ping' do
     expect(image.rows).to eq 120
     expect(image.filename).to match(/Button_0.gif/)
   end
-
 end

data/spec/rmagick/image/properties_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Magick::Image, '#properties' do
-
   let(:img) { Magick::Image.new(20, 20) }
   let(:freeze_error) { RUBY_VERSION[/^1\.9|^2/] ? RuntimeError : TypeError }
 
@@ -25,5 +24,4 @@ RSpec.describe Magick::Image, '#properties' do
     img.freeze
     expect { img['d'] = 'str_4' }.to raise_error(freeze_error)
   end
-
 end

data/spec/rmagick/image/read_spec.rb

@@ -0,0 +1,28 @@
+require 'timeout'
+
+RSpec.describe Magick::Image, '#read' do
+  describe 'issue #200' do
+    before do
+      # pid = Process.spawn File.join(SUPPORT_DIR, 'issue_200', 'app.rb'), err: :close, out: :close
+      # begin
+      #   Timeout.timeout(1) do
+      #     _, @status = Process.waitpid2 pid
+      #   end
+      # rescue Timeout::Error
+      #   Process.kill('KILL', pid)
+      #   _, @status = Process.waitpid2 pid
+      # end
+    end
+
+    it 'not hangs with nil argument' do
+      skip
+      expect(@status.signaled?).to be_falsey
+    end
+
+    it 'raise error with nil argument' do
+      skip
+      expect(@status.success?).to be_truthy
+      expect { Magick::Image.read(nil) }.to raise_error(Magick::ImageMagickError, /unable to open image nil/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
 require 'rmagick'
 
-root_dir = File.expand_path('../..', __FILE__)
+root_dir = File.expand_path('..', __dir__)
 IMAGES_DIR = File.join(root_dir, 'doc/ex/images')
+SUPPORT_DIR = File.join(root_dir, 'spec', 'support')
+
+def supported_after(version)
+  magick_lib_version = Magick::Magick_version.split[1].split('-').first
+  :skip if Gem::Version.new(magick_lib_version) < Gem::Version.new(version)
+end

data/spec/support/issue_200/app.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'rmagick'
+
+begin
+  Magick::Image.read(nil)
+rescue StandardError
+  nil
+end

data/test/Image1.rb

@@ -5,25 +5,25 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner' unless RUBY_VERSION[/^1\.9|^2/]
 
 class Image1_UT < Test::Unit::TestCase
-  FreezeError = RUBY_VERSION[/^1\.9|^2/] ? RuntimeError : TypeError
-
   def setup
     @img = Magick::Image.new(20, 20)
   end
 
   def test_read_inline
-    img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first
+    img = Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first
     blob = img.to_blob
     encoded = [blob].pack('m*')
     res = Magick::Image.read_inline(encoded)
     assert_instance_of(Array, res)
     assert_instance_of(Magick::Image, res[0])
     assert_equal(img, res[0])
+    assert_raise(ArgumentError) { Magick::Image.read(nil) }
+    assert_raise(ArgumentError) { Magick::Image.read("") }
   end
 
   def test_spaceship
-    img0 = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first
-    img1 = Magick::Image.read(IMAGES_DIR+'/Button_1.gif').first
+    img0 = Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first
+    img1 = Magick::Image.read(IMAGES_DIR + '/Button_1.gif').first
     sig0 = img0.signature
     sig1 = img1.signature
     # since <=> is based on the signature, the images should
@@ -59,11 +59,11 @@ class Image1_UT < Test::Unit::TestCase
 
   def test_adaptive_resize
     assert_nothing_raised do
-      res = @img.adaptive_resize(10,10)
+      res = @img.adaptive_resize(10, 10)
       assert_instance_of(Magick::Image, res)
     end
     assert_nothing_raised { @img.adaptive_resize(2) }
-    assert_raise(ArgumentError) { @img.adaptive_resize(10,10,10) }
+    assert_raise(ArgumentError) { @img.adaptive_resize(10, 10, 10) }
     assert_raise(ArgumentError) { @img.adaptive_resize }
   end
 
@@ -95,13 +95,13 @@ class Image1_UT < Test::Unit::TestCase
       assert_instance_of(Magick::Image, res)
     end
     assert_nothing_raised { @img.adaptive_threshold(2) }
-    assert_nothing_raised { @img.adaptive_threshold(2,4) }
-    assert_nothing_raised { @img.adaptive_threshold(2,4,1) }
-    assert_raise(ArgumentError) { @img.adaptive_threshold(2,4,1,2) }
+    assert_nothing_raised { @img.adaptive_threshold(2, 4) }
+    assert_nothing_raised { @img.adaptive_threshold(2, 4, 1) }
+    assert_raise(ArgumentError) { @img.adaptive_threshold(2, 4, 1, 2) }
   end
 
   def test_add_compose_mask
-    mask = Magick::Image.new(20,20)
+    mask = Magick::Image.new(20, 20)
     assert_nothing_raised { @img.add_compose_mask(mask) }
     assert_nothing_raised { @img.delete_compose_mask }
     assert_nothing_raised { @img.add_compose_mask(mask) }
@@ -137,15 +137,15 @@ class Image1_UT < Test::Unit::TestCase
   end
 
   def add_delete_profile
-    img = Magick::Image.read('cmyk.jpg'),first
+    img = Magick::Image.read('cmyk.jpg'), first
     assert_nothing_raised { img.add_profile('cmyk.icm') }
     assert_nothing_raised { img.add_profile('srgb.icm') }
-    img.each_profile { |name, value| assert_equal('icc', name) }
+    img.each_profile { |name, _value| assert_equal('icc', name) }
     assert_nothing_raised { img.delete_profile('icc') }
   end
 
   def test_affine_matrix
-    affine = Magick::AffineMatrix.new(1, Math::PI/6, Math::PI/6, 1, 0, 0)
+    affine = Magick::AffineMatrix.new(1, Math::PI / 6, Math::PI / 6, 1, 0, 0)
     assert_nothing_raised { @img.affine_transform(affine) }
     assert_raise(TypeError) { @img.affine_transform(0) }
     res = @img.affine_transform(affine)
@@ -174,23 +174,23 @@ class Image1_UT < Test::Unit::TestCase
   end
 
   def test_auto_gamma
-     res = nil
-     assert_nothing_raised { res = @img.auto_gamma_channel }
-     assert_instance_of(Magick::Image, res)
-     assert_not_same(@img, res)
-     assert_nothing_raised { res = @img.auto_gamma_channel Magick::RedChannel }
-     assert_nothing_raised { res = @img.auto_gamma_channel Magick::RedChannel, Magick::BlueChannel }
-     assert_raise(TypeError) { @img.auto_gamma_channel(1) }
+    res = nil
+    assert_nothing_raised { res = @img.auto_gamma_channel }
+    assert_instance_of(Magick::Image, res)
+    assert_not_same(@img, res)
+    assert_nothing_raised { res = @img.auto_gamma_channel Magick::RedChannel }
+    assert_nothing_raised { res = @img.auto_gamma_channel Magick::RedChannel, Magick::BlueChannel }
+    assert_raise(TypeError) { @img.auto_gamma_channel(1) }
   end
 
   def test_auto_level
-     res = nil
-     assert_nothing_raised { res = @img.auto_level_channel }
-     assert_instance_of(Magick::Image, res)
-     assert_not_same(@img, res)
-     assert_nothing_raised { res = @img.auto_level_channel Magick::RedChannel }
-     assert_nothing_raised { res = @img.auto_level_channel Magick::RedChannel, Magick::BlueChannel }
-     assert_raise(TypeError) { @img.auto_level_channel(1) }
+    res = nil
+    assert_nothing_raised { res = @img.auto_level_channel }
+    assert_instance_of(Magick::Image, res)
+    assert_not_same(@img, res)
+    assert_nothing_raised { res = @img.auto_level_channel Magick::RedChannel }
+    assert_nothing_raised { res = @img.auto_level_channel Magick::RedChannel, Magick::BlueChannel }
+    assert_raise(TypeError) { @img.auto_level_channel(1) }
   end
 
   def test_auto_orient
@@ -217,11 +217,11 @@ class Image1_UT < Test::Unit::TestCase
     assert_nothing_raised { @img.bilevel_channel(100, Magick::AllChannels) }
     assert_raise(TypeError) { @img.bilevel_channel(100, 2) }
     res = @img.bilevel_channel(100)
-    assert_instance_of(Magick::Image,  res)
+    assert_instance_of(Magick::Image, res)
   end
 
   def test_blend
-    @img2 = Magick::Image.new(20,20) {self.background_color = 'black'}
+    @img2 = Magick::Image.new(20, 20) { self.background_color = 'black' }
     assert_nothing_raised { @img.blend(@img2, 0.25) }
     res = @img.blend(@img2, 0.25)
     assert_instance_of(Magick::Image, res)
@@ -245,24 +245,24 @@ class Image1_UT < Test::Unit::TestCase
   def test_blur_channel
     assert_nothing_raised { @img.blur_channel }
     assert_nothing_raised { @img.blur_channel(1) }
-    assert_nothing_raised { @img.blur_channel(1,2) }
-    assert_nothing_raised { @img.blur_channel(1,2, Magick::RedChannel) }
-    assert_nothing_raised { @img.blur_channel(1,2, Magick::RedChannel, Magick::BlueChannel, Magick::GreenChannel, Magick::OpacityChannel) }
-    assert_nothing_raised { @img.blur_channel(1,2, Magick::CyanChannel, Magick::MagentaChannel, Magick::YellowChannel, Magick::BlackChannel) }
-    assert_nothing_raised { @img.blur_channel(1,2, Magick::GrayChannel) }
-    assert_nothing_raised { @img.blur_channel(1,2, Magick::AllChannels) }
-    assert_raise(TypeError) { @img.blur_channel(1,2,2) }
+    assert_nothing_raised { @img.blur_channel(1, 2) }
+    assert_nothing_raised { @img.blur_channel(1, 2, Magick::RedChannel) }
+    assert_nothing_raised { @img.blur_channel(1, 2, Magick::RedChannel, Magick::BlueChannel, Magick::GreenChannel, Magick::OpacityChannel) }
+    assert_nothing_raised { @img.blur_channel(1, 2, Magick::CyanChannel, Magick::MagentaChannel, Magick::YellowChannel, Magick::BlackChannel) }
+    assert_nothing_raised { @img.blur_channel(1, 2, Magick::GrayChannel) }
+    assert_nothing_raised { @img.blur_channel(1, 2, Magick::AllChannels) }
+    assert_raise(TypeError) { @img.blur_channel(1, 2, 2) }
     res = @img.blur_channel
-    assert_instance_of(Magick::Image,  res)
+    assert_instance_of(Magick::Image, res)
   end
 
   def test_blur_image
     assert_nothing_raised { @img.blur_image }
     assert_nothing_raised { @img.blur_image(1) }
-    assert_nothing_raised { @img.blur_image(1,2) }
-    assert_raise(ArgumentError) { @img.blur_image(1,2,3) }
+    assert_nothing_raised { @img.blur_image(1, 2) }
+    assert_raise(ArgumentError) { @img.blur_image(1, 2, 3) }
     res = @img.blur_image
-    assert_instance_of(Magick::Image,  res)
+    assert_instance_of(Magick::Image, res)
   end
 
   def test_black_threshold
@@ -273,16 +273,16 @@ class Image1_UT < Test::Unit::TestCase
     assert_nothing_raised { @img.black_threshold(50, 50, 50, 50) }
     assert_raise(ArgumentError) { @img.black_threshold(50, 50, 50, 50, 50) }
     res = @img.black_threshold(50)
-    assert_instance_of(Magick::Image,  res)
+    assert_instance_of(Magick::Image, res)
   end
 
   def test_border
     assert_nothing_raised { @img.border(2, 2, 'red') }
     assert_nothing_raised { @img.border!(2, 2, 'red') }
-    res = @img.border(2,2, 'red')
-    assert_instance_of(Magick::Image,  res)
+    res = @img.border(2, 2, 'red')
+    assert_instance_of(Magick::Image, res)
     @img.freeze
-    assert_raise(FreezeError) { @img.border!(2,2, 'red') }
+    assert_raise(FreezeError) { @img.border!(2, 2, 'red') }
   end
 
   def test_change_geometry
@@ -296,9 +296,9 @@ class Image1_UT < Test::Unit::TestCase
   end
 
   def test_changed?
-#        assert_block { !@img.changed? }
-#        @img.pixel_color(0,0,'red')
-#        assert_block { @img.changed? }
+    #        assert_block { !@img.changed? }
+    #        @img.pixel_color(0,0,'red')
+    #        assert_block { @img.changed? }
   end
 
   def test_channel
@@ -397,10 +397,10 @@ class Image1_UT < Test::Unit::TestCase
   end
 
   def test_clut_channel
-    img = Magick::Image.new(20,20) {self.colorspace = Magick::GRAYColorspace}
-    clut = Magick::Image.new(20,1) {self.background_color = 'red'}
+    img = Magick::Image.new(20, 20) { self.colorspace = Magick::GRAYColorspace }
+    clut = Magick::Image.new(20, 1) { self.background_color = 'red' }
     res = nil
-    assert_nothing_raised {res = img.clut_channel(clut)}
+    assert_nothing_raised { res = img.clut_channel(clut) }
     assert_same(res, img)
     assert_nothing_raised { img.clut_channel(clut, Magick::RedChannel) }
     assert_nothing_raised { img.clut_channel(clut, Magick::RedChannel, Magick::BlueChannel) }
@@ -411,22 +411,22 @@ class Image1_UT < Test::Unit::TestCase
     assert_raise(ArgumentError) { @img.color_fill_to_border(-1, 1, 'red') }
     assert_raise(ArgumentError) { @img.color_fill_to_border(1, 100, 'red') }
     assert_nothing_raised do
-      res = @img.color_fill_to_border(@img.columns/2, @img.rows/2, 'red')
+      res = @img.color_fill_to_border(@img.columns / 2, @img.rows / 2, 'red')
       assert_instance_of(Magick::Image, res)
     end
     pixel = Magick::Pixel.new(Magick::QuantumRange)
-    assert_nothing_raised { @img.color_fill_to_border(@img.columns/2, @img.rows/2, pixel) }
+    assert_nothing_raised { @img.color_fill_to_border(@img.columns / 2, @img.rows / 2, pixel) }
   end
 
   def test_color_floodfill
     assert_raise(ArgumentError) { @img.color_floodfill(-1, 1, 'red') }
     assert_raise(ArgumentError) { @img.color_floodfill(1, 100, 'red') }
     assert_nothing_raised do
-      res = @img.color_floodfill(@img.columns/2, @img.rows/2, 'red')
+      res = @img.color_floodfill(@img.columns / 2, @img.rows / 2, 'red')
       assert_instance_of(Magick::Image, res)
     end
     pixel = Magick::Pixel.new(Magick::QuantumRange)
-    assert_nothing_raised { @img.color_floodfill(@img.columns/2, @img.rows/2, pixel) }
+    assert_nothing_raised { @img.color_floodfill(@img.columns / 2, @img.rows / 2, pixel) }
   end
 
   def test_color_histogram
@@ -460,16 +460,16 @@ class Image1_UT < Test::Unit::TestCase
     # IndexError b/c @img is DirectClass
     assert_raise(IndexError) { @img.colormap(0) }
     # Read PseudoClass image
-    pc_img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first
+    pc_img = Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first
     assert_nothing_raised { pc_img.colormap(0) }
     ncolors = pc_img.colors
-    assert_raise(IndexError) { pc_img.colormap(ncolors+1) }
+    assert_raise(IndexError) { pc_img.colormap(ncolors + 1) }
     assert_raise(IndexError) { pc_img.colormap(-1) }
-    assert_nothing_raised { pc_img.colormap(ncolors-1) }
+    assert_nothing_raised { pc_img.colormap(ncolors - 1) }
     res = pc_img.colormap(0)
     assert_instance_of(String, res)
 
-    #test 'set' operation
+    # test 'set' operation
     assert_nothing_raised do
       old_color = pc_img.colormap(0)
       res = pc_img.colormap(0, 'red')
@@ -502,16 +502,16 @@ class Image1_UT < Test::Unit::TestCase
     pixel = Magick::Pixel.new(Magick::QuantumRange)
     assert_nothing_raised { @img.color_reset!(pixel) }
     assert_raise(TypeError) { @img.color_reset!([2]) }
-    assert_raise(ArgumentError)  { @img.color_reset!('x') }
+    assert_raise(ArgumentError) { @img.color_reset!('x') }
     @img.freeze
     assert_raise(FreezeError) { @img.color_reset!('red') }
   end
 
   def test_combine
-    r = Magick::Image.new(20,20) { self.background_color = 'red' }
-    g = Magick::Image.new(20,20) { self.background_color = 'green' }
-    b = Magick::Image.new(20,20) { self.background_color = 'blue' }
-    a = Magick::Image.new(20,20) { self.background_color = 'transparent' }
+    r = Magick::Image.new(20, 20) { self.background_color = 'red' }
+    g = Magick::Image.new(20, 20) { self.background_color = 'green' }
+    b = Magick::Image.new(20, 20) { self.background_color = 'blue' }
+    a = Magick::Image.new(20, 20) { self.background_color = 'transparent' }
     assert_nothing_raised { Magick::Image.combine(r) }
     assert_nothing_raised { Magick::Image.combine(r, g) }
     assert_nothing_raised { Magick::Image.combine(r, g, b) }
@@ -529,8 +529,8 @@ class Image1_UT < Test::Unit::TestCase
   end
 
   def test_compare_channel
-    img1 = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first
-    img2 = Magick::Image.read(IMAGES_DIR+'/Button_1.gif').first
+    img1 = Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first
+    img2 = Magick::Image.read(IMAGES_DIR + '/Button_1.gif').first
     assert_nothing_raised { img1.compare_channel(img2, Magick::MeanAbsoluteErrorMetric) }
     assert_nothing_raised { img1.compare_channel(img2, Magick::MeanSquaredErrorMetric) }
     assert_nothing_raised { img1.compare_channel(img2, Magick::PeakAbsoluteErrorMetric) }
@@ -558,8 +558,8 @@ class Image1_UT < Test::Unit::TestCase
   end
 end
 
-if __FILE__ == $PROGRAM_NAME
-IMAGES_DIR = '../doc/ex/images'
-FILES = Dir[IMAGES_DIR+'/Button_*.gif']
-Test::Unit::UI::Console::TestRunner.run(Image1_UT)  unless RUBY_VERSION[/^1\.9|^2/]
+if $PROGRAM_NAME == __FILE__
+  IMAGES_DIR = '../doc/ex/images'
+  FILES = Dir[IMAGES_DIR + '/Button_*.gif']
+  Test::Unit::UI::Console::TestRunner.run(Image1UT) unless RUBY_VERSION[/^1\.9|^2/]
 end