Fix issues, add CIE XYBri support, add Initial PHPUnit tests and Travis support.

.gitignore

@@ -0,0 +1,2 @@
+.idea
+vendor

.travis.yml

@@ -0,0 +1,16 @@
+language: php
+
+php: 5.3
+
+before_script :
+  - composer install
+
+after_script:
+  - CODECLIMATE_REPO_TOKEN="34ea4cdfa1a1b0da0a5bf10664b2dccf295c5bde0932bf7dd4e4fd39d590d28d" vendor/bin/test-reporter --stdout > codeclimate.json
+  - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"
+
+script: phpunit --configuration phpunit.xml --coverage-text
+
+notifications:
+  email:
+    - [email protected]

Color.php

@@ -71,6 +71,29 @@ public function fromRgbHex($red, $green, $blue)
     {
         return $this->fromRgbInt(hexdec($red), hexdec($green), hexdec($blue));
     }
+
+    /**
+     * Init color from a hex RGB string (#00FF00)
+     *
+     * @param $hex
+     * @return Color
+     */
+    public function fromRgbString($hex)
+    {
+        $hex = str_replace("#", "", $hex);
+
+        if(strlen($hex) == 3) {
+            $r = hexdec(substr($hex,0,1).substr($hex,0,1));
+            $g = hexdec(substr($hex,1,1).substr($hex,1,1));
+            $b = hexdec(substr($hex,2,1).substr($hex,2,1));
+        } else {
+            $r = hexdec(substr($hex,0,2));
+            $g = hexdec(substr($hex,2,2));
+            $b = hexdec(substr($hex,4,2));
+        }
+
+        return $this->fromRgbInt($r, $g, $b);
+    }
 
     /**
      * Init color from integer value
@@ -85,7 +108,37 @@ public function fromInt($intValue)
 
         return $this;
     }
-
+
+    /**
+     * Init color from a CIE XYBri value
+     *
+     * @param $x
+     * @param $y
+     * @param $brightness
+     * @return Color
+     */
+    public function fromXYBri($x, $y, $brightness)
+    {
+        $_x = ($x * $brightness) / $y;
+        $_y = $brightness;
+        $_z = ((1 - $x - $y) * $brightness) / $y;
+
+        $r = $_x * 3.2406 + $_y * -1.5372 + $_z * -0.4986;
+        $g = $_x * -0.9689 + $_y * 1.8758 + $_z * 0.0415;
+        $b = $_x * 0.0557 + $_y * -0.2040 + $_z * 1.0570;
+
+        $r = $r > 0.0031308 ? 1.055 * pow($r, 1 / 2.4) - 0.055 : 12.92 * $r;
+        $g = $g > 0.0031308 ? 1.055 * pow($g, 1 / 2.4) - 0.055 : 12.92 * $g;
+        $b = $b > 0.0031308 ? 1.055 * pow($b, 1 / 2.4) - 0.055 : 12.92 * $b;
+
+        $r = $r > 0 ? round($r * 255) : 0;
+        $g = $g > 0 ? round($g * 255) : 0;
+        $b = $b > 0 ? round($b * 255) : 0;
+
+        return $this->fromRgbInt($r, $g, $b);
+    }
+
+
     /**
      * Convert color to hex
      * 
@@ -121,7 +174,21 @@ public function toRgbHex()
             return dechex($item);
         }, $this->toRgbInt());
     }
-
+
+    /**
+     * Convert color to an RGB Hex string (#00FF00)
+     *
+     * @return string
+     */
+    public function toRgbString()
+    {
+        $hexes = $this->toRgbHex();
+        array_walk($hexes, function(&$hex, $key){
+            $hex = str_pad($hex,2,"0",STR_PAD_LEFT);
+        });
+        return "#" . strtoupper(implode('', $hexes));
+    }
+
     /**
      * Get Hue/Saturation/Value for the current color 
      * (float values, slow but accurate)
@@ -292,7 +359,7 @@ public function toLabCie()
 
         return $lab;
     }
-    
+
     /**
      * Convert color to integer
      * 
@@ -302,7 +369,47 @@ public function toInt()
     {
         return $this->color;
     }
-
+
+    /**
+     * Convert color to a CIE XYBri array.
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function toXYBri(){
+        $rgb = $this->toRgbInt();
+
+        $r = $rgb['red'];
+        $g = $rgb['green'];
+        $b = $rgb['blue'];
+
+        $r = $r / 255;
+        $g = $g / 255;
+        $b = $b / 255;
+
+        if ($r < 0 || $r > 1 || $g < 0 || $g > 1 || $b < 0 || $b > 1) {
+            throw new \Exception("Invalid RGB array. [{$r},{$b},{$g}]");
+        }
+
+        $rt = ($r > 0.04045) ? pow(($r + 0.055) / (1.0 + 0.055), 2.4) : ($r / 12.92);
+        $gt = ($g > 0.04045) ? pow(($g + 0.055) / (1.0 + 0.055), 2.4) : ($g / 12.92);
+        $bt = ($b > 0.04045) ? pow(($b + 0.055) / (1.0 + 0.055), 2.4) : ($b / 12.92);
+
+        $cie_x = $rt * 0.649926 + $gt * 0.103455 + $bt * 0.197109;
+        $cie_y = $rt * 0.234327 + $gt * 0.743075 + $bt * 0.022598;
+        $cie_z = $rt * 0.0000000 + $gt * 0.053077 + $bt * 1.035763;
+
+        if($cie_x + $cie_y + $cie_z == 0){
+            $hue_x = 0.1;
+            $hue_y = 0.1;
+        }else {
+            $hue_x = $cie_x / ($cie_x + $cie_y + $cie_z);
+            $hue_y = $cie_y / ($cie_x + $cie_y + $cie_z);
+        }
+        return array('x'=>$hue_x,'y'=>$hue_y,'bri'=>$cie_y);
+    }
+
+
     /**
      * Alias of toString()
      * 
@@ -320,18 +427,14 @@ public function __toString()
      */
     public function toString()
     {
-        $str = (string)$this->toHex();
-        if (strlen($str) < 6) {
-            $str = str_pad($str, 6, '0', STR_PAD_LEFT);
-        }
-        return strtoupper("#{$str}");
+        return $this->toRgbString();
     }
 
     /**
      * Get the distance between this color and the given color
-     * 
-     * @param Color $color 
-     * 
+     *
+     * @param Color $color
+     *
      * @return int
      */
     public function getDistanceRgbFrom(Color $color)
@@ -350,9 +453,9 @@ public function getDistanceRgbFrom(Color $color)
 
     /**
      * Get distance from the given color using the Delta E method
-     * 
-     * @param Color $color 
-     * 
+     *
+     * @param Color $color
+     *
      * @return float
      */
     public function getDistanceLabFrom(Color $color)
@@ -372,7 +475,7 @@ public function getDistanceLabFrom(Color $color)
     /**
      * Detect if color is grayscale
      * 
-     * @param int @threshold
+     * @param int $threshold
      * 
      * @return bool
      */
@@ -401,9 +504,9 @@ public function getClosestMatch(array $colors)
         $matchKey = null;
         foreach($colors as $key => $color) {
             if (false === ($color instanceof Color)) {
-                $c = new Color($color);
+                $color = new Color($color);
             }
-            $dist = $this->getDistanceLabFrom($c);
+            $dist = $this->getDistanceLabFrom($color);
             if ($dist < $matchDist) {
                 $matchDist = $dist;
                 $matchKey = $key;

README.md

@@ -1,5 +1,7 @@
 # PHP Color Utility Class
 
+![Travis CI](https://travis-ci.org/matthewbaggett/php-color.svg) [![Code Climate](https://codeclimate.com/github/matthewbaggett/php-color/badges/gpa.svg)](https://codeclimate.com/github/matthewbaggett/php-color) [![Test Coverage](https://codeclimate.com/github/matthewbaggett/php-color/badges/coverage.svg)](https://codeclimate.com/github/matthewbaggett/php-color)
+
 This class is intended to make it easier to convert between colorspaces,
 as well as compare one color to another.
 

composer.json

@@ -1,11 +1,28 @@
 {
-    "name": "hasbridge/php-color",
+    "name": "matthewbaggett/php-color",
     "description": "Color utility class for PHP 5.3 that allows for easy conversion between RGB, HSV, XYZ, and Lab colorspaces, as well as color comparison",
     "license": "MIT",
     "autoload": {
-        "psr-0": {"Color": ""}
+        "psr-0": {
+            "Color": ""
+        }
     },
     "require": {
         "php": "~5.3"
-    }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*",
+        "codeclimate/php-test-reporter": "dev-master"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.1-dev"
+        }
+    },
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/matthewbaggett/php-color"
+        }
+    ]
 }