rspec-given 2.3.0.beta.2 → 2.3.0.beta.3

data/README.md

@@ -1,6 +1,6 @@
 # rspec-given
 
-Covering rspec-given, version 2.3.0.beta.2.
+Covering rspec-given, version 2.3.0.beta.3.
 
 rspec-given is an RSpec extension to allow Given/When/Then notation in
 RSpec specifications.  It is a natural extension of the experimental

data/lib/rspec/given.rb

@@ -15,4 +15,5 @@ else
   require 'rspec/given/core'
   require 'rspec/given/have_failed'
   require 'rspec/given/configure'
+  require 'rspec/given/monkey'
 end

data/lib/rspec/given/extensions.rb

@@ -47,7 +47,7 @@ module RSpec
         return false unless nassert.has_content?
         use_na = _rg_na_configured?
         return true if use_na == :always
-        return false if nassert.using_rspec_assertion?
+        return false if !RSpec::Given::MONKEY && nassert.using_rspec_assertion?
         use_na
       end
 
@@ -101,8 +101,9 @@ module RSpec
 
       # Evaluate a Then, And, or Invariant assertion.
       def _rg_evaluate(block)   # :nodoc:
+        RSpec::Given.matcher_called = false
         passed = instance_eval(&block)
-        if ! passed && _rg_na_configured?
+        if ! passed && _rg_na_configured? && ! RSpec::Given.matcher_called
           nassert = NaturalAssertion.new(block, binding, self.class._rgc_lines)
           ::RSpec::Expectations.fail_with nassert.message if _rg_need_na_message?(nassert)
         end

data/lib/rspec/given/module_methods.rb

@@ -1,5 +1,13 @@
 module RSpec
   module Given
+    def self.matcher_called
+      @matcher_called
+    end
+
+    def self.matcher_called=(value)
+      @matcher_called = value
+    end
+
     def self.source_caching_disabled
       @_rg_source_caching_disabled
     end

data/lib/rspec/given/monkey.rb

@@ -0,0 +1,40 @@
+require 'rspec'
+
+# Monkey patch RSpec to detect matchers used in expectations.
+
+unless defined?(RSpec::Given::MONKEY)
+
+  if defined?(RSpec::Expectations::PositiveExpectationHandler) &&
+      defined?(RSpec::Expectations::NegativeExpectationHandler)
+
+    RSpec::Given::MONKEY = true
+
+    module RSpec
+      module Expectations
+        class PositiveExpectationHandler
+          class << self
+            alias _rg_rspec_original_handle_matcher handle_matcher
+            def handle_matcher(actual, matcher, message=nil, &block)
+              RSpec::Given.matcher_called = true
+              _rg_rspec_original_handle_matcher(actual, matcher, message, &block)
+            end
+          end
+        end
+
+        class NegativeExpectationHandler
+          class << self
+            alias _rg_rspec_original_handle_matcher handle_matcher
+            def handle_matcher(actual, matcher, message=nil, &block)
+              RSpec::Given.matcher_called = true
+              _rg_rspec_original_handle_matcher(actual, matcher, message, &block)
+            end
+          end
+        end
+      end
+    end
+
+  else
+    RSpec::Given::MONKEY = false
+  end
+
+end

data/lib/rspec/given/natural_assertion.rb

@@ -1,5 +1,6 @@
 require 'ripper'
 require 'sorcerer'
+require 'rspec/given/monkey'
 
 module RSpec
   module Given
@@ -97,7 +98,7 @@ module RSpec
       end
 
       def source
-        @line_extractor.line(@code_file, @code_line)
+        @source ||= @line_extractor.line(@code_file, @code_line)
       end
 
       def set_file_and_line

data/lib/rspec/given/version.rb

@@ -5,7 +5,7 @@ module RSpec
       VERSION_MINOR = 3,
       VERSION_BUILD = 0,
       'beta',
-      VERSION_BETA  = 2,
+      VERSION_BETA  = 3,
     ]
     VERSION = VERSION_NUMBERS.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-given
 version: !ruby/object:Gem::Version
-  version: 2.3.0.beta.2
+  version: 2.3.0.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sorcerer
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - lib/rspec/given/have_failed.rb
 - lib/rspec/given/line_extractor.rb
 - lib/rspec/given/module_methods.rb
+- lib/rspec/given/monkey.rb
 - lib/rspec/given/natural_assertion.rb
 - lib/rspec/given/rspec1_given.rb
 - lib/rspec/given/version.rb