nlhue 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06b6ea3762cfc73808dac91dd559a0b18d3d5179e4735b39b0158874c6e83506
-  data.tar.gz: 5a32343e8b0a7a22e123c09edaf88cbaee1705db462d96b22a02280e0e6a777d
+  metadata.gz: 4c88ea67d9b9cc9f0b4f9871fdd0c914eda39ee51957c934cd8106b90ca3fac5
+  data.tar.gz: e5a62e8eb43c269bb78ba3231c88066d31b469838a49a0bcde8a784c61bd7276
 SHA512:
-  metadata.gz: a795cc4d87efb3df87b855e24fd77bc77dfa1bc07f25ed1464b728a738d475bd2c627a2eb32b22f6886c43a72e043102b32ae2a0155aca2e8632c37ae8630faa
-  data.tar.gz: f98467b14dc7849c29bdaf93a67701219cbe2eb153dbde915a74869162c80db06624dcca7c1017394875d0a496594b819514f66a23ed70341a6d053104b4978e
+  metadata.gz: bbad21227c522abd8c1fc6d4a8929747976e8dfe67e94ae93acd0c84f1a71991e41fe861be64b411693e4bb17adcddc5c17ad0e2530188fde3b8704197abcd1a
+  data.tar.gz: 9c1251cb375e6c3fcd6580dccec33d073aee51a3e7701b2680ceffaef92c8b17733e7489b6cad9ae56af63470e19989bc1e6d35e021faacd5d07913fbf4c27a7

data/lib/nlhue.rb

@@ -1,30 +1,65 @@
 # Nitrogen Logic's Ruby interface library for the Philips Hue.
 # (C)2013 Mike Bourgeous
 
-# Dummy benchmarking method that may be overridden by library users.
-unless private_methods.include?(:bench)
-	def bench label, *args, &block
-		yield
-	end
-end
+module NLHue
+  module Log
+    @@log_block = nil
+    @@log_e_block = nil
+    @@bench_block = nil
 
-# Logging method that may be overridden by library users.
-unless private_methods.include?(:log)
-	def log msg
-		puts msg
-	end
-end
+    # Pass a block that accepts a message to log, or pass nil to restore
+    # default logging.
+    def self.on_log(&block)
+      @@log_block = block
+    end
+
+    # Pass a block that accepts an exception and an optional message to log, or
+    # pass nil to restore default exception logging.
+    def self.on_log_e(&block)
+      @@log_e_block = block
+    end
+
+    # Pass a block to be called
+    def self.on_bench(&block)
+      @@bench_block = block
+    end
+
+    # Dummy benchmarking method that may be overridden by library users.
+    def bench(label, *args, &block)
+      if @@bench_block
+        @@bench_block.call(label, *args, &block)
+      else
+        yield
+      end
+    end
+
+    # Logging method that may be overridden by library users.
+    def log(msg)
+      if @@log_block
+        @@log_block.call(msg)
+      else
+        puts msg
+      end
+    end
+
+    # Exception logging method that may be overridden by library users using
+    # the on_log_e method.
+    def log_e(e, msg=nil)
+      if @@log_e_block
+        @@log_e_block.call(e, msg)
+      else
+        e ||= StandardError.new('No exception given to log')
+        if msg
+          log "#{msg}: #{e}", e.backtrace
+        else
+          log e, e.backtrace
+        end
+      end
+    end
+  end
 
-# Exception logging method that may be overridden by library users.
-unless private_methods.include?(:log_e)
-	def log_e e, msg=nil
-		e ||= StandardError.new('No exception given to log')
-		if msg
-			puts "#{msg}: #{e}", e.backtrace
-		else
-			puts e, e.backtrace
-		end
-	end
+  include Log
+  extend Log
 end
 
 require_relative 'nlhue/ssdp'

data/lib/nlhue/bridge.rb

@@ -34,6 +34,9 @@ module NLHue
 	# queued and sent one at a time to prevent overloading the bridge's
 	# CPU.
 	class Bridge
+                include NLHue::Log
+                extend NLHue::Log
+
 		# Seconds to wait after an update round finishes before sending
 		# more updates to lights and groups.
 		RATE_LIMIT = 0.2

data/lib/nlhue/disco.rb

@@ -11,6 +11,9 @@ module NLHue
 	# Use #start_discovery and #stop_discovery for continuous bridge
 	# discovery.  Use #send_discovery to perform discovery only once.
 	module Disco
+                include NLHue::Log
+                extend NLHue::Log
+
 		# Number of times a bridge can be missing from discovery if not
 		# subscribed (approx. 5*15=1.25min if interval is 15)
 		MAX_BRIDGE_AGE = 5
@@ -238,7 +241,7 @@ module NLHue
 		private
 		# Calls each discovery callback with the given parameters.
 		def self.notify_callbacks *args
-			bench "Notify Hue disco callbacks: #{args[0].inspect}" do
+			NLHue.bench "Notify Hue disco callbacks: #{args[0].inspect}" do
 				@@disco_callbacks.each do |cb|
 					begin
 						cb.call *args
@@ -313,7 +316,7 @@ module NLHue
 		# callbacks.  Called when the timer set by #reset_disco_timer
 		# expires.
 		def self.update_bridges bridges
-			bench 'update_bridges' do
+			NLHue.bench 'update_bridges' do
 				@@bridges.select! do |k, br|
 					age_limit = br[:bridge].subscribed? ? MAX_SUBSCRIBED_AGE : MAX_BRIDGE_AGE
 

data/lib/nlhue/request_queue.rb

@@ -8,6 +8,9 @@ require 'em/protocols/httpclient'
 
 module NLHue
 	class RequestQueue
+                include NLHue::Log
+                extend NLHue::Log
+
 		attr_reader :host
 
 		# Initializes a request queue with the given host, default

data/lib/nlhue/version.rb

@@ -1,3 +1,3 @@
 module NLHue
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nlhue
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Bourgeous
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler