speculate_about 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d53e888a2cad71c7c20205f0f34d7ededa3df3feceef7d567f051d362a36ccb8
-  data.tar.gz: ee00700ca0a19000b8098cb3022b462da0537477d58ee912f250aba6b02e3e7c
+  metadata.gz: a40862f65330fcfdc48e0b22fb9a09447269ecad7ca0582522ecda4450b3257a
+  data.tar.gz: a65d170a63cdd08c0dfa711854beaf876a5810d84f9a82eab489ffcaa0331e57
 SHA512:
-  metadata.gz: 3ced515885a50ff873cc4b471fe03eab69dc3e7c4f409e4e5ff392a91bfd94a08946aae7eb866607b27ecad62104beee68d8a52230fa2e216e1a544800a4ef0e
-  data.tar.gz: 792619744dab6387ad2e70c7fa53eb49c3b8b9f26470a5de7c92477c3cc274075d7cff720b5fb8dc0a87bf71d2af016517e72449d56298824d3f865253b64192
+  metadata.gz: 1c42854aae7633c76e4d4cb8ce663915b55c48529833920252c3f2b57546cbe59490940db5c375a7468fede051cb237510255c3e5894b9e3ab87aa1feda126e1
+  data.tar.gz: 9c0e44f422c8638346fb416a3b4451a7a17001f1f9db08e70dbf4ed526b5b377fca96fb54ab9b1b3354d9fbbe91e2b97dde1b0bf15f2a261eec697677f7bc030

data/lib/speculations/parser/context.rb

@@ -13,12 +13,13 @@ class Speculations::Parser::Context
 
   def add_example(lnb:, line:)
     examples << Example.new(lnb: lnb, parent: self, line: line, name: potential_name)
-    @potential_name = nil
+    reset_context
     examples.last
   end
 
   def add_include(lnb:)
     includes << Include.new(lnb: lnb, parent: self)
+    @given = false
     includes.last
   end
 
@@ -30,6 +31,10 @@ class Speculations::Parser::Context
      @__examples__ ||= []
   end
 
+  def given?
+    @given
+  end
+
   def includes
      @__includes__ ||= []
   end
@@ -39,8 +44,20 @@ class Speculations::Parser::Context
     lines.flatten.map{ |line| "#{prefix}#{line.strip}" }.join("\n")
   end
 
+  def reset_context
+    @potential_name = nil
+    @given = false
+    self
+  end
+
+  def set_given given
+    @given = given
+    self
+  end
+
   def set_name(potential_name)
     @potential_name = potential_name
+    self
   end
 
   def set_setup(lnb:)
@@ -63,6 +80,7 @@ class Speculations::Parser::Context
   def initialize(alternate_syntax: false, lnb:, name:, filename: nil, orig_filename: nil, parent: nil)
     _init_from_parent filename, orig_filename, parent
     @alternate_syntax = alternate_syntax
+    @given         = false
     @level         = parent ? parent.level.succ : 1
     @lnb           = lnb
     @setup         = nil

data/lib/speculations/parser/state.rb

@@ -8,9 +8,11 @@ module Speculations::Parser::State extend self
   CONTEXT_RGX = %r[\A\s{0,3}\#{1,7}\s+Context\s+(.*)]
   EOBLOCK_RGX = %r[\A\s{0,3}```\s*\z]
   EXAMPLE_RGX = %r[\A\s{0,3}```.*\s:example]
+  GIVEN_RGX   = %r[\A\s{0,3}(?:Given|When)\b]
   INCLUDE_RGX = %r[\A\s{0,3}```.*\s:include]
   NAME_RGX    = %r[\A\s{0,3}Example:?\s+(.*)]i
   RUBY_RGX    = %r[\A\s{0,3}```ruby]
+  THEN_RGX    = %r[\A\s{0,3}Then\s+(.*)]
   WS_RGX      = %r[\A\s*\z]
 
   def before_match line
@@ -30,6 +32,10 @@ module Speculations::Parser::State extend self
   def example_match line
     EXAMPLE_RGX =~ line
   end
+  
+  def given_match line
+    GIVEN_RGX =~ line
+  end
 
   def include_match line
     INCLUDE_RGX =~ line
@@ -43,6 +49,10 @@ module Speculations::Parser::State extend self
     RUBY_RGX =~ line
   end
 
+  def then_match line
+    THEN_RGX.match(line)
+  end
+
   def ws_match line
     WS_RGX =~ line
   end

data/lib/speculations/parser/state/out.rb

@@ -18,24 +18,31 @@ module Speculations
           when name = State.context_match(line)
             node = node.parent if node.parent
             new_node = node.add_child(name: name, lnb: lnb)
-            new_node.set_name(nil)
-            [:out, new_node]
+            [:out, new_node.reset_context]
           when State.ws_match(line)
             [:out, node]
           when name = State.potential_name(line)
             node.set_name(name[1])
+            node.set_given(false)
+            [:out, node]
+          when name = State.then_match(line)
+            node.set_name(name[1])
+            node.set_given(false)
             [:out, node]
+          when State.given_match(line)
+            [:out, node.set_given(true)]
           when State.ruby_match(line)
             if node.potential_name
               node = node.add_example(lnb: lnb, line: line)
               [:exa, node]
-            else
+            elsif node.given?
               node = node.add_include(lnb: lnb)
               [:inc, node]
+            else
+              [:out, node]
             end
           else
-            node.set_name(nil)
-            [:out, node]
+            [:out, node.reset_context]
           end
         end
 

data/lib/speculations/version.rb

@@ -1,3 +1,3 @@
 module SpeculateAbout
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec