livetext 0.9.60 → 0.9.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63cd6b938fdb29f4b900ffb1ded5d378a9ae5d9c6274ec593f8593c2bd47e718
-  data.tar.gz: d62dcbfc69af01c7dc3d15608e2b95c6c3abc0347769fac24b8b600727608f35
+  metadata.gz: 61c11b22070e565c5c25735ea1134d58249a5f441f0ed3c1f9eeb0f8bbf7c628
+  data.tar.gz: feff45c934b1ecb8757dcd1ea3fad4947e7383063faa9f3f68506dc73c99ff9e
 SHA512:
-  metadata.gz: fb08277e4f424959940ba49f8dee3edc65347038a046b46235b618f70a11dfd92932316f325f83f2930938dd97bee26eae172e17951918638137055fc92599c6
-  data.tar.gz: 9834c220e9775071b4e2d5769e5aa0b518e0de760940db1d10a837024f879eb449b98da8eff90f9a2696277f780b6e8baa7595439815411c70795ef865328c12
+  metadata.gz: 6e9fa6aeec991337d703e223f20daef4b65b0d261be3cdcfbce99854ab263c0660e2288de725411ba3eaa29c1e8e65ae421dddd433c187e813b10b052f658f1b
+  data.tar.gz: f899d4de12921521b8d06adb35d10ed1f530cab3f9bc1d8c665ddb9bd7eb54b397d6bf7bc0a8686ecdfbd71a9aba18b470da0da38f2687d09ca03ba662b30f7b

data/lib/livetext/core.rb

@@ -60,13 +60,13 @@ class Livetext
   def initialize(output = ::STDOUT)  # Livetext
     @body = ""
     @indentation = [0]
+    @function_registry = Livetext::FunctionRegistry.new
+    @variables = Livetext::VariableManager.new(self)
+    @formatter = Livetext::Formatter.new(self)
     @api = UserAPI.new(self)
     @output = ::Livetext.output = output
     @html = Livetext::HTML.new(@api)
     @sources = []
-    @function_registry = Livetext::FunctionRegistry.new
-    @variables = Livetext::VariableManager.new(self)
-    @formatter = Livetext::Formatter.new(self)
 # puts "------ init: self = "
 # p self
   end

data/lib/livetext/function_caller.rb

@@ -0,0 +1,36 @@
+# FunctionCaller - Provides simple method-style access to Livetext functions
+class Livetext::FunctionCaller
+  def initialize(function_registry, api)
+    @registry = function_registry
+    @api = api
+  end
+  
+  # Dynamically handle method calls to function names
+  def method_missing(name, *args)
+    # Convert method name to string and call the function registry
+    function_name = name.to_s
+    param = args.first || ""
+    
+    # Set api on Livetext::Functions so all functions can access it
+    Livetext::Functions.api = @api
+    
+    @registry.call(function_name, param)
+  rescue => e
+    "[Error calling function #{function_name}: #{e.message}]"
+  end
+  
+  # Check if a function exists
+  def respond_to_missing?(name, include_private = false)
+    @registry.function_exists?(name.to_s) || super
+  end
+  
+  # List all available functions
+  def list
+    @registry.list_functions.map { |f| f[:name] }
+  end
+  
+  # Check if a specific function exists
+  def exists?(name)
+    @registry.function_exists?(name.to_s)
+  end
+end

data/lib/livetext/function_registry.rb

@@ -5,7 +5,7 @@ class Livetext::FunctionRegistry
     @builtin_functions = {}
     @metadata = {}
     register_builtin_functions
-    puts "DEBUG: Registered #{@builtin_functions.size} builtin functions" if ENV['DEBUG']
+    # puts "DEBUG: Registered #{@builtin_functions.size} builtin functions" if ENV['DEBUG']
   end
   
   def register_user(name, function, source: :inline, filename: nil)
@@ -28,6 +28,18 @@ class Livetext::FunctionRegistry
     elsif @builtin_functions[name_sym]
       call_function(name, @builtin_functions[name_sym], param)
     else
+      # Fall back to Livetext::Functions for backward compatibility
+      fobj = ::Livetext::Functions.new
+      if fobj.respond_to?(name_sym)
+        method = fobj.method(name_sym)
+        if method.parameters.empty?
+          result = fobj.send(name_sym)
+        else
+          result = fobj.send(name_sym, param)
+        end
+        return result.to_s if result
+      end
+      
       "[Error evaluating $$#{name}(#{param})]"
     end
   end
@@ -98,7 +110,7 @@ class Livetext::FunctionRegistry
       end
     end)
     register_builtin(:br, ->(param) do
-      n = (param || "1").to_i
+      n = (param && !param.empty?) ? param.to_i : 1
       "<br>" * n
     end)
     register_builtin(:reverse, ->(param) do

data/lib/livetext/functions.rb

@@ -9,6 +9,7 @@ class Livetext::Functions
 
   class << self
     attr_accessor :param   # kill this?
+    attr_accessor :api
   end
 
   # Instance variables for accessing the Livetext instance and its variables

data/lib/livetext/userapi.rb

@@ -1,5 +1,6 @@
 require_relative 'expansion'
 require_relative 'html'
+require_relative 'function_caller'
 
 # Encapsulate the UserAPI as a class
 
@@ -19,6 +20,7 @@ class Livetext::UserAPI
     @vars = live.vars
     @html = Livetext::HTML.new(self)
     @expander = Livetext::Expansion.new(live)
+    @funcs = Livetext::FunctionCaller.new(live.function_registry, self)
   end
 
   def api
@@ -53,7 +55,7 @@ class Livetext::UserAPI
   end
 
   def expand_functions(str)
-    @expander.expand_functions(str)
+    @expander.expand_function_calls(str)
   end
 
   def setvar(var, val)   # FIXME
@@ -244,5 +246,9 @@ class Livetext::UserAPI
   def debug(*args)
     TTY.puts *args if @live.debug
   end
+  
+  def funcs
+    @funcs
+  end
 end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.60"
+  VERSION = "0.9.62"
 end

data/test/snapshots/simple_func_api/match-output.txt

@@ -0,0 +1,18 @@
+1 <h3>Testing Simple Function API</h3>
+2 <p>Date: 2025-09-09</p>
+3 /<p>Time: \d{2}:\d{2}:\d{2}</p>/
+4 /<p>Directory: .*livetext.*</p>/
+5 <p>Platform: universal.x86_64-darwin22</p>
+6 <p>Ruby version: 2.6.10</p>
+7 <p>Livetext version: 0.9.61</p>
+8 <p>Reverse of 'hello': olleh</p>
+9 <p>Square root of 16: 4</p>
+10 /<p>Random \(1-10\): \d+</p>/
+11 /<p>Link: <a style='text-decoration: none' href='https://google\.com'>Google</a></p>/
+12 <p>Line breaks: <br><br></p>
+13 <p>Date exists: true</p>
+14 <p>Nonexistent exists: false</p>
+15 <p>Total functions: 23</p>
+16 /<p>First 5 functions: br, date, day, days_ago, days_from_now</p>/
+17 <p><strong>Simple API works!</strong></p>
+18 </p>

data/test/snapshots/simple_func_api/source.lt3

@@ -0,0 +1,32 @@
+.dot_def test_simple_func_api args
+  api.out "<h3>Testing Simple Function API</h3>"
+  
+  # Test basic function calls
+  api.out "<p>Date: #{api.funcs.date()}</p>"
+  api.out "<p>Time: #{api.funcs.time()}</p>"
+  api.out "<p>Directory: #{api.funcs.pwd()}</p>"
+  api.out "<p>Platform: #{api.funcs.platform()}</p>"
+  api.out "<p>Ruby version: #{api.funcs.ruby_version()}</p>"
+  api.out "<p>Livetext version: #{api.funcs.livetext_version()}</p>"
+  
+  # Test functions with parameters
+  api.out "<p>Reverse of 'hello': #{api.funcs.reverse('hello')}</p>"
+  api.out "<p>Square root of 16: #{api.funcs.isqrt('16')}</p>"
+  api.out "<p>Random (1-10): #{api.funcs.rand('1 10')}</p>"
+  api.out "<p>Link: #{api.funcs.link('Google|https://google.com')}</p>"
+  api.out "<p>Line breaks: #{api.funcs.br('2')}</p>"
+  
+  # Test function existence
+  api.out "<p>Date exists: #{api.funcs.exists?('date')}</p>"
+  api.out "<p>Nonexistent exists: #{api.funcs.exists?('nonexistent')}</p>"
+  
+  # Test function listing
+  functions = api.funcs.list
+  api.out "<p>Total functions: #{functions.length}</p>"
+  api.out "<p>First 5 functions: #{functions.first(5).join(', ')}</p>"
+  
+  api.out "<p><strong>Simple API works!</strong></p>"
+.end
+
+.test_simple_func_api
+

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

@@ -3,7 +3,7 @@
  3  Hostname: HAL9000
  4  /Platform: .*x86_64-darwin\d+/
  5  /Ruby Version: \d+\.\d+\.\d+/
- 6  Livetext Version: 0.9.59
+ 6  Livetext Version: 0.9.61
  7  </p>
  8  
  9  <p>

data/test/unit/all.rb

@@ -10,6 +10,8 @@ require_relative 'variables'
 require_relative 'variable_manager'
 require_relative 'functions'
 require_relative 'function_registry'
+require_relative 'function_caller'
+require_relative 'function_api_access'
 require_relative 'mixin_functions_class'
 require_relative 'formatter'
 require_relative 'formatter_component'

data/test/unit/function_api_access.rb

@@ -0,0 +1,82 @@
+require 'minitest/autorun'
+require_relative '../../lib/livetext'
+
+class TestFunctionAPIAccess < Minitest::Test
+  def setup
+    @live = Livetext.new
+    @live.vars.set(:View, "test_view")
+    @live.vars.set(:"post.id", "0001")
+  end
+
+  def test_scriptorium_image_scenario
+    # This test mimics the exact scenario from Scriptorium's image function
+    # Define the asset function directly in Livetext::Functions (like in Scriptorium)
+    Livetext::Functions.class_eval do
+      def asset(param)
+        # Get view and post information (exactly like in Scriptorium)
+        vname = self.class.api.vars.to_h[:View]
+        postid = self.class.api.vars.to_h[:"post.id"]
+        "assets/#{postid}/#{param}"  # Simplified version of the asset function
+      end
+    end
+
+    # Test calling it through api.funcs (like the image function in Scriptorium)
+    result = @live.api.funcs.asset("test.jpg")
+    
+    assert_equal "assets/0001/test.jpg", result
+  end
+
+  def test_function_can_access_api_vars
+    # Define a function that needs access to api.vars (like the asset function in Scriptorium)
+    Livetext::Functions.class_eval do
+      def test_asset_function(param)
+        # This mimics the asset function from Scriptorium that needs api.vars
+        vname = self.class.api.vars.to_h[:View]
+        postid = self.class.api.vars.to_h[:"post.id"]
+        "view=#{vname}, post=#{postid}, file=#{param}"
+      end
+    end
+
+    # Test calling it through api.funcs (like the image function in Scriptorium)
+    result = @live.api.funcs.test_asset_function("test.jpg")
+    
+    assert_equal "view=test_view, post=0001, file=test.jpg", result
+  end
+
+  def test_function_can_access_api_vars_without_params
+    # Define a function that needs access to api.vars but takes no parameters
+    Livetext::Functions.class_eval do
+      def test_view_info
+        vname = self.class.api.vars.to_h[:View]
+        postid = self.class.api.vars.to_h[:"post.id"]
+        "view=#{vname}, post=#{postid}"
+      end
+    end
+
+    # Test calling it through api.funcs
+    result = @live.api.funcs.test_view_info()
+    
+    assert_equal "view=test_view, post=0001", result
+  end
+
+  def test_function_handles_missing_api_gracefully
+    # Define a function that tries to access api but it's not set
+    Livetext::Functions.class_eval do
+      def test_no_api
+        if self.class.api
+          "api available"
+        else
+          "no api"
+        end
+      end
+    end
+
+    # Clear the api to test the fallback
+    Livetext::Functions.api = nil
+
+    # Test calling it through api.funcs - should still work because we set it in method_missing
+    result = @live.api.funcs.test_no_api()
+    
+    assert_equal "api available", result
+  end
+end

data/test/unit/function_caller.rb

@@ -0,0 +1,102 @@
+require 'minitest/autorun'
+require_relative '../../lib/livetext'
+require_relative '../../lib/livetext/function_caller'
+
+class TestFunctionCaller < Minitest::Test
+  def setup
+    @registry = Livetext::FunctionRegistry.new
+    @api = Object.new  # Mock api object for testing
+    @caller = Livetext::FunctionCaller.new(@registry, @api)
+  end
+
+  def test_calls_builtin_functions
+    # Test date function
+    result = @caller.date
+    assert_match(/\d{4}-\d{2}-\d{2}/, result)
+    
+    # Test time function
+    result = @caller.time
+    assert_match(/\d{2}:\d{2}:\d{2}/, result)
+    
+    # Test pwd function
+    result = @caller.pwd
+    assert_equal(Dir.pwd, result)
+  end
+
+  def test_calls_functions_with_parameters
+    # Test reverse function
+    result = @caller.reverse("hello")
+    assert_equal("olleh", result)
+    
+    # Test isqrt function
+    result = @caller.isqrt("16")
+    assert_equal("4", result)
+    
+    # Test rand function
+    result = @caller.rand("1 10")
+    num = result.to_i
+    assert(num >= 1 && num <= 10, "Random number should be between 1 and 10, got #{result}")
+  end
+
+  def test_calls_functions_with_no_parameters
+    # Test platform function
+    result = @caller.platform
+    assert_equal(RUBY_PLATFORM, result)
+    
+    # Test ruby_version function
+    result = @caller.ruby_version
+    assert_equal(RUBY_VERSION, result)
+    
+    # Test livetext_version function
+    result = @caller.livetext_version
+    assert_equal(Livetext::VERSION, result)
+  end
+
+  def test_handles_nonexistent_functions
+    result = @caller.nonexistent_function("param")
+    assert_match(/Error evaluating \$\$nonexistent_function/, result)
+  end
+
+  def test_function_existence_check
+    assert(@caller.exists?("date"))
+    assert(@caller.exists?("time"))
+    assert(@caller.exists?("pwd"))
+    refute(@caller.exists?("nonexistent"))
+  end
+
+  def test_list_functions
+    functions = @caller.list
+    assert_instance_of(Array, functions)
+    assert(functions.include?("date"))
+    assert(functions.include?("time"))
+    assert(functions.include?("pwd"))
+    assert(functions.include?("reverse"))
+    assert(functions.include?("isqrt"))
+  end
+
+  def test_respond_to_missing
+    assert(@caller.respond_to?(:date))
+    assert(@caller.respond_to?(:time))
+    assert(@caller.respond_to?(:pwd))
+    refute(@caller.respond_to?(:nonexistent))
+  end
+
+  def test_link_function
+    result = @caller.link("Google|https://google.com")
+    expected = "<a style='text-decoration: none' href='https://google.com'>Google</a>"
+    assert_equal(expected, result)
+  end
+
+  def test_br_function
+    result = @caller.br("3")
+    assert_equal("<br><br><br>", result)
+    
+    # Test with empty parameter (default to 1)
+    result = @caller.br("")
+    assert_equal("<br>", result)
+    
+    # Test with nil parameter (default to 1)
+    result = @caller.br(nil)
+    assert_equal("<br>", result)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.60
+  version: 0.9.62
 platform: ruby
 authors:
 - Hal Fulton
 bindir: bin
 cert_chain: []
-date: 2025-09-06 00:00:00.000000000 Z
+date: 2025-09-09 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -35,6 +35,7 @@ files:
 - lib/livetext/expansion.rb
 - lib/livetext/formatter.rb
 - lib/livetext/formatter_component.rb
+- lib/livetext/function_caller.rb
 - lib/livetext/function_registry.rb
 - lib/livetext/functions.rb
 - lib/livetext/global_helpers.rb
@@ -197,6 +198,10 @@ files:
 - test/snapshots/simple_copy/expected-output.txt
 - test/snapshots/simple_copy/simplefile.inc
 - test/snapshots/simple_copy/source.lt3
+- test/snapshots/simple_func_api/expected-error.txt
+- test/snapshots/simple_func_api/match-output.txt
+- test/snapshots/simple_func_api/source.lt3
+- test/snapshots/simple_func_api/stderr.txt
 - test/snapshots/simple_import/expected-error.txt
 - test/snapshots/simple_import/expected-output.txt
 - test/snapshots/simple_import/simple_import.rb
@@ -236,6 +241,8 @@ files:
 - test/unit/double.rb
 - test/unit/formatter.rb
 - test/unit/formatter_component.rb
+- test/unit/function_api_access.rb
+- test/unit/function_caller.rb
 - test/unit/function_registry.rb
 - test/unit/functions.rb
 - test/unit/html.rb