lights 0.8.16 → 0.8.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTdkYTA0Yzg4MzdkNjk4Nzc0YzkzMWI4ODQ2YWJmMWQ4MjhkMTRiMw==
+    ZDBiNzRiZTg2NjE1ZmI3ZmY1OTMwZmUzY2E2MmYwOWVjMTM1YWRjMA==
   data.tar.gz: !binary |-
-    OTAwNTU4ZTM1NDAzZDkzNmI5NDA3MGVlMDllOGI4NzNhODM0YzY3Ng==
+    YzBmOGUyODgzNWIyMWNlYzc1MmM0YTllY2MyN2ExZWZhZTY0NmRiMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mjk2MzZiN2M5ZGMzYjU4N2VmNmJkN2QzMDQ5NmMxMTVkNWM3NDUyMzFiY2Nj
-    NmUwZDgxOGU3ODlhMzA4NjVhNmJhNzE4ZTI0MzVjMDBmNmNkZjBmYjVlNWU2
-    ZmFiZDBkOGMwNDQ3MGVhMjJmMTFjOTVhY2ZiMmQ3Y2EyNTAwZTI=
+    MWM5ZTQ3OTllZTk1YmRjZDljN2I5ZmQxYTFmMGRiYTc1OTMzZDczZTlhOGFh
+    MDA2ZTRjYWI4ZWUxYTAzMzY2NWU1NWQ2YWFkZjA1MTU0OWZjOGZkNmViNTVk
+    NTIyMDdhMWI4MzhmY2E5ODFkZmQ2OGE3M2Q1YTgyYmRiN2M1YjE=
   data.tar.gz: !binary |-
-    YmY3NWM5ZTk3MDM4YjFjODE5Zjk2NGRhYWQxY2RjZWQ3MDYyYjEyMDQ3OWIz
-    MDZlODExMWEyNzc4ODliY2Q5YjlkMDk3OTM1NmY0NDA4MzlhZjRhMjMwZTkw
-    OWI5NmUyNzNiZWYwNGExNzU4ZjI5MTNlYTkzM2RmNDI4NTBjYzM=
+    YWQ3ODQzNGM3NzQ4YzM5NzFjMGE4ZGM4NzBhMDgzNDUwYmMwNTgxNDc0NzNh
+    NGNmNmJkMDc2Y2FhYTllM2Y0MTEwZTAwZjk1ZGY4NDg4NDE1OTg1ZTM1YzBh
+    N2FkZGVhNTdhM2Y4MDdmMTlhNzY4YmJhYmYyZDY4ZThhMGYwMTc=

data/bin/lights

@@ -293,6 +293,7 @@ class LightsCli
       opts.on("-z", "--xy x,y", Array, "Set xy"){|z| options[:xy]=z}
       opts.on("-l", "--lights 1,2,...N", Array, "Which lights to control"){|l| options[:lights]=l}
       opts.on("-g", "--groups 1,2,...N", Array, "Which groups to control"){|g| options[:groups]=g}
+      opts.on("-S", "--scene <id>", String, "Which scene to recall"){|s| options[:scene]=s}
       opts.on("-d", "--duration seconds", OptionParser::DecimalInteger, "Transition duration in seconds"){|d| options[:duration]=d}
     end.parse!
 
@@ -301,7 +302,8 @@ class LightsCli
         && !options[:ct] && !options[:brightness] \
         && !options[:hue] && !options[:saturation] \
         && !options[:effect] && !options[:alert] \
-        && !options[:xy] && !options[:color]
+        && !options[:xy] && !options[:color] \
+        && !options[:scene]
       puts "Must specify a state to set."
       bad_args = true
     end
@@ -312,7 +314,7 @@ class LightsCli
     end
     exit 1 if bad_args    
    
-    s = BulbState.new 
+    s = GroupState.new
     if options[:on]
       s.on = true
     elsif options[:off]
@@ -350,6 +352,9 @@ class LightsCli
     if options[:xy]
       s.xy = options[:xy]
     end
+    if options[:scene]
+      s.scene = options[:scene]
+    end
 
     if options[:lights]
       set_bulb_state(s,options[:lights])
@@ -442,6 +447,7 @@ begin
 rescue BridgeConnectException,
         UsernameException,
         ResourceUnavailableException,
+        ParameterUnavailableException,
         BulbStateValueOutOfRangeException,
         BulbStateValueTypeException => e
   puts e.message

data/lib/lights.rb

@@ -7,6 +7,7 @@ require 'json'
 require 'lights/bridge'
 require 'lights/exception'
 require 'lights/datastore'
+require 'lights/groupstate'
 require 'lights/loggerconfig'
 
 class Lights 
@@ -156,6 +157,8 @@ private
       raise UsernameException
     when 3
       raise ResourceUnavailableException, result["error"]["description"]
+    when 6
+      raise ParameterUnavailableException, result["error"]["description"]
     when 101
       raise BridgeConnectException
     else
@@ -180,27 +183,39 @@ private
     @logger.debug "==> PUT: #{path}"
     @logger.debug data.to_json 
     response = @http.put( "/api/#{@username}/#{path}", data.to_json )
+    result = JSON.parse( response.body )
     @logger.debug "<== #{response.code}"
     @logger.debug response.body
-    JSON.parse response.body
+    if result.first.kind_of?(Hash) && result.first.has_key?("error")
+      process_error result.first
+    end
+    result
   end
 
   def post( path, data={} )
     @logger.debug "==> POST: #{path}"
     @logger.debug data.to_json
     response = @http.post( "/api/#{@username}/#{path}", data.to_json )
+    result = JSON.parse( response.body )
     @logger.debug "<== #{response.code}"
     @logger.debug response.body
-    JSON.parse response.body
+    if result.first.kind_of?(Hash) && result.first.has_key?("error")
+      process_error result.first
+    end
+    result
   end
 
   def delete( path )
     @logger.debug "==> DELETE: #{path}"
     request = Net::HTTP::Delete.new( "/api/#{@username}/#{path}" )
     response = @http.request request
+    result = JSON.parse( response.body )
     @logger.debug "<== #{response.code}"
     @logger.debug response.body
-    JSON.parse response.body
+    if result.first.kind_of?(Hash) && result.first.has_key?("error")
+      process_error result.first
+    end
+    result
   end
 
 end

data/lib/lights/exception.rb

@@ -27,3 +27,9 @@ class ResourceUnavailableException < Exception
     super
   end
 end
+
+class ParameterUnavailableException < Exception
+  def intialize(msg = "Parameter unavailable")
+    super
+  end
+end

data/lib/lights/groupstate.rb

@@ -0,0 +1,24 @@
+require 'lights/bulbstate'
+
+class GroupState < BulbState
+  attr_reader :scene
+  def initialize(data={})
+    super(data)
+    set_scene data["scene"] if data["scene"]
+  end
+
+  def scene=(value) set_scene(value) end
+  def set_scene(value)
+    if value.class == String
+      @scene = value
+    else
+      raise BulbStateValueTypeException, "Scene value has incorrect type. Requires String, got #{value.class}. Was #{value.inspect}"
+    end
+  end
+
+  def data
+    data = BulbState.instance_method(:data).bind(self).call
+    data["scene"] = @scene if @scene
+    data
+  end
+end

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.16"
+  VERSION = "0.8.17"
 end

data/spec/groupstate_spec.rb

@@ -0,0 +1,29 @@
+require 'lights'
+
+describe GroupState do
+
+  it "properly reconstructs object hash" do
+    data = { "scene" => "22978db88-on-0" }
+    s = GroupState.new(data)
+    s.data.should eql data
+  end
+
+# SCENE
+  it "should properly set scene value in constructor" do
+    data = { "scene" => "22978db88-on-0" }
+    s = GroupState.new(data)
+    s.scene.should eql "22978db88-on-0"
+    s.data["scene"].should eql "22978db88-on-0"
+  end
+  it "should properly set scene value" do
+    s = GroupState.new
+    s.scene = "22978db88-on-0"
+    s.scene.should eq "22978db88-on-0"
+    s.data["scene"].should eq "22978db88-on-0"
+  end
+  it "should raise exception when scene has invalid type" do
+    s = GroupState.new
+    expect { s.scene = 124 }.to raise_error
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.17
 platform: ruby
 authors:
 - Brady Turner
@@ -118,6 +118,7 @@ files:
 - lib/lights/exception.rb
 - lib/lights/group.rb
 - lib/lights/grouplist.rb
+- lib/lights/groupstate.rb
 - lib/lights/hobject.rb
 - lib/lights/list.rb
 - lib/lights/loggerconfig.rb
@@ -140,6 +141,7 @@ files:
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/groupstate_spec.rb
 - spec/rule_spec.rb
 - spec/scene_spec.rb
 homepage: http://rubygems.org/gems/lights
@@ -174,5 +176,6 @@ test_files:
 - spec/features/lights.feature
 - spec/features/support/setup.rb
 - spec/group_spec.rb
+- spec/groupstate_spec.rb
 - spec/rule_spec.rb
 - spec/scene_spec.rb