color-string 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.3.0
+
+- Fixed: HSL alpha channel ([#16](https://github.com/harthur/color-string/pull/16))
+- Fixed: ability to parse signed number ([#15](https://github.com/harthur/color-string/pull/15))
+- Removed: component.json
+- Removed: browser build
+- Added: license field to package.json ([#17](https://github.com/harthur/color-string/pull/17))
+
+---
+
+Check out commit logs for earlier releases

package/README.md

@@ -31,6 +31,6 @@ colorString.hslString([360, 100, 100])   // "hsl(360, 100%, 100%)"
 For [node](http://nodejs.org) with [npm](http://npmjs.org):
 
 	npm install color-string
-	
+
 ### browser
-Download the latest [color-string.js](http://github.com/harthur/color-string/downloads). The `colorString` object is exported.
+Download the latest [color-string.js](https://github.com/harthur/color-string/tree/gh-pages). The `colorString` object is exported.

package/color-string.js

@@ -1,5 +1,5 @@
 /* MIT license */
-var convert = require("color-convert");
+var colorNames = require('color-name');
 
 module.exports = {
    getRgba: getRgba,
@@ -26,8 +26,8 @@ function getRgba(string) {
    }
    var abbr =  /^#([a-fA-F0-9]{3})$/,
        hex =  /^#([a-fA-F0-9]{6})$/,
-       rgba = /^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d\.]+)\s*)?\)$/,
-       per = /^rgba?\(\s*([\d\.]+)\%\s*,\s*([\d\.]+)\%\s*,\s*([\d\.]+)\%\s*(?:,\s*([\d\.]+)\s*)?\)$/,
+       rgba = /^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,
+       per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,
        keyword = /(\D+)/;
 
    var rgb = [0, 0, 0],
@@ -61,7 +61,7 @@ function getRgba(string) {
       if (match[1] == "transparent") {
          return [0, 0, 0, 0];
       }
-      rgb = convert.keyword2rgb(match[1]);
+      rgb = colorNames[match[1]];
       if (!rgb) {
          return;
       }
@@ -76,7 +76,7 @@ function getRgba(string) {
    else {
       a = scale(a, 0, 1);
    }
-   rgb.push(a);
+   rgb[3] = a;
    return rgb;
 }
 
@@ -84,13 +84,14 @@ function getHsla(string) {
    if (!string) {
       return;
    }
-   var hsl = /^hsla?\(\s*(\d+)\s*,\s*([\d\.]+)%\s*,\s*([\d\.]+)%\s*(?:,\s*([\d\.]+)\s*)?\)/;
+   var hsl = /^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
    var match = string.match(hsl);
    if (match) {
+      var alpha = parseFloat(match[4]);
       var h = scale(parseInt(match[1]), 0, 360),
           s = scale(parseFloat(match[2]), 0, 100),
           l = scale(parseFloat(match[3]), 0, 100),
-          a = scale(parseFloat(match[4]) || 1, 0, 1);
+          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
       return [h, s, l, a];
    }
 }
@@ -99,13 +100,14 @@ function getHwb(string) {
    if (!string) {
       return;
    }
-   var hwb = /^hwb\(\s*(\d+)\s*,\s*([\d\.]+)%\s*,\s*([\d\.]+)%\s*(?:,\s*([\d\.]+)\s*)?\)/;
+   var hwb = /^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
    var match = string.match(hwb);
    if (match) {
+    var alpha = parseFloat(match[4]);
       var h = scale(parseInt(match[1]), 0, 360),
           w = scale(parseFloat(match[2]), 0, 100),
           b = scale(parseFloat(match[3]), 0, 100),
-          a = scale(parseFloat(match[4]) || 1, 0, 1);
+          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
       return [h, w, b, a];
    }
 }
@@ -198,7 +200,7 @@ function hwbString(hwb, alpha) {
 }
 
 function keyword(rgb) {
-   return convert.rgb2keyword(rgb.slice(0, 3));
+  return reverseNames[rgb.slice(0, 3)];
 }
 
 // helpers
@@ -210,3 +212,10 @@ function hexDouble(num) {
   var str = num.toString(16).toUpperCase();
   return (str.length < 2) ? "0" + str : str;
 }
+
+
+//create a list of reverse color names
+var reverseNames = {};
+for (var name in colorNames) {
+   reverseNames[colorNames[name]] = name;
+}

package/package.json

@@ -1,19 +1,30 @@
 {
-    "name": "color-string",
-    "description": "Parser and generator for CSS color strings",
-    "version": "0.2.1",
-    "author": "Heather Arthur <fayearthur@gmail.com>",
-    "repository": {
-        "type": "git",
-        "url": "http://github.com/harthur/color-string.git"
-    },
-    "main": "./color-string",
-    "dependencies": {
-        "color-convert": "0.5.x"
-    },
-    "devDependencies": {
-        "browserify": ">=1.0.0",
-        "uglify-js": "1.0.x"
-    },
-    "keywords": ["color", "colour", "rgb", "css"]
-}
+  "name": "color-string",
+  "description": "Parser and generator for CSS color strings",
+  "version": "0.3.0",
+  "author": "Heather Arthur <fayearthur@gmail.com>",
+  "contributors": [
+    "Maxime Thirouin",
+    "Dyma Ywanov <dfcreative@gmail.com>"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/harthur/color-string.git"
+  },
+  "scripts": {
+    "test": "node test/basic.js"
+  },
+  "license": "MIT",
+  "main": "./color-string",
+  "dependencies": {
+    "color-name": "^1.0.0"
+  },
+  "devDependencies": {
+  },
+  "keywords": [
+    "color",
+    "colour",
+    "rgb",
+    "css"
+  ]
+}

package/test/basic.js

@@ -1,14 +1,30 @@
 var string = require("../color-string"),
     assert = require("assert");
 
+
 assert.deepEqual(string.getRgba("#fef"), [255, 238, 255, 1]);
 assert.deepEqual(string.getRgba("#fffFEF"), [255, 255, 239,1]);
 assert.deepEqual(string.getRgba("rgb(244, 233, 100)"), [244, 233, 100, 1]);
 assert.deepEqual(string.getRgba("rgb(100%, 30%, 90%)"), [255, 77, 229, 1]);
-assert.deepEqual(string.getRgba("blue"), [0, 0, 255, 1]);
 assert.deepEqual(string.getRgba("transparent"), [0, 0, 0, 0]);
 assert.deepEqual(string.getHsla("hsl(240, 100%, 50.5%)"), [240, 100, 50.5, 1]);
+assert.deepEqual(string.getHsla("hsl(240deg, 100%, 50.5%)"), [240, 100, 50.5, 1]);
 assert.deepEqual(string.getHwb("hwb(240, 100%, 50.5%)"), [240, 100, 50.5, 1]);
+assert.deepEqual(string.getHwb("hwb(240deg, 100%, 50.5%)"), [240, 100, 50.5, 1]);
+
+// with sign
+assert.deepEqual(string.getRgba("rgb(-244, +233, -100)"), [0, 233, 0, 1]);
+assert.deepEqual(string.getHsla("hsl(+240, 100%, 50.5%)"), [240, 100, 50.5, 1]);
+assert.deepEqual(string.getRgba("rgba(200, +20, -233, -0.0)"), [200, 20, 0, 0]);
+assert.deepEqual(string.getRgba("rgba(200, +20, -233, -0.0)"), [200, 20, 0, 0]);
+assert.deepEqual(string.getHsla("hsla(+200, 100%, 50%, -0.2)"), [200, 100, 50, 0]);
+assert.deepEqual(string.getHwb("hwb(+240, 100%, 50.5%)"), [240, 100, 50.5, 1]);
+assert.deepEqual(string.getHwb("hwb(-240deg, 100%, 50.5%)"), [0, 100, 50.5, 1]);
+assert.deepEqual(string.getHwb("hwb(-240deg, 100%, 50.5%, +0.6)"), [0, 100, 50.5, 0.6]);
+
+//subsequent return values should not change array
+assert.deepEqual(string.getRgba("blue"), [0, 0, 255, 1]);
+assert.deepEqual(string.getRgba("blue"), [0, 0, 255, 1]);
 
 assert.equal(string.getAlpha("rgb(244, 233, 100)"), 1);
 assert.equal(string.getAlpha("rgba(244, 233, 100, 0.5)"), 0.5);
@@ -27,6 +43,9 @@ assert.deepEqual(string.getHwb("hwb(200, 20%, 33%, 0.2)"), [200, 20, 33, 0.2]);
 assert.deepEqual(string.getRgb("#fef"), [255, 238, 255]);
 assert.deepEqual(string.getRgb("rgba(200, 20, 233, 0.2)"), [200, 20, 233]);
 assert.deepEqual(string.getHsl("hsl(240, 100%, 50.5%)"), [240, 100, 50.5]);
+assert.deepEqual(string.getRgba('rgba(0,0,0,0)'), [0, 0, 0, 0]);
+assert.deepEqual(string.getHsla('hsla(0,0%,0%,0)'), [0, 0, 0, 0]);
+assert.deepEqual(string.getHwb("hwb(400, 10%, 200%, 0)"), [360, 10, 100, 0]);
 
 // range
 assert.deepEqual(string.getRgba("rgba(300, 600, 100, 3)"), [255, 255, 100, 1]);

package/Jakefile.js

@@ -1,54 +0,0 @@
-/*
-  Turns CommonJS package into a browser file and minifies.
-  
-  uses node-jake http://github.com/mde/node-jake
-  install jake with `npm install jake -g`
-
-  run with `jake [build|minify|clean]`
-*/
-var fs = require("fs"),
-    path = require("path"),
-    browserify = require("browserify");
-   
-var pkg = JSON.parse(fs.readFileSync("package.json")); 
-var prefix = pkg.name + "-" + pkg.version;
-
-task('build', [], function (dest) {
-  console.log("building...");
-  dest = dest || prefix + ".js";
-
-  var source = browserify.bundle({
-    name: "color-string",
-    main: path.join(__dirname, pkg.main),
-    shim: false
-  });
-  source = "var colorString = (function() {" + source + " return require('color-string')})();"
-
-  fs.writeFileSync(dest, source);
-  console.log("> " + dest);
-});
-
-task('minify', [], function (file, dest) {
-  file = file || prefix + ".js";
-  dest = dest || prefix + ".min.js";
-
-  var minified = minify(fs.readFileSync(file, "utf-8"));
-  fs.writeFileSync(dest, minified, "utf-8");
-  console.log("> " + dest)
-});
-
-task('clean', [], function () {
-  fs.unlink(prefix + ".js");
-  fs.unlink(prefix + ".min.js");
-});
-
-function minify(code) {
-  var uglifyjs = require("uglify-js"),
-      parser = uglifyjs.parser,
-      uglify = uglifyjs.uglify;
-
-  var ast = parser.parse(code);
-  ast = uglify.ast_mangle(ast);
-  ast = uglify.ast_squeeze(ast);
-  return uglify.gen_code(ast);
-}

package/component.json

@@ -1,13 +0,0 @@
-{
-    "name": "color-string",
-    "description": "Parser and generator for CSS color strings",
-    "version": "0.1.1",
-    "author": "Heather Arthur <fayearthur@gmail.com>",
-    "repository": "harthur/color-string",
-    "scripts": ["color-string.js"],
-    "main": "color-string.js",
-    "dependencies": {
-        "harthur/color-convert": "*"
-    },
-    "keywords": ["color", "colour", "rgb", "css"]
-}