lights 0.8.9 → 0.8.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDJjZTE1NTcwYjA3YWU5MmExMzUxNjQyODA5OTNhZDRiMjFjZjY2ZQ==
+    MWJlYThiNGQ5NzkxYjA3NjRmOTcxYzNmMGFkMzcyY2I0Mzk5MjY5Mg==
   data.tar.gz: !binary |-
-    OWI5NTA5NDA0ZGI2NTZkYjg3YWNiMjBkODJmZmM4MGM1MDlhMGIwMw==
+    ZDFiM2M3ZDE3OWU5YWMwZDgyOTY5YTk4MjRiMzA5NmVjY2Q5NDEyNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGYzMWQwYTMyYjU2ODZlMWY4OTcxYzdjYjI1OTY2NDAxYjNjYmQyMDIwNjIz
-    Nzc0Y2M0ZThiMjk5MGI0NGI1ZGNjZjUyOWY0MTlmZmQ4MGY3YWI5ODg1ZTRm
-    M2E5MzhmMmQ3N2I0ZjI2OWFjZTYxMmE4NWNjMzc1YWMzNzcxMjc=
+    MTEwOTkwNTdhYjUyMTNmZDJiOTkwYWIzZWZlNzc0MWJlYjNmYjgzMWE1Y2Yy
+    ZGFmYmRlNTBiNmRjYWExNGUwYWE1M2I1YTdmNjVjYmI5NzcyYWExZjFjMTgx
+    M2EwMmMwNjQ1MmY3NmFhMmMzMmY2NzZhZGIwYjE4ODFjNDVmZGE=
   data.tar.gz: !binary |-
-    ZjMzZTFhNjkxZTMxYjk0ODhlZGU3NWY4MzdmYTE2NWEwMjg4OGVjZWFkZmNk
-    ODg2YjI2NmExYjk2NDI4YzliNjhkODVjYzdjYmJkYTVkMGNkMDQ0ODZlN2Y1
-    Mjc4ZGViOWY2NDUwOWM4NDgxMjIwNzYyZjc3N2E0MmVhMGJjODY=
+    ZmU0YTE1ZGUxOTgyNTAyMzlhNzQ4OTUzZDg4NDMyMmRlNDEzOTY3M2ViODNm
+    NzhiMTM5MDNkYTI0MDQyYTc1ZGU0N2RkZjVlNTYwZjRiNDg0ZjA4NjE4MGM1
+    OTg5MGNhM2E1MzM5OGRjMjczN2U1YzcyZGU1MjUyZTA3ZTcwNDk=

data/README.md

@@ -1,6 +1,6 @@
 lights
 ========
-A Ruby library & CLI for controlling Philips Hue lightbulbs.
+A Ruby library & CLI for interacting with Philips Hue.
 
 * Philips Hue API Documentation: http://www.developers.meethue.com/philips-hue-api
 * lights on RubyGems: https://rubygems.org/gems/lights

data/bin/lights

@@ -173,12 +173,7 @@ class LightsCli
       methods = [:id,:name,:time,:scene,:status]
     when "datastore"
       response = hue.request_datastore
-      response["lights"].each {|id,value| objects << Bulb.new(id,value)}
-      response["groups"].each {|id,value| objects << Group.new(id,value)}
-      response["config"]["whitelist"].each {|id,value| objects << User.new(id,value)}
-      response["rules"].each {|id,value| objects << Rule.new(id,value)}
-      response["scenes"].each {|id,value| objects << Scene.new(id,value)}
-      response["schedules"].each {|id,value| objects << Schedule.new(id,value)}
+      objects = Datastore.new(response).all
       titles = ["TYPE","ID","NAME"]
       methods = [:class,:id,:name]
     else

data/lib/lights.rb

@@ -4,15 +4,9 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-require 'lights/bulb'
-require 'lights/group'
 require 'lights/bridge'
 require 'lights/exception'
