speculate_about 0.6.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf1c9fa5d8bb2d18f142e4fcc18aad6ca71d0694829b7bd0f7d291b0e3c97d2
-  data.tar.gz: '06689091cee69a4f3df817efc5ba8be2ed754d85fe98ed5cb9d27c28b58be506'
+  metadata.gz: 418165840fa00627dbf34678bfc9eec5133565b4d9eaf697a8a748242b8fe759
+  data.tar.gz: 4a1cbab184f1b6861ef38112750e4783b257a19d61dbf19ae4a4385aed47fcde
 SHA512:
-  metadata.gz: c382d674930d2e61a8494de4331a4b4f3afef2cc6b77193fbb09af4610f3c8944f65edb09ff5ff550dfea5f56114692c1d93f37f04a88d30e91d014deba7b7f0
-  data.tar.gz: b29b76a402e49063919eeded1724c7ea2d87c557fba1ea6f4e526d9e9a322da746669d460d3effbc4146090f57559a4c77523464e9cc44f324172c0363e783f1
+  metadata.gz: 251c5d8c14c559797d1246aac8e1ba9cc269be9e68cbe496808768989ffaaf99d0fa2c60d4571ead528cecb7104a7ecee4335119bd28244a9f9678e906855bc1
+  data.tar.gz: 070a7aaa0842f8627876be6516bed4a9cf3615d738bda0d58f0414df4f6b72d5b49302e607960d33dcf524589a4304e3fa31ce30eef5968dfce94e496301e53c

data/lib/speculations/parser/context/include.rb

@@ -2,7 +2,7 @@ class Speculations::Parser::Context::Include
 
   attr_reader :lnb, :parent
 
-  def add_line line 
+  def add_line line
     lines << line
     self
   end

data/lib/speculations/parser/context.rb

@@ -45,7 +45,7 @@ module Speculations
 
       def map_lines(*lines, indent: 0)
         prefix = "  " * (tree_level + indent).succ
-        lines.flatten.map{ |line| "#{prefix}#{line.strip}" }
+        lines.flatten.map{ |line| "#{prefix}#{line.strip}".rstrip }
       end
 
       def to_code

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/context_maker.rb

@@ -0,0 +1,16 @@
+module Speculations
+  class Parser
+    module State
+      module ContextMaker
+        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/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,24 @@
+require_relative 'context_maker'
+module Speculations
+  class Parser
+    module State
+      module Includes extend self
+        include ContextMaker
+
+        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
+
+      end
+    end
+  end
+end

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

@@ -1,7 +1,9 @@
+require_relative 'context_maker'
 module Speculations
   class Parser
     module State
       module Out extend self
+        include ContextMaker
 
         def parse line, lnb, node, _ctxt
           case
@@ -16,15 +18,6 @@ module Speculations
           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

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

@@ -3,10 +3,10 @@ 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)\b\s*(?<title>.*)]
+  THEN_RGX    = %r[\A\s{0,3}(?:Then|But|And|Also|Or)\b\s*(?<title>.*)]
 
   def blank_line line
     BLANK_RGX.match(line)

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.0"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-02-06 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.
@@ -28,7 +28,9 @@ files:
 - lib/speculations/parser/context/include.rb
 - lib/speculations/parser/state.rb
 - lib/speculations/parser/state/candidate.rb
+- lib/speculations/parser/state/context_maker.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