wires 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 660935c436c6c57687e2c3c8a506d9810e478789
-  data.tar.gz: e2cd88acddaade081ca3da917f885e40845d2282
+  metadata.gz: ffc466f024c5e1a6e59c435d1849af75dd19bf0c
+  data.tar.gz: 34336c47982369319a614836b310442e5774e22f
 SHA512:
-  metadata.gz: addb4f0b4d550fa8e2d45d3124900a9a4a605c65ac05ebf10206bef54bffa23b6666ad4381ba675232e081fa75936e6e63639247f37f17b9c432852fa815477c
-  data.tar.gz: 670c122be77ebde3f81e87efb1d1317a526624cddb139c2e9ea9b988f5c1405b1c682b1f6c497c4e79a1b61fc9599b6fe0819a1c4eeaa8394fcaf2fdffb7fb6d
+  metadata.gz: 38e0d5dc15c590d25639f311e9a1029f358975343e174b342365ee1cbb8f6069a6bbf2a31acff62a83d2867a4f34292f82cf4d1eabc91709e204fca1adfc318f
+  data.tar.gz: 68a7b2f5dcde44efb7c8553de8748acfb65ee949b3fb0a471035a13e1826d4bad88a4b4dbe1f60a65a356fedf16359e62af3d6e402b18d73d12210fafcf7f35c

data/lib/wires/channels.rb

@@ -29,15 +29,11 @@ class Channel
     nil end
     
     # Ensure that there is only one instance of Channel per name
-    @@channel_list = Set.new
+    @@channel_hash = Hash.new
     @@new_lock = Mutex.new
     def self.new(*args, &block)
         @@new_lock.synchronize do
-            if not (inst = (@@channel_list.select {|x| \
-                (x.name==args[0] and x.name.class==args[0].class)} [0]))
-                @@channel_list << (inst = super(*args, &block))
-            end
-            inst
+            @@channel_hash[args[0]] ||= super(*args, &block)
         end
     end
     
@@ -86,18 +82,23 @@ class Channel
     nil end
     
     def relevant_channels
-        return @@channel_list if self==@@channel_star
+        return @@channel_hash.values if self==@@channel_star
         
         if self.name.is_a?(Regexp) then raise TypeError,
             "Cannot fire on Regexp channel: #{self.name}."\
             "  Regexp channels can only used in event handlers." end
             
         relevant = [@@channel_star]
-        for c in @@channel_list
+        for c in @@channel_hash.values
             relevant << c if \
-                (c.name.is_a?(Regexp) ?
-                    self.name =~ c.name :
-                    self.name.to_s == c.name.to_s)
+                if c.name.is_a?(Regexp)
+                    self.name =~ c.name
+                elsif (defined?(c.name.channel_name) and
+                       defined?(self.name.channel_name))
+                    self.name.channel_name == c.name.channel_name
+                else
+                    self.name.to_s == c.name.to_s
+                end
         end
         return relevant.uniq
     end

data/lib/wires/hub.rb

@@ -7,6 +7,7 @@ def puts(x) $stdout.puts(x) end
 # get called in new threads in the order received
 class Hub
     @@queue = Queue.new
+    @@running = false
     
     # Start the Hub event loop in a new thread
     def self.run
@@ -18,21 +19,22 @@ class Hub
     def self.run_in_place() self.run_loop() end
     
     # Kill the Hub event loop (softly)
-    def self.kill() @@keepgoing=false end
+    def self.kill() @@running=false end
     
     # Put x in the queue, and block until x is processed
     def self.fire(x)
         @@queue << [x, Thread.current]
-        sleep # yield to event loop thread until awoken by it later
+        # yield to event loop thread until awoken by it later
+        sleep unless not @@running
     end
     def self.<<(x) fire(x) end
     
 private
     
     def self.run_loop
-        @@keepgoing = true
+        @@running = true
             
-        while @@keepgoing
+        while @@running
             if @@queue.empty? then sleep(0)
             else process_item(@@queue.shift) end
         end
@@ -48,7 +50,7 @@ private
                 waiting_thread.wakeup if blocking
                 
             rescue Interrupt, SystemExit => e
-                @keepgoing = false
+                @running = false
                 unhandled_exception(e)
                 
             rescue Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Joe McIlvain