lights 0.8.18 → 0.8.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTUwNmZjMWQ4MzMyMjA2ODU1ZmJhMTVmNGY5ODJiNWFjZTU5ZjgyMQ==
+    MjUyYjgwZTU5M2I1ZjhhMDNhYjQyN2ZiYmU1NmZjMGUxNjNlZjE0MQ==
   data.tar.gz: !binary |-
-    MGQxNTExYWM5NjI1MzRlMzZlOGI1OTVlNjM2Y2YyNjlmOTEwMTFhMA==
+    MmY0YzRlMWQ3OTE0NjczYjk4NDhkN2E4YWE1NDI5OGMyNDBlNzA1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDg4MGE0MmIwNjdhNzljZmFjNmI2YWQ3ZTAyNTRkZDExYzg4MTZkZmY4N2Fi
-    Y2ZlYWQ1Yjk4NmYzZDFiM2NlOGQzNDQ5MDgzYzE2NmM3OTE4MzAxMDQwZmZl
-    N2I1N2M5NjA1YWY2MWM2MzQ0ZDFlNjFmNzM0MWNmZDhlMTY2ZTc=
+    MWM3ODk4ZDUyZGI1MWMyZGUyMWI3MjE0NTVmZGIzYjA1ZmJiODg2ZTc2NjZh
+    NWZiNzFkNzg4Njk1Nzk1YTBhYmI5MzQ2NjQ5NjQ5YzEwODhhNzEwZjM4ODJi
+    MDkwNjQ4ZjQwMWY2NTkyMzI2YTI5MjlhNjYyN2Y2ZDMyNWQzNmE=
   data.tar.gz: !binary |-
-    Y2Q2OWVkMDI3ODAzMjI5NjUwYTI3MjU2YjY0MjY0NTE5YzEzNWE0MmZhODBj
-    NDcwODRhYTc2MDQ3OWI3YzM4MWQ3ZTkyY2Q3ZDE1Y2ViODhiYjU2ZGM4MmQx
-    OGE5NWU5N2Q2ZTFiNzE2MDNjNDAyMjgxYjljODUxMmQzMGNmNDA=
+    ZjNkZThjYTg1YjBiOTQ2OWNmYTY5OTQyOTk2OGM4Mzg1M2YwZGUxNDkyYTdk
+    OTNmYWIyNGJlZmVlY2NkZDBlMWVmYWY5ZGFhNTA1ODc0OTBmNzI2MTRiOGM5
+    MDRmNTMzNWMxYmRhODMxYTBkYTg5OGQxMjM3MWFkMTNkZjk4OGI=

data/lib/lights/bridge.rb

@@ -4,7 +4,6 @@ class Bridge < HObject
 
   attr_reader :id, :ip, :name, :mac
   def initialize(data = {})
-    super
     @id = data["id"]
     @ip = data["internalipaddress"]
     @mac = data["macaddress"]

data/lib/lights/bulb.rb

@@ -2,22 +2,29 @@ require 'lights/bulbstate'
 require 'lights/hobject'
 
 class Bulb < HObject
-  attr_reader :id, :name, :type, :swversion, :state
+  attr_reader :id, :name, :type, :sw_version, :state,
+                :point_symbol, :model_id, :unique_id
+  attr_writer :name, :state
   def initialize(id,data = {})
-    super(data)
     @id = id
     @name = data["name"]
     @type = data["type"]
-    @swversion = data["swversion"]
+    @sw_version = data["swversion"]
+    @point_symbol = data["pointsymbol"]
+    @model_id = data["modelid"]
+    @unique_id = data["uniqueid"]
     @state = BulbState.new data["state"]
   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["swversion"] = @sw_version if @sw_version
+    data["state"] = @state.data unless @state.data.empty?
+    data["pointsymbol"] = @point_symbol if @point_symbol
+    data["modelid"] = @model_id if @model_id
+    data["uniqueid"] = @unique_id if @unique_id
     data
   end
 end

data/lib/lights/bulbstate.rb

@@ -45,7 +45,6 @@ class BulbState < HObject
               :reachable, :transition_time
   def initialize( data = {} ) 
     data = {} if data == nil
-    super
     @on = data["on"] 
     set_bri data["bri"]
     set_hue data["hue"]
@@ -172,8 +171,8 @@ class BulbState < HObject
   end
 
   def data 
-    data = @data
-    data["on"] = @on if (@on!=nil) 
+    data = {}
+    data["on"] = @on unless @on.nil?
     data["bri"] = @bri if @bri 
     data["hue"] = @hue if @hue 
     data["sat"] = @sat if @sat 
@@ -182,7 +181,7 @@ class BulbState < HObject
     data["alert"] = @alert if @alert 
     data["effect"] = @effect if @effect 
     data["colormode"] = @color_mode if @color_mode 
-    data["reachable"] = @reachable if @reachable 
+    data["reachable"] = @reachable unless @reachable.nil?
     data["transitiontime"] = @transition_time if @transition_time
     data 
   end 

data/lib/lights/command.rb

@@ -3,14 +3,13 @@ require 'lights/hobject'
 class Command < HObject
   attr_reader :address, :method, :body
   def initialize(data = {})
-    super
     @address = data["address"]
     @body = data["body"]
     @method = data["method"]
   end
 
   def data
-    data = @data
+    data = {}
     data["address"] = @address if @address
     data["body"] = @body if @body
     data["method"] = @method if @method

data/lib/lights/config.rb

@@ -2,19 +2,58 @@ require 'lights/userlist'
 require 'lights/hobject'
 
 class HueConfig < HObject
-  attr_reader :name, :swversion, :whitelist
+  attr_reader :name, :zigbee_channel, :mac, :dhcp,
+                :ip_address, :netmask, :gateway,
+                :proxy_address, :proxy_port, :utc,
+                :local_time, :time_zone, :whitelist,
+                :swversion, :api_version, :sw_update,
+                :link_button, :portal_services,
+                :portal_connection, :portal_state
   def initialize(data = {})
-    super
     @name = data["name"]
-    @swversion = data["swversion"]
+    @zigbee_channel = data["zigbeechannel"]
+    @mac = data["mac"]
+    @dhcp = data["dhcp"]
+    @ip_address = data["ipaddress"]
+    @netmask = data["netmask"]
+    @gateway = data["gateway"]
+    @proxy_address = data["proxyaddress"]
+    @proxy_port = data["proxyport"]
+    @utc = data["UTC"]
+    @local_time = data["localtime"]
+    @time_zone = data["timezone"]
     @whitelist = UserList.new(data["whitelist"])
+    @sw_version = data["swversion"]
+    @api_version = data["apiversion"]
+    @sw_update = data["swupdate"]
+    @link_button = data["linkbutton"]
+    @portal_services = data["portalservices"]
+    @portal_connection = data["portalconnection"]
+    @portal_state = data["portalstate"]
   end
 
   def data
-    data = @data
+    data = {}
     data["name"] = @name if @name
-    data["swversion"] = @swversion if @swversion
-    data["whitelist"] = @whitelist.data if !@whitelist.data.empty?
+    data["zigbeechannel"] = @zigbee_channel if @zigbee_channel
+    data["mac"] = @mac if @mac
+    data["dhcp"] = @dhcp unless @dhcp.nil?
+    data["ipaddress"] = @ip_address if @ip_address
+    data["netmask"] = @netmask if @netmask
+    data["gateway"] = @gateway if @gateway
+    data["proxyaddress"] = @proxy_address if @proxy_address
+    data["proxyport"] = @proxy_port if @proxy_port
+    data["UTC"] = @utc if @utc
+    data["localtime"] = @local_time if @local_time
+    data["timezone"] = @time_zone if @time_zone
+    data["whitelist"] = @whitelist.data unless @whitelist.data.empty?
+    data["swversion"] = @sw_version if @sw_version
+    data["apiversion"] = @api_version if @api_version
+    data["swupdate"] = @sw_update unless @sw_update.nil?
+    data["linkbutton"] = @link_button unless @link_button.nil?
+    data["portalservices"] = @portal_services unless @portal_services.nil?
+    data["portalconnection"] = @portal_connection if @portal_connection
+    data["portalstate"] = @portal_state unless @portal_state.nil?
     data
   end
 end