-require 'lights/sensor'
-require 'lights/scene'
-require 'lights/user'
-require 'lights/rule'
-require 'lights/schedule'
+require 'lights/datastore'
 require 'lights/loggerconfig'
 
 def jp( s )

data/lib/lights/bulb.rb

@@ -9,17 +9,22 @@ class Bulb
     @id = id
     @name = data["name"]
     @type = data["type"]
-    @swversion = data["type"]
+    @swversion = data["swversion"]
     @state = BulbState.new data["state"]
+    @data = data
   end
 
   def data
-    data = {}
+    data = @data
     data["name"] = @name if @name
     data["type"] = @type if @type
     data["swversion"] = @swversion if @swversion
     data["state"] = @state.data if !@state.data.empty?
     data
   end
+
+  def to_json(options={})
+    data.to_json
+  end
 end
 

data/lib/lights/bulblist.rb

@@ -0,0 +1,22 @@
+require 'lights/bulb'
+
+class BulbList
+
+  attr_reader :bulbs
+  def initialize(data = {})
+    @bulbs = []
+    data.each{|id,value| @bulbs << Bulb.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @bulbs.each {|b| data[b.id] = b.data} if @bulbs
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/bulbstate.rb

@@ -46,6 +46,7 @@ class BulbState
     set_color_mode data["colormode"] 
     @reachable = data["reachable"] 
     set_transition_time data["transitiontime"]
+    @data = data
   end
  
   def color_mode=(value) set_color_mode(value) end
@@ -55,7 +56,7 @@ class BulbState
         || value == ColorMode::CT
       @color_mode = value
     else
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires 'hs', 'xy', or 'ct'"
+      raise BulbStateValueTypeException, "Color mode value has incorrect type. Requires 'hs', 'xy', or 'ct'. Was #{value.inspect}"
     end
   end
 
@@ -66,7 +67,7 @@ class BulbState
         || value == Alert::LSELECT
       @alert = value
     else
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires 'none', 'select', or 'lselect'"
+      raise BulbStateValueTypeException, "Alert value has incorrect type. Requires 'none', 'select', or 'lselect'. Was #{value.inspect}"
     end
   end
 
@@ -75,7 +76,7 @@ class BulbState
     if value.nil? || value == Effect::NONE || value == Effect::COLORLOOP
       @effect = value
     else
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires 'none' or 'colorloop'"
+      raise BulbStateValueTypeException, "Effect value has incorrect type. Requires 'none' or 'colorloop'. Was #{value.inspect}"
     end
   end
 
@@ -85,7 +86,7 @@ class BulbState
     if !!value == value
       @on = value
     else
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires boolean, got #{value.class}"
+      raise BulbStateValueTypeException, "On value has incorrect type. Requires boolean, got #{value.class}. Was #{value.inspect}"
     end
   end
  
@@ -94,58 +95,58 @@ class BulbState
     if value.nil? || value.between?(MIN_BRI,MAX_BRI)
       @bri = value
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be [#{MIN_BRI},#{MAX_BRI}]"
+      raise BulbStateValueOutOfRangeException, "Brightness value out of range. Must be [#{MIN_BRI},#{MAX_BRI}]. Was #{value.inspect}"
     end
   end 
 
   def ct=(value); set_ct(value) end
   def set_ct(value)
     if !value.nil? && (!value.is_a? Integer)
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires integer, got #{value.class}"
+      raise BulbStateValueTypeException, "Color temperature value has incorrect type. Requires integer, got #{value.class}"
     elsif value.nil? || value.between?(MIN_CT,MAX_CT)
       @ct = value
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be [#{MIN_CT},#{MAX_CT}]"
+      raise BulbStateValueOutOfRangeException, "Color temperature value out of range. Must be [#{MIN_CT},#{MAX_CT}]. Was #{value.inspect}"
     end
   end
   
   def sat=(value); set_sat(value) end
   def set_sat(value)
     if !value.nil? && (!value.is_a? Integer)
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires integer, got #{value.class}"
+      raise BulbStateValueTypeException, "Saturation value has incorrect type. Requires integer, got #{value.class}"
     elsif value.nil? || value.between?(MIN_SAT,MAX_SAT)
       @sat = value
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be [#{MIN_SAT},#{MAX_SAT}]"
+      raise BulbStateValueOutOfRangeException, "Saturation alue out of range. Must be [#{MIN_SAT},#{MAX_SAT}]. Was #{value.inspect}"
     end
   end
  
   def hue=(value); set_hue(value) end
   def set_hue(value)
     if !value.nil? && (!value.is_a? Integer)
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires integer, got #{value.class}"
+      raise BulbStateValueTypeException, "Hue value has incorrect type. Requires integer, got #{value.class}"
     elsif value.nil? || value.between?(MIN_HUE,MAX_HUE)
       @hue = value
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be [#{MIN_HUE},#{MAX_HUE}]"
+      raise BulbStateValueOutOfRangeException, "Hue value out of range. Must be [#{MIN_HUE},#{MAX_HUE}]. Was #{value.inspect}"
     end
   end
 
   def transition_time=(value); set_transition_time(value) end
   def set_transition_time(value)
     if !value.nil? && (!value.is_a? Numeric)
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires decimal, got #{value.class}"
+      raise BulbStateValueTypeException, "Transition time value has incorrect type. Requires decimal, got #{value.class}"
     elsif value.nil? || value >= MIN_TRANSITION_TIME
       @transition_time = value
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be > #{MIN_TRANSITION_TIME}"
+      raise BulbStateValueOutOfRangeException, "Transition time value out of range. Must be > #{MIN_TRANSITION_TIME}. Was #{value.inspect}"
     end
   end  
 
   def xy=(value); set_xy(value) end
   def set_xy(value)
     if !value.nil? && (!value.is_a? Array)
-      raise BulbStateValueTypeException, "Value has incorrect type. Requires array, got #{value.class}"
+      raise BulbStateValueTypeException, "XY value has incorrect type. Requires array, got #{value.class}"
     elsif value.nil?
       return
     elsif value.length == 2 && value[0].is_a?(Numeric) \
@@ -156,12 +157,12 @@ class BulbState
       @xy[0] = value[0].to_f
       @xy[1] = value[1].to_f
     else
-      raise BulbStateValueOutOfRangeException, "Value out of range. Must be [#{MIN_XY},#{MAX_XY}]"
+      raise BulbStateValueOutOfRangeException, "XY value out of range. Must be [#{MIN_XY},#{MAX_XY}]. Was #{value.inspect}"
     end
   end
 
   def data 
-    data = {} 
+    data = @data
     data["on"] = @on if (@on!=nil) 
     data["bri"] = @bri if @bri 
     data["hue"] = @hue if @hue 
@@ -176,7 +177,7 @@ class BulbState
     data 
   end 
 
-  def to_json
+  def to_json(options={})
     data.to_json
   end
 end

data/lib/lights/command.rb

@@ -15,7 +15,7 @@ class Command
     data
   end
 
-  def to_json
+  def to_json(options={})
     data.to_json
   end
 end

data/lib/lights/config.rb

@@ -0,0 +1,26 @@
+require 'lights/userlist'
+
+class HueConfig
+
+  attr_reader :name, :swversion, :whitelist
+
+  def initialize(data = {})
+    @name = data["name"]
+    @swversion = data["swversion"]
+    @whitelist = UserList.new(data["whitelist"])
+    @data = data
+  end
+
+  def data
+    data = @data
+    data["name"] = @name if @name
+    data["swversion"] = @swversion if @swversion
+    data["whitelist"] = @whitelist.data if !@whitelist.data.empty?
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/datastore.rb

@@ -0,0 +1,50 @@
+require 'lights/config'
+require 'lights/bulblist'
+require 'lights/grouplist'
+require 'lights/scenelist'
+require 'lights/rulelist'
+require 'lights/schedulelist'
+require 'lights/sensorlist'
+
+class Datastore
+
+  attr_reader :lights, :groups, :config, :rules,
+                :scenes, :schedules, :sensors
+  def initialize(data = {})
+    @data = {}
+    @lights = BulbList.new(data["lights"]) 
+    @groups = GroupList.new(data["groups"])
+    @config = HueConfig.new(data["config"])
+    @schedules = ScheduleList.new(data["schedules"])
+    @scenes = SceneList.new(data["scenes"])
+    @rules = RuleList.new(data["rules"])
+    @sensors = SensorList.new(data["sensors"])
+  end
+
+  def all
+    @lights.bulbs + \
+      @groups.groups + \
+      [@config] + \
+      @schedules.schedules + \
+      @scenes.scenes + \
+      @rules.rules + \
+      @sensors.sensors
+  end
+
+  def data
+    data = @data
+    data["lights"] = @lights.data if !@lights.data.empty?
+    data["groups"] = @groups.data if !@groups.data.empty?
+    data["config"] = @config.data if !@config.data.empty?
+    data["schedules"] = @schedules.data if !@schedules.data.empty?
+    data["scenes"] = @scenes.data if !@scenes.data.empty?
+    data["rules"] = @rules.data if !@rules.data.empty?
+    data["sensors"] = @sensors.data if !@sensors.data.empty?
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/group.rb

@@ -16,15 +16,13 @@ class Group
 
   def data
     data = @data
-    data["id"] = @id if @id
     data["name"] = @name if @name
     data["lights"] = @lights if @lights
     data["action"] = @action.data if @action.data != {}
     data
   end
 
-  def to_json
+  def to_json(options={})
     data.to_json
   end
-
 end

data/lib/lights/grouplist.rb

@@ -0,0 +1,22 @@
+require 'lights/group'
+
+class GroupList
+
+  attr_reader :groups
+  def initialize(data = {})
+    @groups = []
+    data.each{|id,value| @groups << Group.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @groups.each {|g| data[g.id] = g.data} if @groups
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/rule.rb

@@ -9,13 +9,11 @@ class Rule
 
   def data
     data = @data
-    data["id"] = @id if @id
     data["name"] = @name if @name
     data
   end
 
-  def to_json
+  def to_json(options={})
     data.to_json
   end
-
 end

data/lib/lights/rulelist.rb

@@ -0,0 +1,22 @@
+require 'lights/rule'
+
+class RuleList
+
+  attr_reader :rules
+  def initialize(data = {})
+    @rules = []
+    data.each{|id,value| @rules << Rule.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @rules.each {|b| data[b.id] = b.data} if @rules
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/scene.rb

@@ -16,5 +16,9 @@ class Scene
     data["lights"] = @lights if @lights
     data
   end
+
+  def to_json(options={})
+    data.to_json
+  end
 end
 

data/lib/lights/scenelist.rb

@@ -0,0 +1,22 @@
+require 'lights/scene'
+
+class SceneList
+
+  attr_reader :scenes
+  def initialize(data = {})
+    @scenes = []
+    data.each{|id,value| @scenes << Scene.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @scenes.each {|b| data[b.id] = b.data} if @scenes
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/schedule.rb

@@ -24,7 +24,7 @@ class Schedule
     data
   end
 
-  def to_json
+  def to_json(options={})
     data.to_json
   end
 end

data/lib/lights/schedulelist.rb

@@ -0,0 +1,22 @@
+require 'lights/schedule'
+
+class ScheduleList
+
+  attr_reader :schedules
+  def initialize(data = {})
+    @schedules = []
+    data.each{|id,value| @schedules << Schedule.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @schedules.each {|s| data[s.id] = s.data} if @schedules
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/sensor.rb

@@ -4,6 +4,16 @@ class SensorState
     @data = data
     @last_updated = data["lastupdated"]
   end
+
+  def data
+    data = @data
+    data["lastupdated"] = @last_updated if @last_updated
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
 end
 
 class TapState < SensorState
@@ -12,6 +22,16 @@ class TapState < SensorState
     @button_event = data["button_event"]
     super
   end
+
+  def data
+    data = @data
+    data["button_event"] = @button_event if @button_event
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
 end
 
 class Sensor 
@@ -28,4 +48,20 @@ class Sensor
     @state = SensorState.new(data["state"])
     #@config = SensorConfig.new(data["config"])
   end
+  
+  def data
+    data = @data
+    data["name"] = @name if @name
+    data["type"] = @type if @type
+    data["modelid"] = @model_id if @model_id
+    data["manufacturername"] = @manufacturer_name if @manufacturer_name
+    data["uniqueid"] = @unique_id if @unique_id
+    data["swversion"] = @sw_version if @sw_version
+    data["state"] = @state.data if @state.data if !@state.data.empty?
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
 end

data/lib/lights/sensorlist.rb

@@ -0,0 +1,23 @@
+require 'lights/sensor'
+
+class SensorList
+
+  attr_reader :sensors
+
+  def initialize(data = {})
+    @sensors = []
+    data.each{|id,value| @sensors << Sensor.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @sensors.each {|s| data[s.id] = s.data} if @sensors
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/user.rb

@@ -8,4 +8,16 @@ class User
     @create_date = data["create date"]
     @last_use_date = data["last use date"]
   end
+
+  def data
+    data = @data
+    data["name"] = @name if @name
+    data["create date"] = @create_date if @create_date
+    data["last use date"] = @last_use_date if @last_use_date
+    data
+  end
+
+  def to_json(options={})
+    data.to_json
+  end
 end

data/lib/lights/userlist.rb

@@ -0,0 +1,22 @@
+require 'lights/user'
+
+class UserList
+
+  attr_reader :users
+  def initialize(data = {})
+    @users = []
+    data.each{|id,value| @users << User.new(id,value)} if data
+    @data = data
+  end
+
+  def data
+    data = @data
+    @users.each {|u| data[u.id] = u.data} if @users
+    data
+  end
+  
+  def to_json(options={})
+    data.to_json
+  end
+end
+

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/lights.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "simpletable", "~> 0.3.0"
+  s.add_runtime_dependency "simpletable", "~> 0.3.1"
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"

data/spec/datastore_spec.rb

@@ -0,0 +1,515 @@
+require 'lights'
+
+describe Datastore do
+  it "properly reconstructs sub objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
+    ds.lights.data.should eql data["lights"]
+    ds.groups.data.should eql data["groups"]
+    ds.rules.data.should eql data["rules"]
+    ds.scenes.data.should eql data["scenes"]
+    ds.schedules.data.should eql data["schedules"]
+    ds.sensors.data.should eql data["sensors"]
+    ds.data.should eql data
+  end
+end
+
+DATASTORE_JSON = %Q{
+{
+  "lights": {
+    "1": {
+      "state": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "alert": "none",
+        "colormode": "xy",
+        "reachable": true
+      },
+      "type": "Extended color light",
+      "name": "Hue Lamp 1",
+      "modelid": "LCT001",
+      "uniqueid": "00:17:88:01:00:aa:bb:cb-0b",
+      "swversion": "66013452",
+      "pointsymbol": {
+        "1": "0a00f1f01f1f1001f1ff100000000001f2000000",
+        "2": "none",
+        "3": "none",
+        "4": "none",
+        "5": "none",
+        "6": "none",
+        "7": "none",
+        "8": "none"
+      }
+    },
+    "2": {
+      "state": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "alert": "none",
+        "colormode": "xy",
+        "reachable": true
+      },
+      "type": "Extended color light",
+      "name": "Hue Lamp 2",
+      "modelid": "LCT001",
+      "uniqueid": "00:17:88:01:00:aa:bb:ca-0b",
+      "swversion": "66013452",
+      "pointsymbol": {
+        "1": "0a00f1f01f1f1001f1ff100000000001f2000000",
+        "2": "none",
+        "3": "none",
+        "4": "none",
+        "5": "none",
+        "6": "none",
+        "7": "none",
+        "8": "none"
+      }
+    },
+    "3": {
+      "state": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "alert": "none",
+        "colormode": "xy",
+        "reachable": true
+      },
+      "type": "Extended color light",
+      "name": "Hue Lamp 3",
+      "modelid": "LCT001",
+      "uniqueid": "00:17:88:01:00:aa:bb:c9-0b",
+      "swversion": "66013452",
+      "pointsymbol": {
+        "1": "0a00f1f01f1f1001f1ff100000000001f2000000",
+        "2": "none",
+        "3": "none",
+        "4": "none",
+        "5": "none",
+        "6": "none",
+        "7": "none",
+        "8": "none"
+      }
+    },
+    "4": {
+      "state": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "alert": "none",
+        "colormode": "xy",
+        "reachable": true
+      },
+      "type": "Extended color light",
+      "name": "Hue Lamp 4",
+      "modelid": "LCT001",
+      "uniqueid": "00:17:88:01:00:aa:bb:c8-0b",
+      "swversion": "66013452",
+      "pointsymbol": {
+        "1": "none",
+        "2": "none",
+        "3": "none",
+        "4": "none",
+        "5": "none",
+        "6": "none",
+        "7": "none",
+        "8": "none"
+      }
+    },
+    "5": {
+      "state": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "alert": "select",
+        "colormode": "xy",
+        "reachable": true
+      },
+      "type": "Extended color light",
+      "name": "BT Lamp",
+      "modelid": "LCT001",
+      "uniqueid": "00:17:88:01:00:aa:bb:c7-0b",
+      "swversion": "66013452",
+      "pointsymbol": {
+        "1": "none",
+        "2": "none",
+        "3": "none",
+        "4": "none",
+        "5": "none",
+        "6": "none",
+        "7": "none",
+        "8": "none"
+      }
+    }
+  },
+  "groups": {
+    "1": {
+      "name": "Ceiling light",
+      "lights": [
+        "1",
+        "2",
+        "3",
+        "4"
+      ],
+      "type": "LightGroup",
+      "action": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "colormode": "xy"
+      }
+    },
+    "2": {
+      "name": "Lamp",
+      "lights": [
+        "5"
+      ],
+      "type": "LightGroup",
+      "action": {
+        "on": true,
+        "bri": 254,
+        "hue": 34495,
+        "sat": 232,
+        "effect": "none",
+        "xy": [
+          0.3151,
+          0.3251
+        ],
+        "ct": 155,
+        "colormode": "xy"
+      }
+    }
+  },
+  "config": {
+    "name": "Philips hue",
+    "zigbeechannel": 25,
+    "mac": "00:11:22:33:44:55",
+    "dhcp": true,
+    "ipaddress": "192.168.1.27",
+    "netmask": "255.255.255.0",
+    "gateway": "192.168.1.1",
+    "proxyaddress": "none",
+    "proxyport": 0,
+    "UTC": "2015-01-01T00:11:24",
+    "localtime": "2014-12-31T19:11:24",
+    "timezone": "America/New_York",
+    "whitelist": {
+      "testuser1": {
+        "last use date": "2015-01-01T00:11:24",
+        "create date": "2014-12-30T20:05:07",
+        "name": "lights"
+      },
+      "test user 2": {
+        "last use date": "2014-05-26T14:20:54",
+        "create date": "2013-08-03T17:05:51",
+        "name": "unofficial hue app for osx"
+      },
+      "test user 3": {
+        "last use date": "2014-12-31T02:19:57",
+        "create date": "2013-08-03T18:48:19",
+        "name": "test user"
+      }
+    },
+    "swversion": "01018228",
+    "apiversion": "1.5.0",
+    "swupdate": {
+      "updatestate": 0,
+      "checkforupdate": false,
+      "devicetypes": {
+        "bridge": false,
+        "lights": [
+
+        ]
+      },
+      "url": "",
+      "text": "",
+      "notify": false
+    },
+    "linkbutton": false,
+    "portalservices": true,
+    "portalconnection": "connected",
+    "portalstate": {
+      "signedon": true,
+      "incoming": true,
+      "outgoing": true,
+      "communication": "disconnected"
+    }
+  },
+  "schedules": {
+    "6033895564917352": {
+      "name": "Alarm",
+      "description": "Energize",
+      "command": {
+        "address": "/api/8Wc85V5IrG0XTHfB/groups/0/action",
+        "body": {
+          "scene": "d942060b6-on-5"
+        },
+        "method": "PUT"
+      },
+      "localtime": "W124/T06:40:00",
+      "time": "W124/T11:40:00",
+      "created": "2014-09-18T02:54:16",
+      "status": "disabled"
+    },
+    "0326522980291031": {
+      "name": "Alarm",
+      "description": "",
+      "command": {
+        "address": "/api/8Wc85V5IrG0XTHfB/groups/0/action",
+        "body": {
+          "scene": "19a493ad2-off-0"
+        },
+        "method": "PUT"
+      },
+      "localtime": "W124/T07:45:00",
+      "time": "W124/T12:45:00",
+      "created": "2014-09-09T01:13:57",
+      "status": "enabled"
+    }
+  },
+  "scenes": {
+    "fd0ceaedb-on-0": {
+      "name": "Purple and Green",
+      "lights": [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "active": true
+    },
+    "da01b1eaf-on-0": {
+      "name": "Purple on 0",
+      "lights": [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "active": true
+    },
+    "182a404bb-on-0": {
+      "name": "Deck flower on 0",
+      "lights": [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "active": true
+    },
+    "8fc639a85f-on-0": {
+      "name": "Reading on 0",
+      "lights": [
+        "5"
+      ],
+      "active": true
+    },
+    "fedd8e5db-on-0": {
+      "name": "Dark red on 0",
+      "lights": [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5"
+      ],
+      "active": true
+    }
+  },
+  "rules": {
+    "1": {
+      "name": "Tap 2.3 Reading",
+      "owner": "8Wc85V5IrG0XTHfB",
+      "created": "2014-09-17T23:34:25",
+      "lasttriggered": "2014-12-31T03:29:37",
+      "timestriggered": 10,
+      "status": "enabled",
+      "conditions": [
+        {
+          "address": "/sensors/2/state/buttonevent",
+          "operator": "eq",
+          "value": "17"
+        },
+        {
+          "address": "/sensors/2/state/lastupdated",
+          "operator": "dx"
+        }
+      ],
+      "actions": [
+        {
+          "address": "/groups/0/action",
+          "method": "PUT",
+          "body": {
+            "scene": "dc8a6e2b5-on-0"
+          }
+        }
+      ]
+    },
+    "2": {
+      "name": "Tap 2.1 All lights off",
+      "owner": "8Wc85V5IrG0XTHfB",
+      "created": "2014-07-16T20:43:43",
+      "lasttriggered": "2014-12-31T06:29:46",
+      "timestriggered": 12,
+      "status": "enabled",
+      "conditions": [
+        {
+          "address": "/sensors/2/state/buttonevent",
+          "operator": "eq",
+          "value": "34"
+        },
+        {
+          "address": "/sensors/2/state/lastupdated",
+          "operator": "dx"
+        }
+      ],
+      "actions": [
+        {
+          "address": "/groups/0/action",
+          "method": "PUT",
+          "body": {
+            "scene": "19a493ad2-off-0"
+          }
+        }
+      ]
+    },
+    "3": {
+      "name": "Tap 2.4 Purple",
+      "owner": "8Wc85V5IrG0XTHfB",
+      "created": "2014-07-19T16:32:31",
+      "lasttriggered": "none",
+      "timestriggered": 0,
+      "status": "enabled",
+      "conditions": [
+        {
+          "address": "/sensors/2/state/buttonevent",
+          "operator": "eq",
+          "value": "18"
+        },
+        {
+          "address": "/sensors/2/state/lastupdated",
+          "operator": "dx"
+        }
+      ],
+      "actions": [
+        {
+          "address": "/groups/0/action",
+          "method": "PUT",
+          "body": {
+            "scene": "da01b1eaf-on-0"
+          }
+        }
+      ]
+    },
+    "4": {
+      "name": "Tap 2.2 Energize",
+      "owner": "8Wc85V5IrG0XTHfB",
+      "created": "2014-07-16T20:43:43",
+      "lasttriggered": "2014-12-31T21:42:04",
+      "timestriggered": 9,
+      "status": "enabled",
+      "conditions": [
+        {
+          "address": "/sensors/2/state/buttonevent",
+          "operator": "eq",
+          "value": "16"
+        },
+        {
+          "address": "/sensors/2/state/lastupdated",
+          "operator": "dx"
+        }
+      ],
+      "actions": [
+        {
+          "address": "/groups/0/action",
+          "method": "PUT",
+          "body": {
+            "scene": "d942060b6-on-0"
+          }
+        }
+      ]
+    }
+  },
+  "sensors": {
+    "1": {
+      "state": {
+        "daylight": false,
+        "lastupdated": "none"
+      },
+      "config": {
+        "on": true,
+        "long": "none",
+        "lat": "none",
+        "sunriseoffset": 30,
+        "sunsetoffset": -30
+      },
+      "name": "Daylight",
+      "type": "Daylight",
+      "modelid": "PHDL00",
+      "manufacturername": "Philips",
+      "swversion": "1.0"
+    },
+    "2": {
+      "state": {
+        "buttonevent": 16,
+        "lastupdated": "2014-12-31T21:42:04"
+      },
+      "config": {
+        "on": true
+      },
+      "name": "Hue Tap 1",
+      "type": "ZGPSwitch",
+      "modelid": "ZGPSWITCH",
+      "manufacturername": "Philips",
+      "uniqueid": "00:00:00:00:00:aa:bb:cc-f2"
+    }
+  }
+}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Brady Turner
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,21 +110,31 @@ files:
 - lib/lights.rb
 - lib/lights/bridge.rb
 - lib/lights/bulb.rb
+- lib/lights/bulblist.rb
 - lib/lights/bulbstate.rb
 - lib/lights/command.rb
+- lib/lights/config.rb
+- lib/lights/datastore.rb
 - lib/lights/exception.rb
 - lib/lights/group.rb
+- lib/lights/grouplist.rb
 - lib/lights/loggerconfig.rb
 - lib/lights/rule.rb
+- lib/lights/rulelist.rb
 - lib/lights/scene.rb
+- lib/lights/scenelist.rb
 - lib/lights/schedule.rb
+- lib/lights/schedulelist.rb
 - lib/lights/sensor.rb
+- lib/lights/sensorlist.rb
 - lib/lights/user.rb
+- lib/lights/userlist.rb
 - lib/lights/version.rb
 - lights.gemspec
 - spec/bridge_spec.rb
 - spec/bulb_spec.rb
 - spec/bulbstate_spec.rb
+- spec/datastore_spec.rb
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
@@ -158,6 +168,7 @@ test_files:
 - spec/bridge_spec.rb
 - spec/bulb_spec.rb
 - spec/bulbstate_spec.rb
+- spec/datastore_spec.rb
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb