livetext 0.9.25 → 0.9.30

data/lib/livetext/parser/general.rb

@@ -24,7 +24,7 @@ class Livetext::ParseGeneral < StringParser
     lines.each do |line|
       next if line.strip.empty?
       var, value = line.split(" ", 2)
-      val = Livetext.interpolate(value)
+      # val = Livetext.interpolate(value)
       var = prefix + "." + var if prefix
       pairs << [var, value]
     end

data/lib/livetext/parser/set.rb

@@ -53,8 +53,9 @@ class Livetext::ParseSet < StringParser
     var = get_var
     skip_equal
     value = get_value
-    value = Livetext.interpolate(value)
+    # value = Livetext.interpolate(value)
     pair = [var, value]
+    Livetext::Vars[var.to_sym] = value
     pair
   end
 
@@ -115,10 +116,11 @@ class Livetext::ParseSet < StringParser
   end
 
   def unquoted_value
-    char = nil
     value = ""
+    char = nil
     loop do
       char = peek
+      break if char.nil?
       break if eos?
       break if char == " " || char == ","
       value << char
@@ -133,7 +135,12 @@ class Livetext::ParseSet < StringParser
 
   def get_value
     char = peek
-    value = quote?(char) ? quoted_value : unquoted_value
+    flag = quote?(char)
+    if flag
+      value = quoted_value 
+    else
+      value = unquoted_value
+    end
     value
   end
 end

data/lib/livetext/parser/string.rb

@@ -11,10 +11,12 @@ class StringParser
     @i = 0
   end
 
-  def grab
+  def grab(n = 1)
+    raise "n <= 0 for #grab" if n <= 0
     return nil if @eos
-    char = @line[@i]
-    @i += 1
+    i2 = @i + n - 1
+    char = @line[@i..i2]
+    @i += n
     check_eos
     char
   end
@@ -25,9 +27,14 @@ class StringParser
   end
 
   def lookahead
+    # Get rid of this?
     @line[@i + 1]
   end
 
+  def remainder
+    @line[@i..-1]
+  end
+
   def prev
     return nil if @i <= 0
     @line[@i-1]
@@ -37,9 +44,11 @@ class StringParser
     @eos
   end
 
-  def peek
+  def peek(n = 1)
+    raise "n <= 0 for #grab" if n <= 0
     return nil if @eos
-    @line[@i]
+    i2 = @i + n - 1
+    @line[@i..i2]
   end
 
   def skip_spaces

data/lib/livetext/processor.rb

@@ -35,12 +35,17 @@ class Processor
     @indentation = @parent.indentation
     @_mixins = []
     @_imports = []
+    @html = HTML.new(@parent.api)
   end
 
   def api
     @parent.api   # FIXME Is this weird??
   end
 
+  def html
+    @html
+  end
+
   def output=(io)
     @output = io
   end
@@ -57,7 +62,9 @@ class Processor
   end
 
   def disallowed?(name)
-    Disallowed.include?(name.to_sym)
+    flag = Disallowed.include?(name.to_sym)
+# api.tty "disa name = #{name.inspect} flag = #{flag}"
+    flag
   end
 
   def source(enum, file, line)

data/lib/livetext/skeleton.rb

@@ -9,9 +9,10 @@ class Livetext
   module ParsingConstants
   end
 
-  class FormatLine < StringParser
+  class LineParser < StringParser
     module FunCall
     end
   end
+
 end
 

data/lib/livetext/standard.rb

@@ -25,13 +25,13 @@ module Livetext::Standard
 
   attr_reader :data
 
-  def data=(val)    # FIXME this is weird, let's remove it soonish
-    api.data = val.chomp
-#   @args = val.split rescue []
+  def data=(val)    # FIXME this is weird, let's remove it soonish  and why are there two???
+# api.tty ">>>> in #{__FILE__}: api id = #{api.object_id}"
+    val = val.chomp
+    api.data = val
+    api.args = format(val).split rescue []
     @mixins = []
     @imports = []
-    ###
-    # api.data = val
   end
 
   # dumb name - bold, italic, teletype, striketrough
@@ -45,6 +45,12 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
+#  def setvars(pairs)
+#    pairs.each do |var, value|
+#      api.setvar(var, value)
+#    end
+#  end
+
   def backtrace(args = nil, body = nil)
     @backtrace = onoff(api.args.first)
     api.optional_blank_line
@@ -63,7 +69,8 @@ module Livetext::Standard
 
   def func(args = nil, body = nil)
     funcname = api.args[0]
-    check_disallowed(funcname)
+    # check_disallowed(funcname)  # should any be invalid?
+    funcname = funcname.gsub(/\./, "__")
     func_def = <<~EOS
       def #{funcname}(param)
         #{api.body.to_a.join("\n")}
@@ -143,10 +150,14 @@ module Livetext::Standard
   end
 
   def dot_def(args = nil, body = nil)
+# api.tty "in #{__FILE__}: api id = #{api.inspect}"
     name = api.args[0]
-    str = "def #{name}\n"
+# api.tty :dd1
+# api.tty name.inspect
     check_disallowed(name)
+# api.tty :dd2
     # Difficult to avoid eval here
+    str = "def #{name}\n"
     str << api.body(true).join("\n")
     str << "\nend\n"
     eval str
@@ -154,9 +165,9 @@ module Livetext::Standard
   end
 
   def set(args = nil, body = nil)
-    line = api.data.chomp
+    line = api.args.join(" ")  # data.chomp
     pairs = Livetext::ParseSet.new(line).parse
-    set_variables(pairs)
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
@@ -172,8 +183,9 @@ module Livetext::Standard
     else
       lines = api.body
     end
-    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
-    set_variables(pairs)
+    pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
+STDERR.puts "! pairs = #{pairs.inspect}"
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
@@ -187,8 +199,9 @@ module Livetext::Standard
     else
       lines = api.body
     end
-    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
-    set_variables(pairs)
+    pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
+STDERR.puts "pairs = #{pairs.inspect}"
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
@@ -202,8 +215,7 @@ module Livetext::Standard
     end
     indent = @parent.indentation.last
     indented = " " * indent
-    api.setvar(var, rhs.chomp)
-#   @parent.setvar(var, rhs.chomp)
+    api.set(var, rhs.chomp)
     api.optional_blank_line
   end
 
@@ -267,7 +279,9 @@ module Livetext::Standard
   end
 
   def r(args = nil, body = nil)
-    api.out api.data  # No processing at all
+    # FIXME api.data is broken
+    # api.out api.data  # No processing at all
+    api.out api.args.join(" ")
     api.optional_blank_line
   end
 

data/lib/livetext/userapi.rb

@@ -1,22 +1,46 @@
-
-require_relative 'formatline'
+require_relative 'expansion'
+require_relative 'html'
 
 # Encapsulate the UserAPI as a class
 
 class Livetext::UserAPI
 
+  KBD = File.new("/dev/tty", "r")
+  TTY = File.new("/dev/tty", "w")
+
+  DotSpace = ". "  # Livetext::Sigil + Livetext::Space
+
   attr_accessor :data, :args
 
   def initialize(live)
     @live = live
     @vars = live.vars
+    @html = HTML.new(self)
+    @expander = Livetext::Expansion.new(live)
   end
 
-  def setvar(var, val)
-    # FIXME don't like this...
-    str, sym = var.to_s, var.to_sym
-    Livetext::Vars[str] = val
-    Livetext::Vars[sym] = val
+  def api
+    @live.api
+  end
+
+  def html
+    @html
+  end
+
+  def dot
+    @live
+  end
+
+  def setvar(var, val)   # FIXME
+    # Livetext::Vars[var] = val  # Now indifferent and "safe"
+    @live.vars.set(var, val)
+  end
+
+  def setvars(pairs)
+    pairs = pairs.to_a if pairs.is_a?(Hash)
+    pairs.each do |var, value|
+      @live.vars.set(var, value)
+    end
   end
 
   def check_existence(file, msg)
@@ -28,14 +52,18 @@ class Livetext::UserAPI
     @args = format(@data).chomp.split
   end
 
+  def data
+    @data
+  end
+
   def args
     return @args unless block_given?
     @args.each {|arg| yield arg }
   end
 
-  def vars
-    @vars
-  end
+ def vars
+   @vars
+ end
 
   def optional_blank_line
     peek = @live.peek_nextline  # ???
@@ -45,9 +73,7 @@ class Livetext::UserAPI
   end
 
   def comment?(str)
-    sigil = Livetext::Sigil
-    c1 = sigil + Livetext::Space
-    str.index(c1) == 0
+    str.index(DotSpace) == 0
   end
 
   def trailing?(char)
@@ -84,7 +110,7 @@ class Livetext::UserAPI
       break if end?(@line)
       next if comment?(@line)
       @line = format(@line) unless raw
-      lines << @line 
+      lines << @line
     end
     raise "Expected .end, found end of file" unless end?(@line)  # use custom exception
     optional_blank_line   # FIXME Delete this??
@@ -110,22 +136,27 @@ class Livetext::UserAPI
 
   def format(line)
     return "" if line == "\n" || line.nil?
-    line2 = Livetext::FormatLine.parse!(line)
-#   line.replace(line2)
+    line2 = @expander.format(line)
     line2
   end
 
   def passthru(line)
     return if @live.nopass
-    out "<p>" if line == "\n" and ! @live.nopara
-    line = format(line)
-    out line
+    if line == "\n"
+      unless @live.nopara
+        out "<p>" 
+        out
+      end
+    else
+      text = @expander.format(line.chomp)
+      out text
+    end
   end
 
   def out(str = "", file = nil)
     return if str.nil?
     return file.puts str unless file.nil?
-    @live.body << str 
+    @live.body << str
     @live.body << "\n" unless str.end_with?("\n")
   end
 
@@ -133,12 +164,20 @@ class Livetext::UserAPI
     @live.body << str  # no newline
   end
 
+  def tty(*args)
+    TTY.puts *args
+  end
+
+  def err(*args)
+    STDERR.puts *args
+  end
+
   def puts(*args)
-    @live.output.puts *args 
+    @live.output.puts *args
   end
 
   def print(*args)
-    @live.output.print *args 
+    @live.output.print *args
   end
 
   def debug=(val)

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.25"
+  VERSION = "0.9.30"
 end

data/lib/livetext.rb

@@ -9,160 +9,10 @@ require_relative 'livetext/errors'
 require_relative 'livetext/standard'
 require_relative 'livetext/functions'
 require_relative 'livetext/userapi'
-require_relative 'livetext/formatline'
+require_relative 'livetext/formatter'
 require_relative 'livetext/processor'
 require_relative 'livetext/helpers'
 require_relative 'livetext/handler'
 
-
-
-make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
-make_exception(:UnknownMethod,     "Error: name '%1' is unknown")
-
-# Class Livetext reopened (top level).
-
-class Livetext
-
-  include Helpers
-
-  Vars = {}
-
-TTY = ::File.open("/dev/tty", "w")
-
-  attr_reader :main, :sources
-  attr_accessor :nopass, :nopara
-  attr_accessor :body, :indentation
-
-  class << self
-    attr_accessor :output      # bad solution?
-  end
-
-  def vars
-    @_vars
-  end
-
-  def self.interpolate(str)
-    # FIXME There are issues here...
-    # Livetext::FormatLine.var_func_parse(str)
-    parse = Livetext::FormatLine.new(str)
-    parse.var_func_parse
-  end
-
-  def self.customize(mix: [], call: [], vars: {})
-    obj = self.new
-    mix  = Array(mix)
-    call = Array(call)
-    mix.each {|lib| obj.mixin(lib) }
-    call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
-    obj
-  end
-
-  def peek_nextline
-    @main.peek_nextline  # delegate
-  end
-
-  def nextline
-    @main.nextline       # delegate
-  end
-
-  def sources
-    @main.sources        # delegate
-  end
-
-  def save_location
-    @save_location  # delegate
-  end
-
-  def save_location=(where)
-    @save_location = where  # delegate
-  end
-
-  def dump(file = nil)   # not a dot command!
-    file ||= ::STDOUT
-    file.puts @body
-  rescue => err
-    TTY.puts "#dump had an error: #{err.inspect}"
-  end
-
-  def graceful_error(err)
-    dump
-    raise err
-  end
-
-  def customize(mix: [], call: [], vars: {})
-    mix  = Array(mix)
-    call = Array(call)
-    mix.each {|lib| mixin(lib) }
-    call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    vars.each_pair {|var, val| setvar(var, val.to_s) }
-    self
-  end
-
-  def initialize(output = ::STDOUT)
-    @source = nil
-    @_mixins = []
-    @_imports = []
-    @_outdir = "."
-    @no_puts = output.nil?
-    @body = ""
-    @main = Processor.new(self, output)
-    @indentation = [0]
-    @_vars = Livetext::Vars
-    initial_vars
-    @api = UserAPI.new(self)
-  end
-
-  def api
-    @api
-  end
-
-  def interpolate(str)
-  end
-
-  def initial_vars
-    # Other predefined variables (see also setfile)
-    setvar(:User, `whoami`.chomp)
-    setvar(:Version, Livetext::VERSION)
-  end
-
-  def transform(text)
-    setfile!("(string)")
-    enum = text.each_line
-    front = text.match(/.*?\n/).to_a.first.chomp rescue ""
-    @main.source(enum, "STDIN: '#{front}...'", 0)
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)
-    end
-    result = @body
-#   @body = ""
-    result
-  end
-
-  # EXPERIMENTAL and incomplete
-  def xform(*args, file: nil, text: nil, vars: {})
-    case
-      when file && text.nil?
-        xform_file(file)
-      when file.nil? && text
-        transform(text)
-      when file.nil? && text.nil?
-        raise "Must specify file or text"
-      when file && text
-        raise "Cannot specify file and text"
-    end
-    self.process_file(file)
-    self.body
-  end
-
-  def xform_file(file, vars: nil)
-    Livetext::Vars.replace(vars) unless vars.nil?
-    @_vars.replace(vars) unless vars.nil?
-    self.process_file(file)
-    self.body
-  end
-
-end
+require_relative 'livetext/more'
 

data/plugin/bootstrap_menu.rb

@@ -0,0 +1,140 @@
+# https://getbootstrap.com/docs/5.1/components/navs-tabs/#base-nav
+
+require 'json'
+
+def api_out(indent_level, content)
+  api.out "#{(" " * (indent_level * indent_size))}#{content}"
+end
+
+def indent_size; 2; end
+
+def menu(indent_level: 0, &block)
+  api_out indent_level, "<ul class='nav'>"
+  read_to_end_of_block(root_indent_level: indent_level)
+  yield
+  api_out indent_level, "</ul>"
+end
+
+def menu_dropdown(title, indent_level: 0, &block)
+  api_out indent_level, '<li class="nav-item dropdown">'
+  api_out indent_level, "  <a class='nav-link dropdown-toggle' data-bs-toggle='dropdown' href='#' role='button' aria-expanded='false'"
+  api_out indent_level, "    #{title}"
+  api_out indent_level, '  </a>'
+
+  api_out indent_level, '  <ul class="dropdown-menu">'
+  yield
+  api_out indent_level, '  </ul>'
+
+  api_out indent_level, '</li>'
+end
+
+def menu_link(title, href, active: false, indent_level: 0)
+  # Work out if it's possible to determine active state or not
+  api_out indent_level, "<a class='nav-link #{"active" if active}' aria-current='page' href='#{href}'"
+  api_out indent_level, "  #{title}"
+  api_out indent_level, '</a>'
+end
+
+def menu_dropdown_link(title, href, active: false, indent_level: 0)
+  # Work out if it's possible to determine active state or not
+  api_out indent_level, "<a class='dropdown-item #{"active" if active}' href='#{href}'"
+  api_out indent_level, "  #{title}"
+  api_out indent_level, '</a>'
+end
+
+def next_line
+  nextline
+end
+
+def peek_next_line
+  peek_nextline
+end
+
+def line_indent_level(line)
+  indent_level = (line.size - line.lstrip.size) / indent_size.to_f
+  raise "Unbalanced Indenting: Expecting #{indent_size} indents" if indent_level.to_i != indent_level
+  indent_level = indent_level.to_i
+end
+
+def line_command(line)
+  base_line = line.strip
+
+  base_command = base_line.split.first
+
+  if base_command.start_with?(".")
+    return base_command.gsub(".")
+  else
+    raise "Command Expected: #{base_line}"
+  end
+end
+
+def line_attributes_array(line)
+  line_attributes = line.strip.split("", 2).last
+  api.out 0, line_attributes.inspect
+
+  attributes_parsed = JSON.parse(line_attributes)
+  attributes_parsed.is_a?(String) ? [attributes_parsed] : attributes_parsed
+end
+
+def read_to_end_of_block(root_indent_level: 0)
+  expected_indent_level = root_indent_level + 1
+  loop do
+    peeked_line = peek_next_line
+    return if peeked_line.nil? # End of File
+    unless peeked_line.strip.size > 0 # Blank line
+      next_line
+      next
+    end
+
+    line_indent_level = line_indent_level(peeked_line)
+
+    if expected_indent_level != line_indent_level
+      raise "Unexpected Indent Level: Is #{line_indent_level} expected #{expected_indent_level}:\n#{peeked_line}"
+    end
+
+    return if root_indent_level >= line_indent_level # End of Block
+
+    line = next_line # Actually move to the next line
+
+    send(line_command(line), *line_attributes_array(line)) do
+      # This block doesn't run if command doesn't accept a block
+      read_to_end_of_block(root_indent_level: line_indent_level)
+    end
+  end
+end
+
+# Loop should be something like:
+# read `.menu` and log current indent level
+# => send(:menu) do
+#  # Read until indent is
+# end
+
+def simple_test
+  menu do
+    menu_link "Home", "http://fake.com/home"
+    menu_dropdown("Blog") do
+      menu_dropdown_link("Home", "http://fake.com/blog")
+    end
+    menu_link "About", "http://fake.com/about"
+  end
+  # This should have the same output as:
+  # .menu
+  #   .menu_link
+  #   .menu_dropdown ["Blog"]
+  #     .menu_dropdown_link ["Home", "http://fake.com/blog"]
+  #   .menu_link ["About", "http://fake.com/about"]
+  # or this if we end up sticking with .end
+  # .menu
+  #   .menu_link
+  #   .menu_dropdown "Blog"
+  #     .menu_dropdown_link ["Home", "http://fake.com/blog"]
+  #   .end
+  #   .menu_link ["About", "http://fake.com/about"]
+  # .end
+
+
+  # Really this should probably just re-use Rails ActionView to avoid a ton of duplicate code
+  # This would allow us to leverage all the Rails HTML generation logic.
+  # Downside of that is that it does break the paradigm a bit in that blocks with errors won't partially render
+  # it does however also means we would get sanitization and such for free
+end