livetext 0.8.72 → 0.8.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bedb942f052436ccaec81e8f14ac61e4dacce9d7911b4bb3ee3c63a76a5e680
-  data.tar.gz: 39f7227e5e9f06a3be455b0f4cc0f64573b751fa0893912a9cf81edbca2d6a9d
+  metadata.gz: 11a401c968f4dc90a9f9ba1fa0ef1afd8ef678f4067f55fb7830d092d8d44856
+  data.tar.gz: 82d4dee17fd2c7cbfc441c1fb0626e94ae382b028a50a6feb3c40219be0046bb
 SHA512:
-  metadata.gz: 7ea613b9204fdc8f8190540a51e023bd26ec26e3bee675c6ab48a597a408a3e0b7769e2b703a10095cb2bf9909e7cf30fcb261b3d8368641f1128562ad1089b2
-  data.tar.gz: 8cdf9980c22d8bfead5853fe7b3e8f849826f2c1b6c798ff93d652489f61bb4ef03d65ddab179b8941542d5fe3a857667f62c2477a0529671219dbf8945806ae
+  metadata.gz: 8756eb6c73ba416da0674a255ef0106eed222a1b8dabb6aa4c867a2e1c3a085d919bf7b4984aa404a4a5fa4e80f070467fadbac2a5604f28e8b17166c9b781c2
+  data.tar.gz: c846b970b0af22e0160c8503366969dccac7e195177e958ee86cf3384f8b87f787511f507e1a85ad4198d21bb57ba7bdfd72c0858f91f4021c195f3f17f2b168

data/lib/formatline.rb

@@ -1,4 +1,5 @@
 class FormatLine
+
   EOL    = :eol
   Alpha  = /[a-z]/
   Alpha2 = /[a-z0-9_]/
@@ -49,8 +50,8 @@ class FormatLine
       self.send("func_" + name.to_s, param)
     else
       fobj = ::Livetext::Functions.new
-      ::Livetext::Functions.param = param       # is this screwed up???
-      ::Livetext::Functions.context = @context   # is this screwed up???
+      ::Livetext::Functions.param = param        # is this 
+      ::Livetext::Functions.context = @context   #   screwed up???
       fobj.send(name)
     end
   end
@@ -65,6 +66,9 @@ class FormatLine
     @fname, @param = "", ""
   end
 
+# FIXME Much of this should be done via CSS
+# FIXME In particular, strike is deprecated.
+
   def bold
     d0, d1 = SimpleFormats[:b]
     @buffer << "#{d0}#@substr#{d1}"
@@ -98,10 +102,11 @@ class FormatLine
     @fname  = ""
     @vname  = ""
     @param  = ""
+
+    # FIXME - refactor, generalize, clarify
     
     loop do   # starting state
       char = peek
-  #   puts "char = #{char.inspect}"
       case char
         when "\\"
           char = skip

data/lib/functions.rb

@@ -31,11 +31,6 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
     "<br>"*n
   end
 
-#   def asset
-#     param = self.class.param
-#     # FIXME how should this work?
-#   end
-
   def yt
     param = self.class.param
     "https://www.youtube.com/watch?v=#{param}"

data/lib/livetext.rb

@@ -1,19 +1,17 @@
 class Livetext
-  VERSION = "0.8.72"
+  VERSION = "0.8.73"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
-$Livetext = Livetext
-
 require 'fileutils'
 
-
 $: << Livetext::Path
 
 require 'functions'
 require 'userapi'
 require 'standard'
 require 'formatline'
+require 'processor'
 
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 
@@ -26,81 +24,13 @@ class Livetext
   attr_accessor :no_puts
   attr_accessor :body
 
+  # FIXME - phase out stupid 'parameters' method
+
   class << self
     attr_accessor :parameters  # from outside world (process_text)
     attr_accessor :output      # both bad solutions?
   end
 
