wires 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84333d4617ce57228fdd29e5255aa9e30f1ce474
-  data.tar.gz: 445840683d9422bae1292a8655253d32510cca87
+  metadata.gz: ddf7c26252b01261e552ad00ca7ae8dcc20515e8
+  data.tar.gz: 667a3598ae40b52aab46a79a30126a036894429e
 SHA512:
-  metadata.gz: 68bc50ed50729dcae3f913cf9db1dcc36bdf112710a7c03d9dfcc76ab7da05fccfc83f6e65846e29169ba325d3dba30e100d3570efe589cbcac00c46aedbecd8
-  data.tar.gz: eaa90eea5b0051e1f1f9b773b51aa14290b440d29ea54b3d08ae2883a92fc1f5aed96dc812bd8c6ad94316c9d887c2c12387a7186fbfcf19fbfc332c5947eb2d
+  metadata.gz: 9df8d83551265f447ae50263a7f0595439f26137dc926ea1c4cf6f660e052bb9be011dcf59debd88bcad453a0b4d1d85b99aceb1911cb768439726c7a1dd38e3
+  data.tar.gz: 73a9116f9118c88194b47882df37309d8ee024fd7628a1bfe56c6d4a791bdcf0e65a62a092266905e6a922b15f87ee5cc58fae650cccc22086d339a84ee4ec97

data/lib/wires/channels.rb

@@ -4,12 +4,12 @@ def on(events, channels='*', &codeblock)
     for channel in channels
         Channel(channel).register(events, codeblock)
     end
-end
+nil end
 
 
 def fire(event, channel='*') 
     Channel(channel).fire(event)
-end
+nil end
 
 
 def Channel(*args) Channel.new(*args) end
@@ -23,23 +23,26 @@ class Channel
         @name = name
         @target_list = Set.new
         @@channel_list << self
-    end
+    nil end
     
     # Ensure that there is only one instance of Channel per name
     @@channel_list = Set.new
+    @@new_lock = Mutex.new
     def self.new(*args, &block)
-        (@@channel_list.select {|x| x.name == args[0]} [0]) \
-        or super(*args, &block)
+        @@new_lock.synchronize do
+            (@@channel_list.select {|x|
+                (x.name==args[0] and x.name.class==args[0].class)} [0]) \
+            or super(*args, &block)
+        end
     end
     
     # Class-wide reference to the global channel and event hub
     @@channel_star = Channel('*')
-    @@hub = Hub.new
     
     # Register a proc to be triggered by an event on this channel
     def register(events, proc)
         
-        if not proc then raise SyntaxError, \
+        if not proc.is_a?(Proc) then raise SyntaxError, \
             "No Proc given to execute on event: #{events}" end
         
         # Convert all events to strings
@@ -49,8 +52,7 @@ class Channel
         events.uniq!
         
         @target_list << [events, proc]
-        @target_list << [events, proc]
-    end
+    nil end
     
     # Fire an event on this channel
     def fire(_event)
@@ -74,10 +76,10 @@ class Channel
         for chan in relevant_channels()
             for target in chan.target_list
                 for string in target[0] & event.class.codestrings
-                    @@hub.enqueue([string, event, *target[1..-1]])
+                    Hub << [string, event, *target[1..-1]]
         end end end
         
-    end
+    nil end
     
     def relevant_channels
         return @@channel_list if self==@@channel_star
@@ -88,11 +90,19 @@ class Channel
             
         relevant = [@@channel_star, self]
         for c in @@channel_list
-            relevant << c if case c.name
-            when Regexp
-                self.name =~ c.name
-            else String
-                self.name == c.name.to_s
+            for code in Event.from_codestring(self.name).codestrings
+                relevant << c if case c.name
+                when Regexp
+                    code =~ c.name
+                when Event
+                    code == c.name.class
+                when Class
+                    c.name <= Event ? 
+                        code == c.name : 
+                        code == c.name.to_s
+                else
+                    code == c.name.to_s
+                end
             end
         end
         return relevant.uniq

data/lib/wires/hub.rb

@@ -3,28 +3,30 @@
 def puts(x) $stdout.puts(x) end
 
 
+# An event hub. Event/proc associations come in, and the procs 
+# get called in new threads in the order received
 class Hub
-    def initialize
-        @queue = Queue.new
+    @@queue = Queue.new
+    
+    def self._run
+        @@keepgoing = true
+            
+        while @@keepgoing
+            if @@queue.empty? then sleep(0)
+            else _process_item(@@queue.shift) end
+        end
     end
     
-    def self.new
-        @instance ||= super
+    def self.run!
+        @@thread = Thread.new() {Hub._run}
+        at_exit { @@thread.join if not $! }
     end
     
-    def kill!() @keepgoing=false end
+    def self.run_in_place!() self._run() end
     
-    def run
-        @keepgoing = true
-            
-        while @keepgoing
-            if @queue.empty? then sleep(0)
-            else _process_item(@queue.shift) end
-        end
-        
-    end
+    def self.kill!() @@keepgoing=false end
     
-    def _process_item(x)
+    def self._process_item(x)
         x, waiting_thread = x
         string, event, proc = x
         Thread.new do
@@ -43,24 +45,20 @@ class Hub
         end
     end
     
-    def _unhandled_exception(x)
+    def self._unhandled_exception(x)
         $stderr.puts $!
         $stderr.puts $@
     end
     
-    def fire(x)
-        @queue << [x, Thread.current]
+    def self.fire(x)
+        @@queue << [x, Thread.current]
         sleep
     end
     
-    def enqueue(x)
-        fire x
-    end
+    def self.enqueue(x) fire(x) end
+    def self.<<(x)      fire(x) end
+    
+    private_class_method :new
 end
 
 
-# Run the hub in a new thread and join it at main thread exit
-#   However, do not join if an exception caused the exit - 
-#     Such an exception indicates usually an error in user code
-__hub_thread = Thread.new() {Hub.new.run}
-at_exit { __hub_thread.join if not $! }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies: []
 description: An asynchronous (threaded) event routing framework in Ruby. Patch your
   objects together with wires. Inspired by the python 'circuits' framework.