rmagick 2.15.3 → 2.15.4

data/test/Pixel.rb

@@ -5,112 +5,112 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner' unless RUBY_VERSION[/^1\.9|^2/]
 
 class Pixel_UT < Test::Unit::TestCase
-    def setup
-        @pixel = Magick::Pixel.from_color('brown')
-    end
-
-    def test_hash
-        hash = nil
-        assert_nothing_raised { hash = @pixel.hash}
-        assert_not_nil(hash)
-        assert_equal(1385501952, hash)
-
-        p = Magick::Pixel.new
-        assert_equal(0, p.hash)
-
-        p = Magick::Pixel.from_color('red')
-        assert_equal(2139095040, p.hash)
-
-        # Pixel.hash sacrifices the last bit of the opacity channel
-        p = Magick::Pixel.new(0, 0, 0, 72)
-        p2 = Magick::Pixel.new(0, 0, 0, 73)
-        assert_not_equal(p, p2)
-        assert_equal(p.hash, p2.hash)
-    end
-
-    def test_eql?
-        p = @pixel
-        assert(@pixel.eql?(p))
-        p = Magick::Pixel.new
-        assert(!@pixel.eql?(p))
-    end
-
-    def test_fcmp
-      red = Magick::Pixel.from_color('red')
-      blue = Magick::Pixel.from_color('blue')
-      assert_nothing_raised { red.fcmp(red) }
-      assert(red.fcmp(red))
-      assert(!red.fcmp(blue))
-
-      assert_nothing_raised { red.fcmp(blue, 10) }
-      assert_nothing_raised { red.fcmp(blue, 10, Magick::RGBColorspace) }
-      assert_raises(TypeError) { red.fcmp(blue, 'x') }
-      assert_raises(TypeError) { red.fcmp(blue, 10, 'x') }
-    end
-
-    def test_from_hsla
-      assert_nothing_raised { Magick::Pixel.from_hsla(127, 50, 50) }
-      assert_nothing_raised { Magick::Pixel.from_hsla(127, 50, 50, 0) }
-      assert_nothing_raised { Magick::Pixel.from_hsla(127, '50%', 50, 0) }
-      assert_nothing_raised { Magick::Pixel.from_hsla('10%', '50%', 50, 0) }
-      assert_raise(TypeError) { Magick::Pixel.from_hsla([], 50, 50, 0) }
-      assert_raise(TypeError) { Magick::Pixel.from_hsla(127, [], 50, 0) }
-      assert_raise(TypeError) { Magick::Pixel.from_hsla(127, 50, [], 0) }
-      assert_raise(TypeError) { Magick::Pixel.from_hsla(127, 50, 50, []) }
-      assert_nothing_raised { @pixel.to_hsla }
-
-      18.times do |h|
-        25.times do |s|
-          25.times do |l|
-            5.times do |a|
-              args = [20*h, s+25, l+25, a/5.0]
-              px = Magick::Pixel.from_hsla(*args)
-              hsla = px.to_hsla
-              #puts "[#{args.join(', ')}] = [#{hsla.join(', ')}]"
-              # Handle cases where the result is very near 360
-              #hsla[0] = ((hsla[0] + 0.005) % 360.0) - 0.005
-              #hsla[1] = ((hsla[1] + 0.005) % 360.0) - 0.005
-              #hsla[2] = ((hsla[2] + 0.005) % 360.0) - 0.005
-              assert_in_delta(args[0], hsla[0], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
-              assert_in_delta(args[1], hsla[1], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
-              assert_in_delta(args[2], hsla[2], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
-              assert_in_delta(args[3], hsla[3], 0.005, "expected #{args.inspect} got #{hsla.inspect}")
-            end
-          end
-        end
+  def setup
+    @pixel = Magick::Pixel.from_color('brown')
+  end
+
+  def test_hash
+    hash = nil
+    assert_nothing_raised { hash = @pixel.hash}
+    assert_not_nil(hash)
+    assert_equal(1385501952, hash)
+
+    p = Magick::Pixel.new
+    assert_equal(0, p.hash)
+
+    p = Magick::Pixel.from_color('red')
+    assert_equal(2139095040, p.hash)
+
+    # Pixel.hash sacrifices the last bit of the opacity channel
+    p = Magick::Pixel.new(0, 0, 0, 72)
+    p2 = Magick::Pixel.new(0, 0, 0, 73)
+    assert_not_equal(p, p2)
+    assert_equal(p.hash, p2.hash)
+  end
+
+  def test_eql?
+    p = @pixel
+    assert(@pixel.eql?(p))
+    p = Magick::Pixel.new
+    assert(!@pixel.eql?(p))
+  end
+
+  def test_fcmp
+    red = Magick::Pixel.from_color('red')
+    blue = Magick::Pixel.from_color('blue')
+    assert_nothing_raised { red.fcmp(red) }
+    assert(red.fcmp(red))
+    assert(!red.fcmp(blue))
+
+    assert_nothing_raised { red.fcmp(blue, 10) }
+    assert_nothing_raised { red.fcmp(blue, 10, Magick::RGBColorspace) }
+    assert_raises(TypeError) { red.fcmp(blue, 'x') }
+    assert_raises(TypeError) { red.fcmp(blue, 10, 'x') }
+  end
+
+  def test_from_hsla
+    assert_nothing_raised { Magick::Pixel.from_hsla(127, 50, 50) }
+    assert_nothing_raised { Magick::Pixel.from_hsla(127, 50, 50, 0) }
+    assert_nothing_raised { Magick::Pixel.from_hsla(127, '50%', 50, 0) }
+    assert_nothing_raised { Magick::Pixel.from_hsla('10%', '50%', 50, 0) }
+    assert_raise(TypeError) { Magick::Pixel.from_hsla([], 50, 50, 0) }
+    assert_raise(TypeError) { Magick::Pixel.from_hsla(127, [], 50, 0) }
+    assert_raise(TypeError) { Magick::Pixel.from_hsla(127, 50, [], 0) }
+    assert_raise(TypeError) { Magick::Pixel.from_hsla(127, 50, 50, []) }
+    assert_nothing_raised { @pixel.to_hsla }
+
+    18.times do |h|
+    25.times do |s|
+      25.times do |l|
+      5.times do |a|
+        args = [20*h, s+25, l+25, a/5.0]
+        px = Magick::Pixel.from_hsla(*args)
+        hsla = px.to_hsla
+        #puts "[#{args.join(', ')}] = [#{hsla.join(', ')}]"
+        # Handle cases where the result is very near 360
+        #hsla[0] = ((hsla[0] + 0.005) % 360.0) - 0.005
+        #hsla[1] = ((hsla[1] + 0.005) % 360.0) - 0.005
+        #hsla[2] = ((hsla[2] + 0.005) % 360.0) - 0.005
+        assert_in_delta(args[0], hsla[0], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
+        assert_in_delta(args[1], hsla[1], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
+        assert_in_delta(args[2], hsla[2], 0.25, "expected #{args.inspect} got #{hsla.inspect}")
+        assert_in_delta(args[3], hsla[3], 0.005, "expected #{args.inspect} got #{hsla.inspect}")
+      end
       end
-
-      # test percentages
-      args = ['20%','20%','20%','20%']
-      args2 = [360.0/5,255.0/5,255.0/5,1.0/5]
-      px = Magick::Pixel.from_hsla(*args)
-      hsla = px.to_hsla
-      px2 = Magick::Pixel.from_hsla(*args2)
-      hsla2 = px2.to_hsla
-
-      assert_in_delta(hsla[0], hsla2[0], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
-      assert_in_delta(hsla[1], hsla2[1], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
-      assert_in_delta(hsla[2], hsla2[2], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
-      assert_in_delta(hsla[3], hsla2[3], 0.005,  "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
     end
-
-    def test_to_color
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance) }
-      assert_nothing_raised { @pixel.to_color(Magick::SVGCompliance) }
-      assert_nothing_raised { @pixel.to_color(Magick::X11Compliance) }
-      assert_nothing_raised { @pixel.to_color(Magick::XPMCompliance) }
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, true) }
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false) }
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 8) }
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 16) }
-      # test "hex" format
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 8, true) }
-      assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 16, true) }
-
-      assert_equal('#A52A2A', @pixel.to_color(Magick::AllCompliance, false, 8, true))
-      assert_equal('#A5A52A2A2A2A', @pixel.to_color(Magick::AllCompliance, false, 16, true))
-
-      assert_raise(ArgumentError) { @pixel.to_color(Magick::AllCompliance, false, 32) }
-      assert_raise(TypeError) { @pixel.to_color(1) }
     end
