rspec-given 2.3.1.beta.1 → 2.3.1

data/README.md

@@ -1,6 +1,6 @@
 # rspec-given
 
-Covering rspec-given, version 2.3.1.beta.1.
+Covering rspec-given, version 2.3.1.
 
 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/extensions.rb

@@ -105,7 +105,7 @@ module RSpec
         passed = instance_eval(&block)
         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)
+          RSpec::Given.fail_with nassert.message if _rg_need_na_message?(nassert)
         end
       end
     end
@@ -144,9 +144,9 @@ module RSpec
 
       # *DEPRECATED:*
       #
-      # The Scenario command is deprecated. Using Scenario in a spec
-      # will result in a warning message. Eventually the command will
-      # be removed.
+      # The Scenario command is deprecated. Using Scenario in an
+      # example will result in a warning message. Eventually the
+      # command will be removed.
       #
       # Declare a scenario to contain Given/When/Then declarations.  A
       # Scenario is essentially an RSpec context, with the additional
@@ -206,7 +206,7 @@ module RSpec
             begin
               _rg_establish_givens
               instance_eval(&block)
-            rescue RSpec::Core::Pending::PendingDeclaredInExample => ex
+            rescue RSpec::Given.pending_error => ex
               raise
             rescue Exception => ex
               Failure.new(ex)

data/lib/rspec/given/failure.rb

@@ -15,7 +15,7 @@ module RSpec
       end
 
       def ==(other)
-        if other.is_a?(::RSpec::Given::HaveFailed::HaveFailedMatcher)
+        if failed_matcher?(other)
           other.matches?(self)
         else
           die
@@ -23,20 +23,27 @@ module RSpec
       end
 
       def !=(other)
-        if other.is_a?(::RSpec::Given::HaveFailed::HaveFailedMatcher)
+        if failed_matcher?(other)
           ! other.matches?(self)
         else
           die
         end
       end
 
+      def method_missing(sym, *args, &block)
+        die
+      end
+
+      private
+
       def die
         ::Kernel.raise @exception
       end
 
-      def method_missing(sym, *args, &block)
-        die
+      def failed_matcher?(other)
+        other.is_a?(::RSpec::Given::HaveFailed::HaveFailedMatcher)
       end
+
     end
   end
 end

data/lib/rspec/given/module_methods.rb

@@ -1,13 +1,14 @@
 module RSpec
   module Given
+    # Does this platform support natural assertions?
     NATURAL_ASSERTIONS_SUPPORTED = ! defined?(JRUBY_VERSION)
 
     def self.matcher_called
-      @matcher_called
+      @_matcher_called
     end
 
     def self.matcher_called=(value)
-      @matcher_called = value
+      @_matcher_called = value
     end
 
     def self.source_caching_disabled
@@ -18,24 +19,49 @@ module RSpec
       @_rg_source_caching_disabled = value
     end
 
+    # Detect the formatting requested in the given configuration object.
+    #
+    # If the format requires it, source caching will be enabled.
     def self.detect_formatters(c)
       format_active = c.formatters.any? { |f| f.class.name !~ /ProgressFormatter/ }
       RSpec::Given.source_caching_disabled = ! format_active
     end
 
+    # Globally enable/disable natural assertions.
+    #
+    # There is a similar function in Extensions that works at a
+    # describe or context scope.
     def self.use_natural_assertions(enabled=true)
       ok_to_use_natural_assertions(enabled)
       @natural_assertions_enabled = enabled
     end
 
+    # TRUE if natural assertions are globally enabled?
+    def self.natural_assertions_enabled?
+      @natural_assertions_enabled
+    end
+
+    # Is is OK to use natural assertions on this platform.
+    #
+    # An error is raised if the the platform does not support natural
+    # assertions and the flag is attempting to enable them.
     def self.ok_to_use_natural_assertions(enabled)
       if enabled && ! NATURAL_ASSERTIONS_SUPPORTED
         fail ArgumentError, "Natural Assertions are disabled for JRuby"
       end
     end
 
-    def self.natural_assertions_enabled?
-      @natural_assertions_enabled
+    # Fail an example with the given messages.
+    #
+    # This should be the only place we reference the RSpec function.
+    # Everywhere else in rspec-given should be calling this function.
+    def self.fail_with(*args)
+      ::RSpec::Expectations.fail_with(*args)
+    end
+
+    # Error object used by RSpec to indicate a pending example.
+    def self.pending_error
+      RSpec::Core::Pending::PendingDeclaredInExample
     end
   end
 end

data/lib/rspec/given/version.rb

@@ -4,7 +4,6 @@ module RSpec
       VERSION_MAJOR = 2,
       VERSION_MINOR = 3,
       VERSION_BUILD = 1,
-      'beta', 1
     ]
     VERSION = VERSION_NUMBERS.join(".")
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rspec-given
 version: !ruby/object:Gem::Version
-  version: 2.3.1.beta.1
-  prerelease: 6
+  version: 2.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -138,9 +138,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: given
 rubygems_version: 1.8.24