wires-test 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0991c03a9d93a361970b27477d58a18656a54dc
-  data.tar.gz: 6992614716f21cb4d501e994c10391f08158282a
+  metadata.gz: c3467c6ce43030f93a423b5e8a204092aff7a444
+  data.tar.gz: f018a88b955fdc470142c3b16a4970c07e0d5bc5
 SHA512:
-  metadata.gz: 0043870480143307e8469fb414866dd10ffe0f5706422c4a692b7323f7609fbf564d31489db0b040e7fff670371ffbe2bcea4543afff01e6d2e7c5f286c6339c
-  data.tar.gz: 952ff5f296535e411b7bf65f6b8025329b8f1426103faf50d268ace723716fac1508ed2124d83968dec4f9751fa955fbf45baf88af7e9a230f3d0d404aadbf4f
+  metadata.gz: 49278da8615bc376ca929419e38e7f448d9ce5fb55fcd8d2e248e1d013b375607a2cc95fe68d7ece0a86b25231d5ab8dd30f768c2aadf1edd7c6f22f2c8c5ecf
+  data.tar.gz: 284ad78e57dde16b2644703c244cdfd0d41d3eed396de03ad791b9434c4d4b48eb0616127fc5bc16879d8883f6b108ec33e87a5eb0a9ac3ce2f64bc035c5fdff

data/lib/wires/test.rb

@@ -22,28 +22,40 @@ module Wires
         Channel.remove_hook(:@before_fire, &@AFFIX_wires_test_fire_hook)
       end
       
-      def AFFIX_fired?(event, channel, 
+      def AFFIX_fired?(event, channel=:__no_channel_was_specified__, 
                  clear:false, exclusive:false, plurality:nil,
                  exact_event:false, exact_channel:false,
                  &block)
-        key_chan  = channel.is_a?(Channel) ? channel : Channel[channel]
+        key_chan = 
+          case channel
+          when :__no_channel_was_specified__
+            nil
+          when Channel
+            channel
+          else
+            Channel[channel]
+          end
+        
         key_event = Event.list_from event
         
         case key_event.count
         when 0
-          raise ArgumentError,"Can't create an event from input: #{input.inspect}"
+          raise ArgumentError,"Can't create an event from input: "\
+                              "#{event.inspect}"
         when 1
           key_event = key_event.first
         else
-          raise ArgumentError,"Can't check for fired? on multiple events: #{key_event.inspect}"
+          raise ArgumentError,"Can't check for fired? on multiple events: "\
+                              "#{key_event.inspect}"
         end
         
         results = @AFFIX_wires_events.select { |e,c|
           c = Channel[c]
-          (exact_event   ? (key_event == e) : (key_event =~ e)) and
-          (exact_channel ? (key_chan  == c) : (key_chan  =~ c))
+          (exact_event   ? (key_event == e) : (key_event =~ e)) && (!key_chan ||
+          (exact_channel ? (key_chan  == c) : (key_chan  =~ c)))
         }
         
+        # If passed a block, use it to determine
         results.select! { |e,c| yield e,c } if block_given?
         
         clear_AFFIX_fired if clear
@@ -52,9 +64,6 @@ module Wires
         return false if exclusive and (@AFFIX_wires_events != results)
         return false if plurality and (results.size != plurality)
         
-        # # Execute passed block for each match
-        # results.each { |e,c| yield e,c if block_given? }
-        
         true
       end
       

metadata

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