color-string 0.2.4 → 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/color-string.js

@@ -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],
@@ -84,13 +84,14 @@ function getHsla(string) {
    if (!string) {
       return;
    }
-   var hsl = /^hsla?\(\s*(\d+)(?:deg)?\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+)(?:deg)?\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];
    }
 }
@@ -216,4 +218,4 @@ function hexDouble(num) {
 var reverseNames = {};
 for (var name in colorNames) {
    reverseNames[colorNames[name]] = name;
-}
+}

package/package.json

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

package/test/basic.js

@@ -12,9 +12,19 @@ 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.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);
@@ -33,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/Gruntfile.js

@@ -1,42 +0,0 @@
-/*
- * To run this file:
- *  `npm install --dev`
- *  `npm install -g grunt`
- *
- *  `grunt --help`
- */
-
-var fs = require("fs"),
-    browserify = require("browserify"),
-    pkg = require("./package.json");
-
-module.exports = function(grunt) {
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    uglify: {
-      options: {
-        banner: "/*\n" + grunt.file.read('LICENSE') + "\n*/"
-      },
-      dist: {
-        files: {
-          '<%=pkg.name%>-<%=pkg.version%>.min.js': ['<%=pkg.name%>-<%=pkg.version%>.js']
-        }
-      }
-    }
-  });
-
-  grunt.registerTask('build', 'build a browser file', function() {
-    var done = this.async();
-
-    var outfile = './color-string-' + pkg.version + '.js';
-
-    var bundle = browserify('./browser.js').bundle(function(err, src) {
-      console.log("> " + outfile);
-      // write sync instead of piping to get around event bug
-      fs.writeFileSync(outfile, src);
-      done();
-    });
-  });
-
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-};

package/browser.js

@@ -1,3 +0,0 @@
-// this file is the entrypoint for building a browser file with browserify
-
-colorString = require("./color-string");

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"]
-}

package/test.html

@@ -1,8 +0,0 @@
-<html>
-<script src="color-string-0.1.0.js"></script>
-
-<script>
-  alert(colorString.hexString([235, 101, 56]));
-  </script>
-
-</html>