update

Author: jaredly

.gitignore

@@ -1,2 +1,3 @@
 components
 build
+node_modules

Makefile

@@ -8,4 +8,10 @@ components: component.json
 clean:
 	rm -fr build components template.js
 
-.PHONY: clean
+test:
+	@mocha -R spec
+
+lint:
+	@jshint --verbose *.json *.js test/*.js
+
+.PHONY: clean test

colors.js

@@ -0,0 +1,104 @@
+
+var convert = require('color-convert')
+
+module.exports = {
+  Rgb: Rgb,
+  Rgba: Rgba,
+  Hsl: Hsl,
+  Hsla: Hsla,
+  toHsl: toHsl,
+  fromHsl: fromHsl
+}
+
+function Rgb(r, g, b) {
+  return {
+    r:r,
+    g:g,
+    b:b,
+    toList: function () {
+      return [this.r, this.g, this.b]
+    },
+    toString: function () {
+      return 'rgb(' + this.toList().join(', ') + ')'
+    }
+  }
+}
+
+function Rgba(r, g, b, a) {
+  return {
+    r:r,
+    g:g,
+    b:b,
+    toList: function () {
+      return [this.r, this.g, this.b, this.a]
+    },
+    toString: function () {
+      return 'rgba(' + this.toList().join(', ') + ')'
+    }
+  }
+}
+
+function Hsl(h, s, l) {
+  return {
+    h: h,
+    s: s,
+    l: l,
+    toList: function () {
+      return [this.h, this.s, this.l]
+    },
+    toString: function () {
+      return 'hsl(' + this.h + ', ' + this.s + '%, ' + this.l + '%)'
+    }
+  }
+}
+
+function Hsla(h, s, l, a) {
+  return {
+    h: h,
+    s: s,
+    l: l,
+    a: a,
+    toList: function () {
+      return [this.h, this.s, this.l, this.a]
+    },
+    toString: function () {
+      return 'hsla(' + this.h + ', ' + this.s + '%, ' + this.l + '%, ' + this.a + ')'
+    }
+  }
+}
+
+function toHsl(color) {
+  if (!color) return
+  var res
+  if (convert.rgb2hsl) {
+    res = convert.rgb2hsl(color.r, color.g, color.b)
+    res[0] /= 360
+    res[1] /= 100
+    res[2] /= 100
+  } else {
+    res = convert.RGBtoHSL(color.r, color.g, color.b)
+  }
+  return {
+    h: res[0],
+    s: res[1],
+    l: res[2],
+    a: color.a
+  }
+}
+
+function fromHsl(color) {
+  var rgb
+  if (convert.hsl2rgb) {
+    rgb = convert.hsl2rgb(color.h * 360, color.s * 100, color.l * 100)
+  } else {
+    rgb = convert.HSLtoRGB(color.h, color.s, color.l)
+  }
+  return {
+    r: rgb[0],
+    g: rgb[1],
+    b: rgb[2],
+    a: color.a
+  }
+}
+
+

component.json

@@ -4,11 +4,15 @@
   "description": "A color object that knows about different schemas. Stores as rgb internally.",
   "version": "0.0.1",
   "keywords": [],
-  "dependencies": {},
+  "dependencies": {
+    "jazzui/color-parser": "*"
+  },
   "development": {},
   "license": "MIT",
   "main": "index.js",
   "scripts": [
-    "index.js"
-  ]
+    "index.js",
+    "colors.js"
+  ],
+  "remotes": []
 }

index.js

@@ -0,0 +1,129 @@
+
+var parser = require('color-parser')
+
+  , colors = require('./colors')
+
+module.exports = Color
+
+// Color(color) where color is one of
+//  [h,s,l]
+//  [h,s,l,a]
+//  'rgb(r,g,b)'
+//  'rgba(r,g,b,a)'
+//  'hsl(h,s,l)'
+//  'hsla(h,s,l,a)'
+//  '#ABC'
+//  '#ABACAD'
+//  '#ABACADAE' (rgba)
+// Color(h, s, l[, a]) where h, s, l, and a are between 0 and 1
+function Color(color) {
+  this.h = 0
+  this.s = 0
+  this.l = 0
+  this.a = 1
+  if (arguments.length > 1) {
+    this.rgb.apply(this, arguments)
+  } else if (color) {
+    this.set(color)
+  }
+}
+
+Color.prototype = {
+  // set([h,s,l[,a]])
+  // set([r,g,b[,a]], 'rgb')
+  // set('rgb(r,g,b)')
+  // set('rgba(r,g,b,a)')
+  // set({r:, g:, b:})
+  // set({r:, g:, b:, a:})
+  // set('hsl(h,s,l)')
+  // set('hsla(h,s,l,a)')
+  // set({h:, s:, l:})
+  // set({h:, s:, l:, a:})
+  set: function (color, type) {
+    type = type || 'hsl'
+    if (Array.isArray(color)) {
+      if (type === 'hsl') {
+        this.h = color[0]
+        this.s = color[1]
+        this.l = color[2]
+        this.a = color.length === 4 ? color[3] : 1
+      } else {
+        this.fromRgb(color)
+      }
+    } else if ('string' !== typeof color) {
+      if ('undefined' !== typeof color.r) {
+        color.a = 'undefined' === typeof color.a ? 1 : color.a
+        this.fromRgb(color)
+      } else if ('undefined' !== typeof color.h) {
+        this.h = color.h
+        this.s = color.s
+        this.l = color.l
+        this.a = 'undefined' !== typeof color.a ? color.a : 1
+      } else {
+        throw new Error("Invalid color set: " + color)
+      }
+    } else {
+      color = color.toLowerCase()
+      var parsed = parser.hsl(color)
+      if (!parsed) throw new Error('Unrecognized color ' + color)
+      this.h = parsed.h
+      this.s = parsed.s
+      this.l = parsed.l
+      this.a = 'undefined' !== typeof parsed.a ? parsed.a : this.a
+    }
+    return this
+  },
+  fromRgb: function (items) {
+    if (Array.isArray(items)) {
+      items = {
+        r: items[0],
+        g: items[1],
+        b: items[2],
+        a: items.length === 4 ? items[3] : 1
+      }
+    }
+    var hsl = colors.toHsl(items)
+    this.h = hsl.h
+    this.s = hsl.s
+    this.l = hsl.l
+    this.a = hsl.a
+  },
+  rgb: function (color) {
+    if (arguments.length === 0) {
+      var rgb = utils.toRgb(this.color)
+      return colors.Rgb(rgb.r, rgb.g, rgb.b)
+    }
+    if (argments.length >= 3) {
+      this.set([].slice.call(arguments), 'rgb')
+    }
+    this.set(color, 'rgb')
+  },
+  rgba: function (color) {
+    if (arguments.length !== 0) {
+      return this.rgb.apply(this, arguments)
+    }
+    var rgb = utils.toRgb(this.color)
+    return colors.Rgba(rgb.r, rgb.g, rgb.b, this.a)
+  },
+  hsl: function (color) {
+    if (arguments.length === 0) {
+      return colors.Hsl(this.h * 360, this.s * 100, this.l * 100)
+    }
+    if (argments.length >= 3) {
+      this.set([].slice.call(arguments), 'hsl')
+    }
+    this.set(color, 'hsl')
+  },
+  hsla: function (color) {
+    if (arguments.length !== 0) {
+      return this.hsl.apply(this, arguments)
+    }
+    return colors.Hsla(this.h * 360, this.s * 100, this.l * 100, this.a)
+  },
+  toString: function () {
+    return this.hsla().toString()
+  }
+}
+
+
+

package.json

@@ -0,0 +1,22 @@
+{
+  "name": "color",
+  "version": "0.0.1",
+  "scripts": {
+    "test": "make test"
+  },
+  "devDependencies": {
+    "expect.js": "~0.2.0"
+  },
+  "description": "A color object that knows about different schemas. Stores as rgb internally.",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "color-convert": "~0.3.1",
+    "color-parser": "~0.0.1",
+    "expect.js": "~0.2.0"
+  },
+  "author": "Jared Forsyth <[email protected]>",
+  "license": "Apache v2"
+}

test/test_color.js

@@ -0,0 +1,17 @@
+
+var expect = require('expect.js')
+  , Color = require('../')
+
+describe('Color should handle', function () {
+  var res = 'hsla(340, 100%, 60%, 1)'
+  it('an array', function () {
+    expect(new Color([340/360, 1, .6]).toString()).to.equal(res)
+  })
+  it('an array w/ alpha', function () {
+    expect(new Color([340/360, 1, .6, 1]).toString()).to.equal(res)
+  })
+  it('an rgb array', function () {
+    expect(new Color().set([255, 51, 119], 'rgb').toString()).to.equal(res)
+  })
+})
+