rspec-spies 1.2.9 → 2.0.0

data/Gemfile

@@ -0,0 +1,7 @@
+gem 'rspec', '~> 2.0'
+
+group :development do
+  gem 'rake'
+  gem 'jeweler'
+  gem 'rdoc'
+end

data/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2)
+    rdoc (3.6.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rake
+  rdoc
+  rspec (~> 2.0)

data/README.rdoc

@@ -23,7 +23,7 @@ In general, I think it should work by doing your usual stub!, followed running t
 
 To get started, you just need to:
 
- * Run: gem install rspec-spies
+ * Run: gem install rspec-spies --source http://gemcutter.org
  * Update spec_helper to include this line: require 'rspec-spies'
 
 

data/Rakefile

@@ -1,41 +1,36 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :development)
+
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rspec-spies"
-    gem.summary = %Q{rspec has gone without tests spies. no more!}
-    gem.description = %Q{test spies, for rspec}
-    gem.email = "josh@technicalpickles.com"
-    gem.homepage = "http://github.com/technicalpickles/rspec-spies"
-    gem.authors = ["Joshua Nichols"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "rspec-spies"
+  gem.summary = %Q{rspec has gone without tests spies. no more!}
+  gem.description = %Q{test spies, for rspec}
+  gem.email = "josh@technicalpickles.com"
+  gem.homepage = "http://github.com/technicalpickles/rspec-spies"
+  gem.authors = ["Joshua Nichols"]
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end
+Jeweler::GemcutterTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-1.2.9
+2.0.0

data/lib/rspec-spies.rb

@@ -1,49 +1,44 @@
-require 'spec/mocks/proxy'
-Spec::Mocks::Proxy.class_eval do
+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_expected_method(sym)
-    unless @proxied_methods.include?(sym)
-      visibility_string = "#{visibility(sym)} :#{sym}"
-      if target_responds_to?(sym)
-        munged_sym = munge(sym)
-        target_metaclass.instance_eval do
-          alias_method munged_sym, sym if method_defined?(sym)
-        end
-        @proxied_methods << sym
-      end
-      target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
-            def #{sym}(*args, &block)
-              __mock_proxy.record_message_received(:#{sym}, args, block) # this is the only line changed by rspec-spies in this method
-              __mock_proxy.message_received :#{sym}, *args, &block
-            end
-      #{visibility_string}
-      EOF
-    end
+  def define_proxy_method
+    method_name = @method_name
+    visibility_for_method = "#{visibility} :#{method_name}"
+    object_singleton_class.class_eval(<<-EOF, __FILE__, __LINE__)
+       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
   end
 end
 
-require 'spec/matchers'
-Spec::Matchers.module_eval do
+require 'rspec/matchers'
+RSpec::Matchers.module_eval do
   def have_received(sym, &block)
-    Spec::Matchers::Matcher.new :have_received, sym, @args, block do |sym, args, block|
+    RSpec::Matchers::Matcher.new :have_received, sym, @args, block do |sym, args, block|
       match do |actual|
         actual.received_message?(sym, *@args, &block)
       end
 
+
       failure_message_for_should do |actual|
-        "expected #{actual.inspect} to have received #{sym.inspect} with #{args.inspect}"
+        "expected #{actual.inspect} to have received #{sym.inspect} with #{@args.inspect}"
       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 #{sym.inspect} with #{@args.inspect}, but did"
       end
 
+
       description do
         "to have received #{sym.inspect} with #{args.inspect}"
       end
 
+
       def with(*args)
         @args = args
         self

data/spec/rspec-spies_spec.rb

@@ -4,7 +4,7 @@ module Spec
   module Matchers
     describe "[object.should] have_received(method, *args)" do
       before do
-        @object = String.new
+        @object = String.new("HI!")
       end
 
       it "does match if method is called with correct args" do
@@ -27,6 +27,23 @@ module Spec
         have_received(:slice).with(5).matches?(@object).should be_false
       end
 
+      it "correctly lists expects arguments for should" do
+        @object.stub!(:slice)
+
+        matcher  = have_received(:slice).with(5, 3)
+        messages = matcher.instance_variable_get("@messages")
+        message  = messages[:failure_message_for_should].call(@object)
+        message.should == "expected \"HI!\" to have received :slice with [5, 3]"
+      end
+
+      it "correctly lists expects arguments for should_not" do
+        @object.stub!(:slice)
+
+        matcher  = have_received(:slice).with(1, 2)
+        messages = matcher.instance_variable_get("@messages")
+        message  = messages[:failure_message_for_should_not].call(@object)
+        message.should == "expected \"HI!\" to not have received :slice with [1, 2], but did"
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 require 'rspec-spies'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-spies
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  hash: 15
+  prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -9,19 +15,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2011-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  version_requirements: *id001
   name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: jeweler
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: rdoc
+  prerelease: false
 description: test spies, for rspec
 email: josh@technicalpickles.com
 executables: []
@@ -33,7 +86,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -47,29 +101,34 @@ homepage: http://github.com/technicalpickles/rspec-spies
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: rspec has gone without tests spies. no more!
-test_files: 
-- spec/rspec-spies_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC