livetext 0.9.61 → 0.9.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d0ba9b287008c8827a9a1d30881507700dceffae0edd52e4dd5274b5fb4f004
-  data.tar.gz: eb988c908dcdbbbff10710a4a62bd51cdd13b832a9121814150a484448d9c5f7
+  metadata.gz: 61c11b22070e565c5c25735ea1134d58249a5f441f0ed3c1f9eeb0f8bbf7c628
+  data.tar.gz: feff45c934b1ecb8757dcd1ea3fad4947e7383063faa9f3f68506dc73c99ff9e
 SHA512:
-  metadata.gz: 1fcc995144794c8fac0b87c42a4cd8913d57bc31c6f26cc1bd564871366c1c3d260eda87966301d81776f1322fd2c22d453b807ffc06a90e4e1f4ceca3184598
-  data.tar.gz: 40fe697a385ba6684df3746558674793766801933fcbd8b42766a9c2ff1121aebb75942898f32fe6184de3fb96ad2d6c9ecef980df2cf2bd8697c9f377123f08
+  metadata.gz: 6e9fa6aeec991337d703e223f20daef4b65b0d261be3cdcfbce99854ab263c0660e2288de725411ba3eaa29c1e8e65ae421dddd433c187e813b10b052f658f1b
+  data.tar.gz: f899d4de12921521b8d06adb35d10ed1f530cab3f9bc1d8c665ddb9bd7eb54b397d6bf7bc0a8686ecdfbd71a9aba18b470da0da38f2687d09ca03ba662b30f7b

data/lib/livetext/function_caller.rb

@@ -1,7 +1,8 @@
 # FunctionCaller - Provides simple method-style access to Livetext functions
 class Livetext::FunctionCaller
-  def initialize(function_registry)
+  def initialize(function_registry, api)
     @registry = function_registry
+    @api = api
   end
   
   # Dynamically handle method calls to function names
@@ -10,6 +11,9 @@ class Livetext::FunctionCaller
     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}]"

data/lib/livetext/function_registry.rb

@@ -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

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

@@ -20,7 +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)
+    @funcs = Livetext::FunctionCaller.new(live.function_registry, self)
   end
 
   def api

data/lib/livetext/version.rb

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

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

@@ -4,7 +4,7 @@
 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.60</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>/

data/test/snapshots/simple_func_api/source.lt3

@@ -29,3 +29,4 @@
 .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.60
+ 6  Livetext Version: 0.9.61
  7  </p>
  8  
  9  <p>

data/test/unit/all.rb

@@ -11,6 +11,7 @@ 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

@@ -5,7 +5,8 @@ require_relative '../../lib/livetext/function_caller'
 class TestFunctionCaller < Minitest::Test
   def setup
     @registry = Livetext::FunctionRegistry.new
-    @caller = Livetext::FunctionCaller.new(@registry)
+    @api = Object.new  # Mock api object for testing
+    @caller = Livetext::FunctionCaller.new(@registry, @api)
   end
 
   def test_calls_builtin_functions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.61
+  version: 0.9.62
 platform: ruby
 authors:
 - Hal Fulton
@@ -241,6 +241,7 @@ 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