livetext 0.9.27 → 0.9.32

data/test/extra/variables.rb

@@ -0,0 +1,94 @@
+require 'minitest/autorun'
+
+require 'livetext'
+
+# Just another testing class. Chill.
+
+class TestingLivetextVariables < MiniTest::Test
+
+  def setup
+    @live = Livetext.new
+  end
+
+  def check_match(exp, actual)
+    if exp.is_a? Regexp
+      assert_match(exp, actual, "actual does not match expected")
+    else
+      assert_equal(exp, actual, "actual != expected")
+    end
+  end
+
+  def test_variables_001_simple_variable   
+    # Simple variable
+    # No special initialization
+    src = "User name is $User, and all is well"
+    exp = /is [[:alnum:]]+, and/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_002_simple_user_variable   
+    # Simple user variable
+    @live.api.setvar(:whatever, "some var value")
+    src = "This is $whatever"
+    exp = "This is some var value"
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_003_test_undefined_variable   
+    # Test undefined variable
+    # No special initialization
+    src = "foo.bar is $foo.bar, apparently."
+    exp = /undefined/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_004_variables_user_and_version   
+    # Variables $User and $Version
+    # No special initialization
+    src = "I am user $User using Livetext v. $Version"
+    exp = /user [[:alnum:]]+ using Livetext v. [[:digit:]]+.[[:digit:]]+.[[:digit:]]+$/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_005_undefined_variable   
+    # Undefined variable
+    # No special initialization
+    src = "Here is $no.such.var's value"
+    exp = "Here is [no.such.var is undefined]'s value"
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_006_escaped_variable_name   
+    # Escaped variable name
+    # No special initialization
+    src = "The backslash means that \\$gamma is not a variable"
+    exp = "The backslash means that $gamma is not a variable"
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_007_backslash_dollar_dollar   
+    # Backslash dollar dollar
+    @live.api.setvar(:amount, 2.37)
+    src = "Observe: \\$$amount is not a function"
+    exp = "Observe: $2.37 is not a function"
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+  def test_variables_008_period_after_variable_name   
+    # Period after variable name
+    @live.api.setvar(:pi, 3.14159)
+    src = "Pi is roughly $pi."
+    exp = "Pi is roughly 3.14159."
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+ 
+
+end

data/test/extra/variables.txt

@@ -0,0 +1,35 @@
+Simple variable
+"User name is $User, and all is well"
+/is RX_USER, and/
+-------------------------------------------------
+Simple user variable
+init: @live.api.setvar(:whatever, "some var value")
+"This is $whatever"
+"This is some var value"
+-------------------------------------------------
+Test undefined variable
+"foo.bar is $foo.bar, apparently."
+/undefined/
+-------------------------------------------------
+Variables $User and $Version
+"I am user $User using Livetext v. $Version"
+/user RX_USER using Livetext v. RX_VERS/
+-------------------------------------------------
+Undefined variable
+"Here is $no.such.var's value"
+"Here is [no.such.var is undefined]'s value"
+-------------------------------------------------
+Escaped variable name
+"The backslash means that \$gamma is not a variable"
+"The backslash means that $gamma is not a variable"
+-------------------------------------------------
+Backslash dollar dollar
+init: @live.api.setvar(:amount, 2.37)
+"Observe: \$$amount is not a function"
+"Observe: $2.37 is not a function"
+-------------------------------------------------
+Period after variable name
+init: @live.api.setvar(:pi, 3.14159)
+"Pi is roughly $pi."
+"Pi is roughly 3.14159."
+-------------------------------------------------

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

@@ -1,9 +1,9 @@
 Here are examples of <b>boldface</b> 
 and <i>italics</i>
-and <font size=+1><tt>code</tt></font>
+and <tt>code</tt>
 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:

data/test/snapshots/simple_vars/source.lt3

@@ -3,5 +3,5 @@ some text.
 .set name=GulliverFoyle, nation=Terra
 Hi, there.
 $name is my name, and $nation is my nation.
-I'm $name, from $nation\.
+I'm $name, from $nation.
 That's all.

data/test/snapshots/subset.txt

@@ -19,68 +19,68 @@ h This file specifies which snapshots will/won't be run.
 
 # Note that QUIT (on a line by itself) will stop processing the file
 
-
 # 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,4 @@
 
 require_relative 'standard'
 require_relative 'parser'      # nested
