colormath 0.1.1 → 0.1.2

data/lib/colormath/color.rb

@@ -3,17 +3,6 @@ module ColorMath
   # Color can be mixed into any class that responds to red, green, and blue, where 0 <= c <= 1
   #
   module Color
-    EPSILON = 1/256.0
-
-    # Returns true if the RGB components of the two colours differ by less than EPSILON,
-    # i.e. they are the same when represented in 8 bits.
-    #
-    def ==(other)
-      deltas = [ other.red   - self.red,
-                 other.green - self.green,
-                 other.blue  - self.blue ].map{ |e| e.abs }
-      deltas.max < EPSILON
-    end
 
     # The six-digit hexadecimal representation of the colour, e.g. "#cafe66"
     #
@@ -21,6 +10,17 @@ module ColorMath
       "#%02x%02x%02x" % [red * 0xff, green * 0xff, blue * 0xff]
     end
 
+    # The hexadecimal representation of the colour, using 3 digits if possible
+    #
+    def compact_hex
+      case h = hex
+      when /^#(.)\1(.)\2(.)\3$/
+        "##$1#$2#$3"
+      else
+        h
+      end
+    end
+
     def inspect(*args)
       "<%s r=%0.3f g=%0.3f b=%0.3f>" % [self.class.to_s, red, green, blue]
     end

data/lib/colormath/version.rb

@@ -2,7 +2,7 @@ module ColorMath
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/hex_encoding_test.rb

@@ -0,0 +1,30 @@
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require "test/unit"
+require "shoulda"
+require "colormath"
+
+class HexEncodingTest < Test::Unit::TestCase
+
+  should "generate hex code" do
+    %w[ #123456 #abcdef #000000 #ffffff #112233 #aabbcc ].each do |hex|
+      assert_equal hex, ColorMath::hex_color(hex).hex
+    end
+  end
+
+  context "when generating short hex code" do
+    should "use three digits if possible" do
+      assert_equal "#000", ColorMath::hex_color("#000000").compact_hex
+      assert_equal "#fff", ColorMath::hex_color("#ffffff").compact_hex
+      assert_equal "#123", ColorMath::hex_color("#112233").compact_hex
+      assert_equal "#abc", ColorMath::hex_color("#aabbcc").compact_hex
+    end
+
+    should "use six digits if not possible" do
+      %w[ #123456 #abcdef ].each do |hex|
+        assert_equal hex, ColorMath::hex_color(hex).compact_hex
+      end
+    end
+  end
+
+end

data/test/hsl_test.rb

@@ -4,14 +4,6 @@ require "shoulda"
 require "colormath"
 
 class HSLTest < Test::Unit::TestCase
-  should "be equal if initialized with same values" do
-    assert_equal ColorMath::HSL.new(123, 0.5, 0.7), ColorMath::HSL.new(123, 0.5, 0.7)
-  end
-
-  should "not be equal if initialized with different values" do
-    assert_not_equal ColorMath::HSL.new(124, 0.4, 0.8), ColorMath::HSL.new(123, 0.5, 0.7)
-  end
-
   should "force hue >= 0" do
     c = ColorMath::HSL.new(-2, 0, 0)
     assert_equal 358, c.hue

data/test/rgb_test.rb

@@ -4,14 +4,6 @@ require "shoulda"
 require "colormath"
 
 class RGBTest < Test::Unit::TestCase
-  should "be equal if initialized with same values" do
-    assert_equal ColorMath::RGB.new(0.3, 0.5, 0.7), ColorMath::RGB.new(0.3, 0.5, 0.7)
-  end
-
-  should "not be equal if initialized with different values" do
-    assert_not_equal ColorMath::RGB.new(0.5, 0.4, 0.8), ColorMath::RGB.new(0.3, 0.5, 0.7)
-  end
-
   should "force red >= 0" do
     c = ColorMath::HSL.new(-2, 0, 0)
     assert_equal 0, c.red

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: colormath
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Paul Battley
@@ -36,6 +36,7 @@ files:
 - test/blend_test.rb
 - test/conversion_test.rb
 - test/hex_decoding_test.rb
+- test/hex_encoding_test.rb
 - test/hsl_test.rb
 - test/rgb_test.rb
 - lib/colormath/adjust.rb