livetext 0.9.55 → 0.9.56

data/lib/livetext/handler/mixin.rb

@@ -56,6 +56,34 @@ class Livetext::Handler::Mixin
       # Register with the function registry
       parent.function_registry.register_user(method_name.to_s, function, source: :mixin, filename: @file)
     end
+    
+    # Also look for methods defined in Livetext::Functions class
+    # Get all methods from Livetext::Functions
+    functions_class_methods = Livetext::Functions.instance_methods(false)
+    
+    functions_class_methods.each do |method_name|
+      # Skip methods that are already built-in (defined in the original functions.rb)
+      builtin_methods = [:code_lines, :ns, :isqrt, :reverse, :date, :time, :pwd, :rand, :link, :br, :yt, :simple_format, 
+                        :b, :i, :t, :s, :bi, :bt, :bs, :it, :is, :ts, :bit, :bis, :bts, :its, :bits]
+      next if builtin_methods.include?(method_name)
+      
+      # Create a lambda that calls the method on a new Livetext::Functions instance
+      function = ->(param) do
+        fobj = ::Livetext::Functions.new
+        # Set the Livetext instance and its variables for access in functions
+        fobj.live = parent
+        fobj.vars = parent.vars
+        method = fobj.method(method_name)
+        if method.parameters.empty?
+          fobj.send(method_name)
+        else
+          fobj.send(method_name, param)
+        end
+      end
+      
+      # Register with the function registry
+      parent.function_registry.register_user(method_name.to_s, function, source: :mixin, filename: @file)
+    end
   end
 
 end

data/lib/livetext/helpers.rb

@@ -122,43 +122,42 @@ module Livetext::Helpers
   end
 
   def invoke_dotcmd(name, data0="")
-    api.data = data0.dup   # should permit _ in function names at least
+    api.data = data0.dup
     args0 = data0.split
     api.args = args0.dup
-    # Get method signature to determine what parameters to pass
     method = method(name)
-    param_count = method.parameters.length
+    params = method.parameters
     
-    # Pass parameters based on method signature
-    case param_count
+    case params.length
     when 0
       retval = send(name)
     when 2
       retval = send(name, args0, data0)
     when 3
-      # Check if this is a method that needs raw body content
-      # For now, we'll check if it's dot_def and if it has 'body raw' in args
-      raw_body = (name == :dot_def && args0.length >= 3 && args0[2] == 'raw')
-      body_lines = raw_body ? api.body(true) : api.body(false)
-      retval = send(name, args0, data0, body_lines)
+      processed_body = api.body(false)
+      retval = send(name, args0, data0, processed_body)
+    when 4
+      if params[3][1] == :raw 
+        raw_body = api.body(true)
+        retval = send(name, args0, data0, raw_body, true)
+      else
+        raise "4th parameter is not :raw!"
+      end
     else
-      retval = send(name)  # fallback to no parameters
+      raise "#{name} has #{params.length} parameters!"
     end
     retval
-  rescue => err
-    graceful_error(err)   # , "#{__method__}: name = #{name}")
   end
 
   def handle_dotcmd(line, indent = 0)
