speculate_about 0.6.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c9156823395a28b426d374248458dd846e438e3ab0d6b31330e0357db4473e
-  data.tar.gz: 6ac9fb5014c33af83186983cf26f0770ebf7f4f2ef07c070d067f2f30477e658
+  metadata.gz: 691aa57b9ad1035ca6eb20fe75f89b818414dcd33e05acd9d6621e13ee1cfb23
+  data.tar.gz: 286766d1c5243bc9c1c6eb205c6e38ee97b3d06c90f4d77b6d84638a56d465e2
 SHA512:
-  metadata.gz: ee238e533857ea54f7bc47059824e06f264018419e07551338a33b8f319a64c070d59169f37e2c4f266a750cea7603c9d5fc9b45caf5ef3d9f94359fa37aed5d
-  data.tar.gz: b84407b46a432412f6a78e84e2cc3d07c3f381a6a93cbc18a45d5d3ea9c19b5f77209aa79bf8cef4cc9f811a1806ea7f84c6e8e208d025ccc3312475f75d4566
+  metadata.gz: cea1cc7dc006a7315fac53026959d444ae5a9bdcad161a94f57df7fdf3bead8cf5ee23aac5b9eaecdd68bc888cbf0df9e290acc4e09435f2b5bd771113ce38c3
+  data.tar.gz: 6dcd950c3ea0bace47c8ecf3e42dd38ff41d747ac92918c30c08e2403e0c6c2471dcf69c1f3eddc04049988c40d555b07f470ee6a3e873cf8c36aa1223828690

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

@@ -11,17 +11,17 @@ module Speculations
             new_parent = node.parent_of_level(level.pred)
             node = new_parent.new_context(title: match[2], lnb: lnb, level: level)
             [:out, node]
-          when match = State.maybe_example(line)
-            [:candidate, node, match[:title]]
           when match = State.maybe_include(line)
             [:candidate, node, :inc]
+          when match = State.maybe_example(line)
+            [:candidate, node, match[:title]]
           when match = State.ruby_code_block(line)
             if ctxt == :inc
               node = node.new_include(lnb: lnb)
             else
               node = node.new_example(title: ctxt, lnb: lnb)
             end
-            [:in, node]
+            [:in, node, (ctxt == :inc ? :includes : :out)]
           else
             [:out, node]
           end

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

@@ -6,9 +6,9 @@ module Speculations
         def parse line, _lnb, node, ctxt
           case
           when State.eoblock_match(line)
-            [:out, node.parent]
+            [ctxt, node.parent]
           else
-            [:in, node.add_line(line)]
+            [:in, node.add_line(line), ctxt]
           end
         end
       end

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

@@ -0,0 +1,31 @@
+module Speculations
+  class Parser
+    module State
+      module Includes extend self
+
+        def parse line, lnb, node, _ctxt
+          case
+          when match = State.context_match(line)
+            make_new_context(lnb: lnb, node: node, match: match)
+          when match = State.maybe_include(line)
+            [:candidate, node, :inc]
+          when match = State.maybe_example(line)
+            [:candidate, node, match[:title]]
+          else
+            [:includes, node]
+          end
+        end
+
+        private
+
+        def make_new_context(lnb:, match:, node:)
+          level = match[:level].size
+          new_parent = node.parent_of_level(level.pred)
+          node = new_parent.new_context(title: match[:title], lnb: lnb, level: level)
+          [:out, node]
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Speculations::Parser::State::Triggers
   BLANK_RGX   = %r{\A\s*\z}
   CONTEXT_RGX = %r[\A\s{0,3}(?<level>\#{1,7})\s+Context:?\s+(?<title>.*)]
   EOBLOCK_RGX = %r[\A\s{0,3}```\s*\z]
-  GIVEN_RGX   = %r[\A\s{0,3}(?:Given|When)\b]
+  GIVEN_RGX   = %r[\A\s{0,3}(?:Given|When|And)\b]
   EXAMPLE_RGX = %r[\A\s{0,3}Example:?\s+(<?title>.*)]
   RUBY_RGX    = %r[\A\s{0,3}```ruby]
   THEN_RGX    = %r[\A\s{0,3}(?:Then|But|And|Also|Or)\b\s*(?<title>.*)]

data/lib/speculations/parser/state.rb

@@ -1,6 +1,7 @@
 module Speculations::Parser::State extend self
   require_relative './state/candidate'
   require_relative './state/in'
+  require_relative './state/includes'
   require_relative './state/out'
   require_relative './state/triggers'
 

data/lib/speculations/parser.rb

@@ -8,6 +8,7 @@ module Speculations
       @__parsers__ ||= {
         candidate: State::Candidate,
         in: State::In,
+        includes: State::Includes,
         out: State::Out
       }
     end
@@ -31,7 +32,8 @@ module Speculations
       root = node = Context.new(filename: @filename)
       ctxt = nil
       @input.each_with_index do |line, lnb|
-        @state, node, ctxt = self.class.parsers.fetch(@state).parse(line, lnb.succ, node, ctxt)
+        parser = self.class.parsers.fetch(@state)
+        @state, node, ctxt = parser.parse(line, lnb.succ, node, ctxt)
       end
       root
     end

data/lib/speculations/version.rb

@@ -1,3 +1,3 @@
 module Speculations
-  VERSION = "0.6.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Allows Markdown or other text files to be used as literal specs, à la
   Elixr doctest, but from any file.
@@ -29,6 +29,7 @@ files:
 - lib/speculations/parser/state.rb
 - lib/speculations/parser/state/candidate.rb
 - lib/speculations/parser/state/in.rb
+- lib/speculations/parser/state/includes.rb
 - lib/speculations/parser/state/out.rb
 - lib/speculations/parser/state/triggers.rb
 - lib/speculations/version.rb