given_core 3.6.0 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81a55b27b471044bc3e47122ddce790fc92bf11b
-  data.tar.gz: b179e4e397fbdf8af463f9fc8aeb487648db7bcd
+SHA256:
+  metadata.gz: 3c2192daced24063b62f217adf7f4678e1494ead3f719b18163f966a3d6b1b8d
+  data.tar.gz: 0d31d574f7a14ae2c0d6604444cbc8f8b9310ddb3944e1b365536558291142ea
 SHA512:
-  metadata.gz: 4c9fb7d5e745e3af86aeb27821ab5bd206074b3aadcedf1ecc9aac3963a10abef885e0537901a924ac5ddb0bed169b930120ae177d9cc312d993f23cd43b972d
-  data.tar.gz: a0794444e365c2f259e9bd3261f2cb889df7e71e80a48dd3b63feb459c87119d4ae3253fb97854c3db847676a52205cfc27242f51a831cf176fbff5c7d18a372
+  metadata.gz: 95982f411402f3fcffba65f5cbfa0f1925fe504af3cf9b1abc0774864a345383d3647ae4da10ccb4071c9a7ffb5dd805ed34daf751b5d0928995dd7ea3ed6792
+  data.tar.gz: 1f0e5b72fee72726667f45d4e7af536218b383dfab8cc964c1905bbebc1e5c57ee890a2cddb13597cd11e27fbed9ffeeeb12d3f5b399014b3226ccea0bb94ed0

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    minitest (5.5.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    diff-lcs (1.4.4)
+    minitest (5.14.3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sorcerer (1.0.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sorcerer (2.0.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -27,3 +27,6 @@ DEPENDENCIES
   rake
   rspec (>= 2.14.0)
   sorcerer (>= 0.3.7)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -4,7 +4,7 @@
 | :----: |
 | [![Master Build Status](https://secure.travis-ci.org/rspec-given/rspec-given.png?branch=master)](https://travis-ci.org/rspec-given/rspec-given) |
 
-Covering rspec-given, minitest-given, and given-core, version 3.6.0.
+Covering rspec-given, minitest-given, and given-core, version 3.8.2.
 
 rspec-given and minitest-given are extensions to your favorite testing
 framework to allow Given/When/Then notation when writing specs.
@@ -53,7 +53,7 @@ things to watch out for:
 
 * Only one before block is allowed in any given Minitest::Spec
   describe block. This doesn't effect the number of Givens you are
-  allowed to use, but it may surprise if you are use to RSpec.
+  allowed to use, but it may surprise you if you are used to RSpec.
 
 ### Auto Selecting
 
@@ -347,6 +347,17 @@ should use an empty _Then_ clause, like this:
     Then { }
 ```
 
+A _Then_ clause accepts arguments for user-defined RSpec metadata:
+
+```ruby
+    Then(:zippy, :foo => 17) { ... }
+```
+
+Metadata on _Then_ clauses is an RSpec-only feature. You can read more about
+metadata [in RSpec's
+documentation](https://www.relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata).
+
+
 #### Then examples:
 
 ```ruby
@@ -760,12 +771,13 @@ _expect_.
 
 Given uses the Ripper library to parse the source lines and failing
 conditions to find all the sub-expression values upon a failure.
-Currently Ripper is not supported on Rubinius and versions of JRuby
-prior to JRuby-1.7.5.
 
-If you want to use a version of Ruby that does not support Ripper,
-then natural assertions will disabled. In addition, you should also
-disable source caching in the configuration (see the configuration
+If Ripper is not available, like on Rubinius and versions of JRuby prior to
+JRuby-1.7.5, detailed explanations of failures for natural assertions won't be
+available.  Natural assertions will still work, though.
+
+If you want to use a version of Ruby that does not support Ripper, then you
+should disable source caching in the configuration (see the configuration
 section below).
 
 ### Non-Spec Assertions
@@ -870,6 +882,26 @@ License. See the MIT-LICENSE file in the source distribution.
 
 # History
 
+* Version 3.8.1
+
+  * Fix deprecation warnings fro Ruby 2.6 & up
+
+* Version 3.8.0
+
+  * RSpec metadata can now be added to _Then_ clauses (see [#11](https://github.com/rspec-given/rspec-given/pull/11))
+  * Natural assertions now run on Rubinius and older versions of JRuby (see [#15](https://github.com/rspec-given/rspec-given/issues/15))
+    * WARNING: On these platforms, detailed failure explanations aren't available and source code snippets of Then clauses will only show the first line.
+    * WARNING: Assertions of void statements (e.g. `Then { }`) will fail only under runtimes lacking Ripper support
+  * `Given.ok_to_use_natural_assertions` was removed; the method was never properly supported as public, but it was publicly reachable
+
+* Version 3.7.1
+
+  * Mixin Minitest extensions for both ActiveSupport::TestCase (when present) as well as for MiniTest::Spec (see [#8](https://github.com/rspec-given/rspec-given/pulls/8))
+
+* Version 3.7.0
+
+  * Add support for Rails tests when using minitest-given (See [#6](https://github.com/rspec-given/rspec-given/pull/6))
+
 * Version 3.6.0
 
   * Various fixes for RSpec 3.0 (See [#1](https://github.com/rspec-given/rspec-given/pull/1))

data/Rakefile

@@ -62,13 +62,10 @@ end
 EXAMPLES = FileList['examples/**/*_spec.rb', 'examples/use_assertions.rb'].
   exclude('examples/failing/*.rb').
   exclude('examples/minitest/*.rb').
+  exclude('examples/minitest-rails/*.rb').
   exclude('examples/integration/failing/*.rb')
 
-MT_EXAMPLES = FileList['examples/minitest/**/*_spec.rb']
-
-unless Given::NATURAL_ASSERTIONS_SUPPORTED
-  EXAMPLES.exclude("examples/stack/*.rb")
-end
+MT_EXAMPLES = FileList['examples/minitest-rails/**/*_spec.rb', 'examples/minitest/**/*_spec.rb']
 
 FAILING_EXAMPLES = FileList['examples/failing/**/*_spec.rb']
 

data/lib/given/extensions.rb

@@ -247,11 +247,13 @@ module Given
     # :call-seq:
     #   Then { ... assertion ... }
     #
-    def Then(opts={}, &block)
-      on_eval = opts.fetch(:on_eval, "_gvn_then")
+    def Then(*metadata, &block)
+      opts = metadata.last
+      opts = {} unless opts.is_a? Hash
+      on_eval = opts.delete(:on_eval) || "_gvn_then"
       file, line = Given.location_of(block)
       description = _Gvn_lines.line(file, line) unless Given.source_caching_disabled
-      cmd = description ? "it(description)" : "specify"
+      cmd = description ? "it(description, *metadata)" : "specify(*metadata)"
       eval %{#{cmd} do #{on_eval}(&block) end}, binding, file, line
       _Gvn_context_info[:then_defined] = true
     end
@@ -270,7 +272,6 @@ module Given
 
     # Configure the use of natural assertions in this context.
     def use_natural_assertions(enabled=true)
-      Given.ok_to_use_natural_assertions(enabled)
       _Gvn_context_info[:natural_assertions_enabled] = enabled
     end
   end

data/lib/given/line_extractor.rb

@@ -1,5 +1,4 @@
-require 'ripper'
-require 'sorcerer'
+require 'given/natural_assertion'
 require 'given/file_cache'
 
 module Given
@@ -20,6 +19,7 @@ module Given
     private
 
     def extract_lines_from(lines, line_index)
+      return lines[line_index] unless NATURAL_ASSERTIONS_SUPPORTED
       result = lines[line_index]
       while result && incomplete?(result)
         line_index += 1
@@ -29,13 +29,13 @@ module Given
     end
 
     def incomplete?(string)
-      ! complete_sexp?(parse(string))
+      !complete_sexp?(parse(string))
     end
 
     def complete_sexp?(sexp)
       Sorcerer.source(sexp)
       true
-    rescue Sorcerer::Resource::NotSexpError => ex
+    rescue Sorcerer::Resource::NotSexpError
       false
     end
 

data/lib/given/minitest/before_extension.rb

@@ -2,35 +2,55 @@
 # The before blocks defined in Minitest are inadequate for our use.
 # This before_extension file allows us to use real before blocks.
 
+module Given
+  module MiniTest
+    module ClassExtensions
+      # Lazy accessor for Given's before blocks
+      def _Gvn_before_blocks
+        @_Gvn_before_blocks ||= []
+      end
+
+      # Define a Given style before block
+      def _Gvn_before(&block)
+        _Gvn_before_blocks << block
+      end
+    end
+
+    module InstanceExtensions
+      # Establish the before blocks
+      def _gvn_establish_befores
+        return if defined?(@_gvn_ran_befores) && @_gvn_ran_befores
+        @_gvn_ran_befores = true
+        _gvn_contexts.each do |context|
+          context._Gvn_before_blocks.each do |before_block|
+            instance_eval(&before_block)
+          end
+        end
+      end
+    end
+  end
+end
+
 module Minitest
   class Spec
-
     # Redefine setup to trigger before chains
     alias original_setup_without_given setup
     def setup
       original_setup_without_given
       _gvn_establish_befores
     end
+  end
+end
 
-    # Establish the before blocks
-    def _gvn_establish_befores
-      return if defined?(@_gvn_ran_befores) && @_gvn_ran_befores
-      @_gvn_ran_befores = true
-      _gvn_contexts.each do |context|
-        context._Gvn_before_blocks.each do |before_block|
-          instance_eval(&before_block)
-        end
+if defined?(ActiveSupport::TestCase)
+  module ActiveSupport
+    class TestCase
+      # Redefine setup to trigger before chains
+      alias original_setup_without_given setup
+      def setup
+        original_setup_without_given
+        _gvn_establish_befores
       end
     end
-
-    # Lazy accessor for Given's before blocks
-    def self._Gvn_before_blocks
-      @_Gvn_before_blocks ||= []
-    end
-
-    # Define a Given style before block
-    def self._Gvn_before(&block)
-      _Gvn_before_blocks << block
-    end
   end
 end

data/lib/given/minitest/configure.rb

@@ -1,7 +1,15 @@
-
+# Configure ActiveSupprt::TestCase to use the Given extensions.
+if defined?(ActiveSupport::TestCase)
+  ActiveSupport::TestCase.send(:extend, Given::ClassExtensions)
+  ActiveSupport::TestCase.send(:extend, Given::MiniTest::ClassExtensions)
+  ActiveSupport::TestCase.send(:include, Given::FailureMethod)
+  ActiveSupport::TestCase.send(:include, Given::InstanceExtensions)
+  ActiveSupport::TestCase.send(:include, Given::MiniTest::InstanceExtensions)
+end
 # Configure Minitest to use the Given extensions.
-
 Minitest::Spec.send(:extend,  Given::ClassExtensions)
+Minitest::Spec.send(:extend, Given::MiniTest::ClassExtensions)
 Minitest::Spec.send(:include, Given::FailureMethod)
 Minitest::Spec.send(:include, Given::InstanceExtensions)
-Given.use_natural_assertions if Given::NATURAL_ASSERTIONS_SUPPORTED
+Minitest::Spec.send(:include, Given::MiniTest::InstanceExtensions)
+Given.use_natural_assertions

data/lib/given/module_methods.rb

@@ -1,11 +1,5 @@
 
 module Given
-  # Does this platform support natural assertions?
-  RBX_IN_USE = (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx')
-  JRUBY_IN_USE = defined?(JRUBY_VERSION)
-  OLD_JRUBY_IN_USE = JRUBY_IN_USE && (JRUBY_VERSION < '1.7.5')
-
-  NATURAL_ASSERTIONS_SUPPORTED = ! (OLD_JRUBY_IN_USE || RBX_IN_USE)
 
   def self.framework
     @_gvn_framework
@@ -28,7 +22,6 @@ module Given
   # 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
 
@@ -37,19 +30,13 @@ module Given
     @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
-
   # Return file and line number where the block is defined.
   def self.location_of(block)
-    eval "[__FILE__, __LINE__]", block.binding
+    if block.binding.respond_to?(:source_location)
+      block.binding.source_location
+    else
+      eval "[__FILE__, __LINE__]", block.binding
+    end
   end
 
   # Methods forwarded to the framework object.

data/lib/given/natural_assertion.rb

@@ -2,12 +2,22 @@ require 'given/module_methods'
 require 'given/evaluator'
 require 'given/binary_operation'
 
-if Given::NATURAL_ASSERTIONS_SUPPORTED
-  require 'ripper'
-  require 'sorcerer'
-end
-
 module Given
+  NATURAL_ASSERTIONS_SUPPORTED = begin
+                                   require 'ripper'
+                                   require 'sorcerer'
+                                   true
+                                 rescue LoadError
+                                   # Expected on Rubinius & old JRuby
+                                   warn <<-WARNING.gsub(/^\s+/,'')
+                                     rspec-given: WARNING: Ripper is not available, so multi-line Then
+                                     statements will not be printed correctly and detailed failure
+                                     explanations of natural assertions WILL NOT be printed. Additionally,
+                                     assertions containing void statements (e.g. `Then { }`) will fail
+                                     in this runtime.
+                                   WARNING
+                                   false
+                                 end
 
   InvalidThenError = Class.new(StandardError)
 
@@ -23,15 +33,20 @@ module Given
     VOID_SEXP = [:void_stmt]
 
     def has_content?
+      return true unless NATURAL_ASSERTIONS_SUPPORTED
       assertion_sexp != VOID_SEXP
     end
 
     def message
       @output = "#{@clause_type} expression failed at #{source_line}\n"
-      @output << "Failing expression: #{source.strip}\n" if @clause_type != "Then"
-      explain_failure
-      display_pairs(expression_value_pairs)
-      @output << "\n"
+      if NATURAL_ASSERTIONS_SUPPORTED
+        @output << "Failing expression: #{source.strip}\n" if @clause_type != "Then"
+        explain_failure
+        display_pairs(expression_value_pairs)
+        @output << "\n"
+      else
+        @output << "Failing expression (possibly truncated): #{source.strip}\n"
+      end
       @output
     end
 
@@ -174,5 +189,4 @@ module Given
       "#{@code_file}:#{@code_line}"
     end
   end
-
 end

data/lib/given/rspec/all.rb

@@ -6,10 +6,8 @@ module RSpec
   end
 end
 
-if Given::NATURAL_ASSERTIONS_SUPPORTED
-  require 'given/rspec/monkey'
-  raise "Unsupported version of RSpec (#{RSpec::Version::STRING}), unable to detect assertions" unless RSpec::Given::MONKEY
-end
+require 'given/rspec/monkey'
+raise "Unsupported version of RSpec (#{RSpec::Version::STRING}), unable to detect assertions" unless RSpec::Given::MONKEY
 
 require 'given/rspec/have_failed'
 require 'given/rspec/before_extensions'

data/lib/given/rspec/configure.rb

@@ -15,6 +15,6 @@ RSpec.configure do |c|
     c.backtrace_clean_patterns << /lib\/rspec\/given/
   end
 
-  Given.use_natural_assertions if Given::NATURAL_ASSERTIONS_SUPPORTED
+  Given.use_natural_assertions
   Given.source_caching_disabled = false
 end

data/lib/given/version.rb

@@ -2,8 +2,8 @@
 module Given
   VERSION_NUMBERS = [
     VERSION_MAJOR = 3,
-    VERSION_MINOR = 6,
-    VERSION_BUILD = 0,
+    VERSION_MINOR = 8,
+    VERSION_BUILD = 2,
   ]
   VERSION = VERSION_NUMBERS.join(".")
 end

data/rakelib/gemspec.rake

@@ -56,7 +56,6 @@ EOF
     s.author = "Jim Weirich"
     s.email = "jim.weirich@gmail.com"
     s.homepage = "http://github.com/rspec-given/rspec-given"
-    s.rubyforge_project = "given"
   end
 
   MINITEST_GIVEN_SPEC = Gem::Specification.new do |s|
@@ -84,7 +83,6 @@ EOF
     s.author = "Jim Weirich"
     s.email = "jim.weirich@gmail.com"
     s.homepage = "http://github.com/rspec-given/rspec-given"
-    s.rubyforge_project = "given"
   end
 
   GIVEN_CORE_SPEC = Gem::Specification.new do |s|
@@ -112,7 +110,6 @@ EOF
     s.author = "Jim Weirich"
     s.email = "jim.weirich@gmail.com"
     s.homepage = "http://github.com/rspec-given/rspec-given"
-    s.rubyforge_project = "given"
   end
 
   Gem::PackageTask.new(MINITEST_GIVEN_SPEC) do |pkg|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: given_core
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.8.2
 platform: ruby
 authors:
 - Jim Weirich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorcerer
@@ -81,7 +81,7 @@ homepage: http://github.com/rspec-given/rspec-given
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--line-numbers"
 - "--inline-source"
@@ -102,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: given
-rubygems_version: 2.4.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Core engine for RSpec::Given and Minitest::Given.
 test_files: []