hue-lib 0.7.0 → 0.7.1

data/hue-lib.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "hue-lib"
-  s.version     = '0.7.0'
+  s.version     = '0.7.1'
   s.authors     = ["Birkir A. Barkarson", "Aaron Hurley"]
   s.email       = ["birkirb@stoicviking.net"]
   s.homepage    = "https://github.com/birkirb/hue-lib"

data/lib/hue/bridge.rb

@@ -18,6 +18,10 @@ module Hue
       index(uri)
     end
 
+    def add_lights
+      create(uri('lights'))
+    end
+
     def lights
       index(uri('lights'))
     end
@@ -35,7 +39,6 @@ module Hue
     end
 
     def bulbs
-      # puts status['lights'].inspect
       @bulbs ||= lights.keys.map { |b| Bulb.new(self, b) }
     end
 
@@ -50,14 +53,6 @@ module Hue
     #   ids.each{|x| remove_schedule x}
     # end
 
-    def get_light_state(id)
-      index(uri('lights', id))
-    end
-
-    def set_light_state(id, state)
-      update(uri('lights', id, 'state'), state)
-    end
-
     def register
       create(URI.parse(bridge_uri),
              {"username" => application_id, "devicetype" => Hue.device_type})
@@ -67,6 +62,18 @@ module Hue
       delete(uri('config', 'whitelist', application_id))
     end
 
+    def get_light(id)
+      index(uri('lights', id))
+    end
+
+    def set_light(id, property)
+      update(uri('lights', id), property)
+    end
+
+    def set_light_state(id, state)
+      update(uri('lights', id, 'state'), state)
+    end
+
     private
 
     def uri(*args)
@@ -95,7 +102,10 @@ module Hue
       Hue.logger.info("Sending #{payload.to_s if payload} to #{url.to_s}")
       response = nil
       begin
-        response = Net::HTTP.new(url.host, url.port).start { |http| http.request(request) }
+        http = Net::HTTP.new(url.host, url.port)
+        http.open_timeout = 3  # Quick timeout on connection fail.
+        http.read_timeout = 10 # Slower timeout on read fail, but way faster than the default.
+        response = http.start { |http| http.request(request) }
       rescue => err
         Hue.logger.error(err.message)
         raise Hue::Error.new("Problem reaching bridge.", err)

data/lib/hue/bulb.rb

@@ -21,7 +21,7 @@ module Hue
     end
 
     def refresh!
-      @status = bridge.get_light_state(id)
+      @status = bridge.get_light(id)
     end
 
     def info
@@ -55,12 +55,12 @@ module Hue
     end
 
     def on
-      update(on: true)
+      update_state(on: true)
       on?
     end
 
     def off
-      update(on: false)
+      update_state(on: false)
       off?
     end
 
@@ -72,9 +72,9 @@ module Hue
 
     def brightness=(bri)
       if scale = Hue.percent_to_unit_interval(bri)
-        update(bri: (scale * BRIGHTNESS_MAX).round)
+        update_state(bri: (scale * BRIGHTNESS_MAX).round)
       else
-        update(bri: bri.to_i)
+        update_state(bri: bri.to_i)
       end
       brightness
     end
@@ -100,7 +100,7 @@ module Hue
     end
 
     def color=(col)
-      update(col.to_hash)
+      update_state(col.to_hash)
       set_color
     end
 
@@ -113,16 +113,17 @@ module Hue
     end
 
     def blink
-      update(alert: 'lselect')
+      update_state(alert: 'lselect')
     end
 
     def solid
-      update(alert: 'none')
+      update_state(alert: 'none')
     end
 
     def flash
-      update(alert: 'select')
-      update(alert: 'none')
+      update_state(alert: 'select')
+      # immediately update to expected state
+      @status['state']['alert'] = 'none'
     end
 
     def transition_time
@@ -145,12 +146,23 @@ module Hue
       @color = Colors.parse_state(state)
     end
 
-    def update(settings = {})
+    def update_state(settings = {})
       if bridge.set_light_state(id, options.merge(settings))
-        if @status
-          settings.each do |key, value|
-            @status['state'][key.to_s] = value # or refresh!
-          end
+        set_status(settings, 'state')
+      end
+    end
+
+    def update(settings = {})
+      if bridge.set_light(id, settings)
+        set_status(settings)
+      end
+    end
+
+    def set_status(settings, key = nil)
+      if @status
+        status = key ? @status[key] : @status
+        settings.each do |key, value|
+          status[key.to_s] = value
         end
       end
     end

data/spec/hue/bridge_spec.rb

@@ -50,6 +50,11 @@ describe Hue::Bridge do
       with_fake_delete("config/whitelist/#{TEST_APPLICATION_UUID}")
       bridge.unregister
     end
+
+    it 'should allow scanning for new lights' do
+      with_fake_post("#{TEST_APPLICATION_UUID}/lights")
+      bridge.add_lights
+    end
   end
 
   context 'when instantiated with a new config' do

data/spec/hue/bulb_spec.rb

@@ -62,6 +62,12 @@ describe Hue::Bulb do
         bulb.off.should be_true
       end
 
+      it 'should allow changing the name' do
+        with_fake_update('lights/1', name: 'New name')
+        bulb.name = 'New name'
+        bulb.name.should == 'New name'
+      end
+
       it 'should allow setting hue, saturation and brightness' do
         color = Hue::Colors::HueSaturation.new(21845, 1293)
 

data/spec/json/application_uuid/lights/post_success.json

@@ -0,0 +1,7 @@
+[
+  {
+    "success":{
+      "/lights":"Searching for new devices"
+    }
+  }
+]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hue-lib
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -118,6 +118,7 @@ files:
 - spec/hue/config/application_spec.rb
 - spec/hue/config/bridge_spec.rb
 - spec/hue_spec.rb
+- spec/json/application_uuid/lights/post_success.json
 - spec/json/config.json
 - spec/json/config/whitelist/application_uuid/delete_success.json
 - spec/json/get_success.json