rspec-spy 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.1.0
+
+* `rspec-spy` no longer sets up the before hook for you, you need to do that manually. See the README
+
 ## Version 1.0.0
 
 * Removed `strict_mode` and use `should_have_received` and `should_have_not_received` instead

data/README.md

@@ -37,10 +37,14 @@ Or install it yourself as:
 
     $ gem install rspec-spy
 
-Add to your spec_helper.rb:
+Add to your spec_helper.rb in `RSpec.configure` **AFTER any other global before hooks, especially DatabaseCleaner**:
 
 ``` ruby
-require 'rspec-spy'
+# any config.before hooks should go above
+
+config.before(:each, :spy => true) do |example|
+  RSpec::Spy(example)
+end
 ```
 
 ## Usage

data/lib/rspec-spy.rb

@@ -11,9 +11,3 @@ RSpec::Core::Example.class_eval do
   end
 end
 
-RSpec.configure do |config|
-  config.before(:each, :spy => true) do |example|
-    example.example.run_spy
-  end
-end
-

data/lib/rspec/spy.rb

@@ -9,5 +9,9 @@ module RSpec
       end
     end
   end
+
+  def self.Spy(example)
+    example.example.run_spy
+  end
 end
 

data/lib/rspec/spy/mock_methods.rb

@@ -20,13 +20,13 @@ RSpec::Mocks::Methods.class_eval do
 
   def spy_check(method)
     return if RSpec::Spy.ok_to_spy?
-    raise "#{method} should not be used outside of a spy block. Please put it in a spy block or use #{method}!."
+    raise "#{method} was called before RSpec::Spy(example). Make sure that your example is properly tagged (generally with :spy => true) and you have a before hook in your RSpec.configure that calls RSpec::Spy(example)."
   end
 
   def nil_check(method)
     return if RSpec::Mocks::Proxy.allow_message_expectations_on_nil?
     return unless nil?
-    raise "You set an expectation on nil, maybe you're using an @instance_var? If you want to do this, use allow_message_expectations_on_nil."
+    raise "You set an expectation on nil, maybe you're using an @instance_var before it is set? If you want to do this, use allow_message_expectations_on_nil."
   end
 end
 

data/lib/rspec/spy/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Spy
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/spec_helper.rb

@@ -4,4 +4,8 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+
+  config.before(:each, :spy => true) do |example|
+    RSpec::Spy(example)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-spy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -104,7 +104,7 @@ rubyforge_project:
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: rspec-spy-1.0.0
+summary: rspec-spy-1.1.0
 test_files:
 - spec/rspec-spy_spec.rb
 - spec/spec_helper.rb