surrogate 0.5.0 → 0.5.1

data/Readme.md

@@ -5,6 +5,14 @@ Handrolling mocks is the best, but involves more overhead than necessary, and us
 error messages. Surrogate addresses this by endowing your objects with common things that most mocks need.
 Currently it is only integrated with RSpec.
 
+This codebase should be considered highly volatile until 1.0 release. The outer interface should be
+fairly stable, with each 0.a.b version having backwards compatibility for any changes to b (ie
+only refactorings and new features), and possible interface changes (though probably minimal)
+for changes to a. Depending on the internals of the code (anything not shown in the readme) is
+discouraged at this time. If you do want to do this (e.g. to make an interface for test/unit)
+let me know, and I'll inform you / fork your gem and help update it, for any breaking changes
+that I introduce.
+
 
 Features
 ========
@@ -250,6 +258,27 @@ user.should have_been_initialized_with 12
 ```
 
 
+Predicates
+----------
+
+Query qith `have_been_asked_if`, all the same chainable methods from above apply.
+
+```ruby
+class MockUser
+  Surrogate.endow self
+  define(:admin?) { false }
+end
+
+user = MockUser.new
+user.should_not be_admin
+user.will_have_admin? true
+user.should be_admin
+user.should have_been_asked_if(:admin?).times(2)
+```
+
+
+class MockUser
+
 Substitutability
 ----------------
 
@@ -394,11 +423,9 @@ TODO
 ----
 
 * Add proper failure messages for block invocations
-* Add `was told_to` syntax
-* Add support for predicates
 * Add a better explanation for motivations
 * Figure out whether I'm supposed to be using clone or dup for the object -.^ (looks like there may also be an `initialize_copy` method I can take advantage of instead of crazy stupid shit I'm doing now)
-* don't blow up when delegating to the Object#initialize with args
+* don't blow up when delegating to the Object#initialize with args (do I still want this, or do I want to force arity matching (and maybe even variable name matching)?)
 * config: rspec_mocks loaded, whether unprepared blocks should raise or just return nil
 * extract surrogate/rspec into its own gem
 * support subset-substitutabilty not being able to touch real methods (e.g. #respond_to?)

data/lib/surrogate/endower.rb

@@ -5,6 +5,14 @@ class Surrogate
   # please refactor me! ...may not be possible :(
   # Can we move all method definitions into this class?
   class Endower
+    def self.add_hook(&block)
+      hooks << block
+    end
+
+    def self.hooks
+      @hooks ||= []
+    end
+
     def self.endow(klass, &block)
       new(klass, &block).endow
     end
@@ -28,6 +36,7 @@ class Surrogate
       enable_defining_methods                klass
       record_initialization_for_instances_of klass
       remember_invocations_for_instances_of  klass
+      invoke_hooks                           klass
     end
 
     def endow_singleton_class
@@ -36,9 +45,14 @@ class Surrogate
       singleton.module_eval &block if block
       klass.instance_variable_set :@hatchling, Hatchling.new(klass, hatchery)
       remember_invocations_for_instances_of  singleton
+      invoke_hooks                           singleton
       klass
     end
 
+    def invoke_hooks(klass)
+      self.class.hooks.each { |hook| hook.call klass }
+    end
+
     # yeesh :( pretty sure there isn't a better way to do this
     def record_initialization_for_instances_of(klass)
       def klass.method_added(meth)

data/lib/surrogate/rspec/have_been_asked_if.rb

@@ -0,0 +1,71 @@
+require 'surrogate/rspec/invocation_matcher'
+
+class Surrogate
+  module RSpec
+    class HaveBeenAskedIf < InvocationMatcher
+      class FailureMessageShouldDefault < AbstractFailureMessage
+        def get_message
+          "was never asked if #{ method_name }"
+        end
+      end
+
+      class FailureMessageShouldWith < AbstractFailureMessage
+        def get_message
+          message = "should have been asked if #{ method_name } with #{ inspect_arguments expected_invocation }, but "
+          if times_invoked.zero?
+            message << "was never asked"
+          else
+            inspected_invocations = invocations.map { |invocation| inspect_arguments invocation }
+            message << "got #{inspected_invocations.join ', '}"
+          end
+        end
+      end
+
+      class FailureMessageShouldTimes < AbstractFailureMessage
+        def get_message
+          "should have been asked if #{ method_name } #{ times_msg expected_times_invoked }, but was asked #{ times_msg times_invoked }"
+        end
+      end
+
+      class FailureMessageWithTimes < AbstractFailureMessage
+        def get_message
+          message = "should have been asked if #{ method_name } #{ times_msg expected_times_invoked } with #{ inspect_arguments expected_invocation }, but "
+          if times_invoked.zero?
+            message << "was never asked"
+          else
+            message << "was asked #{times_msg times_invoked}"
+          end
+        end
+      end
+
+      class FailureMessageShouldNotDefault < AbstractFailureMessage
+        def get_message
+          "shouldn't have been asked if #{ method_name }, but was asked #{ times_msg times_invoked }"
+        end
+      end
+
+      class FailureMessageShouldNotWith < AbstractFailureMessage
+        def get_message
+          message = "should not have been asked if #{ method_name } with #{ inspect_arguments expected_invocation }"
+        end
+      end
+
+      class FailureMessageShouldNotTimes < AbstractFailureMessage
+        def get_message
+          "shouldn't have been asked if #{ method_name } #{ times_msg expected_times_invoked }, but was"
+        end
+      end
+
+      class FailureMessageShouldNotWithTimes < AbstractFailureMessage
+        def get_message
+          message = "should not have been asked if #{ method_name } #{ times_msg expected_times_invoked } with #{ inspect_arguments expected_invocation }, "
+          if times_invoked.zero?
+             message << "was never asked"
+          else
+            message << "was asked #{times_msg times_invoked}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/surrogate/rspec.rb

@@ -1,5 +1,8 @@
 # Maybe I should be my own gem?
 
+require 'rspec/core'
+require 'surrogate'
+
 class Surrogate
   module RSpec
     class << self
@@ -19,25 +22,50 @@ class Surrogate
     end
 
     module Matchers
-      def have_been_told_to(expected)
-        HaveBeenToldTo.new expected
+      def have_been_told_to(method_name)
+        HaveBeenToldTo.new method_name
+      end
+
+      def told_to(method_name)
+        HaveBeenToldTo.new method_name
+      end
+
+      def have_been_asked_if(method_name)
+        HaveBeenAskedIf.new method_name
+      end
+
+      def asked_if(method_name)
+        HaveBeenAskedIf.new method_name
+      end
+
+      def have_been_asked_for_its(method_name)
+        HaveBeenAskedForIts.new method_name
       end
 
-      def have_been_asked_for_its(expected)
-        HaveBeenAskedForIts.new expected
+      def asked_for(method_name)
+        HaveBeenAskedForIts.new method_name
       end
 
       def have_been_initialized_with(*initialization_args, &block)
         HaveBeenInitializedWith.new *initialization_args, &block
       end
+
+      def initialized_with(*initialization_args, &block)
+        HaveBeenInitializedWith.new *initialization_args, &block
+      end
+    end
+  end
+
+  Endower.add_hook do |klass|
+    klass.class_eval do
+      alias was should
+      alias was_not should_not
     end
   end
 end
 
-require 'rspec/core'
-require 'surrogate'
 require 'surrogate/rspec/substitute_for'
-
+require 'surrogate/rspec/have_been_asked_if'
 require 'surrogate/rspec/have_been_asked_for_its'
 require 'surrogate/rspec/have_been_initialized_with'
 require 'surrogate/rspec/have_been_told_to'

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/rspec/{have_been_initialized_with_spec.rb → matchers_for_initialization_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'RSpec matchers', 'have_been_initialized_with' do
+describe 'should/should_not have_been_initialized_with' do
   let(:mocked_class) { Surrogate.endow Class.new }
   before { mocked_class.module_eval { def initialize(*) end } } # b/c 1.9.3 will have arity issues otherwise
 
@@ -27,3 +27,31 @@ describe 'RSpec matchers', 'have_been_initialized_with' do
       failure_message_for { mocked_class.new("1").should_not have_been_told_to(:initialize).with('1') }
   end
 end
+
+describe 'was/was_not initialized_with' do
+  let(:mocked_class) { Surrogate.endow Class.new }
+  before { mocked_class.module_eval { def initialize(*) end } } # b/c 1.9.3 will have arity issues otherwise
+
+  it 'is the same as have_been_told_to(:initialize).with(...)' do
+    mocked_class.new.was initialized_with no_args
+    mocked_class.new.was_not initialized_with 1
+    mocked_class.new(1).was initialized_with 1
+    mocked_class.new(1, '2').was initialized_with 1, '2'
+  end
+
+  def failure_message_for
+    yield
+  rescue RSpec::Expectations::ExpectationNotMetError
+    $!.message
+  end
+
+  example 'failure message for should' do
+    failure_message_for { mocked_class.new("1").was initialized_with 2 }.should ==
+      failure_message_for { mocked_class.new("1").was told_to(:initialize).with(2) }
+  end
+
+  example 'failure message for should not' do
+    failure_message_for { mocked_class.new("1").was_not initialized_with('1') }.should ==
+      failure_message_for { mocked_class.new("1").was_not told_to(:initialize).with('1') }
+  end
+end

data/spec/rspec/{have_been_asked_for_its_spec.rb → matchers_for_nouns_spec.rb}

@@ -1,32 +1,48 @@
 require 'spec_helper'
 
-describe 'RSpec matchers', 'have_been_asked_for_its' do
+shared_examples_for 'a noun matcher' do
   let(:mocked_class) { Surrogate.endow Class.new }
   let(:instance) { mocked_class.new }
 
+  def did_ask(argument, modifiers={})
+    assert!(positive_assertion, argument, modifiers)
+  end
+
+  def did_not_ask(argument, modifiers={})
+    assert!(negative_assertion, argument, modifiers)
+  end
+
+  def assert!(assertion, argument, modifiers)
+    matcher = send(matcher_name, argument)
+    matcher.send(:with, *modifiers[:with]) if modifiers.has_key? :with
+    matcher.send(:times, modifiers[:times]) if modifiers.has_key? :times
+    instance.send(assertion, matcher)
+  end
+
+
   describe 'default use case' do
     before { mocked_class.define :name, default: 'Ayaan' }
 
     example 'passes if has been invoked at least once' do
-      instance.should_not have_been_asked_for_its :name
+      did_not_ask :name
       instance.name
-      instance.should have_been_asked_for_its :name
+      did_ask :name
       instance.name
-      instance.should have_been_asked_for_its :name
+      did_ask :name
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_asked_for_its :name }.to \
+      expect { did_ask :name }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /was never asked for its name/)
     end
 
     example 'failure message for should not' do
       instance.name
-      expect { instance.should_not have_been_asked_for_its :name }.to \
+      expect { did_not_ask :name }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked for its name, but was asked 1 time/)
 
       instance.name
-      expect { instance.should_not have_been_asked_for_its :name }.to \
+      expect { did_not_ask :name }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked for its name, but was asked 2 times/)
     end
   end
@@ -36,41 +52,41 @@ describe 'RSpec matchers', 'have_been_asked_for_its' do
     before { mocked_class.define :size, default: nil }
 
     example 'default use case' do
-      instance.should_not have_been_asked_for_its(:size).with(1, 2, 3)
+      did_not_ask :size, with: [1, 2, 3]
       instance.size 1, 2
-      instance.should_not have_been_asked_for_its(:size).with(1, 2, 3)
+      did_not_ask :size, with: [1, 2, 3]
       instance.size 1, 2, 3
-      instance.should have_been_asked_for_its(:size).with(1, 2, 3)
+      did_ask :size, with: [1, 2, 3]
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_asked_for_its(:size).with(1, '2') }.to \
+      expect { did_ask :size, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its size with `1, "2"', but was never asked/)
 
       instance.size 3
       instance.size 4, '5'
-      expect { instance.should have_been_asked_for_its(:size).with(1, '2') }.to \
+      expect { did_ask :size, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its size with `1, "2"', but got `3', `4, "5"'/)
     end
 
     example 'failure message for should not' do
       instance.size 1, '2'
-      expect { instance.should_not have_been_asked_for_its(:size).with(1, '2') }.to \
+      expect { did_not_ask :size, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been asked for its size with `1, "2"'/)
     end
 
     describe 'integration with rspec argument_matchers' do
       it 'works with rspec matchers' do
-        instance.should_not have_been_asked_for_its(:size).with(no_args)
+        did_not_ask :size, with: [no_args]
         instance.size(1)
-        instance.should_not have_been_asked_for_its(:size).with(no_args)
+        did_not_ask :size, with: [no_args]
         instance.size
-        instance.should have_been_asked_for_its(:size).with(no_args)
+        did_ask :size, with: [no_args]
 
-        instance.should_not have_been_asked_for_its(:size).with(hash_including all: true)
+        did_not_ask :size, with: [hash_including(all: true)]
         instance.size any: false, all: true
-        instance.should have_been_asked_for_its(:size).with(hash_including all: true)
-        instance.should_not have_been_asked_for_its(:size).with(hash_including all: false)
+        did_ask     :size, with: [hash_including(all: true)]
+        did_not_ask :size, with: [hash_including(all: false)]
       end
     end
   end
@@ -80,28 +96,28 @@ describe 'RSpec matchers', 'have_been_asked_for_its' do
     before { mocked_class.define :value, default: nil }
 
     example 'default use case' do
-      instance.should have_been_asked_for_its(:value).times(0)
+      did_ask :value, times: 0
       instance.value
-      instance.should have_been_asked_for_its(:value).times(1)
+      did_ask :value, times: 1
       instance.value
-      instance.should have_been_asked_for_its(:value).times(2)
+      did_ask :value, times: 2
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_asked_for_its(:value).times(1) }.to \
+      expect { did_ask :value, times: 1 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its value 1 time, but was asked 0 times/)
 
       instance.value
-      expect { instance.should have_been_asked_for_its(:value).times(2) }.to \
+      expect { did_ask :value, times: 2 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its value 2 times, but was asked 1 time/)
     end
 
     example 'failure message for should not' do
-      expect { instance.should_not have_been_asked_for_its(:value).times(0) }.to \
+      expect { did_not_ask :value, times: 0 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked for its value 0 times, but was/)
 
       instance.value
-      expect { instance.should_not have_been_asked_for_its(:value).times(1) }.to \
+      expect { did_not_ask :value, times: 1 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked for its value 1 time, but was/)
     end
   end
@@ -110,39 +126,56 @@ describe 'RSpec matchers', 'have_been_asked_for_its' do
     before { mocked_class.define :value, default: nil }
 
     example 'default use case' do
-      instance.should have_been_asked_for_its(:value).times(0).with(1, '2')
-      instance.should_not have_been_asked_for_its(:value).times(1).with(1, '2')
+      did_ask     :value, times: 0, with: [1, '2']
+      did_not_ask :value, times: 1, with: [1, '2']
       instance.value
-      instance.should have_been_asked_for_its(:value).times(0).with(1, '2')
-      instance.should_not have_been_asked_for_its(:value).times(1).with(1, '2')
+      did_ask     :value, times: 0, with: [1, '2']
+      did_not_ask :value, times: 1, with: [1, '2']
+
       instance.value 1, '2'
-      instance.should have_been_asked_for_its(:value).times(1).with(1, '2')
+      did_ask     :value, times: 1, with: [1, '2']
       instance.value 1, '2' # correct one
       instance.value 1, '3'
       instance.value 2, '2'
       instance.value 1, '2', 3
-      instance.should have_been_asked_for_its(:value).times(2).with(1, '2')
-      instance.should have_been_asked_for_its(:value).with(1, '2').times(2)
+      instance.send positive_assertion, send(matcher_name, :value).times(2).with(1, '2')
+      instance.send positive_assertion, send(matcher_name, :value).with(1, '2').times(2)
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_asked_for_its(:value).times(1).with(1, '2') }.to \
+      expect { did_ask :value, times: 1, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its value 1 time with `1, "2"', but was never asked/)
 
       instance.value 1, '2'
-      expect { instance.should have_been_asked_for_its(:value).times(0).with(1, '2') }.to \
+      expect { did_ask :value, times: 0, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its value 0 times with `1, "2"', but was asked 1 time/)
 
       instance.value 1, '2'
-      expect { instance.should have_been_asked_for_its(:value).times(1).with(1, '2') }.to \
+      expect { did_ask :value, times: 1, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked for its value 1 time with `1, "2"', but was asked 2 times/)
     end
 
     example 'failure message for should not' do
       instance.value 1, '2'
       instance.value 1, '2'
-      expect { instance.should_not have_been_asked_for_its(:value).times(2).with(1, '2') }.to \
+      expect { did_not_ask :value, times: 2, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been asked for its value 2 times with `1, "2"'/)
     end
   end
 end
+
+describe 'should/should_not have_been_asked_for_its' do
+  let(:positive_assertion) { :should }
+  let(:negative_assertion) { :should_not }
+  let(:matcher_name)       { :have_been_asked_for_its }
+
+  it_behaves_like 'a noun matcher'
+end
+
+describe 'was/was_not asked_for' do
+  let(:positive_assertion) { :was }
+  let(:negative_assertion) { :was_not }
+  let(:matcher_name)       { :asked_for }
+
+  it_behaves_like 'a noun matcher'
+end

data/spec/rspec/matchers_for_predicates_spec.rb

@@ -0,0 +1,175 @@
+require 'spec_helper'
+
+shared_examples_for 'a predicate matcher' do
+  let(:mocked_class) { Surrogate.endow(Class.new).define :changed?, default: false }
+  let(:instance) { mocked_class.new }
+
+  def did_ask(argument, modifiers={})
+    assert!(positive_assertion, argument, modifiers)
+  end
+
+  def did_not_ask(argument, modifiers={})
+    assert!(negative_assertion, argument, modifiers)
+  end
+
+  def assert!(assertion, argument, modifiers)
+    matcher = send(matcher_name, argument)
+    matcher.send(:with, *modifiers[:with]) if modifiers.has_key? :with
+    matcher.send(:times, modifiers[:times]) if modifiers.has_key? :times
+    instance.send(assertion, matcher)
+  end
+
+  describe 'default use case' do
+    example 'passes if has been invoked at least once' do
+      did_not_ask :changed?
+      instance.changed?
+      did_ask :changed?
+      instance.changed?
+      did_ask :changed?
+    end
+
+    example 'failure message for should' do
+      expect { did_ask :changed? }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /was never asked if changed?/)
+    end
+
+    example 'failure message for should not' do
+      instance.changed?
+      expect { did_not_ask :changed? }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked if changed\?, but was asked 1 time/)
+
+      instance.changed?
+      expect { did_not_ask :changed? }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked if changed\?, but was asked 2 times/)
+    end
+  end
+
+
+  describe 'specifying which arguments it should have been invoked with' do
+
+    example 'default use case' do
+      did_not_ask :changed?, with: [1, 2, 3]
+      instance.changed? 1, 2
+      did_not_ask :changed?, with: [1, 2, 3]
+      instance.changed? 1, 2, 3
+      did_ask :changed?, with: [1, 2, 3]
+    end
+
+    example 'failure message for should' do
+      expect { did_ask :changed?, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? with `1, "2"', but was never asked/)
+
+      instance.changed? 3
+      instance.changed? 4, '5'
+      expect { did_ask :changed?, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? with `1, "2"', but got `3', `4, "5"'/)
+    end
+
+    example 'failure message for should not' do
+      instance.changed? 1, '2'
+      expect { did_not_ask :changed?, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been asked if changed\? with `1, "2"'/)
+    end
+
+    describe 'integration with rspec argument_matchers' do
+      it 'works with rspec matchers' do
+        did_not_ask :changed?, with: [no_args]
+        instance.changed?(1)
+        did_not_ask :changed?, with: [no_args]
+        instance.changed?
+        did_ask     :changed?, with: [no_args]
+
+        did_not_ask :changed?, with: [hash_including(all: true)]
+        instance.changed? any: false, all: true
+        did_ask     :changed?, with: [hash_including(all: true)]
+        did_not_ask :changed?, with: [hash_including(all: false)]
+      end
+    end
+  end
+
+
+  describe 'specifying number of times invoked' do
+
+    example 'default use case' do
+      did_ask :changed?, times: 0
+      instance.changed?
+      did_ask :changed?, times: 1
+      instance.changed?
+      did_ask :changed?, times: 2
+    end
+
+    example 'failure message for should' do
+      expect { did_ask :changed?, times: 1 }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? 1 time, but was asked 0 times/)
+
+      instance.changed?
+      expect { did_ask :changed?, times: 2 }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? 2 times, but was asked 1 time/)
+    end
+
+    example 'failure message for should not' do
+      expect { did_not_ask :changed?, times: 0 }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked if changed\? 0 times, but was/)
+
+      instance.changed?
+      expect { did_not_ask :changed?, times: 1 }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been asked if changed\? 1 time, but was/)
+    end
+  end
+
+  describe 'conjunction of with(args) and times(n)' do
+
+    example 'default use case' do
+      did_ask     :changed?, times: 0, with: [1, '2']
+      did_not_ask :changed?, times: 1, with: [1, '2']
+      instance.changed?
+      did_ask     :changed?, times: 0, with: [1, '2']
+      did_not_ask :changed?, times: 1, with: [1, '2']
+      instance.changed? 1, '2'
+      did_ask     :changed?, times: 1, with: [1, '2']
+      instance.changed? 1, '2' # correct one
+      instance.changed? 1, '3'
+      instance.changed? 2, '2'
+      instance.changed? 1, '2', 3
+      instance.send positive_assertion, send(matcher_name, :changed?).times(2).with(1, '2')
+      instance.send positive_assertion, send(matcher_name, :changed?).with(1, '2').times(2)
+    end
+
+    example 'failure message for should' do
+      expect { did_ask :changed?, times: 1, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? 1 time with `1, "2"', but was never asked/)
+
+      instance.changed? 1, '2'
+      expect { did_ask :changed?, times: 0, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? 0 times with `1, "2"', but was asked 1 time/)
+
+      instance.changed? 1, '2'
+      expect { did_ask :changed?, times: 1, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been asked if changed\? 1 time with `1, "2"', but was asked 2 times/)
+    end
+
+    example 'failure message for should not' do
+      instance.changed? 1, '2'
+      instance.changed? 1, '2'
+      expect { did_not_ask :changed?, times: 2, with: [1, '2'] }.to \
+        raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been asked if changed\? 2 times with `1, "2"'/)
+    end
+  end
+end
+
+describe 'should/should_not have_been_asked_if' do
+  let(:positive_assertion) { :should }
+  let(:negative_assertion) { :should_not }
+  let(:matcher_name)       { :have_been_asked_if }
+
+  it_behaves_like 'a predicate matcher'
+end
+
+describe 'was/was_not asked_if' do
+  let(:positive_assertion) { :was }
+  let(:negative_assertion) { :was_not }
+  let(:matcher_name)       { :asked_if }
+
+  it_behaves_like 'a predicate matcher'
+end
+

data/spec/rspec/{have_been_told_to_spec.rb → matchers_for_verbs_spec.rb}

@@ -1,32 +1,48 @@
 require 'spec_helper'
 
-describe 'RSpec matchers', 'have_been_told_to' do
+shared_examples_for 'a verb matcher' do
+
   let(:mocked_class) { Surrogate.endow Class.new }
   let(:instance) { mocked_class.new }
 
+  def did(argument, modifiers={})
+    assert!(positive_assertion, argument, modifiers)
+  end
+
+  def did_not(argument, modifiers={})
+    assert!(negative_assertion, argument, modifiers)
+  end
+
+  def assert!(assertion, argument, modifiers)
+    matcher = send(matcher_name, argument)
+    matcher.send(:with, *modifiers[:with]) if modifiers.has_key? :with
+    matcher.send(:times, modifiers[:times]) if modifiers.has_key? :times
+    instance.send(assertion, matcher)
+  end
+
   describe 'default use case' do
     before { mocked_class.define :kick, default: [] }
 
     example 'passes if has been invoked at least once' do
-      instance.should_not have_been_told_to :kick
+      did_not :kick
       instance.kick
-      instance.should have_been_told_to :kick
+      did :kick
       instance.kick
-      instance.should have_been_told_to :kick
+      did :kick
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_told_to :kick }.to \
+      expect { did :kick }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /was never told to kick/)
     end
 
     example 'failure message for should not' do
       instance.kick
-      expect { instance.should_not have_been_told_to :kick }.to \
+      expect { did_not :kick }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been told to kick, but was told to kick 1 time/)
 
       instance.kick
-      expect { instance.should_not have_been_told_to :kick }.to \
+      expect { did_not :kick }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been told to kick, but was told to kick 2 times/)
     end
   end
@@ -36,26 +52,26 @@ describe 'RSpec matchers', 'have_been_told_to' do
     before { mocked_class.define :smile, default: nil }
 
     example 'default use case' do
-      instance.should_not have_been_told_to(:smile).with(1, 2, 3)
+      did_not :smile, with: [1,2,3]
       instance.smile 1, 2
-      instance.should_not have_been_told_to(:smile).with(1, 2, 3)
+      did_not :smile, with: [1,2,3]
       instance.smile 1, 2, 3
-      instance.should have_been_told_to(:smile).with(1, 2, 3)
+      did :smile, with: [1,2,3]
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_told_to(:smile).with(1, '2') }.to \
+      expect { did :smile, with: [1,'2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to smile with `1, "2"', but was never told to/)
 
       instance.smile 3
       instance.smile 4, '5'
-      expect { instance.should have_been_told_to(:smile).with(1, '2') }.to \
+      expect { did :smile, with: [1,'2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to smile with `1, "2"', but got `3', `4, "5"'/)
     end
 
     example 'failure message for should not' do
       instance.smile 1, '2'
-      expect { instance.should_not have_been_told_to(:smile).with(1, '2') }.to \
+      expect { did_not :smile, with: [1,'2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been told to smile with `1, "2"'/)
     end
   end
@@ -65,28 +81,28 @@ describe 'RSpec matchers', 'have_been_told_to' do
     before { mocked_class.define :wink, default: nil }
 
     example 'default use case' do
-      instance.should have_been_told_to(:wink).times(0)
+      did :wink, times: 0
       instance.wink
-      instance.should have_been_told_to(:wink).times(1)
+      did :wink, times: 1
       instance.wink
-      instance.should have_been_told_to(:wink).times(2)
+      did :wink, times: 2
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_told_to(:wink).times(1) }.to \
+      expect { did :wink, times: 1 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to wink 1 time but was told to wink 0 times/)
 
       instance.wink
-      expect { instance.should have_been_told_to(:wink).times(2) }.to \
+      expect { did :wink, times: 2 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to wink 2 times but was told to wink 1 time/)
     end
 
     example 'failure message for should not' do
-      expect { instance.should_not have_been_told_to(:wink).times(0) }.to \
+      expect { did_not :wink, times: 0 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been told to wink 0 times, but was/)
 
       instance.wink
-      expect { instance.should_not have_been_told_to(:wink).times(1) }.to \
+      expect { did_not :wink, times: 1 }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /shouldn't have been told to wink 1 time, but was/)
     end
   end
@@ -95,39 +111,56 @@ describe 'RSpec matchers', 'have_been_told_to' do
     before { mocked_class.define :wink, default: nil }
 
     example 'default use case' do
-      instance.should have_been_told_to(:wink).times(0).with(1, '2')
-      instance.should_not have_been_told_to(:wink).times(1).with(1, '2')
+      did     :wink, times: 0, with: [1, '2']
+      did_not :wink, times: 1, with: [1, '2']
       instance.wink
-      instance.should have_been_told_to(:wink).times(0).with(1, '2')
-      instance.should_not have_been_told_to(:wink).times(1).with(1, '2')
+      did     :wink, times: 0, with: [1, '2']
+      did_not :wink, times: 1, with: [1, '2']
       instance.wink 1, '2'
-      instance.should have_been_told_to(:wink).times(1).with(1, '2')
+      did     :wink, times: 1, with: [1, '2']
       instance.wink 1, '2' # correct one
       instance.wink 1, '3'
       instance.wink 2, '2'
       instance.wink 1, '2', 3
-      instance.should have_been_told_to(:wink).times(2).with(1, '2')
-      instance.should have_been_told_to(:wink).with(1, '2').times(2)
+      instance.send positive_assertion, send(matcher_name, :wink).times(2).with(1, '2')
+      instance.send positive_assertion, send(matcher_name, :wink).with(1, '2').times(2)
     end
 
     example 'failure message for should' do
-      expect { instance.should have_been_told_to(:wink).times(1).with(1, '2') }.to \
+      expect { did :wink, times: 1, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to wink 1 time with `1, "2"', but was never told to/)
 
       instance.wink 1, '2'
-      expect { instance.should have_been_told_to(:wink).times(0).with(1, '2') }.to \
+      expect { did :wink, times: 0, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to wink 0 times with `1, "2"', but got it 1 time/)
 
       instance.wink 1, '2'
-      expect { instance.should have_been_told_to(:wink).times(1).with(1, '2') }.to \
+      expect { did :wink, times: 1, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should have been told to wink 1 time with `1, "2"', but got it 2 times/)
     end
 
     example 'failure message for should not' do
       instance.wink 1, '2'
       instance.wink 1, '2'
-      expect { instance.should_not have_been_told_to(:wink).times(2).with(1, '2') }.to \
+      expect { did_not :wink, times: 2, with: [1, '2'] }.to \
         raise_error(RSpec::Expectations::ExpectationNotMetError, /should not have been told to wink 2 times with `1, "2"'/)
     end
   end
 end
+
+
+describe 'should/should_not have_been_told_to' do
+  let(:positive_assertion) { :should }
+  let(:negative_assertion) { :should_not }
+  let(:matcher_name)       { :have_been_told_to }
+
+  it_behaves_like 'a verb matcher'
+end
+
+describe 'was/was_not told_to' do
+  let(:positive_assertion) { :was }
+  let(:negative_assertion) { :was_not }
+  let(:matcher_name)       { :told_to }
+
+  it_behaves_like 'a verb matcher'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindable_block
-  requirement: &70339421986340 !ruby/object:Gem::Requirement
+  requirement: &70359043120580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70339421986340
+  version_requirements: *70359043120580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339421985140 !ruby/object:Gem::Requirement
+  requirement: &70359043118940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70339421985140
+  version_requirements: *70359043118940
 description: Framework to aid in handrolling mock/spy objects.
 email:
 - josh.cheek@gmail.com
@@ -55,6 +55,7 @@ files:
 - lib/surrogate/rspec.rb
 - lib/surrogate/rspec/abstract_failure_message.rb
 - lib/surrogate/rspec/have_been_asked_for_its.rb
+- lib/surrogate/rspec/have_been_asked_if.rb
 - lib/surrogate/rspec/have_been_initialized_with.rb
 - lib/surrogate/rspec/have_been_told_to.rb
 - lib/surrogate/rspec/invocation_matcher.rb
@@ -66,9 +67,10 @@ files:
 - spec/acceptance_spec.rb
 - spec/defining_api_methods_spec.rb
 - spec/rspec/block_support_spec.rb
-- spec/rspec/have_been_asked_for_its_spec.rb
-- spec/rspec/have_been_initialized_with_spec.rb
-- spec/rspec/have_been_told_to_spec.rb
+- spec/rspec/matchers_for_initialization_spec.rb
+- spec/rspec/matchers_for_nouns_spec.rb
+- spec/rspec/matchers_for_predicates_spec.rb
+- spec/rspec/matchers_for_verbs_spec.rb
 - spec/rspec/messages_spec.rb
 - spec/rspec/rspec_mocks_integration_spec.rb
 - spec/rspec/substitute_for_spec.rb
@@ -103,9 +105,10 @@ test_files:
 - spec/acceptance_spec.rb
 - spec/defining_api_methods_spec.rb
 - spec/rspec/block_support_spec.rb
-- spec/rspec/have_been_asked_for_its_spec.rb
-- spec/rspec/have_been_initialized_with_spec.rb
-- spec/rspec/have_been_told_to_spec.rb
+- spec/rspec/matchers_for_initialization_spec.rb
+- spec/rspec/matchers_for_nouns_spec.rb
+- spec/rspec/matchers_for_predicates_spec.rb
+- spec/rspec/matchers_for_verbs_spec.rb
 - spec/rspec/messages_spec.rb
 - spec/rspec/rspec_mocks_integration_spec.rb
 - spec/rspec/substitute_for_spec.rb