wires-test 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1718698a58e0c296d5ea90c17e985e2b11e29066
-  data.tar.gz: 91503847e44ceaf0515743ca5437961db0618778
+  metadata.gz: 3028d08f961e119349b80c44ab1809c333d95066
+  data.tar.gz: cb913b720f705ecf252ae37930823b026235c76a
 SHA512:
-  metadata.gz: 50f5eda520268beb59e8b69c3609d500b16ad9243084eae51350ba72e23c8ab58c6a240ad2d93595954d5f10d181aee01260b9269480ff15ff2f4d89d3cdbc7a
-  data.tar.gz: bcebcce1914b6af57772a2dd20660587b57e81698a78d12b6050aa205cfa35b499c26ddd75cea202e9a480f1f2827b53ce8351ee1c044e4d8daa695efc74c162
+  metadata.gz: 2344202069fc523a21a7eb67c125f8a39203c428341b3dcc168472b2dbe6b4420c6eac08596af93ccc0cecb77f86b122db79ab94770e93fa7d2498eb06ddc46e
+  data.tar.gz: 423b169d738c321b5ef677aae9370c417dcab1a1ff00386f97d8bce70b0ca5857cde357895333feb7b515b22f1eb966c24e199a4cf5eedfbdf96dc7ff1bfb3d9

data/lib/wires/test/minitest.rb

@@ -0,0 +1,2 @@
+gem 'minitest', '~> 4.3.2'
+require 'minitest/autorun'

data/lib/wires/test.rb

@@ -1,5 +1,7 @@
-gem 'minitest', '~> 4.3.2'
-require 'minitest/autorun'
+
+begin
+  require_relative 'test/minitest'
+end unless __FILE__=="(eval)"
 
 
 module Wires
@@ -7,7 +9,7 @@ module Wires
   module Test
     
     module Helper
-    
+      
       def before_setup
         @received_wires_events = []
         Channel.before_fire { |e,c| @received_wires_events << [e,c] }
@@ -19,23 +21,34 @@ module Wires
         clear_fired
       end
       
-      def fired?(event,channel=self, clear:false, exclusive:false, plurality:nil,
-                 exact_event:false, exact_channel:false, &block)
+      def fired?(event, channel=self, 
+                     clear:false, exclusive:false, plurality:nil,
+                     exact_event:false, exact_channel:false)
+        key_chan  = Channel[channel] unless channel.is_a? Channel
         key_event = Event.new_from event
-        key_chan  = Channel.new channel
+        
+        case key_event.count
+        when 0
+          raise ArgumentError,"Can't create an event from input: #{input.inspect}"
+        when 1
+          key_event = key_event.first
+        else
+          raise ArgumentError,"Can't check for fired? on multiple events: #{key_event.inspect}"
+        end
         
         results = @received_wires_events.select { |e,c|
-          (exact_event   ? (key_event.class == e.class) : (key_event =~ e)) and
-          (exact_channel ? (key_chan  === c)            : (key_chan  =~ c))
+          (exact_event   ? (key_event.event_type == e.event_type) : (key_event =~ e)) and
+          (exact_channel ? (key_chan  === c)                      : (key_chan  =~ c))
         }
         
         clear_fired if clear
         
         return false if results.empty?
         return false if exclusive and (@received_wires_events != results)
-        return false if plurality  and (results.size != plurality)
+        return false if plurality and (results.size != plurality)
         
-        results.each(&block) # Execute passed block for each match
+        # Execute passed block for each match
+        results.each { |e,c| yield e,c if block_given? }
         
         true
       end
@@ -55,10 +68,37 @@ module Wires
       def clear_fired
         @received_wires_events.clear
       end
+      
+      # Build an alternate version of Helper for an alternate Wires module
+      # Optionally, specify an affix to be used in method names;
+      # This helps to differentiate from the original Helper
+      def self.build_alt(wires_module_path, affix:nil)
+        affix = affix.to_s if affix
+        
+        [__FILE__] # List of files to mutate and eval
+          .map  { |file| File.read file }
+          .each do |code|
+            
+            code.gsub!(/Wires/, "#{wires_module_path}")
+            
+            mutated_names = 
+              instance_methods \
+              - [:before_setup, :after_teardown] \
+              + [:@received_wires_events]
+            
+            mutated_names.each do |meth|
+              meth     = meth.to_s
+              sys_meth = meth.gsub /([^_]+)$/, "#{affix}_\\1"
+              code.gsub!(meth, sys_meth)
+            end if affix
+            
+            eval code
+          end
+      end
     end
-  
-    class Unit < Minitest::Unit;  include Test::Helper;  end
-    class Spec < Minitest::Spec;  include Test::Helper;  end
+    
+    class Unit < ::Minitest::Unit;  include Test::Helper;  end
+    class Spec < ::Minitest::Spec;  include Test::Helper;  end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires-test
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Joe McIlvain
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/wires/test/minitest.rb
 - lib/wires/test.rb
 - LICENSE
 homepage: https://github.com/jemc/wires-test/