given_core 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21590386d93b228b7693a69b72ac1a9490153176
-  data.tar.gz: 888675be1bcf66f89099f35a227e1450569e61e5
+  metadata.gz: 9a6bd70c1d9815426170d605a9040ceba3993762
+  data.tar.gz: 59be6e8b07e64d2a60661117dbe5c6ea0ead6d04
 SHA512:
-  metadata.gz: f715fadc107ddab08ae1ed179ab2e5a8baf289fb61ee1a8fda0a7cdb59734e3b8604b08795f8d660e048624e8eb005e87668ac79d0c1f297e93ad588a311f68a
-  data.tar.gz: 3b4552e9a81535deb11e291a349dc71131189e6e6cecdb9e8b3e2407b1deda4023a2c172e8e4a298ad4d6cd404bda7d390ac8a3739a296bcc0ebc3df3eb5d1e0
+  metadata.gz: c0aae29eb0093e3e77a26d548cf08e88225e5c9ee9cef3ebd6b0d11fc10f2f7ecdf1cc54525881ca96772cbfbc528dbd11c48fc06c445112229db01e60cc9e09
+  data.tar.gz: 00f16bf0ecd6df899963c9b571df2d097d66e9a2eaad21a44e93ffb83d185fcd490a66d0c9f3f2e3289527380787d24c7cc18790f4be5318090346f358cc49a3

data/Gemfile.lock

@@ -19,6 +19,7 @@ GEM
     sorcerer (1.0.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -4,7 +4,7 @@
 | :----: |
 | [![Master Build Status](https://secure.travis-ci.org/jimweirich/rspec-given.png?branch=master)](https://travis-ci.org/jimweirich/rspec-given) |
 
-Covering rspec-given, minitest-given, and given-core, version 3.4.0.
+Covering rspec-given, minitest-given, and given-core, version 3.5.0.
 
 rspec-given and minitest-given are extensions to your favorite testing
 framework to allow Given/When/Then notation when writing specs.
@@ -758,11 +758,15 @@ _expect_.
 
 ### Platform Support
 
-Natural assertions use the Ripper library to parse the failing
-condition and find all the sub-expression values upon a failure.
+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. Natural assertions are disabled in that case.
-However, all other features of Given are supported.
+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
+section below).
 
 ### Non-Spec Assertions
 
@@ -787,7 +791,7 @@ end
 
 To use the non-testing assertions, you need to require the
 'given/assertions' file and then include the
-<code>Given::Assertions</code> module into what ever class is using
+code>Given::Assertions</code> module into what ever class is using
 the
 <code>Precondition</code>/<code>Postcondition</code>/<code>Assert</code>
 methods. The code block for these assertions should always be a

data/lib/given/line_extractor.rb

@@ -1,3 +1,5 @@
+require 'ripper'
+require 'sorcerer'
 require 'given/file_cache'
 
 module Given
@@ -19,23 +21,26 @@ module Given
 
     def extract_lines_from(lines, line_index)
       result = lines[line_index]
-      if continued?(result)
-        level = indentation_level(result)
-        begin
-          line_index += 1
-          result << lines[line_index]
-        end while indentation_level(lines[line_index]) > level
+      while result && incomplete?(result)
+        line_index += 1
+        result << lines[line_index]
       end
       result
     end
 
-    def continued?(string)
-      string =~ /(\{|do) *$/
+    def incomplete?(string)
+      ! complete_sexp?(parse(string))
     end
 
-    def indentation_level(string)
-      string =~ /^(\s*)\S/
-      $1.nil? ? 1000000 : $1.size
+    def complete_sexp?(sexp)
+      Sorcerer.source(sexp)
+      true
+    rescue Sorcerer::Resource::NotSexpError => ex
+      false
+    end
+
+    def parse(string)
+      Ripper::SexpBuilder.new(string).parse
     end
   end
 end

data/lib/given/version.rb

@@ -2,7 +2,7 @@
 module Given
   VERSION_NUMBERS = [
     VERSION_MAJOR = 3,
-    VERSION_MINOR = 4,
+    VERSION_MINOR = 5,
     VERSION_BUILD = 0,
   ]
   VERSION = VERSION_NUMBERS.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: given_core
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorcerer