lifx 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74701d68bb9de49cf00008a94e46f8721c5d3e6
-  data.tar.gz: 8dd72e9b4f78d2bc70d042142879b3c98df2b172
+  metadata.gz: c4d3a3b49f4182b136607335b3439a6d8c475af4
+  data.tar.gz: 5119e5d44ca2c1649a9f4226678dc1c3c04900c3
 SHA512:
-  metadata.gz: 8c620c92cf6dd96dac5b2abac78563e3e7276fa7a3a08b17f010eb7fd123320a3cce52d807c6c6eb7cd46d595800e8fba539625cf287cb858888ef812566e148
-  data.tar.gz: 98187dcc6c15b1d53c48ae6cd7ed95dc86c781b3218e2ab79a51d8bf4c56570b1b3152b97091b56f3e41ee3455cde8449c1eed5b408cad1d75b88dc48df227f8
+  metadata.gz: 76282a8c2b04cf4f0c0b199532d2847b97eacf7f8313c246c9aedafbf1cf6d35b02d9c75e75d472bb4f41a278988b92aae63cace417e5902a9e84095161f62f2
+  data.tar.gz: 0b81b9d0165ce833a8436bb597a5f6398ebf4cebee892f02116a6af9a7450b851c782639c9c077b8672bd3b836cf1f6be03e7dfb219ca02f3255165b12311355

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 0.4.8
+
+- Routing table is only updated from State messages
+- Fix memory leaks
+
 ### 0.4.7
 
 - Only create Light devices when a Light::State is received

data/bin/lifx-snoop

@@ -27,7 +27,7 @@ end
 
 begin
   light_udp = LIFX::Transport::UDP.new('0.0.0.0', 56700)
-  light_udp.add_observer(self) do |message: nil, ip: nil, transport: nil|
+  light_udp.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
     if matchers.all? { |m| message.to_s =~ m }
       puts "#{Time.now.iso8601(5)} BROADCAST: #{ip} #{message}"
     end
@@ -35,7 +35,7 @@ begin
   light_udp.listen
 
   peer_udp = LIFX::Transport::UDP.new('0.0.0.0', 56750)
-  peer_udp.add_observer(self) do |message: nil, ip: nil, transport: nil|
+  peer_udp.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
     if matchers.all? { |m| message.to_s =~ m }
       puts "#{Time.now.iso8601(5)} PEER:      #{ip} #{message}"
     end

data/lib/lifx.rb

@@ -7,6 +7,8 @@ require "lifx/required_keyword_arguments"
 require "lifx/utilities"
 require "lifx/logging"
 
+require "lifx/thread"
+
 require "lifx/protocol/payload"
 %w(device light sensor wan wifi message).each { |f| require "lifx/protocol/#{f}" }
 require "lifx/protocol/type"

data/lib/lifx/color.rb

@@ -19,7 +19,7 @@ module LIFX
 
     # Helper to create a white {Color}
     # @param brightness: [Float] Valid range: `0..1`
-    # @param kelvin: [Integer] Valid range: `2500..10000`
+    # @param kelvin: [Integer] Valid range: `2500..9000`
     # @return [Color]
     def white(brightness: 1.0, kelvin: DEFAULT_KELVIN)
       Color.new(0, 0, brightness, kelvin)
@@ -37,7 +37,7 @@ module LIFX
     extend Colors
     UINT16_MAX = 65535
     KELVIN_MIN = 2500
-    KELVIN_MAX = 10000
+    KELVIN_MAX = 9000
 
     class << self
       # Helper method to create from HSB/HSV
@@ -54,7 +54,7 @@ module LIFX
       # @param hue [Float] Valid range: `0..360`
       # @param saturation [Float] Valid range: `0..1`
       # @param brightness [Float] Valid range: `0..1`
-      # @param kelvin [Integer] Valid range: `2500..10000`
+      # @param kelvin [Integer] Valid range: `2500..9000`
       # @return [Color]
       def hsbk(hue, saturation, brightness, kelvin)
         new(hue, saturation, brightness, kelvin)
@@ -150,7 +150,7 @@ module LIFX
     end
 
     # Returns a new Color with the kelvin changed while keeping other attributes
-    # @param kelvin [Integer] Kelvin. `2500..10000`
+    # @param kelvin [Integer] Kelvin. `2500..9000`
     # @return [Color]
     def with_kelvin(kelvin)
       Color.new(hue, saturation, brightness, kelvin)
@@ -184,7 +184,7 @@ module LIFX
       conditions = []
 
       conditions << (((hue - other.hue).abs < (threshold * 360)) || begin
-        # FIXME: Surely there's a better way. 
+        # FIXME: Surely there's a better way.
         hues = [hue, other.hue].sort
         hues[0] += 360
         (hues[0] - hues[1]).abs < (threshold * 360)

data/lib/lifx/gateway_connection.rb

@@ -66,13 +66,10 @@ module LIFX
       @tcp_attempts += 1
       logger.info("#{self}: Establishing connection to #{ip}:#{port}")
       @tcp_transport = Transport::TCP.new(ip, port)
-      @tcp_transport.add_observer(self) do |message: nil, ip: nil, transport: nil|
-        notify_observers(message: message, ip: ip, transport: @tcp_transport)
+      @tcp_transport.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
+        notify_observers(:message_received, message: message, ip: ip, transport: @tcp_transport)
       end
       @tcp_transport.listen
-      at_exit do
-        @tcp_transport.close if @tcp_transport
-      end
     end
 
     def write(message)
@@ -80,7 +77,9 @@ module LIFX
     end
 
     def close
-      @threads.each { |thr| Thread.kill(thr) }
+      @threads.each do |thr|
+        thr.abort
+      end
       [@tcp_transport, @udp_transport].compact.each(&:close)
     end
 
@@ -118,8 +117,7 @@ module LIFX
     def initialize_write_queue
       @queue = SizedQueue.new(MAXIMUM_QUEUE_LENGTH)
       @last_write = Time.now
-      Thread.abort_on_exception = true
-      Thread.new do
+      Thread.start do
         loop do
           if !connected?
             sleep 0.1
@@ -174,5 +172,11 @@ module LIFX
       false
     end
 
+    def observer_callback_definition
+      {
+        message_received: -> (message: nil, ip: nil, transport: nil) {}
+      }
+    end
+
   end
 end

data/lib/lifx/light.rb

@@ -76,7 +76,7 @@ module LIFX
     # @return [Color] Color
     def color(refresh: false, fetch: true)
       @color = nil if refresh
-      send_message!(Protocol::Light::Get.new, wait_for: Protocol::Light::Get) if fetch && !@color
+      send_message!(Protocol::Light::Get.new, wait_for: Protocol::Light::State) if fetch && !@color
       @color
     end
 
@@ -86,7 +86,7 @@ module LIFX
     # @return [String, nil] Label
     def label(refresh: false, fetch: true)
       @label = nil if refresh
-      send_message!(Protocol::Light::Get.new, wait_for: Protocol::Light::Get) if fetch && !@label
+      send_message!(Protocol::Light::Get.new, wait_for: Protocol::Light::State) if fetch && !@label
       @label
     end
 
@@ -158,7 +158,7 @@ module LIFX
     # @return [:unknown, :off, :on] Light power state
     def power(refresh: false, fetch: true)
       @power = nil if refresh
-      send_message!(Protocol::Device::GetPower.new, wait_for: Protocol::Device::StatePower) if !@power && fetch
+      send_message!(Protocol::Light::Get.new, wait_for: Protocol::Light::State) if !@power && fetch
       case @power
       when nil
         :unknown
@@ -331,7 +331,7 @@ module LIFX
     def tags
       context.tags_for_device(self)
     end
-    
+
     # Returns a nice string representation of the Light
     # @return [String]
     def to_s

data/lib/lifx/network_context.rb

@@ -4,12 +4,16 @@ require 'lifx/routing_manager'
 require 'lifx/tag_manager'
 require 'lifx/light'
 require 'lifx/protocol_path'
+require 'lifx/timers'
+
+require 'weakref'
 
 module LIFX
   class NetworkContext
     include Logging
     include Utilities
     include RequiredKeywordArguments
+    include Timers
     extend Forwardable
 
     # NetworkContext stores lights and ties together TransportManager, TagManager and RoutingManager
@@ -19,14 +23,15 @@ module LIFX
       @devices = {}
 
       @transport_manager = transport_manager
-      @transport_manager.context = self
-      @transport_manager.add_observer(self) do |message: nil, ip: nil, transport: nil|
+      @transport_manager.context = WeakRef.new(self)
+      @transport_manager.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
         handle_message(message, ip, transport)
       end
 
       reset!
 
       @threads = []
+      @threads << initialize_timer_thread
     end
 
     def discover
@@ -44,9 +49,12 @@ module LIFX
 
     def stop
       @transport_manager.stop
+      stop_timers
       @threads.each do |thread|
-        Thread.kill(thread)
+        thread.abort
+        thread.join
       end
+      @threads = nil
     end
 
     # Sends a message to their destination(s)
@@ -84,7 +92,7 @@ module LIFX
       if within_sync?
         raise "You cannot nest sync"
       end
-      messages = Thread.new do
+      messages = Thread.start do
         Thread.current[:sync_enabled] = true
         Thread.current[:sync_messages] = messages = []
         block.call
@@ -94,11 +102,11 @@ module LIFX
 
       time = nil
       try_until -> { time } do
-        light = gateways.sample
+        light = lights.alive.sample
         time = light && light.time
       end
 
-      delay = (messages.count + 1) * (1.0 / message_rate)
+      delay = (messages.count + 1) * (1.0 / @transport_manager.message_rate)
       at_time = ((time.to_f + delay) * 1_000_000_000).to_i
       messages.each do |m|
         m.at_time = at_time

data/lib/lifx/observable.rb

@@ -1,36 +1,52 @@
+require 'weakref'
+
 module LIFX
   # @private
   module Observable
     class ObserverCallbackMismatch < ArgumentError; end
-    def add_observer(obj, &callback)
-      if !callback_has_required_keys?(callback)
+    class ObserverCallbackNotFound < ArgumentError; end
+
+    def add_observer(obj, type, &callback)
+      if !callback_type_exists?(type)
+        raise ObserverCallbackNotFound.new
+      end
+      if !callback_has_required_keys?(type, callback)
         raise ObserverCallbackMismatch.new
       end
-      observers[obj] = callback
+      observers[type][WeakRef.new(obj)] = callback
     end
 
-    def remove_observer(obj)
-      observers.delete(obj)
+    def remove_observer(obj, type)
+      observers[type].delete(obj)
     end
 
-    def notify_observers(**args)
-      observers.each do |_, callback|
+    def remove_observers
+      observers.clear
+    end
+
+    def notify_observers(type, **args)
+      observers[type].each do |_, callback|
         callback.call(**args)
       end
     end
 
-    def callback_has_required_keys?(callback)
-      (required_keys_for_callback - required_keys_in_proc(callback)).empty?
+    def callback_type_exists?(type)
+      !!observer_callback_definition[type]
+    end
+
+    def callback_has_required_keys?(type, callback)
+      (required_keys_for_callback(type) - required_keys_in_proc(callback)).empty?
     end
 
     def observer_callback_definition
-      nil
+      {}
     end
 
-    def required_keys_for_callback
-      @_required_keys_for_callback ||= begin
-        return [] if !observer_callback_definition
-        required_keys_in_proc(observer_callback_definition)
+    def required_keys_for_callback(type)
+      @_required_keys_for_callback ||= {}
+      @_required_keys_for_callback[type] ||= begin
+        return [] if !observer_callback_definition[type]
+        required_keys_in_proc(observer_callback_definition[type])
       end
     end
 
@@ -41,7 +57,7 @@ module LIFX
     end
 
     def observers
-      @_observers ||= {}
+      @_observers ||= Hash.new { |h, k| h[k] = {} }
     end
   end
 end

data/lib/lifx/routing_manager.rb

@@ -1,6 +1,7 @@
 require 'lifx/routing_table'
 require 'lifx/tag_table'
 require 'lifx/utilities'
+require 'weakref'
 
 module LIFX
   # @private
@@ -13,11 +14,16 @@ module LIFX
 
     attr_reader :context, :tag_table, :routing_table
 
+    STALE_ROUTING_TABLE_PURGE_INTERVAL = 60
+
     def initialize(context: required!(:context))
-      @context = context
+      @context = WeakRef.new(context)
       @routing_table = RoutingTable.new
       @tag_table = TagTable.new
       @last_refresh_seen = {}
+      @context.timers.every(STALE_ROUTING_TABLE_PURGE_INTERVAL) do
+        routing_table.clear_stale_entries
+      end
     end
 
     def resolve_target(target)
@@ -85,8 +91,9 @@ module LIFX
         @routing_table.update_table(site_id: message.site_id,
                                     device_id: message.device_id,
                                     tag_ids: tag_ids_from_field(message.payload.tags))
+      when Protocol::Device::StatePanGateway, Protocol::Device::StatePower
+        @routing_table.update_table(site_id: message.site_id, device_id: message.device_id)
       end
-      @routing_table.update_table(site_id: message.site_id, device_id: message.device_id)
     end
 
     MINIMUM_REFRESH_INTERVAL = 20

data/lib/lifx/routing_table.rb

@@ -7,10 +7,10 @@ module LIFX
       @device_site_mapping = entries
     end
 
-    def update_table(site_id: site_id, device_id: device_id, tag_ids: nil)
+    def update_table(site_id: site_id, device_id: device_id, tag_ids: nil, last_seen: Time.now)
       device_mapping = @device_site_mapping[device_id] ||= Entry.new(site_id, device_id, [])
       device_mapping.site_id = site_id
-      device_mapping.last_seen = Time.now
+      device_mapping.last_seen = last_seen
       device_mapping.tag_ids = tag_ids if tag_ids
     end
 
@@ -30,5 +30,11 @@ module LIFX
     def entries
       @device_site_mapping.values
     end
+
+    def clear_stale_entries(threshold: 60 * 5)
+      @device_site_mapping.reject! do |device_id, entry|
+        entry.last_seen < Time.now - threshold
+      end
+    end
   end
 end

data/lib/lifx/site.rb

@@ -11,7 +11,7 @@ module LIFX
     include Logging
     include Observable
     include RequiredKeywordArguments
-    
+
     attr_reader :id, :gateways, :tag_manager
 
     def initialize(id: required!(:id))
@@ -38,8 +38,8 @@ module LIFX
         @gateways_mutex.synchronize do
           @gateways[message.device_id] ||= GatewayConnection.new
           @gateways[message.device_id].handle_message(message, ip, transport)
-          @gateways[message.device_id].add_observer(self) do |**args|
-            notify_observers(**args)
+          @gateways[message.device_id].add_observer(self, :message_received) do |**args|
+            notify_observers(:message_received, **args)
           end
         end
       end
@@ -48,12 +48,12 @@ module LIFX
 
     def flush(**options)
       @gateways.values.map do |gateway|
-        Thread.new do
+        Thread.start do
           gateway.flush(**options)
         end
       end.each(&:join)
     end
-    
+
     def to_s
       %Q{#<LIFX::Site id=#{id}>}
     end
@@ -61,13 +61,19 @@ module LIFX
 
     def stop
       @threads.each do |thread|
-        Thread.kill(thread)
+        thread.abort
       end
       @gateways.values.each do |gateway|
         gateway.close
       end
     end
 
+    def observer_callback_definition
+      {
+        message_received: -> (message: nil, ip: nil, transport: nil) {}
+      }
+    end
+
 
     protected
 

data/lib/lifx/tag_manager.rb

@@ -1,3 +1,5 @@
+require 'weakref'
+
 module LIFX
   # @api private
   # @private
@@ -15,7 +17,7 @@ module LIFX
     class TagLimitReached < StandardError; end
 
     def initialize(context: required!(:context), tag_table: required!(:tag_table))
-      @context = context
+      @context = WeakRef.new(context)
       @tag_table = tag_table
     end
 
@@ -83,7 +85,7 @@ module LIFX
         end
       end
     end
-    
+
     protected
 
     VALID_TAG_IDS = (0...64).to_a.freeze

data/lib/lifx/thread.rb

@@ -0,0 +1,11 @@
+require 'thread'
+
+module LIFX
+  class Thread < ::Thread
+    def abort
+      if alive?
+        kill.join
+      end
+    end
+  end
+end

data/lib/lifx/timers.rb

@@ -5,13 +5,21 @@ module LIFX
     protected
     def initialize_timer_thread
       timers.after(1) {} # Just so timers.wait doesn't complain when there's no timer
-      Thread.new do
+      @timer_thread = Thread.start do
         loop do
           timers.wait
         end
       end
     end
 
+    def stop_timers
+      timers.each(&:cancel)
+      if @timer_thread
+        @timer_thread.abort
+      end
+    end
+
+    public
     def timers
       @timers ||= ::Timers.new
     end

data/lib/lifx/transport.rb

@@ -5,7 +5,7 @@ module LIFX
   class Transport
     include Logging
     include Observable
-    
+
     attr_reader :host, :port
 
     def initialize(host, port, ignore_unpackable_messages: true)
@@ -23,7 +23,7 @@ module LIFX
     end
 
     def close
-      raise NotImplementedError
+      remove_observers
     end
 
     def to_s
@@ -32,7 +32,10 @@ module LIFX
     alias_method :inspect, :to_s
 
     def observer_callback_definition
-      -> (message: nil, ip: nil, transport: nil) {}
+      {
+        message_received: -> (message: nil, ip: nil, transport: nil) {},
+        disconnected: -> {}
+      }
     end
   end
 end

data/lib/lifx/transport/tcp.rb

@@ -13,7 +13,7 @@ module LIFX
       end
 
       def connected?
-        @socket && !@socket.closed?
+        !!(@socket && !@socket.closed?)
       end
 
       CONNECT_TIMEOUT = 3
@@ -31,17 +31,23 @@ module LIFX
       end
 
       def close
+        super
         return if !@socket
-        Thread.kill(@listener) if @listener
-        @listener = nil
-        @socket.close if !@socket.closed?
+        if !@socket.closed?
+          @socket.close
+          notify_observers(:disconnected)
+        end
         @socket = nil
+        if @listener
+          @listener.abort
+        end
+        @listener = nil
       end
 
       HEADER_SIZE = 8
       def listen
         return if @listener
-        @listener = Thread.new do
+        @listener = Thread.start do
           while @socket do
             begin
               header_data = @socket.recv(HEADER_SIZE, Socket::MSG_PEEK)
@@ -49,8 +55,8 @@ module LIFX
               size        = header.msg_size
               data        = @socket.recv(size)
               message     = Message.unpack(data)
-              
-              notify_observers(message: message, ip: host, transport: self)
+
+              notify_observers(:message_received, {message: message, ip: host, transport: self})
             rescue Message::UnpackError
               if Config.log_invalid_messages
                 logger.info("#{self}: Exception occured while decoding message - #{ex}")

data/lib/lifx/transport/udp.rb

@@ -28,9 +28,8 @@ module LIFX
         if @listener
           raise "Socket already being listened to"
         end
-        
-        Thread.abort_on_exception = true
-        @listener = Thread.new do
+
+        @listener = Thread.start do
           reader = UDPSocket.new
           reader.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
           reader.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true) if Socket.const_defined?('SO_REUSEPORT')
@@ -39,7 +38,7 @@ module LIFX
             begin
               bytes, (_, _, ip, _) = reader.recvfrom(128)
               message = Message.unpack(bytes)
-              notify_observers(message: message, ip: ip, transport: self)
+              notify_observers(:message_received, {message: message, ip: ip, transport: self})
             rescue Message::UnpackError
               if Config.log_invalid_messages
                 logger.warn("#{self}: Unrecognised bytes: #{bytes.bytes.map { |b| '%02x ' % b }.join}")
@@ -50,10 +49,13 @@ module LIFX
       end
 
       def close
-        Thread.kill(@listener) if @listener
+        super
         return if !@socket
         @socket.close
         @socket = nil
+        if @listener
+          @listener.abort
+        end
       end
 
       protected

data/lib/lifx/transport_manager.rb

@@ -24,10 +24,15 @@ module LIFX
       end
 
       def stop
-        raise NotImplementedError
+        @context = nil
+        remove_observers
       end
 
-
+      def observer_callback_definition
+        {
+          message_received: -> (message: nil, ip: nil, transport: nil) {}
+        }
+      end
     end
   end
 end

data/lib/lifx/transport_manager/lan.rb

@@ -21,7 +21,7 @@ module LIFX
 
       def flush(**options)
         @sites.values.map do |site|
-          Thread.new do
+          Thread.start do
             site.flush(**options)
           end
         end.each(&:join)
@@ -31,8 +31,7 @@ module LIFX
       DISCOVERY_INTERVAL                     = 15   # seconds
       def discover
         stop_discovery
-        Thread.abort_on_exception = true
-        @discovery_thread = Thread.new do
+        @discovery_thread = Thread.start do
           @last_request_seen = Time.at(0)
           message = Message.new(path: ProtocolPath.new(tagged: true), payload: Protocol::Device::GetPanGateway.new)
           logger.info("Discovering gateways on #{@bind_ip}:#{@port}")
@@ -49,12 +48,19 @@ module LIFX
       end
 
       def stop_discovery
-        Thread.kill(@discovery_thread) if @discovery_thread
+        if @discovery_thread
+          @discovery_thread.abort
+        end
       end
 
       def stop
+        super
         stop_discovery
-        @threads.each(&:kill)
+        stop_timers
+        @threads.each do |thr|
+          thr.abort
+        end
+        @peer_transport.close
         @transport.close
         @sites.values.each do |site|
           site.stop
@@ -152,17 +158,17 @@ module LIFX
 
       def create_broadcast_transport
         @transport = Transport::UDP.new(@send_ip, @port)
-        @transport.add_observer(self) do |message: nil, ip: nil, transport: nil|
+        @transport.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
           handle_broadcast_message(message, ip, @transport)
-          notify_observers(message: message, ip: ip, transport: transport)
+          notify_observers(:message_received, message: message, ip: ip, transport: transport)
         end
         @transport.listen(ip: @bind_ip)
       end
 
       def create_peer_transport
         @peer_transport = Transport::UDP.new('255.255.255.255', @peer_port)
-        @peer_transport.add_observer(self) do |message: nil, ip: nil, transport: nil|
-          notify_observers(message: message, ip: ip, transport: transport)
+        @peer_transport.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
+          notify_observers(:message_received, message: message, ip: ip, transport: transport)
         end
         @peer_transport.listen(ip: @bind_ip)
       end
@@ -174,8 +180,8 @@ module LIFX
         when Protocol::Device::StatePanGateway
           if !@sites.has_key?(message.path.site_id)
             @sites[message.path.site_id] = Site.new(id: message.path.site_id)
-            @sites[message.path.site_id].add_observer(self) do |**args|
-              notify_observers(**args)
+            @sites[message.path.site_id].add_observer(self, :message_received) do |**args|
+              notify_observers(:message_received, **args)
             end
           end
           @sites[message.path.site_id].handle_message(message, ip, transport)

data/lib/lifx/version.rb

@@ -1,3 +1,3 @@
 module LIFX
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/integration/client_spec.rb

@@ -19,7 +19,7 @@ module LIFX
         sleep 1
 
         msgs = []
-        udp.add_observer(self) do |message: nil, ip: nil, transport: nil|
+        udp.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
           msgs << message if message.payload.is_a?(Protocol::Light::SetWaveform)
         end
         udp.listen

data/spec/routing_manager_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module LIFX
   describe RoutingManager do
     describe '#tags_for_device_id' do
-      subject(:manager) { RoutingManager.new(context: double) }
+      subject(:manager) { RoutingManager.new(context: double(timers: double(every: double))) }
 
       before do
         ['Some label', 'Another label', 'Much label'].each_with_index do |lbl, i|

data/spec/routing_table_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module LIFX
+  describe RoutingTable do
+    describe '#clear_stale_entries' do
+      subject(:table) { RoutingTable.new }
+
+      before do
+        table.update_table(site_id: 'site', device_id: 'stale device', last_seen: Time.now - 305)
+        table.update_table(site_id: 'site', device_id: 'recent device', last_seen: Time.now)
+      end
+
+      it 'clears only entries older than 5 minutes' do
+        expect(table.entries.count).to eq(2)
+        table.clear_stale_entries
+        expect(table.entries.count).to eq(1)
+        expect(table.entries.first.device_id).to eq('recent device')
+      end
+    end
+  end
+end

data/spec/transport/udp_spec.rb

@@ -24,7 +24,7 @@ module LIFX
       let(:socket) { UDPSocket.new }
       let(:messages) { [] }
       before do
-        udp.add_observer(self) do |message: nil, ip: nil, transport: nil|
+        udp.add_observer(self, :message_received) do |message: nil, ip: nil, transport: nil|
           messages << message
         end
         udp.listen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifx
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Jack Chen (chendo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -152,6 +152,7 @@ files:
 - lib/lifx/tag_manager.rb
 - lib/lifx/tag_table.rb
 - lib/lifx/target.rb
+- lib/lifx/thread.rb
 - lib/lifx/timers.rb
 - lib/lifx/transport.rb
 - lib/lifx/transport/tcp.rb
@@ -170,6 +171,7 @@ files:
 - spec/message_spec.rb
 - spec/protocol_path_spec.rb
 - spec/routing_manager_spec.rb
+- spec/routing_table_spec.rb
 - spec/spec_helper.rb
 - spec/transport/udp_spec.rb
 - spec/transport_spec.rb
@@ -209,6 +211,7 @@ test_files:
 - spec/message_spec.rb
 - spec/protocol_path_spec.rb
 - spec/routing_manager_spec.rb
+- spec/routing_table_spec.rb
 - spec/spec_helper.rb
 - spec/transport/udp_spec.rb
 - spec/transport_spec.rb