rspec-spies 2.1.3 → 2.1.4

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+before_script:
+  - bundle install
+  - bundle exec rake appraisal:install
+script: bundle exec rake appraisal

data/Appraisals

@@ -1,5 +1,13 @@
-appraise "rspec-2-8" do
-  gem "rspec", "~> 2.8.0"
+appraise "rspec-2-13" do
+  gem "rspec", "~> 2.13.0"
+  gem "rspec-spies"
+  gem "rake"
+  gem "appraisal"
+  gem "jeweler"
+end
+
+appraise "rspec-2-12" do
+  gem "rspec", "~> 2.12.0"
   gem "rspec-spies"
   gem "rake"
   gem "appraisal"

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rspec', '~> 2.0'
 

data/Gemfile.lock

@@ -1,25 +1,28 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    rdoc (3.6.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+      rdoc
+    json (1.7.7)
+    rake (10.0.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -1,5 +1,7 @@
 = rspec-spies
 
+{<img src="https://travis-ci.org/technicalpickles/rspec-spies.png" />}[https://travis-ci.org/technicalpickles/rspec-spies]
+
 Behold, the Test Spies pattern! http://xunitpatterns.com/Test%20Spy.html
 
 Some other mocking frameworks support this. In particular, rr, notamock, and jferris's fork of mocha. It'd be great to see support for it in rspec's mocking library as well.

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/gemfiles/{rspec-2-11.gemfile → rspec_2_11.gemfile}

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rspec", "~> 2.11.0"
 gem "rspec-spies"

data/gemfiles/{rspec-2-11.gemfile.lock → rspec_2_11.gemfile.lock}

@@ -1,7 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     diff-lcs (1.1.3)
@@ -11,21 +11,20 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.7.7)
+    rake (10.0.3)
+    rdoc (4.0.0)
       json (~> 1.4)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    rspec-spies (2.1.2)
+    rspec-mocks (2.11.3)
+    rspec-spies (2.1.3)
       rspec (~> 2.0)
-      rspec-spies
 
 PLATFORMS
   ruby

data/gemfiles/{rspec-2-8.gemfile → rspec_2_12.gemfile}

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
-gem "rspec", "~> 2.8.0"
+gem "rspec", "~> 2.12.0"
 gem "rspec-spies"
 gem "rake"
 gem "appraisal"

data/gemfiles/rspec_2_12.gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.7)
+    rake (10.0.3)
+    rdoc (4.0.0)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    rspec-spies (2.1.3)
+      rspec (~> 2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  jeweler
+  rake
+  rspec (~> 2.12.0)
+  rspec-spies

data/gemfiles/rspec_2_13.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rspec", "~> 2.13.0"
+gem "rspec-spies"
+gem "rake"
+gem "appraisal"
+gem "jeweler"
+

data/gemfiles/rspec_2_13.gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    diff-lcs (1.2.1)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.7)
+    rake (10.0.3)
+    rdoc (4.0.0)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-spies (2.1.3)
+      rspec (~> 2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  jeweler
+  rake
+  rspec (~> 2.13.0)
+  rspec-spies

data/lib/rspec-spies.rb

@@ -1,22 +1,17 @@
-require 'rspec/mocks/method_double'
-RSpec::Mocks::MethodDouble.class_eval do
-  # override defining stubs to record the message was called.
-  # there's only one line difference from upstream rspec, but can't change it without fully overriding
-  def define_proxy_method
-    return if @method_is_proxied
+require 'rspec/mocks/proxy'
 
-    object_singleton_class.class_eval <<-EOF, __FILE__, __LINE__ + 1
-      def #{@method_name}(*args, &block)
-        __mock_proxy.record_message_received :#{@method_name}, *args, &block
-        __mock_proxy.message_received :#{@method_name}, *args, &block
-      end
-      #{visibility_for_method}
-    EOF
-    @method_is_proxied = true
+RSpec::Mocks::Proxy.class_eval do
+  alias_method :oldsp_message_received, :message_received
+  alias_method :oldsp_reset, :reset
+
+  def message_received(message, *args, &block)
+    record_message_received(message, *args, &block)
+    oldsp_message_received(message, *args, &block)
   end
 
-  def visibility_for_method
-    "#{visibility} :#{method_name}"
+  def reset
+    @messages_received = []
+    oldsp_reset
   end
 end
 
@@ -33,12 +28,17 @@ end
 
 RSpec::Matchers.define :have_received do |method_name, args, block|
   match do |actual|
-    messages_received = actual.send(:__mock_proxy).instance_variable_get("@messages_received")
-    messages_received.any? do |message|
+    @messages_received = actual.send(:__mock_proxy).instance_variable_get("@messages_received").dup
+    @messages_received.keep_if do |message|
       received_method_name, received_args, received_block = *message
       result = (received_method_name == method_name)
-      result &&= argument_expectation_class.new(@args || any_args).args_match?(received_args)
-      result &&= (received_block == block)
+      result &&= argument_expectation_class.new(*@args || any_args).args_match?(*received_args)
+    end
+
+    if @times
+      @messages_received.length == @expected_count
+    else
+      @messages_received.length > 0
     end
   end
 
@@ -46,8 +46,16 @@ RSpec::Matchers.define :have_received do |method_name, args, block|
     @args = args
   end
 
+  chain :exactly do |count|
+    @expected_count = count
+  end
+
+  chain :times do
+    @times = true
+  end
+
   failure_message_for_should do |actual|
-    "expected #{actual.inspect} to have received #{method_name.inspect}#{args_message}"
+    "expected #{actual.inspect} to have received #{method_name.inspect}#{args_message}#{times_message}"
   end
 
   failure_message_for_should_not do |actual|
@@ -61,4 +69,8 @@ RSpec::Matchers.define :have_received do |method_name, args, block|
   def args_message
     @args ? " with #{@args.inspect}" : ""
   end
+
+  def times_message
+    @times ? " exactly #{@expected_count} times but was called #{@messages_received.count} times" : ""
+  end
 end

data/rspec-spies.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rspec-spies"
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = "2012-11-13"
+  s.date = "2013-03-22"
   s.description = "test spies, for rspec"
   s.email = "josh@technicalpickles.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Appraisals",
     "Gemfile",
     "Gemfile.lock",
@@ -25,10 +26,12 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "gemfiles/rspec-2-11.gemfile",
-    "gemfiles/rspec-2-11.gemfile.lock",
-    "gemfiles/rspec-2-8.gemfile",
-    "gemfiles/rspec-2-8.gemfile.lock",
+    "gemfiles/rspec_2_11.gemfile",
+    "gemfiles/rspec_2_11.gemfile.lock",
+    "gemfiles/rspec_2_12.gemfile",
+    "gemfiles/rspec_2_12.gemfile.lock",
+    "gemfiles/rspec_2_13.gemfile",
+    "gemfiles/rspec_2_13.gemfile.lock",
     "lib/rspec-spies.rb",
     "rspec-spies.gemspec",
     "spec/rspec-spies_spec.rb",
@@ -37,7 +40,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/technicalpickles/rspec-spies"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.25"
   s.summary = "rspec has gone without tests spies. no more!"
 
   if s.respond_to? :specification_version then

data/spec/rspec-spies_spec.rb

@@ -37,6 +37,42 @@ module Spec
         have_received(:slice).with(hash_including({ :foo => :baz })).matches?(@object).should be_false
       end
 
+      it "matches if specifies exactly(x).times" do
+        @object.stub!(:slice)
+        @object.slice(5)
+        @object.slice(5)
+
+        have_received(:slice).exactly(1).times.matches?(@object).should be_false
+        have_received(:slice).exactly(2).times.matches?(@object).should be_true
+        have_received(:slice).exactly(3).times.matches?(@object).should be_false
+      end
+
+      it "matches if called multiple times with different arguments" do
+        @object.stub!(:slice)
+        @object.slice(1)
+        @object.slice(2)
+
+        have_received(:slice).with(1).matches?(@object).should be_true
+        have_received(:slice).with(2).matches?(@object).should be_true
+        have_received(:slice).with(3).matches?(@object).should be_false
+      end
+
+      it "matches if specifies regex, if method is called with matches arguments" do
+        @object.stub!(:slice)
+        @object.slice('foobar')
+
+        have_received(:slice).with(/foo/).matches?(@object).should be_true
+        have_received(:slice).with(/foox/).matches?(@object).should be_false
+      end
+
+      it "matches if third argument is a block" do
+        @object.stub!(:slice)
+        @object.slice(5) do; end
+
+        have_received(:slice).with(5).matches?(@object).should be_true
+        have_received(:slice).with(5,anything).matches?(@object).should be_false
+      end
+
       it "does not match if method is called with incorrect args" do
         @object.stub!(:slice)
         @object.slice(3)
@@ -79,5 +115,21 @@ module Spec
       end
     end
 
+    describe 'clearing out received messages' do
+      class Foo; end
+
+      before do
+        Foo.stub(:party)
+      end
+
+      it 'base case' do
+        Foo.party
+        have_received(:party).matches?(Foo).should be_true
+      end
+
+      it 'does not match even if the class method has been called in another spec' do
+        have_received(:party).matches?(Foo).should be_false
+      end
+    end
   end
 end

metadata

@@ -1,71 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: rspec-spies
 version: !ruby/object:Gem::Version
-  version: 2.1.3
   prerelease: 
+  version: 2.1.4
 platform: ruby
 authors:
 - Joshua Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355083921100 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+    none: false
   prerelease: false
-  version_requirements: *70355083921100
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355083920560 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70355083920560
+  type: :development
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70355083920040 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70355083920040
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70355083919380 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70355083919380
+  type: :development
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70355083918660 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70355083918660
+  type: :development
 description: test spies, for rspec
 email: josh@technicalpickles.com
 executables: []
@@ -75,6 +100,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .travis.yml
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -82,10 +108,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- gemfiles/rspec-2-11.gemfile
-- gemfiles/rspec-2-11.gemfile.lock
-- gemfiles/rspec-2-8.gemfile
-- gemfiles/rspec-2-8.gemfile.lock
+- gemfiles/rspec_2_11.gemfile
+- gemfiles/rspec_2_11.gemfile.lock
+- gemfiles/rspec_2_12.gemfile
+- gemfiles/rspec_2_12.gemfile.lock
+- gemfiles/rspec_2_13.gemfile
+- gemfiles/rspec_2_13.gemfile.lock
 - lib/rspec-spies.rb
 - rspec-spies.gemspec
 - spec/rspec-spies_spec.rb
@@ -98,20 +126,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: 2747625147983931777
+      segments:
+      - 0
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: rspec has gone without tests spies. no more!

data/gemfiles/rspec-2-8.gemfile.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.4.1)
-      bundler
-      rake
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-spies (2.1.2)
-      rspec (~> 2.0)
-      rspec-spies
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  jeweler
-  rake
-  rspec (~> 2.8.0)
-  rspec-spies