livetext 0.9.27 → 0.9.30

data/lib/livetext/userapi.rb

@@ -1,5 +1,5 @@
-
-require_relative 'lineparser'     # FIXME  meh, because of #format
+require_relative 'expansion'
+require_relative 'html'
 
 # Encapsulate the UserAPI as a class
 
@@ -15,18 +15,32 @@ class Livetext::UserAPI
   def initialize(live)
     @live = live
     @vars = live.vars
+    @html = HTML.new(self)
+    @expander = Livetext::Expansion.new(live)
   end
 
   def api
     @live.api
   end
 
+  def html
+    @html
+  end
+
   def dot
     @live
   end
 
-  def setvar(var, val)
-    Livetext::Vars[var] = val  # Now indifferent and "safe"
+  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)
@@ -34,19 +48,22 @@ class Livetext::UserAPI
   end
 
   def data=(value)
-# TTY.puts "in #{__FILE__}: api = #{@live.api.inspect}"
     @data = value
     @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  # ???
@@ -93,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??
@@ -119,21 +136,27 @@ class Livetext::UserAPI
 
   def format(line)
     return "" if line == "\n" || line.nil?
-    line2 = Livetext::LineParser.parse!(line)
+    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
 
@@ -150,11 +173,11 @@ class Livetext::UserAPI
   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.27"
+  VERSION = "0.9.30"
 end

data/lib/livetext.rb

@@ -9,7 +9,7 @@ require_relative 'livetext/errors'
 require_relative 'livetext/standard'
 require_relative 'livetext/functions'
 require_relative 'livetext/userapi'
-require_relative 'livetext/lineparser'
+require_relative 'livetext/formatter'
 require_relative 'livetext/processor'
 require_relative 'livetext/helpers'
 require_relative 'livetext/handler'

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

data/plugin/misc/navbar.rb

@@ -0,0 +1,162 @@
+
+private def get_href_title(line)
+  *title, href = line[1..-1].split(@space)
+  if href[0] == "@"
+    blank = true
+    href = href[1..-1]
+  else
+    blank = false
+  end
+  title = title.join(@space)
+  [href, title, blank]
+end
+
+private def add_root(url)
+  return url if url =~ /^http/     # already has http[s]
+  return url unless @root          # no root defined
+  range1 = 0..-1
+  range1 = 0..-2 if @root[-1] == "/"
+  root = @root[range1] 
+  range2 = 0..-1
+  range2 = 1..-1 if url[0] == "/"
+  url = url[range2]
+  root + "/" + url
+end
+
+private def get_brand
+  peek = @enum.peek
+  arg = peek[6..-1]
+  href, item, blank = get_href_title(arg)
+  # doesn't honor @root... and blank is unused here
+  if item =~ /\.(jpg|png|gif)$/i
+    item = "<img src='#{item}'></img>" 
+  end
+  details = {class: "navbar-brand mr-auto", href: add_root(href)}
+  @brand = html.tag(:a, **details, cdata: item)
+end
+
+private def slash_tags
+  @root = @brand = nil
+  @classes = "navbar-light bg-light"
+  loop do   # /brand /root ...
+    peek = @enum.peek
+    break if peek[0] != '/'
+    case
+      when peek.start_with?("/brand ")
+        get_brand
+      when peek.start_with?("/root ")
+        @root = peek[6..-1]
+      when peek.start_with?("/classes ")
+        @classes = peek[9..-1]
+    end
+    line = @enum.next
+  end
+end
+
+private def handle_children
+  value = ""
+  loop do
+    if @enum.peek.start_with?(@space)   # it's a child
+      line = @enum.next
+      href, title, blank = get_href_title(line)
+      details = {class: "dropdown-item", href: add_root(href)}
+      details[:target] = "_blank" if blank
+      link = html.tag(:a, **details, cdata: title)
+      str = html.tag(:li, cdata: link)
+      value << str + "\n"
+    else
+      break
+    end
+  end
+  api.out value
+end
+
+private def no_children(href, title)
+  html.li(class: "nav-item") do 
+    api.out html.tag(:a, class: "nav-link", href: add_root(href), cdata: title)
+  end
+end
+
+private def has_children(href, title)
+  css = "nav-item dropdown"
+  html.li(class: css) do
+    details = {class: "nav-link dropdown-toggle", href: "#", id: "navbarDropdown", 
+               role: "button", :"data-bs-toggle" => "dropdown", :"aria-expanded" => "false"}
+    @dropdowns += 1
+    api.out html.tag(:a, **details, cdata: title)
+    details = {class: "dropdown-menu", :"aria-labelledby" => "navbarDropdown"}
+    html.ul(**details) do  # children...
+      handle_children
+    end
+  end
+end
+
+private def handle_body
+  @dropdowns = 1
+  loop do
+    line = @enum.next
+    href, title, blank = get_href_title(line)
+    case line[0]
+    when "-"
+      no_children(href, title)
+    when "="
+      has_children(href, title)
+    end
+  end
+end
+
+def bootstrap
+  api.out <<~HTML
+  <head>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" 
+     rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" 
+     crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" 
+     integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" 
+     crossorigin="anonymous">
+    </script>
+  </head>
+  HTML
+end
+
+private def toggler
+  details = {class: "navbar-toggler", type: "button", "data-bs-toggle": "collapse", 
+             "data-bs-target": "#navbarSupportedContent", 
+             "aria-controls": "navbarSupportedContent", "aria-expanded": "false", 
+             "aria-label": "Toggle navigation"}
+  str = html.tag(:button, **details, cdata: '<span class="navbar-toggler-icon"></span>')
+  api.out str
+end
+
+private def branding
+  return if @brand.empty? || @brand.nil?
+  api.out @brand
+end
+
+def html
+  @html
+end
+
+def navbar
+  @html = HTML.new(api)
+  # bootstrap
+  @space = " "
+  @enum = api.body.each
+  slash_tags
+
+  css = "navbar navbar-expand-md " + @classes
+  html.nav(class: css) do
+    html.div(class: "container-fluid") do 
+      toggler
+      branding
+      content = {class: "collapse navbar-collapse", id: "navbarSupportedContent"}
+      html.div(**content) do
+        css = "navbar-nav me-auto mb-2 mb-md-0"
+        html.ul(class: css) do
+          handle_body
+        end
+      end
+    end
+  end
+end
+

data/test/snapshots/basic_formatting/expected-output.txt

@@ -3,11 +3,10 @@ and <i>italics</i>
 and <font size=+1><tt>code</tt></font>
 as well as <b>more complex</b> examples 
 of <i>italicized text</i>
-and <font size=+1><tt>code font</tt></font>.
+and <tt>code font</tt>.
 <p>
 
 Here are some random punctuation marks:
 ; # . * _ ` : @ % ^ & $
 <p>
-
 No need to escape these:  * _ `

data/test/snapshots/bootstrap_menu/expected-output.txt

@@ -0,0 +1,4 @@
+abc 123
+this is a test
+more stuff
+still more stuff

data/test/snapshots/bootstrap_menu/source.lt3

@@ -0,0 +1,17 @@
+.nopara
+
+.mixin bootstrap_menu
+
+.menu
+  .menu_link "Home", "http://fake.com/home"
+  .menu_dropdown "Blog"
+    .menu_dropdown_link "Home", "http://fake.com/blog"
+    .menu_dropdown_link "Design", "http://fake.com/design"
+    .menu_dropdown_link "HTML", "http://fake.com/html"
+    .menu_dropdown_link "CSS", "http://fake.com/css"
+    .menu_dropdown_link "Javascript", "http://fake.com/jscript"
+  .menu_dropdown "Work"
+    .menu_dropdown_item "Web Design", "http://fake.com/webdes"
+    .menu_dropdown_item "Typography", "http://fake.com/typog"
+    .menu_dropdown_item "Front-end", "http://fake.com/fronten"
+  .menu_link "About", "http://fake.com/about"

data/test/snapshots/subset.txt

@@ -19,68 +19,70 @@ h This file specifies which snapshots will/won't be run.
 
 # Note that QUIT (on a line by itself) will stop processing the file
 
+# Bootstrap
 
 # Others (usually passing):
 
 # import/include/mixin, others...
 
-   error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
-   error_no_such_copy       # ^ Same behavior as  error_no_such_inc
-   error_no_such_mixin      # ^ Same behavior as error_missing_end
-   simple_copy              #                    
-   simple_import            # 
-   simple_include           #                            
-   simple_mixin             #                            
-   import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
-   import2                  # 
-   mixin_bookish            # 
-   import_bookish           # 
-                    
-# raw input                     
-                     
-   single_raw_line          #  
-   raw_lines                #  
-   raw_text_block           #  
-   copy_is_raw              #  
-                     
-# comments                     
-                     
-   block_comment            #                              
-   comments_ignored_1       #  
-                     
-# variables and heredocs                     
-                     
-   predef_vars              #  
-   simple_vars              #  
-   more_complex_vars        #  
-   table_with_heredocs      #  
+    error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
+    error_no_such_copy       # ^ Same behavior as  error_no_such_inc
+    error_no_such_mixin      # ^ Same behavior as error_missing_end
+    simple_copy              #
+    simple_import            #
+    simple_include           #
+    simple_mixin             #
+    import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
+    import2                  #
+    mixin_bookish            #
+    import_bookish           #
+    test_wtf_bookish         #
+
+# raw input
+
+    single_raw_line          #
+    raw_lines                #
+    raw_text_block           #
+    copy_is_raw              #
+
+# comments
+
+    block_comment            #
+    comments_ignored_1       #
+
+# variables and heredocs
+
+    predef_vars              #
+    simple_vars              #
+    more_complex_vars        #
+    table_with_heredocs      #
 
 # testing def
 
-   def_method               #  
-                     
+    def_method               #
+
 # intraline formatting
 
-   basic_formatting         #  
-   test_formatting_34       # 
-   test_formatting_35       # 
+    basic_formatting         #
+    test_formatting_34       #
+    test_formatting_35       #
 
 # Errors
 
-   error_line_num           #  
-   error_mismatched_end     #  
-   error_name_not_permitted #  
-   error_invalid_name       # ^ Same behavior as error_no_such_inc
-   error_missing_end        # Output is duplicated somehow. Look for: puts @body or puts @main.body
-   error_inc_line_num       # Forgot what's wrong here
+    error_line_num           #
+    error_mismatched_end     #
+    error_name_not_permitted #
+    error_invalid_name       # ^ Same behavior as error_no_such_inc
+    error_missing_end        # Output is duplicated somehow. Look for: puts @body or puts @main.body
+    error_inc_line_num       # Forgot what's wrong here
 
 # functions
 
-   functions                #  
-   more_functions           # 
+    functions                #
+    more_functions           #
+
+# More/misc...
 
-# More/misc...                     
-                     
-   example_alpha            #  
-   example_alpha2           #  
-   hello_world              #  
+    example_alpha            #
+    example_alpha2           #
+    hello_world              #

data/test/unit/all.rb

@@ -1,5 +1,5 @@
 
 require_relative 'standard'
 require_relative 'parser'      # nested
-require_relative 'lineparser'
-require_relative 'tokenizer'
+# require_relative 'lineparser'
+# require_relative 'tokenizer'

data/test/unit/lineparser.rb

@@ -332,7 +332,7 @@ end
   TestLines.each.with_index do |item, num|
     msg, src, exp, blank = *item
     # generate tests...
-    name = "test_formatting_#{'%02d' % (num + 1)}"
+    name = "test_formatting_#{'%03d' % (num + 1)}"
     method_source = <<~RUBY
       def #{name}   # #{msg}
         msg, src, exp = <<~STUFF.split("\\n")

data/test/unit/parser/general.rb

@@ -33,11 +33,11 @@ class TestParseGeneral < MiniTest::Test
   def test_variables
     vars = ["foo 234\n", "bar 456\n"]
     expect = [%w[foo 234], %w[bar 456]]
-    assert_equal ParseGeneral.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect, "case 1 failed"
 
     vars = ["foo2 234", "bar2 456"]     # newline irrelevant
     expect = [%w[foo2 234], %w[bar2 456]]
-    assert_equal ParseGeneral.parse_vars(vars), expect
+    assert_equal ParseGeneral.parse_vars(vars), expect, "case 2 failed"
 
     # quotes are not stripped... hmm
     vars = ["alpha 'simple string'", 'beta "another string"']

data/test/unit/parser/set.rb

@@ -145,15 +145,6 @@ class TestParseSet < MiniTest::Test
     # ^ ParseSet isn't smart enough to know about variables/functions
   end
 
-  def test_var_eq_func
-    set = ParseSet.new("date = $$date").parse
-    set = set.first  # [["var", "value"]]
-    assert_equal set.first, "date"
-p set.last
-    assert set.last =~ /undefined/, "Found 'undefined' for variable value"
-    # ^ ParseSet isn't smart enough to know about variables/functions
-  end
-
   def xtest_two_strings
     line = %[bday="May 31", date='5/31']
     set = ParseSet.new(line).parse