surrogate 0.5.2 → 0.5.3

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*

data/.travis.yml

@@ -1,4 +1,8 @@
-nguage: ruby
+language: ruby
 rvm:
   - 1.9.3
 script: "bundle exec rake"
+gemfile:
+  - Gemfile
+  - gemfiles/rspec_mocks_2.2
+  - gemfiles/rspec_mocks_2.10

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in cobbler.gemspec
 gemspec
+
+gem "rspec", "~> 2.2", group: :development

data/Readme.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/JoshCheek/surrogate.png?branch=master)](http://travis-ci.org/JoshCheek/surrogate)
+
 
 
 About
@@ -446,7 +448,6 @@ TODO
 ----
 
 * Remove dependency on all of RSpec and only depend on rspec-core, then have AC tests for the other shit
-* Move surrogates to be first class and defined in the classes that use them.
 * Add proper failure messages for block invocations
 * 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)

data/Readme.md.mountain_berry_fields

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/JoshCheek/surrogate.png?branch=master)](http://travis-ci.org/JoshCheek/surrogate)
+
 <% setup do %>
 $LOAD_PATH.unshift '../lib', __FILE__
 require 'surrogate'
@@ -531,7 +533,6 @@ TODO
 ----
 
 * Remove dependency on all of RSpec and only depend on rspec-core, then have AC tests for the other shit
-* Move surrogates to be first class and defined in the classes that use them.
 * Add proper failure messages for block invocations
 * 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)

data/gemfiles/rspec_mocks_2.10

@@ -0,0 +1,8 @@
+# set this with
+# export BUNDLE_GEMFILE=gemfiles/rspec_mocks_2.10
+
+source "http://rubygems.org"
+
+gemspec path: File.expand_path('../..', __FILE__)
+
+gem "rspec", "= 2.10", group: :development

data/gemfiles/rspec_mocks_2.2

@@ -0,0 +1,8 @@
+# set this with
+# export BUNDLE_GEMFILE=gemfiles/rspec_mocks_2.2
+
+source "http://rubygems.org"
+
+gemspec path: File.expand_path('../..', __FILE__)
+
+gem "rspec", "= 2.2", group: :development

data/lib/surrogate/rspec/{have_been_initialized_with.rb → initialization_matcher.rb}

@@ -1,8 +1,8 @@
-require 'surrogate/rspec/have_been_told_to'
+require 'surrogate/rspec/verb_matcher'
 
 class Surrogate
   module RSpec
-    class HaveBeenInitializedWith < HaveBeenToldTo
+    class InitializationMatcher < VerbMatcher
       def initialize(*initialization_args, &block)
         super :initialize
         with *initialization_args, &block

data/lib/surrogate/rspec/{have_been_asked_for_its.rb → noun_matcher.rb}

@@ -2,7 +2,7 @@ require 'surrogate/rspec/invocation_matcher'
 
 class Surrogate
   module RSpec
-    class HaveBeenAskedForIts < InvocationMatcher
+    class NounMatcher < InvocationMatcher
 
       class FailureMessageShouldDefault < AbstractFailureMessage
         def get_message

data/lib/surrogate/rspec/{have_been_asked_if.rb → predicate_matcher.rb}

@@ -2,7 +2,7 @@ require 'surrogate/rspec/invocation_matcher'
 
 class Surrogate
   module RSpec
-    class HaveBeenAskedIf < InvocationMatcher
+    class PredicateMatcher < InvocationMatcher
       class FailureMessageShouldDefault < AbstractFailureMessage
         def get_message
           "was never asked if #{ method_name }"

data/lib/surrogate/rspec/{have_been_told_to.rb → verb_matcher.rb}

@@ -2,7 +2,7 @@ require 'surrogate/rspec/invocation_matcher'
 
 class Surrogate
   module RSpec
-    class HaveBeenToldTo < InvocationMatcher
+    class VerbMatcher < InvocationMatcher
       class FailureMessageShouldDefault < AbstractFailureMessage
         def get_message
           "was never told to #{ method_name }"

data/lib/surrogate/rspec/with_filter.rb

@@ -70,6 +70,29 @@ class Surrogate
 
 
 
+      class RSpecMatchAsserter
+        attr_accessor :actual_invocation, :expected_invocation
+
+        def initialize(actual_invocation, expected_invocation)
+          self.actual_invocation, self.expected_invocation = actual_invocation, expected_invocation
+        end
+
+        def match?
+          rspec_arg_expectation = matcher_class.new *expected_invocation.args
+          rspec_arg_expectation.args_match? *actual_invocation.args
+        end
+
+        def matcher_class
+          return ::RSpec::Mocks::ArgumentListMatcher if approximate_2_11?
+          ::RSpec::Mocks::ArgumentExpectation
+        end
+
+        def approximate_2_11?
+          Gem::Requirement.create('~> 2.11').satisfied_by? Gem::Version.new(::RSpec::Mocks::Version::STRING)
+        end
+      end
+
+
 
       # rename args to invocation
       attr_accessor :expected_invocation, :block, :pass, :filter_name
@@ -112,8 +135,7 @@ class Surrogate
 
       def args_match?(actual_invocation)
         if RSpec.rspec_mocks_loaded?
-          rspec_arg_expectation = ::RSpec::Mocks::ArgumentExpectation.new *expected_invocation.args
-          rspec_arg_expectation.args_match? *actual_invocation.args
+          RSpecMatchAsserter.new(actual_invocation, expected_invocation).match?
         else
           expected_arguments == actual_arguments
         end

data/lib/surrogate/rspec.rb

@@ -23,35 +23,35 @@ class Surrogate
 
     module Matchers
       def have_been_told_to(method_name)
-        HaveBeenToldTo.new method_name
+        VerbMatcher.new method_name
       end
 
       def told_to(method_name)
-        HaveBeenToldTo.new method_name
+        VerbMatcher.new method_name
       end
 
       def have_been_asked_if(method_name)
-        HaveBeenAskedIf.new method_name
+        PredicateMatcher.new method_name
       end
 
       def asked_if(method_name)
-        HaveBeenAskedIf.new method_name
+        PredicateMatcher.new method_name
       end
 
       def have_been_asked_for_its(method_name)
-        HaveBeenAskedForIts.new method_name
+        NounMatcher.new method_name
       end
 
       def asked_for(method_name)
-        HaveBeenAskedForIts.new method_name
+        NounMatcher.new method_name
       end
 
       def have_been_initialized_with(*initialization_args, &block)
-        HaveBeenInitializedWith.new *initialization_args, &block
+        InitializationMatcher.new *initialization_args, &block
       end
 
       def initialized_with(*initialization_args, &block)
-        HaveBeenInitializedWith.new *initialization_args, &block
+        InitializationMatcher.new *initialization_args, &block
       end
     end
   end
@@ -65,10 +65,10 @@ class Surrogate
 end
 
 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'
+require 'surrogate/rspec/predicate_matcher'
+require 'surrogate/rspec/noun_matcher'
+require 'surrogate/rspec/initialization_matcher'
+require 'surrogate/rspec/verb_matcher'
 
 
 RSpec.configure do |config|

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/surrogate.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'bindable_block', '= 0.0.5.1'
 
-  s.add_development_dependency "rspec", '~> 2.2'
   s.add_development_dependency "rake"
-  s.add_development_dependency "mountain_berry_fields",                "~> 1.0.2"
+  s.add_development_dependency "rspec",                                "~> 2.2"
+  s.add_development_dependency "mountain_berry_fields",                "~> 1.0.3"
   s.add_development_dependency "mountain_berry_fields-rspec",          "~> 1.0.2"
   s.add_development_dependency "mountain_berry_fields-magic_comments", "~> 1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindable_block
-  requirement: &70330602486000 !ruby/object:Gem::Requirement
+  requirement: &70195439834980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,43 +21,43 @@ dependencies:
         version: 0.0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70330602486000
+  version_requirements: *70195439834980
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70330602485480 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70195439834560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330602485480
+  version_requirements: *70195439834560
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70330602485100 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70195439834020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70330602485100
+  version_requirements: *70195439834020
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields
-  requirement: &70330602484560 !ruby/object:Gem::Requirement
+  requirement: &70195439833520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70330602484560
+  version_requirements: *70195439833520
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields-rspec
-  requirement: &70330602484020 !ruby/object:Gem::Requirement
+  requirement: &70195439833060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70330602484020
+  version_requirements: *70195439833060
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields-magic_comments
-  requirement: &70330602483520 !ruby/object:Gem::Requirement
+  requirement: &70195439832600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70330602483520
+  version_requirements: *70195439832600
 description: Framework to aid in handrolling mock/spy objects.
 email:
 - josh.cheek@gmail.com
@@ -91,6 +91,8 @@ files:
 - Rakefile
 - Readme.md
 - Readme.md.mountain_berry_fields
+- gemfiles/rspec_mocks_2.10
+- gemfiles/rspec_mocks_2.2
 - lib/surrogate.rb
 - lib/surrogate/api_comparer.rb
 - lib/surrogate/endower.rb
@@ -100,26 +102,26 @@ files:
 - lib/surrogate/options.rb
 - 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/initialization_matcher.rb
 - lib/surrogate/rspec/invocation_matcher.rb
+- lib/surrogate/rspec/noun_matcher.rb
+- lib/surrogate/rspec/predicate_matcher.rb
 - lib/surrogate/rspec/substitute_for.rb
 - lib/surrogate/rspec/times_predicate.rb
+- lib/surrogate/rspec/verb_matcher.rb
 - lib/surrogate/rspec/with_filter.rb
 - lib/surrogate/values.rb
 - lib/surrogate/version.rb
 - spec/acceptance_spec.rb
 - spec/defining_api_methods_spec.rb
 - spec/rspec/block_support_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/initialization_matcher_spec.rb
 - spec/rspec/messages_spec.rb
+- spec/rspec/noun_matcher_spec.rb
+- spec/rspec/predicate_matcher_spec.rb
 - spec/rspec/rspec_mocks_integration_spec.rb
 - spec/rspec/substitute_for_spec.rb
+- spec/rspec/verb_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/unit/api_comparer_spec.rb
 - surrogate.gemspec
@@ -151,13 +153,13 @@ test_files:
 - spec/acceptance_spec.rb
 - spec/defining_api_methods_spec.rb
 - spec/rspec/block_support_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/initialization_matcher_spec.rb
 - spec/rspec/messages_spec.rb
+- spec/rspec/noun_matcher_spec.rb
+- spec/rspec/predicate_matcher_spec.rb
 - spec/rspec/rspec_mocks_integration_spec.rb
 - spec/rspec/substitute_for_spec.rb
+- spec/rspec/verb_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/unit/api_comparer_spec.rb
 has_rdoc: