livetext 0.9.03 → 0.9.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868972bd6d69160614982ec1673ffe4b1e6b52cc0c37b3f3665b4cd63a9465c4
-  data.tar.gz: bb03f156bed4713bfa30804c6bb4fb5057a22db84523774a90649e62e22ac8f6
+  metadata.gz: 953abc29d2faf2ff8d8ae5e1c7e4033efbc1dbd57b69144634b3287b71424b77
+  data.tar.gz: 3086f96e6226ada9787338b26d08950667e44b65029e5bc5d80bc4c72b50b7bb
 SHA512:
-  metadata.gz: f44235d6cd9649515ae9b6fed910b233f90c37f92c54bec3183f718b83e918ef95192aa8e8c08ec8b2eca16edbcbcc519a002214efeff4d042d7056f8a3a3a78
-  data.tar.gz: 148fa1af92fa0320bbbe3db92fb89cd24d4ebc0620d65343c1c0120c1a61c5612df7fe27bf2d6b0cf805189e00a566487cda712a4e1e09be3ce1f4e9ea035999
+  metadata.gz: d8a49669fc15a3a5aad4151cf190f8d527edc1349fb30a7abfdf9141648f32bbb56d507a6f7ccfc983c9335d7f2df037a9dbf30325e27c02e1d68590ffb1c2bd
+  data.tar.gz: 9e4c56a912009b7332fd9702c1fd7a8a27fdbb9c639d0ae62ec4adabd31e8e70554a7ab4645ba6595a138712c0dfcb47430805d69530f26e5d9479dd90148b38

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.03"
+  VERSION = "0.9.04"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -31,6 +31,10 @@ class Livetext
     attr_accessor :output      # both bad solutions?
   end
 
+  def vars
+    Livetext::Vars.dup
+  end
+
   def self.customize(mix: [], call: [], vars: {})
     obj = self.new
     mix  = Array(mix)
@@ -50,10 +54,6 @@ class Livetext
     self
   end
 
-  def vars
-    Livetext::Vars.dup
-  end
-
   Space = " "
   Sigil = "." # Can't change yet
 
@@ -73,29 +73,30 @@ class Livetext
     @body = ""
     @main = Processor.new(self, output)
     @indentation = [0]
+    @_vars = Livetext::Vars
   end
 
-def _parse_colon_args(args, hash)  # really belongs in livetext
-  h2 = hash.dup
-  e = args.each
-  loop do
-    arg = e.next.chop.to_sym
-    raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
-    h2[arg] = e.next
+  def _parse_colon_args(args, hash)  # really belongs in livetext
+    h2 = hash.dup
+    e = args.each
+    loop do
+      arg = e.next.chop.to_sym
+      raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
+      h2[arg] = e.next
+    end
+    h2 = h2.reject {|k,v| v.nil? }
+    h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
+    h2
   end
-  h2 = h2.reject {|k,v| v.nil? }
-  h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
-  h2
-end
 
-def _get_arg(name, args)  # really belongs in livetext
-  raise "(#{name}) Expected an array" unless args.is_a? Array
-  raise "(#{name}) Expected an arg" if args.empty?
-  raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
-  val = args[0]
-  raise "Expected an argument '#{name}'" if val.nil?
-  val
-end
+  def _get_arg(name, args)  # really belongs in livetext
+    raise "(#{name}) Expected an array" unless args.is_a? Array
+    raise "(#{name}) Expected an arg" if args.empty?
+    raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
+    val = args[0]
+    raise "Expected an argument '#{name}'" if val.nil?
+    val
+  end
 
   def mixin(mod)
     @main._mixin(mod)
@@ -105,6 +106,8 @@ end
     str, sym = var.to_s, var.to_sym
     Livetext::Vars[str] = val
     Livetext::Vars[sym] = val
+    @_vars[str] = val
+    @_vars[sym] = val
   end
 
   def _setfile(file)
@@ -166,50 +169,13 @@ end
     self.body
   end
 
-  def xform_file(file, vars: {})
+  def xform_file(file)  # , vars: {})
     Livetext::Vars.replace(vars) unless vars.nil?
+    @_vars.replace(vars) unless vars.nil?
     self.process_file(file)
     self.body
   end
 
-#  def transform(text)
-#    _setfile!("(string)")
-#    @output = ::Livetext.output
-#    enum = text.each_line
-#    front = text.match(/.*?\n/).to_a.first.chomp  rescue "..."
-#    @main.source(enum, "STDIN: '#{front}...'", 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)  # transform_line ???
-#    end
-#    @body
-#  end
-
-## FIXME don't need process *and* process_text
-
-#  def process_text(text)
-#    _setfile!("(string)")
-#    text = text.split("\n") if text.is_a? String
-#    enum = text.each
-#    @backtrace = false
-#    front = text[0].chomp
-#    @main.source(enum, "(text): '#{front}...'", 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)
-#    end
-#    val = @main.finalize if @main.respond_to? :finalize
-#    val
-#  rescue => err
-#    puts "process_text: err = #{err}"
-##   puts err.backtrace.join("\n")
-#    puts @body
-#    @body = ""
-#    return @body
-#  end
-
 ## FIXME process_file[!] should call process[_text]
 
   def process_file(fname, btrace=false)
@@ -231,21 +197,6 @@ end
     @body = ""
   end
 
-#  def process_file!(fname, backtrace=false)
-#    _setfile(fname)
-#    raise "No such file '#{fname}' to process" unless File.exist?(fname)
-#    @main.output = StringIO.new
-#    enum = File.readlines(fname).each
-#    @backtrace = backtrace
-#    @main.source(enum, fname, 0)
-#    loop do 
-#      line = @main.nextline
-#      break if line.nil?
-#      process_line(line)
-#    end
-#    @main.finalize if @main.respond_to? :finalize
-#  end
-
   def handle_scomment(line)
   end
 
@@ -265,7 +216,7 @@ end
 
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
-line = line.sub(/# .*$/, "")
+    line = line.sub(/# .*$/, "")
     name = _get_name(line).to_sym
     result = nil
     if @main.respond_to?(name)

data/lib/standard.rb

@@ -472,6 +472,11 @@ EOS
     _out "</table></center>"
   end
 
+  def image
+    name = @_args[0]
+    _out "<img src='#{name}'></img>"
+  end
+
   def br
     n = _args.first || "1"
     out = ""

data/lib/userapi.rb

@@ -27,6 +27,10 @@ module Livetext::UserAPI
     end
   end
 
+  def _vars
+    @_vars.dup
+  end
+
   def _optional_blank_line
     peek = peek_nextline
     return if peek.nil?

metadata

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