color 1.4.1 → 1.4.2

data/lib/color/hsl.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 # An HSL colour object. Internally, the hue (#h), saturation (#s), and
 # luminosity/lightness (#l) values are dealt with as fractional values in
 # the range 0..1.

data/lib/color/palette.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 require 'color'
 
 module Color::Palette

data/lib/color/palette/adobecolor.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 require 'color/palette'
 
 # A class that can read an Adobe Color palette file (used for Photoshop

data/lib/color/palette/gimp.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 require 'color/palette'
 
 # A class that can read a GIMP (GNU Image Manipulation Program) palette file

data/lib/color/palette/monocontrast.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 require 'color/palette'
 
 # Generates a monochromatic constrasting colour palette for background and
@@ -25,7 +13,7 @@ require 'color/palette'
 # against the background.
 class Color::Palette::MonoContrast
   # Hash of CSS background colour values.
-  # 
+  #
   # This is always 11 values:
   #
   # 0::       The starting colour.
@@ -33,7 +21,7 @@ class Color::Palette::MonoContrast
   # -1..-5::  Darker colours.
   attr_reader :background
   # Hash of CSS foreground colour values.
-  # 
+  #
   # This is always 11 values:
   #
   # 0::       The starting colour.
@@ -60,7 +48,7 @@ class Color::Palette::MonoContrast
     else
       @minimum_brightness_diff = bd
     end
-      
+
     regenerate(@background[0], @foreground[0])
   end
 

data/lib/color/rgb-colors.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 class Color::RGB
   AliceBlue             = Color::RGB.new(0xf0, 0xf8, 0xff)
   AntiqueWhite          = Color::RGB.new(0xfa, 0xeb, 0xd7)

data/lib/color/rgb.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 # An RGB colour object.
 class Color::RGB
   # The format of a DeviceRGB colour for PDF. In color-tools 2.0 this will
@@ -45,7 +33,7 @@ class Color::RGB
     #   Color::RGB.from_html("cabbed")
     def from_html(html_colour)
       html_colour = html_colour.gsub(%r{[#;]}, '')
-      case html_colour.size 
+      case html_colour.size
       when 3
         colours = html_colour.scan(%r{[0-9A-Fa-f]}).map { |el| (el * 2).to_i(16) }
       when 6
@@ -249,7 +237,7 @@ class Color::RGB
   def mix_with(mask, opacity)
     opacity /= 100.0
     rgb = self.dup
-    
+
     rgb.r = (@r * opacity) + (mask.r * (1 - opacity))
     rgb.g = (@g * opacity) + (mask.g * (1 - opacity))
     rgb.b = (@b * opacity) + (mask.b * (1 - opacity))
@@ -427,8 +415,8 @@ class Color::RGB
   #
   # The subtraction is done using the RGB Accessor methods to ensure a valid
   # colour in the result.
-  def -(other) 
-    other = other.to_rgb 
+  def -(other)
+    other = other.to_rgb
     rgb = self.dup
 
     rgb.r -= other.r

data/lib/color/rgb/metallic.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 # This namespace contains some RGB metallic colours suggested by Jim Freeze.
 module Color::RGB::Metallic
   Aluminum    = Color::RGB.new(0x99, 0x99, 0x99)

data/lib/color/yiq.rb

@@ -1,15 +1,3 @@
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.4.1
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
 # A colour object representing YIQ (NTSC) colour encoding.
 class Color::YIQ
   # Creates a YIQ colour object from fractional values 0 .. 1.
@@ -44,7 +32,7 @@ class Color::YIQ
     other.kind_of?(Color::YIQ) and
     ((@y - other.y).abs <= Color::COLOR_TOLERANCE) and
     ((@i - other.i).abs <= Color::COLOR_TOLERANCE) and
-    ((@q - other.q).abs <= Color::COLOR_TOLERANCE) 
+    ((@q - other.q).abs <= Color::COLOR_TOLERANCE)
   end
 
   def to_yiq

data/test/test_adobecolor.rb

@@ -1,24 +1,12 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 require 'color/palette/adobecolor'
 
 module TestColor
   module TestPalette
-    class TestAdobeColor < Test::Unit::TestCase
+    class TestAdobeColor < Minitest::Test
       include Color::Palette
 
       # This is based on the Visibone Anglo-Centric Color Code List; this is
@@ -335,7 +323,7 @@ QwBNAFkASwAAAA0JxA2sEZQF3AAAAAsAVQBOAEsATgBPAFcATgAgADEAMwAA
 
       def test_version1
         v1 = VISIBONE_V1.unpack("m*")[0]
-        assert_nothing_raised { @aco = AdobeColor.new(v1) }
+        @aco = AdobeColor.new(v1)
         assert_equal(216, @aco.size)
         assert_equal(1, @aco.version)
         assert_equal({:rgb => 216}, @aco.statistics)
@@ -378,12 +366,10 @@ QwBNAFkASwAAAA0JxA2sEZQF3AAAAAsAVQBOAEsATgBPAFcATgAgADEAMwAA
       end
 
       def test_exercise
-        assert_nothing_raised do
-          File.open(@filename, "wb") do |f|
-            f.write EXERCISE.unpack("m*")[0]
-          end
+        File.open(@filename, "wb") do |f|
+          f.write EXERCISE.unpack("m*")[0]
         end
-        assert_nothing_raised { @aco = AdobeColor.from_file(@filename) }
+        @aco = AdobeColor.from_file(@filename)
         assert_equal(5, @aco.size)
         assert_equal(7, @aco.instance_variable_get(:@order).size)
       end
@@ -396,7 +382,7 @@ QwBNAFkASwAAAA0JxA2sEZQF3AAAAAsAVQBOAEsATgBPAFcATgAgADEAMwAA
 
       def test_each_name
         v2 = VISIBONE_V2.unpack("m*")[0]
-        assert_nothing_raised { @aco = AdobeColor.new(v2) }
+        @aco = AdobeColor.new(v2)
         assert_equal(216, @aco.size)
         assert_equal(2, @aco.version)
         @aco.each_name do |n, s|
@@ -408,7 +394,7 @@ QwBNAFkASwAAAA0JxA2sEZQF3AAAAAsAVQBOAEsATgBPAFcATgAgADEAMwAA
 
       def test_values_at
         v2 = VISIBONE_V2.unpack("m*")[0]
-        assert_nothing_raised { @aco = AdobeColor.new(v2) }
+        @aco = AdobeColor.new(v2)
         assert_equal(216, @aco.size)
         assert_equal(2, @aco.version)
         assert_equal([Color::RGB::White, Color::RGB.from_html("#ff0033")],

data/test/test_cmyk.rb

@@ -1,22 +1,10 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 
 module TestColor
-  class TestCMYK < Test::Unit::TestCase
+  class TestCMYK < Minitest::Test
     def setup
       @cmyk = Color::CMYK.new(10, 20, 30, 40)
     end
@@ -24,44 +12,44 @@ module TestColor
     def test_cyan
       assert_in_delta(0.1, @cmyk.c, Color::COLOR_TOLERANCE)
       assert_in_delta(10, @cmyk.cyan, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.cyan = 20 }
+      @cmyk.cyan = 20
       assert_in_delta(0.2, @cmyk.c, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.c = 2.0 }
+      @cmyk.c = 2.0
       assert_in_delta(100, @cmyk.cyan, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.c = -1.0 }
+      @cmyk.c = -1.0
       assert_in_delta(0.0, @cmyk.c, Color::COLOR_TOLERANCE)
     end
 
     def test_magenta
       assert_in_delta(0.2, @cmyk.m, Color::COLOR_TOLERANCE)
       assert_in_delta(20, @cmyk.magenta, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.magenta = 30 }
+      @cmyk.magenta = 30
       assert_in_delta(0.3, @cmyk.m, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.m = 2.0 }
+      @cmyk.m = 2.0
       assert_in_delta(100, @cmyk.magenta, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.m = -1.0 }
+      @cmyk.m = -1.0
       assert_in_delta(0.0, @cmyk.m, Color::COLOR_TOLERANCE)
     end
 
     def test_yellow
       assert_in_delta(0.3, @cmyk.y, Color::COLOR_TOLERANCE)
       assert_in_delta(30, @cmyk.yellow, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.yellow = 20 }
+      @cmyk.yellow = 20
       assert_in_delta(0.2, @cmyk.y, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.y = 2.0 }
+      @cmyk.y = 2.0
       assert_in_delta(100, @cmyk.yellow, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.y = -1.0 }
+      @cmyk.y = -1.0
       assert_in_delta(0.0, @cmyk.y, Color::COLOR_TOLERANCE)
     end
 
     def test_black
       assert_in_delta(0.4, @cmyk.k, Color::COLOR_TOLERANCE)
       assert_in_delta(40, @cmyk.black, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.black = 20 }
+      @cmyk.black = 20
       assert_in_delta(0.2, @cmyk.k, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.k = 2.0 }
+      @cmyk.k = 2.0
       assert_in_delta(100, @cmyk.black, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @cmyk.k = -1.0 }
+      @cmyk.k = -1.0
       assert_in_delta(0.0, @cmyk.k, Color::COLOR_TOLERANCE)
     end
 
@@ -75,16 +63,14 @@ module TestColor
     end
 
     def test_to_grayscale
-      gs = nil
-      assert_nothing_raised { gs = @cmyk.to_grayscale }
+      gs = @cmyk.to_grayscale
       assert_kind_of(Color::GrayScale, gs)
       assert_in_delta(0.4185, gs.g, Color::COLOR_TOLERANCE)
       assert_kind_of(Color::GreyScale, @cmyk.to_greyscale)
     end
 
     def test_to_hsl
-      hsl = nil
-      assert_nothing_raised { hsl = @cmyk.to_hsl }
+      hsl = @cmyk.to_hsl
       assert_kind_of(Color::HSL, hsl)
       assert_in_delta(0.48, hsl.l, Color::COLOR_TOLERANCE)
       assert_in_delta(0.125, hsl.s, Color::COLOR_TOLERANCE)
@@ -94,14 +80,13 @@ module TestColor
     end
 
     def test_to_rgb
-      rgb = nil
-      assert_nothing_raised { rgb = @cmyk.to_rgb(true) }
+      rgb = @cmyk.to_rgb(true)
       assert_kind_of(Color::RGB, rgb)
       assert_in_delta(0.5, rgb.r, Color::COLOR_TOLERANCE)
       assert_in_delta(0.4, rgb.g, Color::COLOR_TOLERANCE)
       assert_in_delta(0.3, rgb.b, Color::COLOR_TOLERANCE)
 
-      assert_nothing_raised { rgb = @cmyk.to_rgb }
+      rgb = @cmyk.to_rgb
       assert_kind_of(Color::RGB, rgb)
       assert_in_delta(0.54, rgb.r, Color::COLOR_TOLERANCE)
       assert_in_delta(0.48, rgb.g, Color::COLOR_TOLERANCE)
@@ -117,8 +102,7 @@ module TestColor
     end
 
     def test_to_yiq
-      yiq = nil
-      assert_nothing_raised { yiq = @cmyk.to_yiq }
+      yiq = @cmyk.to_yiq
       assert_kind_of(Color::YIQ, yiq)
       assert_in_delta(0.4911, yiq.y, Color::COLOR_TOLERANCE)
       assert_in_delta(0.05502, yiq.i, Color::COLOR_TOLERANCE)

data/test/test_color.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
+gem 'minitest'
+require 'minitest/autorun'
+
 require 'color'
 require 'color/css'
 
 module TestColor
-  class TestColor < Test::Unit::TestCase
+  class TestColor < Minitest::Test
     def setup
       Kernel.module_eval do
         alias old_warn warn

data/test/test_css.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 require 'color/css'
 
 module TestColor
-  class TestCSS < Test::Unit::TestCase
+  class TestCSS < Minitest::Test
     def test_index
       assert_equal(Color::RGB::AliceBlue, Color::CSS[:aliceblue])
       assert_equal(Color::RGB::AliceBlue, Color::CSS["AliceBlue"])