wires-test 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b19ee2c3fdcbfd811e3f05cc2816446d3a7b1191
-  data.tar.gz: b0e8297e79d2ad56763979b51fa0921a044ab16b
+  metadata.gz: 9a3c4bf5ece47b1d797b828be77984f4891b4c9a
+  data.tar.gz: 67706a912177f2717174f1b0f2ca248df8cc4f0a
 SHA512:
-  metadata.gz: 9e77daf69bb48615b8d5a1b611a4ccb4c5ca4d09dbd728e64f237d03981fd5600ca0584ab25590803691764e0c4cdac8a4cff64054745128eb812ce7e97ceb61
-  data.tar.gz: 53ee036fad0eae79d1be14a25ee418a324a36978ad003e111f46c2bce6fbce197cc3b5616c506e5f052b9d0338ce2b60d87a94c1d7a1a630037e45ac5500a203
+  metadata.gz: 413d663728075ee10b62f392291def4612af0a612bb21dd3d6a032581158e36c5552a1c9d2d3ae84a7f43376bf88b681d307b19fa40c6378dff70777ef1386f9
+  data.tar.gz: e04e33bb642574f228c67bb0e53b40a41135e2a7ac15a8f866b0f0501339756ef9bbd19d37322b09f3b664474e59a766e0a4cccc100618db4250e629273ee0ab

data/lib/wires/test.rb

@@ -1,28 +1,25 @@
 
-# Encase all code in a HEREDOC string until the...
-<<'-END OF IMPLEMENTATION'
-
 module Wires
   module Test
     module Helper
       
-      attr_reader :AFFIX_wires_events
+      attr_reader :wires_events
       
-      def AFFIX_wires_test_setup
-        @AFFIX_wires_events = []
-        @AFFIX_wires_test_fire_hook = \
+      def wires_test_setup
+        @wires_events = []
+        @wires_test_fire_hook = \
         Channel.add_hook(:@before_fire) { |e,c| 
-          @AFFIX_wires_events << [e,c]
+          @wires_events << [e,c]
         }
       end
       
-      def AFFIX_wires_test_teardown
+      def wires_test_teardown
         Wires::Hub.join_children
-        @AFFIX_wires_events = nil
-        Channel.remove_hook(:@before_fire, &@AFFIX_wires_test_fire_hook)
+        @wires_events = nil
+        Channel.remove_hook(:@before_fire, &@wires_test_fire_hook)
       end
       