-  class Processor
-    include Livetext::Standard
-    include Livetext::UserAPI
-
-    Disallowed = [:nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
-                  :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
-                  :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
-                  :to_s, :inspect, :methods, :singleton_methods, :protected_methods, 
-                  :private_methods, :public_methods, :instance_variables, 
-                  :instance_variable_get, :instance_variable_set, 
-                  :instance_variable_defined?, :remove_instance_variable, 
-                  :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, 
-                  :respond_to?, :extend, :display, :method, :public_method, 
-                  :singleton_method, :define_singleton_method, :object_id, :to_enum, 
-                  :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
-                  :instance_exec, :__send__, :__id__, :__binding__]
-
-    def initialize(parent, output = nil)
-      @parent = parent
-      @_nopass = false
-      @_nopara = false
-      # Meh?
-      @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
-      @sources = []
-    end
-
-    def output=(io)
-      @output = io
-    end
-
-    def _error!(err, abort=true, trace=false)
-      where = @sources.last || @save_location
-      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if trace && err.respond_to?(:backtrace)
-      exit if abort
-    end
-
-    def _disallowed?(name)
-      Disallowed.include?(name.to_sym)
-    end
-
-    def source(enum, file, line)
-      @sources.push([enum, file, line])
-    end
-
-    def peek_nextline
-      @sources.last[0].peek
-    rescue StopIteration
-      @sources.pop
-      nil
-    end
-
-    def nextline
-      return nil if @sources.empty?
-      line = @sources.last[0].next
-      @sources.last[2] += 1
-      line
-    rescue StopIteration
-      @sources.pop
-      nil
-    end
-
-    def grab_file(fname)
-      File.read(fname)
-    end
-
-  end
-
-####
-
   Space = " "
 
   def initialize(output = ::STDOUT)
@@ -129,27 +59,10 @@ class Livetext
     end
   end
 
-#   def transform_line(line, context=nil)
-#     context ||= binding
-#     @context = context
-#     sigil = "." # Can't change yet
-#     nomarkup = true
-#     # FIXME inefficient
-#     scomment  = rx(sigil, Livetext::Space)  # apply these in order
-#     sname     = rx(sigil)
-#     if line =~ scomment
-#       handle_scomment(line)
-#     elsif line =~ sname 
-#       handle_sname(line)
-#     else
-#       @body << line
-#     end
-#     result
-#   end
-
   def process(text)
     enum = text.each_line
-    @main.source(enum, "STDIN", 0)
+    front = text.match(/.*?\n/).to_a.first.chomp
+    @main.source(enum, "STDIN: '#{front}...'", 0)
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -160,7 +73,8 @@ class Livetext
   def transform(text)
     @output = ::Livetext.output
     enum = text.each_line
-    @main.source(enum, "STDIN", 0)
+    front = text.match(/.*?\n/).to_a.first.chomp
+    @main.source(enum, "STDIN: '#{front}...'", 0)
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -169,11 +83,14 @@ class Livetext
     @body
   end
 
+## FIXME don't need process *and* process_text
+
   def process_text(text)
     text = text.split("\n") if text.is_a? String
     enum = text.each
     @backtrace = false
-    @main.source(enum, "(text)", 0)
+    front = text.match(/.*?\n/).to_a.first.chomp
+    @main.source(enum, "(text): '#{front}...'", 0)
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -186,11 +103,14 @@ class Livetext
     puts err.backtrace.join("\n")
   end
 
+## FIXME process_file[!] should call process[_text]
+
   def process_file(fname, context=nil)
     context ||= binding
     @context = context
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
-    enum = File.readlines(fname).each
+    text = File.readlines(fname)
+    enum = text.each
     @backtrace = false
     @main.source(enum, fname, 0)
     loop do 
@@ -223,10 +143,7 @@ class Livetext
   def handle_scomment(line, sigil=".")
   end
 
-  def _get_name(line, sigil=".")
-    name, data = line.split(" ", 2)
-    name = name[1..-1]  # chop off sigil
-    @main.data = data
+  def _check_name(name)
     @main._error! "Name '#{name}' is not permitted" if @main._disallowed?(name)
     name = "_def" if name == "def"
     name = "_include" if name == "include"
@@ -234,13 +151,22 @@ class Livetext
     name
   end
 
+  def _get_name(line, sigil=".")
+    name, data = line.split(" ", 2)
+    name = name[1..-1]  # chop off sigil
+    @main.data = data
+    name = _check_name(name)
+  end
+
   def handle_sname(line, sigil=".")
     name = _get_name(line, sigil)
-    unless @main.respond_to?(name)
+    result = nil
+    if @main.respond_to?(name)
+      result = @main.send(name)
+    else
       @main._error! "Name '#{name}' is unknown"
       return
     end
-    result = @main.send(name)
     result
   rescue => err
     @main._error!(err)

data/lib/processor.rb

@@ -0,0 +1,71 @@
+class Livetext
+
+  class Processor
+    include Livetext::Standard
+    include Livetext::UserAPI
+
+    Disallowed = [:nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
+                  :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
+                  :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
+                  :to_s, :inspect, :methods, :singleton_methods, :protected_methods, 
+                  :private_methods, :public_methods, :instance_variables, 
+                  :instance_variable_get, :instance_variable_set, 
+                  :instance_variable_defined?, :remove_instance_variable, 
+                  :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, 
+                  :respond_to?, :extend, :display, :method, :public_method, 
+                  :singleton_method, :define_singleton_method, :object_id, :to_enum, 
+                  :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
+                  :instance_exec, :__send__, :__id__, :__binding__]
+
+    def initialize(parent, output = nil)
+      @parent = parent
+      @_nopass = false
+      @_nopara = false
+      # Meh?
+      @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
+      @sources = []
+    end
+
+    def output=(io)
+      @output = io
+    end
+
+    def _error!(err, abort=true, trace=false)
+      where = @sources.last || @save_location
+      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
+      STDERR.puts err.backtrace if trace && err.respond_to?(:backtrace)
+      exit if abort
+    end
+
+    def _disallowed?(name)
+      Disallowed.include?(name.to_sym)
+    end
+
+    def source(enum, file, line)
+      @sources.push([enum, file, line])
+    end
+
+    def peek_nextline
+      @sources.last[0].peek
+    rescue StopIteration
+      @sources.pop
+      nil
+    end
+
+    def nextline
+      return nil if @sources.empty?
+      line = @sources.last[0].next
+      @sources.last[2] += 1
+      line
+    rescue StopIteration
+      @sources.pop
+      nil
+    end
+
+    def grab_file(fname)
+      File.read(fname)
+    end
+
+  end
+
+end

data/lib/standard.rb

@@ -206,18 +206,17 @@ module Livetext::Standard
   def copy
     file = @_args.first
     _check_existence(file, "No such file '#{file}' to copy")
-    @output.puts grab_file(file)
+    _out grab_file(file)
     _optional_blank_line
   end
 
   def r
-# STDERR.puts "@_data = #{@_data.inspect}"
-    _puts @_data  # No processing at all
+    _out @_data  # No processing at all
   end
 
   def raw
     # No processing at all (terminate with __EOF__)
-    _puts _raw_body  
+    _out _raw_body  
   end
 
   def debug
@@ -263,57 +262,55 @@ module Livetext::Standard
   end
 
   def newpage
-    _puts '<p style="page-break-after:always;"></p>'
-    _puts "<p/>"
+    _out '<p style="page-break-after:always;"></p>'
+    _out "<p/>"
   end
 
   def invoke(str)
   end
 
   def mono
-    _puts "<pre>"
-    _body(true) {|line| puts line }
-    _puts "</pre>"
+    _out "<pre>"
+    _body(true) {|line| _out line }
+    _out "</pre>"
     _optional_blank_line
   end
 
   def dlist
     delim = _args.first
-    _puts "<dl>"
+    _out "<dl>"
     _body do |line|
       line = _formatting(line)
       term, defn = line.split(delim)