-require_relative 'lineparser'
-require_relative 'tokenizer'
+require_relative 'html'

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.32
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -29,7 +29,8 @@ files:
 - lib/cmdargs.rb
 - lib/livetext.rb
 - lib/livetext/errors.rb
-- lib/livetext/funcall.rb
+- lib/livetext/expansion.rb
+- lib/livetext/formatter.rb
 - lib/livetext/functions.rb
 - lib/livetext/global_helpers.rb
 - lib/livetext/handler.rb
@@ -37,7 +38,6 @@ files:
 - lib/livetext/handler/mixin.rb
 - lib/livetext/helpers.rb
 - lib/livetext/html.rb
-- lib/livetext/lineparser.rb
 - lib/livetext/more.rb
 - lib/livetext/parser.rb
 - lib/livetext/parser/general.rb
@@ -53,19 +53,29 @@ files:
 - lib/livetext/version.rb
 - livetext.gemspec
 - plugin/bookish.rb
+- plugin/bootstrap_menu.rb
 - plugin/calibre.rb
 - plugin/livemagick.rb
 - plugin/markdown.rb
+- plugin/misc/navbar.rb
 - plugin/pyggish.rb
 - plugin/tutorial.rb
 - test/all.rb
+- test/extra/README.txt
+- test/extra/bracketed.rb
+- test/extra/bracketed.txt
+- test/extra/double.rb
+- test/extra/double.txt
+- test/extra/functions.rb
+- test/extra/functions.txt
+- test/extra/single.rb
+- test/extra/single.txt
+- test/extra/testgen.rb
+- test/extra/variables.rb
+- test/extra/variables.txt
 - test/snapshots.rb
-- test/snapshots/basic_formatting/actual-error.txt
-- test/snapshots/basic_formatting/actual-output.txt
-- test/snapshots/basic_formatting/err-sdiff.txt
 - test/snapshots/basic_formatting/expected-error.txt
 - test/snapshots/basic_formatting/expected-output.txt
-- test/snapshots/basic_formatting/out-sdiff.txt
 - test/snapshots/basic_formatting/source.lt3
 - test/snapshots/block_comment/expected-error.txt
 - test/snapshots/block_comment/expected-output.txt
@@ -80,13 +90,11 @@ files:
 - test/snapshots/def_method/expected-error.txt
 - test/snapshots/def_method/expected-output.txt
 - test/snapshots/def_method/source.lt3
-- test/snapshots/error_inc_line_num/README.txt
 - test/snapshots/error_inc_line_num/expected-output.txt
 - test/snapshots/error_inc_line_num/file2.lt3
 - test/snapshots/error_inc_line_num/match-error.txt
 - test/snapshots/error_inc_line_num/source.lt3
 - test/snapshots/error_invalid_name/expected-output.txt
-- test/snapshots/error_invalid_name/foo
 - test/snapshots/error_invalid_name/match-error.txt
 - test/snapshots/error_invalid_name/source.lt3
 - test/snapshots/error_line_num/expected-output.txt
@@ -116,9 +124,6 @@ files:
 - test/snapshots/example_alpha2/expected-error.txt
 - test/snapshots/example_alpha2/expected-output.txt
 - test/snapshots/example_alpha2/source.lt3
-- test/snapshots/functions/actual-error.txt
-- test/snapshots/functions/actual-output.txt
-- test/snapshots/functions/err-sdiff.txt
 - test/snapshots/functions/expected-error.txt
 - test/snapshots/functions/expected-output.txt
 - test/snapshots/functions/source.lt3
@@ -141,25 +146,15 @@ files:
 - test/snapshots/mixin_bookish/expected-output.txt
 - test/snapshots/mixin_bookish/source.lt3
 - test/snapshots/mixin_bookish/toc.tmp
-- test/snapshots/more_complex_vars/actual-error.txt
-- test/snapshots/more_complex_vars/actual-output.txt
-- test/snapshots/more_complex_vars/err-sdiff.txt
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
-- test/snapshots/more_complex_vars/out-sdiff.txt
 - test/snapshots/more_complex_vars/source.lt3
-- test/snapshots/more_functions/actual-error.txt
-- test/snapshots/more_functions/actual-output.txt
-- test/snapshots/more_functions/err-sdiff.txt
 - test/snapshots/more_functions/expected-error.txt
 - test/snapshots/more_functions/expected-output.txt
 - test/snapshots/more_functions/source.lt3
 - test/snapshots/predef_vars/expected-error.txt
 - test/snapshots/predef_vars/match-output.txt
 - test/snapshots/predef_vars/source.lt3
-- test/snapshots/raw_lines/actual-error.txt
-- test/snapshots/raw_lines/actual-output.txt
-- test/snapshots/raw_lines/err-sdiff.txt
 - test/snapshots/raw_lines/expected-error.txt
 - test/snapshots/raw_lines/expected-output.txt
 - test/snapshots/raw_lines/source.lt3
@@ -183,12 +178,8 @@ files:
 - test/snapshots/simple_mixin/expected-output.txt
 - test/snapshots/simple_mixin/simple_mixin.rb
 - test/snapshots/simple_mixin/source.lt3
-- test/snapshots/simple_vars/actual-error.txt
-- test/snapshots/simple_vars/actual-output.txt
-- test/snapshots/simple_vars/err-sdiff.txt
 - test/snapshots/simple_vars/expected-error.txt
 - test/snapshots/simple_vars/expected-output.txt
-- test/snapshots/simple_vars/out-sdiff.txt
 - test/snapshots/simple_vars/source.lt3
 - test/snapshots/single_raw_line/expected-error.txt
 - test/snapshots/single_raw_line/expected-output.txt
@@ -197,17 +188,11 @@ files:
 - test/snapshots/table_with_heredocs/expected-error.txt
 - test/snapshots/table_with_heredocs/expected-output.txt
 - test/snapshots/table_with_heredocs/source.lt3
-- test/snapshots/var_into_func/actual-error.txt
-- test/snapshots/var_into_func/actual-output.txt
-- test/snapshots/var_into_func/err-sdiff.txt
 - test/snapshots/var_into_func/expected-error.txt
 - test/snapshots/var_into_func/expected-output.txt
-- test/snapshots/var_into_func/out-sdiff.txt
 - test/snapshots/var_into_func/source.lt3
 - test/unit/all.rb
 - test/unit/html.rb
-- test/unit/lineparser.rb
-- test/unit/new_lineparser.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb
 - test/unit/parser/general.rb
@@ -216,7 +201,6 @@ files:
 - test/unit/parser/string.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
-- test/unit/tokenizer.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby

data/lib/livetext/funcall.rb

@@ -1,87 +0,0 @@
-
-require_relative '../livetext'
-
-# Parse function calls
-
-module Livetext::LineParser::FunCall
-
-  include Livetext::ParsingConstants
-
-  def param_loop(char)
-    param = ""
-    loop do
-      case peek
-        when Escape
-          param << escaped
-        when char, LF, nil
-          break
-      else
-        param << grab
-      end
-    end
-    param = nil if param.empty?
-    param
-  end
-
-  def grab_colon_param
-    grab  # grab :
-    param = param_loop(Space)
-  end
-
-  def grab_bracket_param
-    grab # [
-    param = param_loop("]")
-    grab  # "]"
-    param
-  end
-
-  def funcall(name, param)
-    err = "[Error evaluating $$#{name}(#{param})]"
-    name = name.gsub(/\./, "__")
-    result = 
-      if self.send?(name, param)
-        # do nothing
-      else
-        fobj = ::Livetext::Functions.new
-        fobj.send(name, param) rescue err
-      end
-    result.to_s
-  end
-
-  def grab_func_with_param
-    add_token(:str, @token)
-    func = grab_alpha
-    add_token(:func, func)
-    param = grab_func_param(grab)    # may be null/missing
-    param
-  end
-
-  def double_dollar
-    case peek
-      when Space;   add_token :string, "$$ "; grab
-      when LF, nil; add "$$ "; add_token :str
-      when Alpha;   param = grab_func_with_param
-      else          grab; add_token :str, "$$" + peek
-    end
-  end
-
-#   def grab_func_param
-#     case peek
-#       when "["
-#         param = grab_bracket_param
-#         add_token(:brackets, param)
-#       when ":"
-#         param = grab_colon_param
-#         add_token(:colon, param)
-#     else  # do nothing
-#     end
-#   end
-
-  def escaped
-    grab        # Eat the backslash
-    ch = grab   # Take next char
-    ch
-  end
-
-end
-