data/lib/lights/datastore.rb

@@ -11,7 +11,6 @@ class Datastore < HObject
   attr_reader :lights, :groups, :config, :rules,
                 :scenes, :schedules, :sensors
   def initialize(data = {})
-    super
     @lights = BulbList.new(data["lights"]) 
     @groups = GroupList.new(data["groups"])
     @config = HueConfig.new(data["config"])
@@ -32,7 +31,7 @@ class Datastore < HObject
   end
 
   def data
-    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/lib/lights/exception.rb

@@ -12,7 +12,7 @@ end
 
 class BulbStateValueOutOfRangeException < Exception
   def initalize(msg = "Value out of range.")
-    super(msg)
+    super
   end
 end
 

data/lib/lights/group.rb

@@ -1,21 +1,22 @@
 require 'lights/hobject'
 
 class Group < HObject
-  attr_reader :id, :data, :name, :lights, :action
+  attr_reader :id, :data, :name, :lights, :action, :type
   attr_writer :name, :lights, :action
   def initialize( id = nil, data = {} )
-    super(data)
     @id = id
     @action = BulbState.new(data["action"]) 
     @name = data["name"]
     @lights = data["lights"]
+    @type = data["type"]
   end
 
   def data
-    data = @data
+    data = {}
     data["name"] = @name if @name
     data["lights"] = @lights if @lights
-    data["action"] = @action.data if @action.data != {}
+    data["type"] = @type if @type
+    data["action"] = @action.data unless @action.data.empty?
     data
   end
 end

data/lib/lights/hobject.rb

@@ -1,6 +1,5 @@
 class HObject
-  def initialize(data={})
-    @data = data
+  def initialize(*args)
   end
 
   def to_json(options={})

data/lib/lights/list.rb

@@ -9,12 +9,11 @@ class List < HObject
 
   attr_reader :list
   def initialize(data = {})
-    super
     @list = []
   end
 
   def data
-    data = @data
+    data = {}
     @list.each {|b| data[b.id] = b.data} if @list
     data
   end

data/lib/lights/rule.rb

@@ -1,16 +1,31 @@
 require 'lights/hobject'
 
 class Rule < HObject
-  attr_reader :id, :data, :name
+  attr_reader :id, :name, :owner, :created,
+                :last_triggered, :times_triggered,
+                :status, :conditions, :actions
   def initialize( id = nil, data = {} )
-    super(data)
     @id = id
     @name = data["name"]
+    @owner = data["owner"]
+    @created = data["created"]
+    @last_triggered = data["lasttriggered"]
+    @times_triggered = data["timestriggered"]
+    @status = data["status"]
+    @conditions = data["conditions"]
+    @actions = data["actions"]
   end
 
   def data
-    data = @data
+    data = {}
     data["name"] = @name if @name
+    data["owner"] = @owner if @owner
+    data["created"] = @created if @created
+    data["lasttriggered"] = @last_triggered if @last_triggered
+    data["timestriggered"] = @times_triggered if @times_triggered
+    data["status"] = @status if @status
+    data["conditions"] = @conditions if @conditions
+    data["actions"] = @actions if @actions
     data
   end
 end

data/lib/lights/scene.rb

@@ -3,7 +3,6 @@ require 'lights/hobject'
 class Scene < HObject
   attr_accessor :id, :name, :active, :lights
   def initialize(id,data = {})
-    super(data)
     @id = id
     @name = data["name"]
     @active = data["active"]
@@ -13,7 +12,7 @@ class Scene < HObject
   def data
     data = {}
     data["name"] = @name if @name
-    data["active"] = @active if @active 
+    data["active"] = @active unless @active.nil?
     data["lights"] = @lights if @lights
     data
   end

data/lib/lights/schedule.rb

@@ -2,13 +2,17 @@ require 'lights/command'
 require 'lights/hobject'
 
 class Schedule < HObject
-  attr_reader :id, :name, :time, :status
+  attr_reader :id, :name, :time, :status,
+                :description, :local_time,
+                :created, :command
   def initialize(id,data = {})