-      _puts "<dt>#{term}</dt>"
-      _puts "<dd>#{defn}</dd>"
+      _out "<dt>#{term}</dt>"
+      _out "<dd>#{defn}</dd>"
     end
-    _puts "</dl>"
+    _out "</dl>"
   end
 
   def old_dlist
     delim = _args.first
-    _puts "<table>"
+    _out "<table>"
     _body do |line|
       line = _formatting(line)
       term, defn = line.split(delim)
-      _puts "<tr>"
-      _puts "<td width=3%><td width=10%>#{term}</td><td>#{defn}</td>"
-      _puts "</tr>"
+      _out "<tr>"
+      _out "<td width=3%><td width=10%>#{term}</td><td>#{defn}</td>"
+      _out "</tr>"
     end
-    _puts "</table>"
+    _out "</table>"
   end
 
   def link
     url = _args.first
     text = _args[2..-1].join(" ")
-    _puts "<a href='#{url}'>#{text}</a>"
+    _out "<a href='#{url}'>#{text}</a>"
   end
 
   def xtable   # Borrowed from bookish - FIXME
-#   @table_num ||= 0
-#   @table_num += 1
     title = @_data
     delim = " :: "
-    _puts "<br><center><table border=1 width=90% cellpadding=5>"
+    _out "<br><center><table border=1 width=90% cellpadding=5>"
     lines = _body(true)
     maxw = nil
     lines.each do |line|
@@ -330,23 +327,20 @@ module Livetext::Standard
   
     lines.each do |line|
       cells = line.split(delim)
-      _puts "<tr>"
+      _out "<tr>"
       cells.each.with_index do |cell, i| 
-        _puts "  <td valign=top>#{cell}</td>"
+        _out "  <td valign=top>#{cell}</td>"
       end
-      _puts "</tr>"
+      _out "</tr>"
     end
-    _puts "</table></center>"
-#   @toc << "#{_nbsp(8)}<b>Table #@chapter.#@table_num</b> #{title}<br>"
-  # _next_output(_slug("table_#{title}"))
-#   _puts "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
+    _out "</table></center>"
   end
 
   def br
     n = _args.first || "1"
     out = ""
     n.to_i.times { out << "<br>" }
-    _puts out
+    _out out
   end
 
 end 

data/lib/userapi.rb

@@ -105,9 +105,7 @@ module Livetext::UserAPI
 
   def _passthru(line, context = nil)
     return if @_nopass
-#   p [@_nopara, line]
     _out "<p>" if line == "\n" and ! @_nopara
-#   _out "<p>" if line == "" and ! @_nopara
     _formatting(line, context)
     _out line
   end

data/plugin/pyggish.rb

@@ -145,7 +145,7 @@ def ruby
 
   _process_code(code)
   html = _colorize(code, :ruby)
-  @output.puts "\n#{html}\n "
+  _out "\n#{html}\n "
 end
 
 def elixir
@@ -159,7 +159,7 @@ def elixir
 
   _process_code(code)
   html = _colorize(code, :elixir)
-  @output.puts "\n#{html}\n "
+  _out "\n#{html}\n "
 end
 
 def fragment
@@ -176,12 +176,12 @@ def fragment
   text ||= "ERROR IN HIGHLIGHTER"
   _debug "text = \n#{text.inspect}\n-----"
 # PygmentFix.pyg_finalize(text, lexer)
-  @output.puts text + "\n<br>"
+  _out text + "\n<br>"
 end
 
 def code       # FIXME ?
   text = ""   
-  _body {|line| @output.puts "    " + line }
+  _body {|line| _out "    " + line }
 end
 
 def mono

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.72
+  version: 0.8.73
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -23,6 +23,7 @@ files:
 - lib/formatline.rb
 - lib/functions.rb
 - lib/livetext.rb
+- lib/processor.rb
 - lib/standard.rb
 - lib/userapi.rb
 - livetext.gemspec