-      def AFFIX_fired?(event, channel=:__no_channel_was_specified__, 
+      def fired?(event, channel=:__no_channel_was_specified__, 
                  clear:false, exclusive:false, plurality:nil,
                  exact_event:false, exact_channel:false,
                  &block)
@@ -49,7 +46,7 @@ module Wires
                               "#{key_event.inspect}"
         end
         
-        results = @AFFIX_wires_events.select { |e,c|
+        results = @wires_events.select { |e,c|
           c = Channel[c]
           (exact_event   ? (key_event == e) : (key_event =~ e)) && (!key_chan ||
           (exact_channel ? (key_chan  == c) : (key_chan  =~ c)))
@@ -58,20 +55,20 @@ module Wires
         # If passed a block, use it to determine
         results.select! { |e,c| yield e,c } if block_given?
         
-        clear_AFFIX_fired if clear
+        clear_fired if clear
         
         return false if results.empty?
-        return false if exclusive and (@AFFIX_wires_events != results)
+        return false if exclusive and (@wires_events != results)
         return false if plurality and (results.size != plurality)
         
         true
       end
       
-      def clear_AFFIX_fired
-        @AFFIX_wires_events.clear
+      def clear_fired
+        @wires_events.clear
       end
       
-      def AFFIX_wires_test_channel_from_kwargs **kwargs
+      def wires_test_channel_from_kwargs **kwargs
         # Get channel_name from keyword arguments
         channel_name = \
           kwargs.has_key?(:channel_name) ?
@@ -90,7 +87,7 @@ module Wires
 end
 
 
-shared_context "with AFFIX wires", :AFFIX_wires=>true do
+shared_context "with wires", :wires=>true do
   unless ancestors.include? Wires::Convenience
     include Wires::Convenience
   end
@@ -98,52 +95,75 @@ shared_context "with AFFIX wires", :AFFIX_wires=>true do
   unless ancestors.include? Wires::Test::Helper
     include Wires::Test::Helper
     around do |example|
-      AFFIX_wires_test_setup
+      wires_test_setup
       example.run
-      AFFIX_wires_test_teardown
+      wires_test_teardown
     end
   end
   
   extend Wires::Test::RSpec::ExampleGroupMethods
 end
 
-shared_context "with AFFIX wires stimulus" do |event, **kwargs|
-  include_context "with AFFIX wires"
+shared_context "with wires stimulus" do |event, **kwargs|
+  include_context "with wires"
   
   before do
-    channel_obj = AFFIX_wires_test_channel_from_kwargs **kwargs
+    channel_obj = wires_test_channel_from_kwargs **kwargs
     channel_obj.fire event, blocking:true
   end
 end
 
 
-::RSpec::Matchers.define :have_AFFIX_fired do
-  match do |_|
-    *args, fulfilling = process_expected(*expected)
-    AFFIX_fired? *args, &fulfilling
+::RSpec::Matchers.define :have_fired do |*args|
+  def where(&block)
+    raise ArgumentError, "No block passed to #should have_fired(...).where; "\
+                         "be sure to use {} instead of do/end so that the "\
+                         "block binds syntactically to #where instead of "\
+                         "binding to #should." if block.nil?
+    @fulfilling_block = proc{|*args| block.call(*args); true}
+    self
+  end
+  
+  def fulfilling(&block)
+    raise ArgumentError, "No block passed to #should have_fired(...).fulfilling; "\
+                         "be sure to use {} instead of do/end so that the "\
+                         "block binds syntactically to #fulfilling instead of "\
+                         "binding to #should." if block.nil?
+    @fulfilling_block = block
+    self
+  end
+  
+  def once;      exactly(1).times;  self end
+  def twice;     exactly(2).times;  self end
+  def exactly(n) @plurality = n;    self end
+  def times; @use_plurality = true; self end
+  
+  match do
+    plur = @use_plurality ? @plurality : nil
+    fired? *args, plurality:plur, &@fulfilling_block
   end
   
   description do
-    event, channel, _ = process_expected(*expected)
+    event, channel, *rest = args
     
     str = "have fired #{event.inspect}"
     str += " on #{channel.inspect}" if channel
     str
   end
   
-  failure_message_for_should do |*args, &blk|
+  failure_message_for_should do
+    "expected to #{description}\n"+
     "received: \n  #{actual_events.map(&:inspect).join("\n  ")}"
   end
   
-  failure_message_for_should_not do |*args, &blk|
+  failure_message_for_should_not do
+    "expected not to #{description}\n"+
     "received: \n  #{actual_events.map(&:inspect).join("\n  ")}"
   end
   
   def actual_events
-    matcher_execution_context.instance_variable_get :@AFFIX_wires_events
+    matcher_execution_context.instance_variable_get :@wires_events
   end
-  
-  def process_expected(*args, fulfilling:nil); [*args, fulfilling] end
 end
 
 
@@ -152,27 +172,35 @@ module Wires
     module RSpec
       module ExampleGroupMethods
       
-        def with_AFFIX_stimulus(event, **kwargs, &block)
-          context "(with AFFIX stimulus #{event.inspect})" do
-            include_context "with AFFIX wires stimulus", event, **kwargs
+        def with_stimulus(event, **kwargs, &block)
+          context "(with stimulus #{event.inspect})" do
+            include_context "with wires stimulus", event, **kwargs
             instance_eval &block
           end
         end
         
-        def it_AFFIX_fires(event, **kwargs, &block)
+        def it_fires(event, **kwargs, &block)
           context "fires #{event.inspect}" do
             specify do
-              channel_obj = AFFIX_wires_test_channel_from_kwargs **kwargs
-              should have_AFFIX_fired event, channel_obj, fulfilling:block
+              channel_obj = wires_test_channel_from_kwargs **kwargs
+              if block.nil?
+                should have_fired(event, channel_obj)
+              else
+                should have_fired(event, channel_obj).fulfilling(&block)
+              end
             end
           end
         end
         
-        def it_AFFIX_fires_no(event, **kwargs, &block)
+        def it_fires_no(event, **kwargs, &block)
           context "fires no #{event.inspect}" do
             specify do
-              channel_obj = AFFIX_wires_test_channel_from_kwargs **kwargs
-              should_not have_AFFIX_fired event, channel_obj, fulfilling:block
+              channel_obj = wires_test_channel_from_kwargs **kwargs
+              if block.nil?
+                should_not have_fired(event, channel_obj)
+              else
+                should_not have_fired(event, channel_obj).fulfilling(&block)
+              end
             end
           end
         end
@@ -181,33 +209,3 @@ module Wires
     end
   end
 end
-
--END OF IMPLEMENTATION
-.gsub(/AFFIX[_ ]/, "")    # Remove all AFFIX markers (see Wires::Test.build_alt)
-.tap { |code| eval code } # Eval the cleaned code in 
-
-
-
-module Wires
-  module Test
-    # Build an alternate version of Test 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 ? affix.to_s+'_' : ''
-      
-      [__FILE__] # List of files to mutate and eval
-        .map  { |file| File.read file }
-        .each do |code|
-          
-          code =~ /(?<='-END OF IMPLEMENTATION').*?(?=-END OF IMPLEMENTATION)/m
-          code = $&
-
-          code.gsub! /Wires/, "#{wires_module_path}"
-          code.gsub! /AFFIX[_ ]/, affix
-          
-          eval code
-        end
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires-test
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wires
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/wires/test.rb
 - LICENSE
+- lib/wires/test.rb
 homepage: https://github.com/jemc/wires-test/
 licenses:
 - Copyright 2013 Joe McIlvain. All rights reserved.
@@ -94,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: wires-test
 test_files: []
-has_rdoc: