livetext 0.9.41 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f65ba04aa3e01ed5a56dd2163dd7ff35e2e4292f41f971e61713789867e6def
-  data.tar.gz: 127e52d056f1da7417881d24663789ef6b8fb606832fa28c7f9228bbbd77af02
+  metadata.gz: 2eecc4b7aec5571c91f72cdba9b7d2e3ab43c7caf3f079ba336ccc112d4a4939
+  data.tar.gz: d3556ab21ab322f054c0aae264a8e2c833f61f1baa69bb5a965d4b418bf08c58
 SHA512:
-  metadata.gz: 6bd983272c4169d31eeb01ccf18fb04bf960a3cde7c6769a8533d5a6dbc55add87cda2788c73fa3d9b8b679efc8f40afd1ec0e74997cfd36926175c8dde569a2
-  data.tar.gz: 57f5909d4b25efb53c8e7aaad64bcd1bc1f5387f1934a67193c2c10e37868135585cff57476fe3fec6e2cd9fcccc8ede3f734fcb891b27157841aee18d054d13
+  metadata.gz: 665b6c06e3f9469a7f98c1e4b6b9a7a4fad55d7a554811d4c92a63757a7ec2d44f33f4468ea2d709896d4bcc4cadb8a1a7f95fdacb2533982a552c133116bbd3
+  data.tar.gz: 7f391f554863d8411fd3523a09029419914dd8d8df66df1ac5bc2e0186060b543977c46c9e4bbe59343cb8dfa78263c81ff876f8732811b1ed2caa33fb41f05a

data/bin/livetext

@@ -5,6 +5,25 @@ require 'rubygems'
 require_relative '../lib/livetext'
 
 def usage
+  STDERR.puts <<~EOF
+  Usage: 
+    livetext [options] [filename]
+
+    Options:
+      -v, --version            Print version information
+      -t, --test               Run all tests
+      -p, --path               Print the path of the installed gem
+      -b, --backtrace          Enable backtrace information
+      -m name, --mixin name    Load the specified mixin before processing
+      -s, --stdin              Read from standard input
+      -h, --help               Print this help information
+      -i name, --install name  Install the specified plugin         
+
+  EOF
+  exit
+end
+
+def old_usage
   STDERR.puts <<~EOF
   Usage: 
     livetext filename
@@ -22,6 +41,10 @@ def usage
       livetext -p
       livetext --path
 
+    Load a mixin:
+      livetext -m name
+      livetext --mixin name
+
     Run tests:
       livetext -t
       livetext --test

data/lib/livetext/more.rb

@@ -101,12 +101,10 @@ class Livetext
     obj = self.new
     mix  = Array(mix)
     call = Array(call)
-# STDERR.puts "#{__method__}: obj meth = #{obj.methods.sort.inspect}"
     mix.each do |lib| 
       obj.invoke_dotcmd(:mixin, lib.dup)
     end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
     obj.api.setvars(vars)
     obj
   end

data/lib/livetext/standard.rb

@@ -179,19 +179,64 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
+=begin
+      Filename: foobar
+get_globals - 1 - transforming /private/tmp/.blogs/views/foobar/data/global.lt3
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/view.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/view.txt
+
+              rpath = /private/tmp/.blogs/views/foobar/settings/view.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/view.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = view.txt
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/recent.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/recent.txt
+              rpath = /private/tmp/.blogs/views/foobar/settings/recent.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/recent.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = recent.txt
+
+>> variables: fdir = /private/tmp/.blogs/views/foobar/data/ 
+              fname = ../settings/publish.txt 
+              path = /private/tmp/.blogs/views/foobar/data/../settings/publish.txt
+              rpath = /private/tmp/.blogs/views/foobar/settings/publish.txt 
+              path = /private/tmp/.blogs/views/foobar/settings/publish.txt  
+              dir = /private/tmp/.blogs/views/foobar/settings  
+              base = publish.txt
+
+get_globals - 2
+
+=end
+
   def variables(args = nil, body = nil)
     prefix = api.args[0]
-    file = api.args[1]
+    fname = api.args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
-    if file
-      here = ::Livetext::Vars[:FileDir] + "/"
-      lines = File.readlines(here + file)
+    fdir  = ::Livetext::Vars[:FileDir] + "/"   # where is the file we are reading?
+    if fname
+      path0  = fdir + fname
+      # puts ">> variables: fdir = #{fdir} fname = #{fname} path = #{path0}"
+      pname = Pathname.new(path0)
+      rpath = pname.realpath(pname)
+      path, dir, base = rpath.to_s, rpath.dirname.to_s, rpath.basename.to_s
+      # puts "              rpath = #{rpath} path = #{path}  dir = #{dir}  base = #{base}"
+      dok, fok = Dir.exist?(dir), File.exist?(path)
+      raise "No such dir #{dir.inspect} (file #{path})" unless dok
+      raise "No such file #{path.inspect} (file #{path})" unless fok
+      lines = File.readlines(path)
     else
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
     api.setvars(pairs)
     api.optional_blank_line
+  rescue => e
+    puts e
+    puts $!
   end
 
   def heredoc(args = nil, body = nil)
@@ -408,6 +453,36 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
+  def table(args = nil, body = nil)   # Same as xtable
+    title = api.data
+    delim = " :: "
+    api.out "<br>\n\n<center><table width=90% cellpadding=5>"
+    lines = api.body(true)
+    maxw = nil
+    processed = []
+    lines.each do |line|
+      line = api.format(line)
+      line.gsub!(/\n+/, "<br>\n")
+      processed << line
+      cells = line.split(delim)
+      wide = cells.map {|cell| cell.length }
+      maxw = [0] * cells.size
+      maxw = maxw.map.with_index {|x, i| [x, wide[i]].max }
+    end
+
+    sum = maxw.inject(0, :+)
+    maxw.map! {|x| (x/sum*100).floor }
+
+    processed.each do |line|
+      cells = line.split(delim)
+      html.wrap :tr do
+        cells.each {|cell| api.out "  <td valign=top>#{cell}</td>" }
+      end
+    end
+    api.out "</table></center>"
+    api.optional_blank_line
+  end
+
   def image(args = nil, body = nil)
     name, wide, high = api.args
     geom = ""

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.41"
+  VERSION = "0.9.43"
 end

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

@@ -1,7 +1,9 @@
 Testing heredocs (used in a table)
 <p>
 
-<br><center><table width=90% cellpadding=5>
+<br>
+
+<center><table width=90% cellpadding=5>
 <tr>
   <td valign=top>This is <br>only <br>a test.<br></td>
   <td valign=top>This is <br>just <br>some <br>random text.<br></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.41
+  version: 0.9.43
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com