speculate_about 0.5.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7347969c0f7e0d357050ba84401e3c069366c052b028a3e123c94ee355b9829
-  data.tar.gz: 277902ff252cfade683c395485015f03700028839dcd986d965dbfc5f6c1a425
+  metadata.gz: 9b33715812d0321ea53813b6a821e91c355f235c088a4ac6410f338e681d4a2b
+  data.tar.gz: 2e8cc718817fba9f4aa263f65420de5aa4f70625f7e1c8b7c0b43b352ac69e7e
 SHA512:
-  metadata.gz: 62daedfb2b2e00c7d9d1cac4fbe5c5fefcbfbb6dbfd49fed4cbdb4c224c37c54f80edd53aeb23215ca2192e0957a323dd7669c190917443b412e73976b8abbeb
-  data.tar.gz: 2a8626af0e4d46e63b514416d0341aaa61aa504f28ccf777827c701230ed1dddd08aa6b63314a066820799e05bb490b221f3481002eff144853c79732ce96464
+  metadata.gz: 42b7a04f119f34a49bd694509807681f7ebd8d4348556e1a121e648c391447a8f6f28cde03fc7615b93b07e077b6c5d268ef590c437e9c233d18a639b76db622
+  data.tar.gz: a5980e1500f466cb7072d55deb5b56fa5b790dc24810e902e28f3e105c053e8d0ab447403ef367ee51a9318151a06e80ede034e4b5f1a21ca62cf39c32c78d3c

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.5.2"
+  VERSION = "1.0.1"
 end

data/lib/speculations.rb

@@ -15,7 +15,7 @@ module Speculations extend self
     raise ArgumentError, "#{infile} not found" unless File.readable? infile
     outfile ||= _speculation_path(infile)
     if _out_of_date?(outfile, infile)
-      ast  = Speculations::Parser.new.parse_from_file(infile)
+      ast  = p Speculations::Parser.new.parse_from_file(infile)
       code = _decorated_ast_code ast, infile
       File.write(outfile, code.join("\n"))
     end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
+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.
 email: robert.dober@gmail.com
@@ -56,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
@@ -72,14 +46,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Extract RSpecs from Markdown