livetext 0.9.52 → 0.9.55

data/test/unit/formatter_component.rb

@@ -0,0 +1,84 @@
+require 'minitest/autorun'
+
+require_relative '../../lib/livetext'
+
+class TestingLivetextFormatter < Minitest::Test
+  def setup
+    @live = Livetext.new
+  end
+
+  def test_formatter_component_initialization
+    # Test that FormatterComponent is properly initialized
+    assert(@live.formatter, "FormatterComponent should be initialized")
+    assert_instance_of(Livetext::FormatterComponent, @live.formatter)
+  end
+
+  def test_basic_formatting
+    # Test basic text formatting
+    assert_equal("<b>bold</b>", @live.formatter.format("*bold"))
+    assert_equal("<i>italic</i>", @live.formatter.format("_italic"))
+    assert_equal("<tt>code</tt>", @live.formatter.format("`code"))
+    assert_equal("<strike>strike</strike>", @live.formatter.format("~strike"))
+  end
+
+  def test_double_markers
+    # Test double markers
+    assert_equal("<b>bold</b>", @live.formatter.format("**bold"))
+    assert_equal("**", @live.formatter.format("**"))  # standalone
+    assert_equal(" ** ", @live.formatter.format(" ** "))  # surrounded by spaces
+  end
+
+  def test_bracketed_markers
+    # Test bracketed markers
+    assert_equal("<b>content</b>", @live.formatter.format("*[content]"))
+    assert_equal("<i>content</i>", @live.formatter.format("_[content]"))
+    assert_equal("<tt>content</tt>", @live.formatter.format("`[content]"))
+    assert_equal("", @live.formatter.format("*[]"))  # empty brackets disappear
+  end
+
+  def test_escaped_markers
+    # Test escaped markers
+    assert_equal("*literal", @live.formatter.format("\\*literal"))
+    assert_equal("_literal", @live.formatter.format("\\_literal"))
+    assert_equal("`literal", @live.formatter.format("\\`literal"))
+    assert_equal("~literal", @live.formatter.format("\\~literal"))
+  end
+
+  def test_format_line
+    # Test format_line method
+    assert_equal("<b>bold</b>", @live.formatter.format_line("*bold\n"))
+    assert_equal("", @live.formatter.format_line(nil))
+    assert_equal("", @live.formatter.format_line(""))
+  end
+
+  def test_format_multiple
+    # Test format_multiple method
+    lines = ["*bold\n", "_italic\n", "`code\n"]
+    expected = ["<b>bold</b>", "<i>italic</i>", "<tt>code</tt>"]
+    assert_equal(expected, @live.formatter.format_multiple(lines))
+  end
+
+  def test_convenience_methods
+    # Test convenience methods
+    assert_equal("<b>text</b>", @live.formatter.bold("text"))
+    assert_equal("<i>text</i>", @live.formatter.italic("text"))
+    assert_equal("<tt>text</tt>", @live.formatter.code("text"))
+    assert_equal("<strike>text</strike>", @live.formatter.strike("text"))
+    assert_equal("<a href='url'>text</a>", @live.formatter.link("text", "url"))
+  end
+
+  def test_escape_html
+    # Test HTML escaping
+    assert_equal("&lt;tag&gt;", @live.formatter.escape_html("<tag>"))
+    assert_equal("&amp;", @live.formatter.escape_html("&"))
+    assert_equal("&quot;text&quot;", @live.formatter.escape_html('"text"'))
+    assert_equal("&#39;text&#39;", @live.formatter.escape_html("'text'"))
+  end
+
+  def test_edge_cases
+    # Test edge cases
+    assert_equal("", @live.formatter.format(nil))
+    assert_equal("", @live.formatter.format(""))
+    assert_equal("plain text", @live.formatter.format("plain text"))
+  end
+end

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/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.55
 platform: ruby
 authors:
 - Hal Fulton
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-07 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -30,6 +30,8 @@ files:
 - 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 +45,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
@@ -76,13 +78,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 +131,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
@@ -149,6 +163,17 @@ files:
 - 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 +207,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/expected-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
@@ -192,7 +220,11 @@ files:
 - test/test_escape.lt3
 - test/unit/all.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/parser.rb
@@ -204,6 +236,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/lib/livetext/processor.rb

@@ -1,88 +0,0 @@
-
-# Class Processor does the actual work of processing input.
-
-class Processor
-
-  include Livetext::Standard
-
-  Disallowed = 
-     %i[ __binding__        __id__            __send__          class
-         clone              display           dup               enum_for
-         eql?               equal?            extend            freeze
-         frozen?            hash              inspect           instance_eval   
-         instance_exec      instance_of?      is_a?             kind_of?
-         method             methods           nil?              object_id          
-         pretty_inspect     private_methods   protected_methods public_method
-         public_methods     public_send       respond_to?       send
-         singleton_class    singleton_method  singleton_methods taint
-         tainted?           tap               to_enum           to_s
-         trust              untaint           untrust           untrusted?
-         define_singleton_method              instance_variable_defined?
-         instance_variable_get                instance_variable_set
-         remove_instance_variable             instance_variables ]
-
-  attr_reader :parent, :sources
-
-  def initialize(parent, output = nil)   # Processor
-    @parent = parent || self
-    # STDERR.puts "PARENT.api = #{parent.api.inspect}"
-    @parent.api ||= Livetext::UserAPI.new(@parent)
-    @nopass = false
-    @nopara = false
-    # Meh?
-    @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
-    @sources = []
-    @indentation = @parent.indentation
-    @_mixins = []
-    @_imports = []
-    @html = Livetext::HTML.new(@parent.api)
-  end
-
-  def api
-    @parent.api   # FIXME Is this weird??
-  end
-
-  def html
-    @html
-  end
-
-  def output=(io)
-    @output = io
-  end
-
-  def error(*args)
-    ::STDERR.puts *args
-  end
-
-  def disallowed?(name)
-    flag = Disallowed.include?(name.to_sym)
-    flag
-  end
-
-  def source(enum, file, line)
-    @sources.push([enum, file, line])
-  end
-
-  def peek_nextline
-    return nil if @sources.empty?
-    source = @sources.last
-    line = source[0].peek
-    line
-  rescue StopIteration
-    @sources.pop
-    nil
-  rescue => err
-    TTY.puts "#{__method__}: RESCUE err = #{err.inspect}"
-    nil
-  end
-
-  def nextline
-    return nil if @sources.empty?
-    line = @sources.last[0].next
-    @sources.last[2] += 1
-    line
-  rescue StopIteration
-    @sources.pop
-    nil
-  end
-end