speculate_about 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d2e27062babfecbf03e34c59b76b495cbb1a9f27d3cbd0f4b23501d3be9181
-  data.tar.gz: bdde751f7fa2c532dc95551f06ecc22f44fba32ad0f70103371e1743f62ca347
+  metadata.gz: d53e888a2cad71c7c20205f0f34d7ededa3df3feceef7d567f051d362a36ccb8
+  data.tar.gz: ee00700ca0a19000b8098cb3022b462da0537477d58ee912f250aba6b02e3e7c
 SHA512:
-  metadata.gz: 95b2fd95e73b0b95d8c9237200bdb86c198f8584987d1f0a54968b742b46c1a06ffff29eb6352962a14e54c9d9d7e047a02f98c57b78a8894fc5c14a4f941d8c
-  data.tar.gz: bc56ce52b6e4bc87fbff62c5fb5583ad6fe683b4dd78e18bc8b6d6da28bfbdedf46d3397e297c70878dff8633e3c8c0aa15cb89c871d01ff3c84a8c32c3ccf12
+  metadata.gz: 3ced515885a50ff873cc4b471fe03eab69dc3e7c4f409e4e5ff392a91bfd94a08946aae7eb866607b27ecad62104beee68d8a52230fa2e216e1a544800a4ef0e
+  data.tar.gz: 792619744dab6387ad2e70c7fa53eb49c3b8b9f26470a5de7c92477c3cc274075d7cff720b5fb8dc0a87bf71d2af016517e72449d56298824d3f865253b64192

data/lib/speculate_about.rb

@@ -3,11 +3,11 @@ require 'rspec'
 require 'speculations/parser'
 
 module SpeculateAbout
-  def speculate_about file
+  def speculate_about file, alternate_syntax: false
     paths = _find_files(file, File.dirname( caller.first ))
     raise ArgumentError, "no files found for pattern #{file}" if paths.empty?
     paths.each do |path|
-      code = _compile path, _readable(path) 
+      code = _compile path, _readable(path), alternate_syntax: alternate_syntax 
       ENV["SPECULATE_ABOUT_DEBUG"] ? _show(code, path) : instance_eval(code, path)
     end
   end
@@ -15,8 +15,8 @@ module SpeculateAbout
 
   private
 
-  def _compile path, file
-    ast  = Speculations::Parser.new.parse_from_file(path, file)
+  def _compile path, file, alternate_syntax: false
+    ast  = Speculations::Parser.new.parse_from_file(path, file, alternate_syntax: alternate_syntax)
     ast.to_code
   end
   def _readable(path)

data/lib/speculations/parser.rb

@@ -3,7 +3,7 @@ class Speculations::Parser
   require_relative './parser/context'
   require_relative './parser/state'
 
-  attr_reader :filename, :input, :orig_filename, :root, :state
+  attr_reader :alternate_syntax, :filename, :input, :orig_filename, :root, :state
 
   def self.parsers
      @__parsers__ ||= {
@@ -14,7 +14,8 @@ class Speculations::Parser
      }
   end
 
-  def parse_from_file file, orig_filename = nil
+  def parse_from_file file, orig_filename = nil, alternate_syntax: false
+    @alternate_syntax = alternate_syntax
     @filename = file
     @orig_filename = orig_filename || file
     @input = File
@@ -31,7 +32,7 @@ class Speculations::Parser
   end
 
   def parse!
-    root = node = Context.new(name: "Speculations from #{@filename}", lnb: 0, filename: @filename, orig_filename: orig_filename, parent: nil)
+    root = node = Context.new(alternate_syntax: alternate_syntax, name: "Speculations from #{@filename}", lnb: 0, filename: @filename, orig_filename: orig_filename, parent: nil)
     input.each_with_index do |line, lnb|
       @state, node = self.class.parsers.fetch(@state).parse(line, lnb.succ, node)
     end

data/lib/speculations/parser/context.rb

@@ -3,11 +3,11 @@ class Speculations::Parser::Context
   require_relative './context/example'
   require_relative './context/setup'
 
-  attr_reader :filename, :level, :lnb, :name, :orig_filename, :parent, :potential_name, :setup
+  attr_reader :alternate_syntax, :filename, :level, :lnb, :name, :orig_filename, :parent, :potential_name, :setup
 
   def add_child(name:, lnb:)
     raise "Illegal nesting" if parent
-    children << self.class.new(name: name, lnb: lnb, parent: self)
+    children << self.class.new(alternate_syntax: alternate_syntax, name: name, lnb: lnb, parent: self)
     children.last
   end
 
@@ -60,8 +60,9 @@ class Speculations::Parser::Context
   
   private
 
-  def initialize(lnb:, name:, filename: nil, orig_filename: nil, parent: nil)
+  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
     @level         = parent ? parent.level.succ : 1
     @lnb           = lnb
     @setup         = nil

data/lib/speculations/parser/state.rb

@@ -9,7 +9,9 @@ module Speculations::Parser::State extend self
   EOBLOCK_RGX = %r[\A\s{0,3}```\s*\z]
   EXAMPLE_RGX = %r[\A\s{0,3}```.*\s:example]
   INCLUDE_RGX = %r[\A\s{0,3}```.*\s:include]
-  NAME_RGX    = %r[\A\s{0,3}Example:\s+(.*)]
+  NAME_RGX    = %r[\A\s{0,3}Example:?\s+(.*)]i
+  RUBY_RGX    = %r[\A\s{0,3}```ruby]
+  WS_RGX      = %r[\A\s*\z]
 
   def before_match line
     BEFORE_RGX =~ line
@@ -36,4 +38,12 @@ module Speculations::Parser::State extend self
   def potential_name line
     NAME_RGX.match(line)
   end
+
+  def ruby_match line
+    RUBY_RGX =~ line
+  end
+
+  def ws_match line
+    WS_RGX =~ line
+  end
 end

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

@@ -4,6 +4,42 @@ module Speculations
       module Out extend self
 
         def parse line, lnb, node
+          if node.alternate_syntax
+            _parse_alternate line, lnb, node
+          else
+            _parse_classical line, lnb, node
+          end
+        end
+
+        private
+
+        def _parse_alternate line, lnb, node
+          case
+          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]
+          when State.ws_match(line)
+            [:out, node]
+          when name = State.potential_name(line)
+            node.set_name(name[1])
+            [:out, node]
+          when State.ruby_match(line)
+            if node.potential_name
+              node = node.add_example(lnb: lnb, line: line)
+              [:exa, node]
+            else
+              node = node.add_include(lnb: lnb)
+              [:inc, node]
+            end
+          else
+            node.set_name(nil)
+            [:out, node]
+          end
+        end
+
+        def _parse_classical line, lnb, node
           case
           when name = State.context_match(line)
             node = node.parent if node.parent

data/lib/speculations/version.rb

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

metadata

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