-    super(data)
     @id = id
     @name = data["name"]
     @time = data["time"]
     @status = data["status"]
+    @description = data["description"]
+    @local_time = data["localtime"]
+    @created = data["created"]
     @command = Command.new(data["command"])
   end
 
@@ -17,11 +21,14 @@ class Schedule < HObject
   end
 
   def data
-    data = @data
+    data = {}
     data["name"] = @name if @name
     data["time"] = @time if @time
     data["status"] = @status if @status
-    data["command"] = @command.data if !@command.data.empty?
+    data["description"] = @description if @description
+    data["localtime"] = @local_time if @local_time
+    data["created"] = @created if @created
+    data["command"] = @command.data unless @command.data.empty?
     data
   end
 end

data/lib/lights/sensor.rb

@@ -1,35 +1,25 @@
 class SensorState < HObject
   attr_reader :last_updated
   def initialize(data)
-    super
     @last_updated = data["lastupdated"]
+    @daylight = data["daylight"]
+    @button_event = data["buttonevent"]
   end
 
   def data
-    data = @data
+    data = {}
     data["lastupdated"] = @last_updated if @last_updated
-    data
-  end
-end
-
-class TapState < SensorState
-  attr_reader :button_event
-  def initialize(data)
-    super
-    @button_event = data["button_event"]
-  end
-
-  def data
-    data = @data
-    data["button_event"] = @button_event if @button_event
+    data["daylight"] = @daylight unless @daylight.nil?
+    data["buttonevent"] = @button_event if @button_event
     data
   end
 end
 
 class Sensor < HObject
-  attr_reader :id, :data, :name, :type, :model_id, :manufacturer_name, :unique_id, :sw_version, :state
+  attr_reader :id, :data, :name, :type, :model_id,
+                :manufacturer_name, :unique_id,
+                :sw_version, :state
   def initialize( id, data = {} )
-    super(data)
     @id = id
     @name = data["name"]
     @type = data["type"]
@@ -37,19 +27,20 @@ class Sensor < HObject
     @manufacturer_name = data["manufacturername"]
     @unique_id = data["uniqueid"]
     @sw_version = data["swversion"]
+    @config = data["config"]
     @state = SensorState.new(data["state"])
-    #@config = SensorConfig.new(data["config"])
   end
   
   def data
-    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["config"] = @config if @config
+    data["state"] = @state.data unless @state.data.empty?
     data
   end
 end

data/lib/lights/user.rb

@@ -3,7 +3,6 @@ require 'lights/hobject'
 class User < HObject
   attr_reader :id, :name, :create_date, :last_use_date
   def initialize( id, data = {} )
-    super(data)
     @id = id
     @name = data["name"]
     @create_date = data["create date"]
@@ -11,7 +10,7 @@ class User < HObject
   end
 
   def data
-    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/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.18"
+  VERSION = "0.8.19"
 end

data/spec/bulb_spec.rb

@@ -7,6 +7,13 @@ describe Bulb do
     bulb.name.should eql "test name"
   end
 
+  it "properly set name parameter" do
+    data = { "name" => "test name" }
+    bulb = Bulb.new(1,data)
+    bulb.name = "new test name"
+    bulb.name.should eql "new test name"
+  end
+
   it "properly creates state object" do
     data = {
       "name" => "test name",

data/spec/datastore_spec.rb

@@ -2,15 +2,45 @@ require 'lights'
 
 describe Datastore do
   it "properly reconstructs sub objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
+    ds.data.should eql data
+  end
+
+  it "properly reconstructs light objects" do
     data = JSON.parse(DATASTORE_JSON)
     ds = Datastore.new data
     ds.lights.data.should eql data["lights"]
+  end
+  it "properly reconstructs group objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
     ds.groups.data.should eql data["groups"]
+  end
+  it "properly reconstructs rule objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
     ds.rules.data.should eql data["rules"]
+  end
+  it "properly reconstructs scene objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
     ds.scenes.data.should eql data["scenes"]
+  end
+  it "properly reconstructs schedule objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
     ds.schedules.data.should eql data["schedules"]
+  end
+  it "properly reconstructs sensor objects" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
     ds.sensors.data.should eql data["sensors"]
-    ds.data.should eql data
+  end
+  it "properly reconstructs config object" do
+    data = JSON.parse(DATASTORE_JSON)
+    ds = Datastore.new data
+    ds.config.data.should eql data["config"]
   end
 end
 
@@ -19,7 +49,7 @@ DATASTORE_JSON = %Q{
   "lights": {
     "1": {
       "state": {
-        "on": true,
+        "on": false,
         "bri": 254,
         "hue": 34495,
         "sat": 232,
@@ -31,7 +61,7 @@ DATASTORE_JSON = %Q{
         "ct": 155,
         "alert": "none",
         "colormode": "xy",
-        "reachable": true
+        "reachable": false
       },
       "type": "Extended color light",
       "name": "Hue Lamp 1",
@@ -227,7 +257,7 @@ DATASTORE_JSON = %Q{
     "name": "Philips hue",
     "zigbeechannel": 25,
     "mac": "00:11:22:33:44:55",
-    "dhcp": true,
+    "dhcp": false,
     "ipaddress": "192.168.1.27",
     "netmask": "255.255.255.0",
     "gateway": "192.168.1.1",
@@ -269,7 +299,7 @@ DATASTORE_JSON = %Q{
       "notify": false
     },
     "linkbutton": false,
-    "portalservices": true,
+    "portalservices": false,
     "portalconnection": "connected",
     "portalstate": {
       "signedon": true,
@@ -320,7 +350,7 @@ DATASTORE_JSON = %Q{
         "4",
         "5"
       ],
-      "active": true
+      "active": false
     },
     "da01b1eaf-on-0": {
       "name": "Purple on 0",

data/spec/group_spec.rb

@@ -2,22 +2,152 @@ require 'lights'
 
 describe Group do
   it "properly parses input parameters" do
-    data = { 
-      "key1" => "value 1",
-      "key2" => "value 2",
-    }
+    data = JSON.parse(GROUPS_JSON)["1"]
     group = Group.new(1,data)
     group.id.should eql 1
-    group.data.should eql data 
+    group.name.should eql "Ceiling light"
+    group.type.should eql "LightGroup"
+    group.lights.should eql ["1","2","3","4"]
   end
 
   it "properly reconstucts object hash" do
-    data = {
-      "key1" => "value 1",
-      "key2" => "value 2",
-    }
+    data = JSON.parse(GROUPS_JSON)["1"]
     group = Group.new(1,data)
     group.id.should eql 1
     group.data.should eql data
   end
 end
+
+GROUPS_JSON = %Q{
+{
+  "1": {
+    "name": "Ceiling light",
+    "lights": [
+      "1",
+      "2",
+      "3",
+      "4"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  },
+  "2": {
+    "name": "Lamp",
+    "lights": [
+      "5"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  },
+  "3": {
+    "name": "HueCraft_Ambiance1",
+    "lights": [
+      "1",
+      "2"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  },
+  "4": {
+    "name": "HueCraft_Ambiance2",
+    "lights": [
+      "3",
+      "4"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  },
+  "5": {
+    "name": "HueCraft_Effect1",
+    "lights": [
+      "5"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  },
+  "6": {
+    "name": "HueCraft_HueCraft",
+    "lights": [
+      "1",
+      "2",
+      "3",
+      "4",
+      "5"
+    ],
+    "type": "LightGroup",
+    "action": {
+      "on": true,
+      "bri": 254,
+      "hue": 56100,
+      "sat": 232,
+      "effect": "none",
+      "xy": [
+        0.4119,
+        0.1949
+      ],
+      "ct": 293,
+      "colormode": "xy"
+    }
+  }
+}
+}

data/spec/rule_spec.rb

@@ -4,8 +4,6 @@ describe Rule do
   it "properly reconstucts object hash" do
     data = {
       "name" => "test name",
-      "key1" => "value 1",
-      "key2" => "value 2",
     }
     rule = Rule.new(1,data)
     rule.id.should eql 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - Brady Turner