speculate_about 0.2.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585ea729bce40c7978af922d12ac5ec32384c2a4e5b1a19fd159354864344776
-  data.tar.gz: ac750695bb18b891c1977533dce8b8932c74bb75cad89d1a1d81cd6b955cbe8f
+  metadata.gz: eba621014a8f6064b0d3d05c09e224c2977d0430dc2fa6483ddd8da7624e8b9d
+  data.tar.gz: ecbe9909ee3762d338bc423cab8aa18f86fd4ee34ab689adc7913227b2c09c7d
 SHA512:
-  metadata.gz: e46327125543f2e112fef196d87e660e67cd3078d8a8bb61171a775130508bff51c7595be05c1a5345e167a64ec0d342e974ac450f9ddec340622561e6bd5c50
-  data.tar.gz: f384dd4f32c12cf6c9973e520cf237712bb46e28ffe965bdf161c66a1c276977f7e991d8eea9f8d0102f136fed6e76b4f60f3ed0058df7f9737abc4413bff5d4
+  metadata.gz: 1bbd8986311ef802cdbd29c587116ebf386042160f8edc95536e9678e588a9ece9612990be7561084b82a83d6c129d53ac892f4da7e4a9f6eb4f495cc7041dd1
+  data.tar.gz: 53ad8621033646b8e89c18d900bedc4165ed948e2d65246ba6a0342d4229fc860d05e36e2cbfddd2e787a07d178ea8275ca33e785433afa6c16df10d39f286f7

data/lib/speculate_about.rb

@@ -3,28 +3,41 @@ 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, file
-      ENV["SPECULATE_ABOUT_DEBUG"] ? puts(code) : instance_eval(code)
+      code = _compile path, _readable(path), alternate_syntax: alternate_syntax 
+      ENV["SPECULATE_ABOUT_DEBUG"] ? _show(code, path) : instance_eval(code, path)
     end
   end
 
 
   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)
+    d = File.dirname(path)
+    File.join(File.basename(d), File.basename(path))
+  end
   def _find_files file, local_path
     [Dir.pwd, local_path]
       .flat_map do |dir|
         Dir.glob(File.join(dir, file))
     end
   end
+  def _show(code, path)
+     message = "Generated code for #{path}"
+     _underline(message)
+     puts code
+  end
+  def _underline(message, ul: "=")
+    puts message
+    puts message.gsub(/./, ul)
+  end
 end
 
 RSpec.configure do |conf|

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,22 +3,23 @@ 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
 
   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:)
@@ -60,8 +77,10 @@ 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
+    @given         = false
     @level         = parent ? parent.level.succ : 1
     @lnb           = lnb
     @setup         = nil
@@ -74,8 +93,12 @@ class Speculations::Parser::Context
   end
 
   def _init_from_parent filename, orig_filename, parent
-    @filename = parent ? parent.filename : filename
+    _set_filename filename, orig_filename, parent
     @orig_filename = parent ? parent.orig_filename : orig_filename
+  end
+
+  def _set_filename filename, orig_filename, parent
+    @filename = parent ? parent.filename : filename
     raise ArgumentError, "no filename given in root context" unless @filename
   end
 

data/lib/speculations/parser/state.rb

@@ -8,8 +8,12 @@ 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+(.*)]
+  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|But|And)\s+(.*)]
+  WS_RGX      = %r[\A\s*\z]
 
   def before_match line
     BEFORE_RGX =~ line
@@ -28,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
@@ -36,4 +44,16 @@ module Speculations::Parser::State extend self
   def potential_name line
     NAME_RGX.match(line)
   end
+
+  def ruby_match line
+    RUBY_RGX =~ line
+  end
+
+  def then_match line
+    THEN_RGX.match(line)
+  end
+
+  def ws_match line
+    WS_RGX =~ line
+  end
 end

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

@@ -4,6 +4,49 @@ 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)
+            [: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]
+            elsif node.given?
+              node = node.add_include(lnb: lnb)
+              [:inc, node]
+            else
+              [:out, node]
+            end
+          else
+            [:out, node.reset_context]
+          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

@@ -0,0 +1,3 @@
+module SpeculateAbout
+  VERSION = "0.4.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculate_about
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,7 @@ files:
 - lib/speculations/parser/state/exa.rb
 - lib/speculations/parser/state/inc.rb
 - lib/speculations/parser/state/out.rb
+- lib/speculations/version.rb
 homepage: https://github.com/robertdober/speculate
 licenses:
 - Apache-2.0