+
+    # test percentages
+    args = ['20%','20%','20%','20%']
+    args2 = [360.0/5,255.0/5,255.0/5,1.0/5]
+    px = Magick::Pixel.from_hsla(*args)
+    hsla = px.to_hsla
+    px2 = Magick::Pixel.from_hsla(*args2)
+    hsla2 = px2.to_hsla
+
+    assert_in_delta(hsla[0], hsla2[0], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
+    assert_in_delta(hsla[1], hsla2[1], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
+    assert_in_delta(hsla[2], hsla2[2], 0.25, "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
+    assert_in_delta(hsla[3], hsla2[3], 0.005,  "#{hsla.inspect} != #{hsla2.inspect} with args: #{args.inspect} and #{args2.inspect}")
+  end
+
+  def test_to_color
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance) }
+    assert_nothing_raised { @pixel.to_color(Magick::SVGCompliance) }
+    assert_nothing_raised { @pixel.to_color(Magick::X11Compliance) }
+    assert_nothing_raised { @pixel.to_color(Magick::XPMCompliance) }
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, true) }
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false) }
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 8) }
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 16) }
+    # test "hex" format
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 8, true) }
+    assert_nothing_raised { @pixel.to_color(Magick::AllCompliance, false, 16, true) }
+
+    assert_equal('#A52A2A', @pixel.to_color(Magick::AllCompliance, false, 8, true))
+    assert_equal('#A5A52A2A2A2A', @pixel.to_color(Magick::AllCompliance, false, 16, true))
+
+    assert_raise(ArgumentError) { @pixel.to_color(Magick::AllCompliance, false, 32) }
+    assert_raise(TypeError) { @pixel.to_color(1) }
+  end
 end

data/test/Preview.rb

@@ -5,50 +5,50 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner' unless RUBY_VERSION[/^1\.9|^2/]
 
 class Preview_UT < Test::Unit::TestCase
-    def test_preview
-        preview_types = [
-          Magick::RotatePreview,
-          Magick::ShearPreview,
-          Magick::RollPreview,
-          Magick::HuePreview,
-          Magick::SaturationPreview,
-          Magick::BrightnessPreview,
-          Magick::GammaPreview,
-          Magick::SpiffPreview,
-          Magick::DullPreview,
-          Magick::GrayscalePreview,
-          Magick::QuantizePreview,
-          Magick::DespecklePreview,
-          Magick::ReduceNoisePreview,
-          Magick::AddNoisePreview,
-          Magick::SharpenPreview,
-          Magick::BlurPreview,
-          Magick::ThresholdPreview,
-          Magick::EdgeDetectPreview,
-          Magick::SpreadPreview,
-          Magick::SolarizePreview,
-          Magick::ShadePreview,
-          Magick::RaisePreview,
-          Magick::SegmentPreview,
-          Magick::SwirlPreview,
-          Magick::ImplodePreview,
-          Magick::WavePreview,
-          Magick::OilPaintPreview,
-          Magick::CharcoalDrawingPreview,
-          Magick::JPEGPreview ]
+  def test_preview
+    preview_types = [
+      Magick::RotatePreview,
+      Magick::ShearPreview,
+      Magick::RollPreview,
+      Magick::HuePreview,
+      Magick::SaturationPreview,
+      Magick::BrightnessPreview,
+      Magick::GammaPreview,
+      Magick::SpiffPreview,
+      Magick::DullPreview,
+      Magick::GrayscalePreview,
+      Magick::QuantizePreview,
+      Magick::DespecklePreview,
+      Magick::ReduceNoisePreview,
+      Magick::AddNoisePreview,
+      Magick::SharpenPreview,
+      Magick::BlurPreview,
+      Magick::ThresholdPreview,
+      Magick::EdgeDetectPreview,
+      Magick::SpreadPreview,
+      Magick::SolarizePreview,
+      Magick::ShadePreview,
+      Magick::RaisePreview,
+      Magick::SegmentPreview,
+      Magick::SwirlPreview,
+      Magick::ImplodePreview,
+      Magick::WavePreview,
+      Magick::OilPaintPreview,
+      Magick::CharcoalDrawingPreview,
+      Magick::JPEGPreview ]
 
-        hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first
-        assert_nothing_raised do
-            prev = hat.preview(Magick::RotatePreview)
-            assert_instance_of(Magick::Image, prev)
-        end
-        puts "\n"
-        preview_types.each do |type|
-            puts "testing #{type}..."
-            assert_nothing_raised { hat.preview(type) }
-        end
-        assert_raise(TypeError) { hat.preview(2) }
+    hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first
+    assert_nothing_raised do
+      prev = hat.preview(Magick::RotatePreview)
+      assert_instance_of(Magick::Image, prev)
     end
+    puts "\n"
+    preview_types.each do |type|
+      puts "testing #{type}..."
+      assert_nothing_raised { hat.preview(type) }
+    end
+    assert_raise(TypeError) { hat.preview(2) }
+  end
 end
 
 if __FILE__ == $PROGRAM_NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.15.4
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -45,16 +45,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.33.0
 description: RMagick is an interface between Ruby and ImageMagick.
 email: github@benjaminfleischer.com
 executables: []
@@ -62,6 +62,7 @@ extensions:
 - ext/RMagick/extconf.rb
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -428,6 +429,13 @@ files:
 - rmagick.gemspec
 - spec/rmagick/ImageList1_spec.rb
 - spec/rmagick/draw_spec.rb
+- spec/rmagick/image/blue_shift_spec.rb
+- spec/rmagick/image/composite_spec.rb
+- spec/rmagick/image/constitute_spec.rb
+- spec/rmagick/image/dispatch_spec.rb
+- spec/rmagick/image/from_blob_spec.rb
+- spec/rmagick/image/ping_spec.rb
+- spec/rmagick/image/properties_spec.rb
 - spec/spec_helper.rb
 - test/Image1.rb
 - test/Image2.rb
@@ -474,6 +482,13 @@ summary: Ruby binding to ImageMagick
 test_files:
 - spec/rmagick/ImageList1_spec.rb
 - spec/rmagick/draw_spec.rb
+- spec/rmagick/image/blue_shift_spec.rb
+- spec/rmagick/image/composite_spec.rb
+- spec/rmagick/image/constitute_spec.rb
+- spec/rmagick/image/dispatch_spec.rb
+- spec/rmagick/image/from_blob_spec.rb
+- spec/rmagick/image/ping_spec.rb
+- spec/rmagick/image/properties_spec.rb
 - spec/spec_helper.rb
 - test/Image1.rb
 - test/Image2.rb