wires 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed84cacba5f8de403b014bf21dea7f17f715039d
-  data.tar.gz: 5db5c2bb5684593b81e0faf26dae9317d1c0bb55
+  metadata.gz: 0ee0ef4612e829c49c23b2b56726ebfa7b78e0a7
+  data.tar.gz: 855a4eee6ae3b7c9906876202c23a1503bc1484e
 SHA512:
-  metadata.gz: 18d0e590b738f66685730de3006f978a9faa22124a37e5511e798f909999ceb8b0bd41a72c96a9e18acf8c30a241865dcadbd2a0bca307a5bc7bf301bed57d72
-  data.tar.gz: e699ce9a9d99f7077f95c06c700e15c0b03ea2795d804da7b10f9f596d7b180cc278d0938660a2a887d9d9a252cc2949afdcbeb2ceab744c248020b85c43240b
+  metadata.gz: 980b22d9a6bd54663e18c89f3b57c2fcae6d9973f337b2d08035ae17cb3029a2688ef868864955520fd7db8868340dd8368ecac24c3924417a8946edbc91ea1f
+  data.tar.gz: 4ab9d5b9cc254ebc0b9f33d2988b9c08f1f10a960793132b9ed72fca4a3e3a921293a5792eabbe077b274f717a4a65169aa6c2b712342d045942f6bbd80adcbb

data/lib/wires/channels.rb

@@ -22,7 +22,6 @@ class Channel
     def initialize(name)
         @name = name
         @target_list = Set.new
-        @@channel_list << self
     nil end
     
     # Ensure that there is only one instance of Channel per name
@@ -30,9 +29,11 @@ class Channel
     @@new_lock = Mutex.new
     def self.new(*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)
+            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
         end
     end
     
@@ -62,8 +63,7 @@ class Channel
         _event, *args = _event
         
         # Create event object from event as an object, class, or symbol/string
-        event = 
-        case _event
+        event = case _event
             when Event
                 _event
             when Class
@@ -88,22 +88,12 @@ class Channel
             "Cannot fire on Regexp channel: #{self.name}."\
             "  Regexp channels can only used in event handlers." end
             
-        relevant = [@@channel_star, self]
+        relevant = [@@channel_star]
         for c in @@channel_list
-            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
+            relevant << c if \
+                (c.name.is_a?(Regexp) ?
+                    self.name =~ c.name :
+                    self.name.to_s == c.name.to_s)
         end
         return relevant.uniq
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 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.