-    indent = @indentation.last # top of stack
-    line = line.sub(/# .*$/, "")   # FIXME Could be problematic?
+    line = line.sub(/# .*$/, "")
     name, data = get_name_data(line)
-    success = true  # Be optimistic...  :P
+    check_disallowed(name)
     case
-      when name == :end   # special case
-        graceful_error EndWithoutOpening()
-      when respond_to?(name)
-        success = invoke_dotcmd(name, data)    # was 141
+    when name == :end   # special case
+      graceful_error EndWithoutOpening()
+    when respond_to?(name)
+      success = invoke_dotcmd(name, data)    # was 141
     else
       graceful_error UnknownMethod(name)
     end

data/lib/livetext/standard.rb

@@ -322,7 +322,7 @@ module Livetext::Standard
   end
 
   def mixin(args, data)
-    name = api.args.first   # Expect a module name
+    name = args.first   # Expect a module name
     @mixins ||= []
     return if @mixins.include?(name)
     @mixins << name
@@ -334,7 +334,7 @@ module Livetext::Standard
   end
 
   def import(args, data)
-    name = api.args.first   # Expect a module name
+    name = args.first   # Expect a module name
     @imports ||= []
     return if @imports.include?(name)
     @imports << name

data/lib/livetext/userapi.rb

@@ -138,12 +138,31 @@ class Livetext::UserAPI
       @line = format(@line) unless raw
       lines << @line
     end
-    raise "Expected .end, found end of file" unless end?(@line)  # use custom exception
+    graceful_error ExpectedEnd() unless end?(@line)  # use custom exception
     optional_blank_line   # FIXME Delete this??
     return lines unless block_given?
     lines.each {|line| yield line }   # FIXME what about $. ?
   end
 
+  def body_with_raw
+    processed_lines = []
+    raw_lines = []
+    end_found = false
+    loop do
+      @line = @live.nextline
+      break if @line.nil?
+      @line.chomp!
+      break if end?(@line)
+      next if comment?(@line)
+      raw_lines << @line
+      @line = format(@line)
+      processed_lines << @line
+    end
+    graceful_error ExpectedEnd() unless end?(@line)  # use custom exception
+    optional_blank_line   # FIXME Delete this??
+    [processed_lines, raw_lines]
+  end
+
   def body_text(raw=false)
     raw_body.join("\n")
   end

data/lib/livetext/variable_manager.rb

@@ -25,7 +25,7 @@ class Livetext::VariableManager
   end
 
   def exists?(name)
-    @variables[name.to_sym] != nil
+    @variables.exists?(name)
   end
 
   def list
@@ -40,6 +40,19 @@ class Livetext::VariableManager
     @variables = Livetext::Variables.new(vars)
   end
 
+  # Enable live.vars.myvar syntax
+  def method_missing(name, *args)
+    if args.empty?
+      @variables[name.to_sym] || "[#{name} is undefined]"
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(name, include_private = false)
+    true  # Since method_missing always returns a value, respond_to? should always return true
+  end
+
   private
 
   def initialize_default_variables

data/lib/livetext/variables.rb

@@ -21,7 +21,7 @@
     end
   
     def [](var)
-      @vars[var.to_sym]
+      @vars[var.to_sym] || "[#{var} is undefined]"
     end
 
     def []=(var, value)
@@ -50,5 +50,9 @@
     def to_h
       @vars.select { |k, v| k.is_a?(Symbol) }
     end
+
+    def exists?(var)
+      @vars[var.to_sym] != nil
+    end
   end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.55"
+  VERSION = "0.9.56"
 end

data/plugin/booktool.rb

@@ -67,12 +67,12 @@ end
 
 # These are duplicated. Remove safely
 
-  def h1(args = nil, body = nil); api.out html.tag(:h1, api.data); return true; end
-  def h2(args = nil, body = nil); api.out html.tag(:h2, api.data); return true; end
-  def h3(args = nil, body = nil); api.out html.tag(:h3, api.data); return true; end
-  def h4(args = nil, body = nil); api.out html.tag(:h4, api.data); return true; end
-  def h5(args = nil, body = nil); api.out html.tag(:h5, api.data); return true; end
-  def h6(args = nil, body = nil); api.out html.tag(:h6, api.data); return true; end
+  def h1(args = nil, body = nil); api.out html.tag(:h1, cdata: api.data); return true; end
+  def h2(args = nil, body = nil); api.out html.tag(:h2, cdata: api.data); return true; end
+  def h3(args = nil, body = nil); api.out html.tag(:h3, cdata: api.data); return true; end
+  def h4(args = nil, body = nil); api.out html.tag(:h4, cdata: api.data); return true; end
+  def h5(args = nil, body = nil); api.out html.tag(:h5, cdata: api.data); return true; end
+  def h6(args = nil, body = nil); api.out html.tag(:h6, cdata: api.data); return true; end
 
 def alpha_columns(args = nil, body = nil)
   n = api.args.first.to_i   # FIXME: what if it's missing?