livetext 0.9.55 → 0.9.56

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.55
+  version: 0.9.56
 platform: ruby
 authors:
 - Hal Fulton
 bindir: bin
 cert_chain: []
-date: 2025-08-07 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,10 +22,14 @@ 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
@@ -57,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
@@ -157,6 +162,10 @@ 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
@@ -208,7 +217,7 @@ files:
 - 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/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
@@ -219,6 +228,9 @@ 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
@@ -227,6 +239,7 @@ files:
 - 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

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

data/plugin/markdown.rb

@@ -1,43 +0,0 @@
-# This file is intended to be used via a Livetext .mixin  
-# or the equivalent.
-
-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
-

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

@@ -1,18 +0,0 @@
-System Info Variables:
-Hostname: HAL9000
-Platform: universal.x86_64-darwin22
-Ruby Version: 2.6.10
-Livetext Version: 0.9.53
-<p>
-
-System Info Functions:
-Hostname: HAL9000
-Platform: universal.x86_64-darwin22
-Ruby Version: 2.6.10
-Livetext Version: 0.9.53
-<p>
-
-Date Formatting Functions:
-Default: 2025-08-07
-Days ago: 2025-07-31
-Days from now: 2025-08-14