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

data/Gemfile

@@ -7,4 +7,5 @@ group :dev do
   gem 'bluecloth'
   gem 'ghpreview'
   gem 'flog'
+  gem 'flay'
 end

data/Gemfile.lock

@@ -3,6 +3,9 @@ GEM
   specs:
     bluecloth (2.2.0)
     diff-lcs (1.1.3)
+    flay (2.0.1)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
     flog (3.2.1)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.0)
@@ -32,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   bluecloth
+  flay
   flog
   ghpreview
   rake (>= 0.9.2.2)

data/README.md

@@ -1,6 +1,6 @@
 # rspec-given
 
-Covering rspec-given, version 3.0.0.beta.1.
+Covering rspec-given, version 2.3.0.beta.2.
 
 rspec-given is an RSpec extension to allow Given/When/Then notation in
 RSpec specifications.  It is a natural extension of the experimental
@@ -392,11 +392,11 @@ comparison operators (==, !=, <, <=, >, >=) or matching operators (=~,
 
 Keep the following in mind when using Natural Assertions.
 
-* Only a single assertion per _Then_. Only the final expression of the
-  _Then_ block will be considered when determining pass/fail for the
-  assertion. If you _want_ to express a complex condition for the
-  _Then_, you need to use ||, && or some other logical operation to
-  join the conditions into a single expression (and the failure
+* Only a single expression/assertion per _Then_. The single expression
+  of the _Then_ block will be considered when determining pass/fail
+  for the assertion. If you _want_ to express a complex condition for
+  the _Then_, you need to use ||, && or some other logical operation
+  to join the conditions into a single expression (and the failure
   message will breakdown the values for each part).
 
 * Natural assertions must be **idempotent** (that means they don't

data/lib/rspec/given/extensions.rb

@@ -14,7 +14,7 @@ module RSpec
       # outermost.
       def _rg_inner_contexts    # :nodoc:
         self.class.ancestors.select { |context|
-          context.respond_to?(:_rg_givens)
+          context.respond_to?(:_rgc_givens)
         }
       end
 
@@ -24,9 +24,11 @@ module RSpec
         _rg_inner_contexts.reverse
       end
 
-      def _rg_info(keyword)
+      # Return the context information for keyword from the innermost
+      # defining context.
+      def _rg_info(keyword)     # :nodoc:
         _rg_inner_contexts.each do |context|
-          h = context._rg_context_info
+          h = context._rgc_context_info
           if h.has_key?(keyword)
             return h[keyword]
           end
@@ -34,10 +36,28 @@ module RSpec
         nil
       end
 
-      def _rg_natural_assertions?(nassert)
+      # Should a natural assertion failure message be generated?
+      #
+      # A natural assertion failure message is generated if the
+      # assertion has non-empty content that doesn't use rspec
+      # assertions. The configuration options for natural assertions
+      # are checked and applied accordingly.
+      #
+      def _rg_need_na_message?(nassert) # :nodoc:
+        return false unless nassert.has_content?
+        use_na = _rg_na_configured?
+        return true if use_na == :always
+        return false if nassert.using_rspec_assertion?
+        use_na
+      end
+
+      # Return the configuration value for natural assertions.
+      #
+      # If natural assertions are not configured in the contexts, use
+      # the global configuration value.
+      def _rg_na_configured?    # :nodoc:
         info_value = _rg_info(:natural_assertions_enabled)
-        use_na = info_value.nil? ? RSpec::Given.natural_assertions_enabled? : info_value
-        (! nassert.using_rspec_assertion? && use_na) || (use_na == :always)
+        info_value.nil? ? RSpec::Given.natural_assertions_enabled? : info_value
       end
 
       # Establish all the Given preconditions the current and
@@ -47,7 +67,7 @@ module RSpec
         return if defined?(@_rg_ran) && @_rg_ran
         @_rg_ran = true
         _rg_contexts.each do |context|
-          context._rg_givens.each do |block|
+          context._rgc_givens.each do |block|
             instance_eval(&block)
           end
         end
@@ -57,18 +77,18 @@ module RSpec
       # describe/context blocks, starting with the outermost context.
       def _rg_check_invariants  # :nodoc:
         _rg_contexts.each do |context|
-          context._rg_invariants.each do |block|
+          context._rgc_invariants.each do |block|
             _rg_evaluate(block)
           end
         end
       end
 
       def _rg_check_ands  # :nodoc:
-        return if self.class._rg_context_info[:and_ran]
-        self.class._rg_and_blocks.each do |block|
+        return if self.class._rgc_context_info[:and_ran]
+        self.class._rgc_and_blocks.each do |block|
           _rg_evaluate(block)
         end
-        self.class._rg_context_info[:and_ran] = true
+        self.class._rgc_context_info[:and_ran] = true
       end
 
       # Implement the run-time semantics of the Then clause.
@@ -79,12 +99,12 @@ module RSpec
         _rg_check_ands
       end
 
-      def _rg_evaluate(block)
-        unless instance_eval(&block)
-          nassert = NaturalAssertion.new(block, binding, self.class._rg_lines)
-          if ! nassert.using_rspec_assertion? && nassert.has_content?
-            ::RSpec::Expectations.fail_with nassert.message
-          end
+      # Evaluate a Then, And, or Invariant assertion.
+      def _rg_evaluate(block)   # :nodoc:
+        passed = instance_eval(&block)
+        if ! passed && _rg_na_configured?
+          nassert = NaturalAssertion.new(block, binding, self.class._rgc_lines)
+          ::RSpec::Expectations.fail_with nassert.message if _rg_need_na_message?(nassert)
         end
       end
     end
@@ -93,31 +113,31 @@ module RSpec
 
       # List of all givens directly in the current describe/context
       # block.
-      def _rg_givens            # :nodoc:
-        @_rg_givens ||= []
+      def _rgc_givens            # :nodoc:
+        @_rgc_givens ||= []
       end
 
       # List of all invariants directly in the current
       # describe/context block.
-      def _rg_invariants        # :nodoc:
-        @_rg_invariants ||= []
+      def _rgc_invariants        # :nodoc:
+        @_rgc_invariants ||= []
       end
 
-      def _rg_and_blocks
-        @_rg_and_blocks ||= []
+      def _rgc_and_blocks
+        @_rgc_and_blocks ||= []
       end
 
-      def _rg_context_info
-        @_rg_context_info ||= {}
+      def _rgc_context_info
+        @_rgc_context_info ||= {}
       end
 
-      def _rg_lines
-        @_rg_lines ||= LineExtractor.new
+      def _rgc_lines
+        @_rgc_lines ||= LineExtractor.new
       end
 
       # Trigger the evaluation of a Given! block by referencing its
       # name.
-      def _rg_trigger_given(name) # :nodoc:
+      def _rgc_trigger_given(name) # :nodoc:
         Proc.new { send(name) }
       end
 
@@ -157,7 +177,7 @@ module RSpec
         if args.first.is_a?(Symbol)
           let(args.first, &block)
         else
-          _rg_givens << block
+          _rgc_givens << block
         end
       end
 
@@ -170,7 +190,7 @@ module RSpec
       #
       def Given!(name, &block)
         let!(name, &block)
-        _rg_givens << _rg_trigger_given(name)
+        _rgc_givens << _rgc_trigger_given(name)
       end
 
       # Declare the code that is under test.
@@ -209,29 +229,29 @@ module RSpec
       def Then(&block)
         env = block.binding
         file, line = eval "[__FILE__, __LINE__]", env
-        description = _rg_lines.line(file, line) unless RSpec::Given.source_caching_disabled
+        description = _rgc_lines.line(file, line) unless RSpec::Given.source_caching_disabled
         if description
           cmd = "it(description)"
         else
           cmd = "specify"
         end
         eval %{#{cmd} do _rg_then(&block) end}, binding, file, line
-        _rg_context_info[:then_defined] = true
+        _rgc_context_info[:then_defined] = true
       end
 
       # Establish an invariant that must be true for all Then blocks
       # in the current (and nested) scopes.
       def Invariant(&block)
-        _rg_invariants << block
+        _rgc_invariants << block
       end
 
       def And(&block)
-        fail "And defined without a Then" unless _rg_context_info[:then_defined]
-        _rg_and_blocks << block
+        fail "And defined without a Then" unless _rgc_context_info[:then_defined]
+        _rgc_and_blocks << block
       end
 
       def use_natural_assertions(enabled=true)
-        _rg_context_info[:natural_assertions_enabled] = enabled
+        _rgc_context_info[:natural_assertions_enabled] = enabled
       end
     end
   end

data/lib/rspec/given/version.rb

@@ -5,7 +5,7 @@ module RSpec
       VERSION_MINOR = 3,
       VERSION_BUILD = 0,
       'beta',
-      VERSION_BETA  = 1,
+      VERSION_BETA  = 2,
     ]
     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.1
+  version: 2.3.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec