wires 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe770b52bcfa8f3d4ebd9cdbc9474495cf518d40
-  data.tar.gz: 504f5acec60a51e872a21e01730f0e624e6ce0af
+  metadata.gz: 8ba5a18e82d8030466a788523b4cf1a35444a7ee
+  data.tar.gz: 358f486714e9b7b2d91103966a08c6591d6b4b88
 SHA512:
-  metadata.gz: 1e2e093f083689a43817e88ca3eec0dd013d513eb072c2f95b4fa98131c23748e61f19830dbe949d8560e91c706a069859f5813d256ed793295bba039bfbb96f
-  data.tar.gz: 2bfa6a3d6fe622e208ea61b41ae7dc40ca6ed3bb20dba0c07a4eab0e916301f1a4a13e760eb89857079f57e524c3794d25f5ea07196d047df053522152542f28
+  metadata.gz: d04c8d15e06683af78f41167c30443209063ff38561229006ad2d35e94cfb924c570daee44344092e95b81dc9515399f10509fdfdaea5d00dc3ea1375ed4a564
+  data.tar.gz: ee87a782456ba1f9cd1572edda652cde60e7e4d66e1721e59e21fe8eb660b043f5f2bdd0f90c8bf1b3f68665196c3271906528d55715bc07c563b73892f0f87e

data/lib/wires/channel.rb

@@ -95,23 +95,35 @@ module Wires
     
     def relevant_channels
       return @@channel_hash[hub].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_hash[hub].values
-        relevant << c if \
-          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
+      my_names = (self.name.is_a? Array) ? self.name : [self.name]
+      my_names.map {|o| (o.respond_to? :channel_name) ? o.channel_name : o.to_s}
+              .flatten(1)
+      
+      for my_name in my_names
+        
+        if my_name.is_a?(Regexp) then raise TypeError,
+          "Cannot fire on Regexp channel: #{self.name}."\
+          "  Regexp channels can only used in event handlers." end
+        
+        for other_chan in @@channel_hash[hub].values
+          
+          other_name = other_chan.name
+          other_name = (other_name.respond_to? :channel_name) ? \
+                          other_name.channel_name : other_name
+          
+          relevant << other_chan if \
+            if other_name.is_a?(Regexp)
+              my_name =~ other_name
+            else
+              my_name.to_s == other_name.to_s
+            end
+            
+        end
+        
       end
+      
       return relevant.uniq
     end
     

data/lib/wires/hub.rb

@@ -12,7 +12,7 @@ module Wires
     private
     
       # Make subclasses call class_init
-      def inherited(subcls); subcls.class_init end
+      def inherited(subcls); subcls.send(:class_init) end
       
       # Moved to a dedicated method for subclass' sake
       def class_init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport