rspec-spies 2.1.0 → 2.1.1

data/Gemfile

@@ -1,9 +1,3 @@
 source :rubygems
 
-gem 'rspec', '~> 2.0'
-
-group :development do
-  gem 'rake'
-  gem 'jeweler'
-  gem 'rdoc'
-end
+gemspec

data/Gemfile.lock

@@ -1,3 +1,10 @@
+PATH
+  remote: .
+  specs:
+    rspec-spies (2.1.1)
+      rspec (~> 2.0)
+      rspec-spies
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -25,4 +32,4 @@ DEPENDENCIES
   jeweler
   rake
   rdoc
-  rspec (~> 2.0)
+  rspec-spies!

data/README.rdoc

@@ -25,6 +25,7 @@ To get started, you just need to:
 
  * Run: gem install rspec-spies --source http://gemcutter.org
  * Update spec_helper to include this line: require 'rspec-spies'
+   * Alternatively, you can add `-r rspec-spies` to your project's .rspec file
 
 
 == Before and after test spies

data/Rakefile

@@ -12,6 +12,12 @@ Jeweler::Tasks.new do |gem|
   gem.email = "josh@technicalpickles.com"
   gem.homepage = "http://github.com/technicalpickles/rspec-spies"
   gem.authors = ["Joshua Nichols"]
+
+  gem.add_runtime_dependency 'rspec', '~> 2.0'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'jeweler'
+  gem.add_development_dependency 'rdoc'
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/rspec-spies.rb

@@ -15,30 +15,36 @@ RSpec::Mocks::MethodDouble.class_eval do
   end
 end
 
+require 'rspec/expectations'
 require 'rspec/matchers'
-RSpec::Matchers.define :have_received do |sym, args, block|
+RSpec::Matchers.define :have_received do |method_name, args, block|
   match do |actual|
-    actual.received_message?(sym, *@args, &block)
+    messages_received = actual.send(:__mock_proxy).instance_variable_get("@messages_received")
+    messages_received.any? do |message|
+      received_method_name, received_args, received_block = *message
+      result = (received_method_name == method_name)
+      result &&= RSpec::Mocks::ArgumentExpectation.new(@args || any_args).args_match?(received_args)
+      result &&= (received_block == block)
+    end
   end
 
+  chain :with do |*args|
+    @args = args
+  end
 
   failure_message_for_should do |actual|
-    "expected #{actual.inspect} to have received #{sym.inspect} with #{@args.inspect}"
+    "expected #{actual.inspect} to have received #{method_name.inspect}#{args_message}"
   end
 
-
   failure_message_for_should_not do |actual|
-    "expected #{actual.inspect} to not have received #{sym.inspect} with #{@args.inspect}, but did"
+    "expected #{actual.inspect} to not have received #{method_name.inspect}#{args_message}, but did"
   end
 
-
   description do
-    "to have received #{sym.inspect} with #{@args.inspect}"
+    "to have received #{method_name.inspect}#{args_message}"
   end
 
-
-  def with(*args)
-    @args = args
-    self
+  def args_message
+    @args ? " with #{@args.inspect}" : ""
   end
 end

data/rspec-spies.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rspec-spies"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = "2012-01-31"
+  s.date = "2012-09-05"
   s.description = "test spies, for rspec"
   s.email = "josh@technicalpickles.com"
   s.extra_rdoc_files = [
@@ -32,24 +32,36 @@ 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.24"
   s.summary = "rspec has gone without tests spies. no more!"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec-spies>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_runtime_dependency(%q<rspec>, ["~> 2.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
+      s.add_dependency(%q<rspec-spies>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rspec-spies>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/spec/rspec-spies_spec.rb

@@ -7,13 +7,36 @@ module Spec
         @object = String.new("HI!")
       end
 
-      it "does match if method is called with correct args" do
+      it "matches if method is called with correct args" do
         @object.stub!(:slice)
         @object.slice(5)
 
         have_received(:slice).with(5).matches?(@object).should be_true
       end
 
+      it "matches if doesn't specify args, even if method is called with args" do
+        @object.stub!(:slice)
+        @object.slice(5)
+
+        have_received(:slice).matches?(@object).should be_true
+      end
+
+      it "matches if specifies nil arg, if method is called with a nil arg" do
+        @object.stub!(:slice)
+        @object.slice(nil)
+
+        have_received(:slice).with(nil).matches?(@object).should be_true
+        have_received(:slice).matches?(@object).should be_true
+      end
+
+      it "matches if specifies hash_including, if method is called with has including arguments" do
+        @object.stub!(:slice)
+        @object.slice({ :foo => :bar, :baz => :quux })
+
+        have_received(:slice).with(hash_including({ :foo => :bar })).matches?(@object).should be_true
+        have_received(:slice).with(hash_including({ :foo => :baz })).matches?(@object).should be_false
+      end
+
       it "does not match if method is called with incorrect args" do
         @object.stub!(:slice)
         @object.slice(3)

metadata

@@ -1,68 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rspec-spies
-version: !ruby/object:Gem::Version
-  version: 2.1.0
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 1
+  version: 2.1.1
 platform: ruby
-authors:
+authors: 
 - Joshua Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-spies
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70331177385760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70331177385760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70331177385060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70331177385060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70331177384440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70331177384440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70331177383920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70331177383920
+  version_requirements: *id008
 description: test spies, for rspec
 email: josh@technicalpickles.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-files:
+files: 
 - .document
 - Gemfile
 - Gemfile.lock
@@ -77,29 +154,36 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/technicalpickles/rspec-spies
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -2045128620934632625
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: rspec has gone without tests spies. no more!
 test_files: []
+