nlhue 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3feebc5e72316132ee5ad26feef1b4796c6f5567
-  data.tar.gz: 18a322dc0c0964268450142f995e22c36d836574
+  metadata.gz: 316e835681bc596533571a1d66f4bba4d8a1820c
+  data.tar.gz: 47dda76305bca4cac07bde9a99f50c8a8f6661f0
 SHA512:
-  metadata.gz: dd0d71faacb9941e8dd2be87ebb515b3ce8842a623864bf210f92c9cbf0cc0399c175f2a31d3320e3b87d0c74aeb38b27f287e3184a09ea347d7a89a51256105
-  data.tar.gz: fba985b9eb5facfd853f4eec98fe3b51f06f72f562006712a6a72549d009381411a9b84549f0a4ee19d86808b370e0a5a1cdbb06eade3a29f5f66dbb2b3ec7c9
+  metadata.gz: 3bc6d3ac8bfe570d6b8ff1bf7507906ca0b24a13d8dcd1f6e4964bab208e860fb75a28b660565ab6aba902493117c69acfa3d8d0a76a9d1780cdb0007497bab9
+  data.tar.gz: ca1c3325ba192fa629b9a861fb94439666c9c1aef07f022ee5b2c35ab8197869f66c61d917341ef54eace36ded679a667098d1149e09026e4f350f8dd5b8fb52

data/lib/nlhue/bridge.rb

@@ -268,7 +268,7 @@ module NLHue
 		# with true and whether the lights/groups were changed, false
 		# and an exception on error.
 		def update &block
-			@request_queue.get "/api/#{@username}", :info do |response|
+			@request_queue.get "/api/#{api_key}", :info do |response|
 				status, result = check_json response
 
 				changed = false
@@ -717,25 +717,25 @@ module NLHue
 		# Makes a GET request under the API using this Bridge's stored
 		# username.
 		def get_api subpath, category=nil, &block
-			@request_queue.get "/api/#{@username}#{subpath}", &block
+			@request_queue.get "/api/#{api_key}#{subpath}", &block
 		end
 
 		# Makes a POST request under the API using this Bridge's stored
 		# username.
 		def post_api subpath, data, category=nil, content_type=nil, &block
-			@request_queue.post "/api/#{@username}#{subpath}", data, category, content_type, &block
+			@request_queue.post "/api/#{api_key}#{subpath}", data, category, content_type, &block
 		end
 
 		# Makes a PUT request under the API using this Bridge's stored
 		# username.
 		def put_api subpath, data, category=nil, content_type=nil, &block
-			@request_queue.put "/api/#{@username}#{subpath}", data, category, content_type, &block
+			@request_queue.put "/api/#{api_key}#{subpath}", data, category, content_type, &block
 		end
 
 		# Makes a DELETE request under the API using this Bridge's
 		# stored username.
 		def delete_api subpath, category=nil, &block
-			@request_queue.delete "/api/#{@username}#{subpath}", category, &block
+			@request_queue.delete "/api/#{api_key}#{subpath}", category, &block
 		end
 
 		# Schedules a Light, Scene, or Group to have its deferred values
@@ -771,6 +771,13 @@ module NLHue
 		end
 
 		private
+		# Returns the string to use in API URLs as the API key (the
+		# bridge username if registered, or an obviously invalid string
+		# otherwise).
+		def api_key
+			@username || 'unknown'
+		end
+
 		# Sets this bridge's name (call after getting UPnP XML or
 		# bridge config JSON), removing the IP address if present.
 		def set_name name

data/lib/nlhue/disco.rb

@@ -23,7 +23,7 @@ module NLHue
 		MAX_SUBSCRIBED_AGE = 150000
 
 		# Number of times a bridge can fail to update
-		MAX_BRIDGE_ERR = 2
+		MAX_BRIDGE_ERR = 4
 
 		# Bridges discovered on the network
 		# [serial] => {
@@ -280,7 +280,7 @@ module NLHue
 									info = @@bridges[br.serial]
 									@@bridges.delete br.serial
 									br.remove_update_callback info[:cb]
-									notify_bridge_removed br, 'Error updating bridge.'
+									notify_bridge_removed br, "Error updating bridge: #{result}"
 									EM.next_tick do
 										br.clean # next tick to ensure after notify*removed
 										do_disco

data/lib/nlhue/version.rb

@@ -1,3 +1,3 @@
 module NLHue
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nlhue
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Bourgeous
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler