livetext 0.9.52 → 0.9.56

data/test/unit/function_registry.rb

@@ -0,0 +1,132 @@
+require 'minitest/autorun'
+
+require_relative '../../lib/livetext'
+
+class TestingLivetextFunctionRegistry < 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_registry_builtin_functions
+    # Test that builtin functions work through the registry
+    src = "$$date"
+    exp = /^\d{4}-\d{2}-\d{2}$/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+
+  def test_registry_user_functions
+    # Test that user functions are registered and work
+    registry = @live.function_registry
+    
+    # Register a test function
+    registry.register_user('testfunc', ->(param) { param.upcase }, source: :inline, filename: 'test.lt3')
+    
+    # Test that it works
+    result = registry.call('testfunc', 'hello')
+    assert_equal('HELLO', result)
+  end
+
+  def test_registry_function_override
+    # Test that user functions override builtin functions
+    registry = @live.function_registry
+    
+    # Register a user function that should override the builtin
+    registry.register_user('reverse', ->(param) { param.upcase }, source: :inline, filename: 'test.lt3')
+    
+    # Test that user function is called, not builtin
+    result = registry.call('reverse', 'hello')
+    assert_equal('HELLO', result)  # User function (uppercase), not builtin (reverse)
+  end
+
+  def test_registry_function_listing
+    # Test that we can list functions
+    registry = @live.function_registry
+    functions = registry.list_functions
+    
+    # Should have builtin functions
+    builtin_names = functions.select { |f| f[:source] == "builtin" }.map { |f| f[:name] }
+    assert_includes(builtin_names, "date")
+    assert_includes(builtin_names, "time")
+    assert_includes(builtin_names, "reverse")
+  end
+
+  def test_registry_error_handling
+    # Test error handling for non-existent functions
+    src = "$$nonexistent[param]"
+    exp = /Error evaluating/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+
+
+
+  def test_registry_function_source_tracking
+    # Test that function sources are tracked correctly
+    registry = @live.function_registry
+    
+    # Register a test function
+    registry.register_user('testsource', ->(param) { "test" }, source: :inline, filename: 'test.lt3')
+    
+    # Check that it's listed with correct source
+    functions = registry.list_functions
+    test_func = functions.find { |f| f[:name] == 'testsource' }
+    assert_equal("inline (test.lt3)", test_func[:source])
+  end
+
+  def test_registry_function_info
+    # Test getting detailed function information
+    registry = @live.function_registry
+    
+    # Test builtin function info
+    info = registry.get_function_info('date')
+    assert_equal('date', info[:name])
+    assert_equal('builtin', info[:source])
+    assert_equal('builtin', info[:filename])
+    assert_equal(:builtin, info[:type])
+    
+    # Test non-existent function
+    info = registry.get_function_info('nonexistent')
+    assert_nil(info)
+  end
+
+  def test_registry_mixin_source_tracking
+    # Test that mixin functions are tracked with correct source
+    registry = @live.function_registry
+    
+    # Register a mixin function
+    registry.register_user('mixinfunc', ->(param) { "mixin" }, source: :mixin, filename: 'test_mixin.rb')
+    
+    # Check that it's listed with correct source
+    functions = registry.list_functions
+    mixin_func = functions.find { |f| f[:name] == 'mixinfunc' }
+    assert_equal("mixin (test_mixin.rb)", mixin_func[:source])
+  end
+
+  def test_registry_function_exists
+    # Test the function_exists? method
+    registry = @live.function_registry
+    
+    assert(registry.function_exists?('date'), "Builtin function should exist")
+    assert(registry.function_exists?('time'), "Builtin function should exist")
+    refute(registry.function_exists?('nonexistent'), "Non-existent function should not exist")
+  end
+
+  def test_registry_backward_compatibility
+    # Test that old-style function calls still work
+    src = "$$date"
+    exp = /^\d{4}-\d{2}-\d{2}$/
+    actual = @live.api.format(src)
+    check_match(exp, actual)
+  end
+
+
+end

data/test/unit/mixin_functions_class.rb

@@ -0,0 +1,131 @@
+require 'minitest/autorun'
+require_relative '../../lib/livetext'
+
+class TestingMixinFunctionsClass < Minitest::Test
+  def setup
+    @live = Livetext.new
+  end
+
+  def test_mixin_registers_functions_from_class
+    # Test that the mixin handler properly registers functions from Livetext::Functions class
+    
+    # First, verify that our test functions don't exist yet
+    registry = @live.function_registry
+    assert_nil(registry.get_function_info('class_func'))
+    assert_nil(registry.get_function_info('another_class_func'))
+    assert_nil(registry.get_function_info('simple_class_func'))
+    
+    # Load the mixin by calling the method directly
+    @live.mixin(['mixin_functions_class'], '')
+    
+    # Now verify that the functions are registered
+    info = registry.get_function_info('class_func')
+    assert_equal('class_func', info[:name])
+    assert_equal('mixin (/Users/Hal/Dropbox/topx/git/livetext/plugin/mixin_functions_class.rb)', info[:source])
+    assert_equal(:user, info[:type])
+    
+    info = registry.get_function_info('another_class_func')
+    assert_equal('another_class_func', info[:name])
+    assert_equal('mixin (/Users/Hal/Dropbox/topx/git/livetext/plugin/mixin_functions_class.rb)', info[:source])
+    
+    info = registry.get_function_info('simple_class_func')
+    assert_equal('simple_class_func', info[:name])
+    assert_equal('mixin (/Users/Hal/Dropbox/topx/git/livetext/plugin/mixin_functions_class.rb)', info[:source])
+  end
+
+  def test_mixin_functions_work_properly
+    # Test that the registered functions actually work
+    
+    # Load the mixin
+    @live.mixin(['mixin_functions_class'], '')
+    
+    # Test function calls
+    result = @live.api.format("$$class_func:test_param")
+    assert_equal("Class function called with: test_param", result)
+    
+    result = @live.api.format("$$another_class_func[with brackets]")
+    assert_equal("Another class function called with: with brackets", result)
+    
+    result = @live.api.format("$$simple_class_func")
+    assert_equal("Simple class function with no parameters", result)
+  end
+
+  def test_mixin_functions_have_vars_access
+    # Test that functions in Livetext::Functions class have access to Livetext::Vars
+    
+    # Set a variable using the better instance-based approach
+    @live.vars.set(:View, "test_view")
+    
+    # Load the mixin
+    @live.mixin(['mixin_functions_class'], '')
+    
+    # Test function that accesses vars
+    result = @live.api.format("$$vars_test:some_value")
+    assert_equal("Vars test: param=some_value, View=test_view", result)
+  end
+
+  def test_mixin_does_not_register_builtin_functions
+    # Test that the mixin handler doesn't re-register builtin functions
+    
+    # Load the mixin
+    @live.mixin(['mixin_functions_class'], '')
+    
+    # Check that builtin functions still have correct source
+    registry = @live.function_registry
+    info = registry.get_function_info('date')
+    assert_equal('builtin', info[:source])  # Should still be builtin, not mixin
+    
+    info = registry.get_function_info('reverse')
+    assert_equal('builtin', info[:source])  # Should still be builtin, not mixin
+  end
+
+  def test_mixin_registers_both_module_and_class_functions
+    # Test that mixin handler registers both module methods and Livetext::Functions methods
+    
+    # Create a test mixin file with both types
+    test_mixin_content = <<~RUBY
+      def module_func(param)
+        "Module function: \#{param}"
+      end
+      
+      class Livetext::Functions
+        def class_func(param)
+          "Class function: \#{param}"
+        end
+      end
+    RUBY
+    
+    # Write temporary test file in current directory
+    test_file = File.join(Dir.pwd, "temp_mixin_test.rb")
+    File.write(test_file, test_mixin_content)
+    
+    begin
+      # Load the mixin
+      @live.mixin(['temp_mixin_test'], '')
+      
+      # Test that both types of functions are registered
+      registry = @live.function_registry
+      
+      # Module function should be registered
+      info = registry.get_function_info('module_func')
+      assert_equal('module_func', info[:name])
+      assert_equal("mixin (./temp_mixin_test.rb)", info[:source])
+      
+      # Class function should be registered
+      info = registry.get_function_info('class_func')
+      assert_equal('class_func', info[:name])
+      assert_equal("mixin (./temp_mixin_test.rb)", info[:source])
+      
+      # Both should work
+      result = @live.api.format("$$module_func:test")
+      assert_equal("Module function: test", result)
+      
+      result = @live.api.format("$$class_func:test")
+      assert_equal("Class function: test", result)
+      
+    ensure
+      # Clean up
+      File.delete(test_file) if File.exist?(test_file)
+    end
+  end
+end

data/test/unit/stringparser.rb

@@ -1,8 +1,6 @@
 require 'minitest/autorun'
 
-
-
-require_relative '../../lib/stringparser'
+require_relative '../../lib/livetext/parser/string'
 
 class TestStringParser < Minitest::Test
 
@@ -38,13 +36,13 @@ class TestStringParser < Minitest::Test
   end
 
   def test_next
-    assert_nil @zero.next
+    assert_nil @zero.grab
     assert_equal @zero.i, 0      # nothing happens
 
-    assert_equal @one.next, "x"
+    assert_equal @one.grab, "x"
     assert_equal @one.i, 1
 
-    assert_equal @many.next, "T"
+    assert_equal @many.grab, "T"
     refute @many.eos, "EOS was true for #{@many.inspect}"
     assert_equal @many.i, 1
   end
@@ -56,20 +54,20 @@ class TestStringParser < Minitest::Test
   end
 
   def test_next_eos
-    @zero.next
+    @zero.grab
     assert @zero.eos?
 
     @one.eos?
     refute @one.eos?
-    @one.next
+    @one.grab
     assert @one.eos?
-    @one.next # One beyond the actual end
+    @one.grab # One beyond the actual end
     assert @one.eos? # Still the end
 
-    @many.next
+    @many.grab
     refute @many.eos?
     count = @many.len    # doesn't make sense??
-    count.times { @many.next }
+    count.times { @many.grab }
     assert @many.eos?
   end
 
@@ -80,36 +78,20 @@ class TestStringParser < Minitest::Test
   end
 
   def test_next_peek
-    char1 = @zero.next
+    char1 = @zero.grab
     char2 = @zero.peek
     assert_nil char1
     assert_nil char2
     assert @zero.i == 0
-    assert @zero.last?
     assert @zero.eos?
 
-    refute @one.last?
     char1 = @one.peek
-    refute @one.last?
-    char2 = @one.next
-    assert @one.last? # One beyond the last
+    char2 = @one.grab
     char3 = @one.peek
     assert char1
     assert char2 == char1
     assert char3 == @str1[1]
     assert @one.i == 1
-    assert @one.last?
-    assert @one.eos?
-
-    char1 = @many.peek
-    char2 = @many.next
-    char3 = @many.peek
-    assert char1
-    assert char2 == char1
-    assert char3 == @strN[1]
-    assert @many.i == 1
-    refute @many.last?
-    refute @many.eos?
   end
 
   def test_skip_spaces
@@ -135,8 +117,8 @@ class TestStringParser < Minitest::Test
 
   def test_for_parse_set
     str = StringParser.new('gamma = "oh, well"')
-    count = str.len    # doesn't make sense??
-    count.times { print str.next; }
-
+    count = str.len
+    count.times { str.grab }
+    assert str.eos?
   end
 end

data/test/unit/variable_manager.rb

@@ -0,0 +1,71 @@
+require 'minitest/autorun'
+
+require_relative '../../lib/livetext'
+
+class TestingLivetextVariableManager < Minitest::Test
+  def setup
+    @live = Livetext.new
+  end
+
+  def test_variable_manager_initialization
+    # Test that VariableManager is properly initialized
+    assert(@live.variables, "VariableManager should be initialized")
+    assert_instance_of(Livetext::VariableManager, @live.variables)
+  end
+
+  def test_default_variables
+    # Test that default variables are set
+    assert_equal(`whoami`.chomp, @live.variables.get(:User))
+    assert_equal(Livetext::VERSION, @live.variables.get(:Version))
+    assert_equal(`hostname`.chomp, @live.variables.get(:Hostname))
+    assert_equal(RUBY_PLATFORM, @live.variables.get(:Platform))
+    assert_equal(RUBY_VERSION, @live.variables.get(:RubyVersion))
+    assert_equal(Livetext::VERSION, @live.variables.get(:LivetextVersion))
+  end
+
+  def test_date_time_variables
+    # Test that date/time variables are set
+    now = Time.now
+    assert_equal(now.year.to_s, @live.variables.get(:Year))
+    assert_equal(now.mon.to_s, @live.variables.get(:Month))
+    assert_equal(now.day.to_s, @live.variables.get(:Day))
+    assert_equal(now.hour.to_s, @live.variables.get(:Hour))
+    assert_equal(now.min.to_s, @live.variables.get(:Minute))
+    assert_equal(now.sec.to_s, @live.variables.get(:Second))
+    assert_equal(now.wday.to_s, @live.variables.get(:Weekday))
+    assert_equal(now.strftime("%U"), @live.variables.get(:Week))
+  end
+
+  def test_set_and_get_variables
+    # Test setting and getting custom variables
+    @live.variables.set(:test_var, "test_value")
+    assert_equal("test_value", @live.variables.get(:test_var))
+  end
+
+  def test_set_multiple_variables
+    # Test setting multiple variables at once
+    pairs = { var1: "value1", var2: "value2" }
+    @live.variables.set_multiple(pairs)
+    assert_equal("value1", @live.variables.get(:var1))
+    assert_equal("value2", @live.variables.get(:var2))
+  end
+
+  def test_variable_exists
+    # Test checking if variables exist
+    @live.variables.set(:exists_test, "value")
+    assert(@live.variables.exists?(:exists_test))
+    refute(@live.variables.exists?(:nonexistent))
+  end
+
+  def test_bracket_access
+    # Test bracket notation access
+    @live.variables.set(:bracket_test, "bracket_value")
+    assert_equal("bracket_value", @live.variables[:bracket_test])
+  end
+
+  def test_backward_compatibility
+    # Test that the old vars interface still works
+    assert(@live.vars, "vars method should still work")
+    assert_equal(`whoami`.chomp, @live.vars.get(:User))
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.52
+  version: 0.9.56
 platform: ruby
 authors:
 - Hal Fulton
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -22,14 +22,20 @@ files:
 - imports/bookish.rb
 - imports/calibre.rb
 - imports/livemagick.rb
-- imports/markdown.rb
 - imports/pyggish.rb
 - imports/tutorial.rb
 - lib/livetext.rb
+- lib/livetext/ast.rb
+- lib/livetext/ast/show_ast_clean.rb
+- lib/livetext/ast/show_ast_result.rb
+- lib/livetext/ast/show_raw_arrays.rb
+- lib/livetext/ast_to_html.rb
 - lib/livetext/core.rb
 - lib/livetext/errors.rb
 - lib/livetext/expansion.rb
 - lib/livetext/formatter.rb
+- lib/livetext/formatter_component.rb
+- lib/livetext/function_registry.rb
 - lib/livetext/functions.rb
 - lib/livetext/global_helpers.rb
 - lib/livetext/handler.rb
@@ -43,11 +49,11 @@ files:
 - lib/livetext/parser/string.rb
 - lib/livetext/parsing.rb
 - lib/livetext/paths.rb
-- lib/livetext/processor.rb
 - lib/livetext/reopen.rb
 - lib/livetext/skeleton.rb
 - lib/livetext/standard.rb
 - lib/livetext/userapi.rb
+- lib/livetext/variable_manager.rb
 - lib/livetext/variables.rb
 - lib/livetext/version.rb
 - livetext.gemspec
@@ -55,8 +61,9 @@ files:
 - plugin/bootstrap_menu.rb
 - plugin/codetool.rb
 - plugin/livemagick.rb
-- plugin/markdown.rb
+- plugin/lt3scriptor.rb
 - plugin/misc/navbar.rb
+- plugin/mixin_functions_class.rb
 - plugin/tutorial.rb
 - test/all.rb
 - test/extra/README.txt
@@ -76,13 +83,22 @@ files:
 - test/snapshots/comments_ignored_1/expected-error.txt
 - test/snapshots/comments_ignored_1/expected-output.txt
 - test/snapshots/comments_ignored_1/source.lt3
+- test/snapshots/complex_body/expected-error.txt
+- test/snapshots/complex_body/expected-output.txt
+- test/snapshots/complex_body/source.lt3
 - test/snapshots/copy_is_raw/expected-error.txt
 - test/snapshots/copy_is_raw/expected-output.txt
 - test/snapshots/copy_is_raw/rawtext.inc
 - test/snapshots/copy_is_raw/source.lt3
+- test/snapshots/debug_command/expected-error.txt
+- test/snapshots/debug_command/expected-output.txt
+- test/snapshots/debug_command/source.lt3
 - test/snapshots/def_method/expected-error.txt
 - test/snapshots/def_method/expected-output.txt
 - test/snapshots/def_method/source.lt3
+- test/snapshots/def_parameters/expected-error.txt
+- test/snapshots/def_parameters/expected-output.txt
+- test/snapshots/def_parameters/source.lt3
 - 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
@@ -120,6 +136,9 @@ files:
 - test/snapshots/functions/expected-error.txt
 - test/snapshots/functions/expected-output.txt
 - test/snapshots/functions/source.lt3
+- test/snapshots/functions_reflection/expected-error.txt
+- test/snapshots/functions_reflection/expected-output.txt
+- test/snapshots/functions_reflection/source.lt3
 - test/snapshots/hello_world/expected-error.txt
 - test/snapshots/hello_world/expected-output.txt
 - test/snapshots/hello_world/source.lt3
@@ -143,12 +162,27 @@ files:
 - test/snapshots/mixin_functions/expected-output.txt
 - test/snapshots/mixin_functions/mixin_functions.rb
 - test/snapshots/mixin_functions/source.lt3
+- test/snapshots/mixin_functions_class/expected-error.txt
+- test/snapshots/mixin_functions_class/expected-output.txt
+- test/snapshots/mixin_functions_class/mixin_functions_class.rb
+- test/snapshots/mixin_functions_class/source.lt3
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
 - test/snapshots/more_functions/expected-error.txt
 - test/snapshots/more_functions/expected-output.txt
 - test/snapshots/more_functions/source.lt3
+- test/snapshots/multiple_functions/expected-error.txt
+- test/snapshots/multiple_functions/expected-output.txt
+- test/snapshots/multiple_functions/source.lt3
+- test/snapshots/nested_includes/expected-error.txt
+- test/snapshots/nested_includes/expected-output.txt
+- test/snapshots/nested_includes/level2.inc
+- test/snapshots/nested_includes/level3.inc
+- test/snapshots/nested_includes/source.lt3
+- test/snapshots/parameter_handling/expected-error.txt
+- test/snapshots/parameter_handling/expected-output.txt
+- test/snapshots/parameter_handling/source.lt3
 - test/snapshots/predef_vars/expected-error.txt
 - test/snapshots/predef_vars/match-output.txt
 - test/snapshots/predef_vars/source.lt3
@@ -182,6 +216,9 @@ files:
 - test/snapshots/single_raw_line/expected-output.txt
 - test/snapshots/single_raw_line/source.lt3
 - test/snapshots/subset.txt
+- test/snapshots/system_info/expected-error.txt
+- test/snapshots/system_info/match-output.txt
+- test/snapshots/system_info/source.lt3
 - test/snapshots/table_with_heredocs/expected-error.txt
 - test/snapshots/table_with_heredocs/expected-output.txt
 - test/snapshots/table_with_heredocs/old-exp-out.txt
@@ -191,10 +228,18 @@ files:
 - test/snapshots/var_into_func/source.lt3
 - test/test_escape.lt3
 - test/unit/all.rb
+- test/unit/ast.rb
+- test/unit/ast_directives.rb
+- test/unit/ast_variables.rb
 - test/unit/bracketed.rb
+- test/unit/core_methods.rb
 - test/unit/double.rb
+- test/unit/formatter.rb
+- test/unit/formatter_component.rb
+- test/unit/function_registry.rb
 - test/unit/functions.rb
 - test/unit/html.rb
+- test/unit/mixin_functions_class.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb
 - test/unit/parser/general.rb
@@ -204,6 +249,7 @@ files:
 - test/unit/single.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
+- test/unit/variable_manager.rb
 - test/unit/variables.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:

data/imports/markdown.rb

@@ -1,44 +0,0 @@
-# This file is intended to be used via a Livetext .mixin  
-# or the equivalent.
-
-module Markdown
-  SimpleFormats = {}
-  SimpleFormats[:b] = %w[* *]
-  SimpleFormats[:i] = %w[_ _]
-  SimpleFormats[:t] = %w[` `]
-  SimpleFormats[:s] = %w[<strike> </strike>]
-
-
-  def h1(args = nil, body = nil); api.out "# #{Livetext.interpolate(api.data)}"; api.optional_blank_line end       # atx style for now
-  def h2(args = nil, body = nil); api.out "## #{Livetext.interpolate(api.data)}"; api.optional_blank_line end
-  def h3(args = nil, body = nil); api.out "### #{Livetext.interpolate(api.data)}"; api.optional_blank_line end
-  def h4(args = nil, body = nil); api.out "#### #{Livetext.interpolate(api.data)}"; api.optional_blank_line end
-  def h5(args = nil, body = nil); api.out "##### #{Livetext.interpolate(api.data)}"; api.optional_blank_line end
-  def h6(args = nil, body = nil); api.out "###### #{Livetext.interpolate(api.data)}"; api.optional_blank_line end
-
-  def title(args = nil, body = nil)
-    h1
-  end
-
-  def section(args = nil, body = nil)
-    h3
-  end
-
-  def bq(args = nil, body = nil)   # block quote
-    api.body {|line| api.out "> #{line}" }
-  end
-
-  def list(args = nil, body = nil)
-    api.body {|line| api.out " * #{line}" }
-  end
-
-  def olist(args = nil, body = nil)   # Doesn't handle paragraphs yet
-    n = 0
-    api.body do |line|
-      n += 1
-      api.out "#{n}. #{_format(line)}"
-    end
-  end
-
-  alias nlist olist
-end