livetext 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90efd2fa7302e61cfe5ed140c8f954afd2b7c699ec705d8ff0c1d36bd6641fa4
-  data.tar.gz: b551f8a5dc4eda7435fe73b4680604c8468a59417286c01194672d319bdaf411
+  metadata.gz: 3d2ff056cfc390401ec0517a7a74bb0eadf9128fff5eaff5c60a548775bdde9f
+  data.tar.gz: c76d7b425e3c19b0c44c752ff5705757415f60ee1d2647b538cfb9e6eb263ec3
 SHA512:
-  metadata.gz: 213f8d126a548e54a34ce1c4f551d9f4ab208df618bb4e1d069ee5c6f430d03daeef6054c71e205dc1431b1bea6c6bb05d9362985c8be280ed982781b139b047
-  data.tar.gz: ef50d633131bf82ac06c7807ea53edbc11ba032e0ea3db7eade09afed2e5e954656515872ead7fb38a798c7079fb0d73e742a18b4b258d29baab13de6b8e28d5
+  metadata.gz: bc98e86fdc72cbe0441ad2b80cbff64d3afbf4cae68eaba12e6e84ba5dd51913e6cdc9c687678782db61f64796347a2cf5d149e2eb74c4ed436634efa0c8b9fb
+  data.tar.gz: e6359fd712953b1579bb36d56b5dfd9546963064e4a5f08165ccf4a61dcc1de0a52374a15d7f038e63fe9ff00f25a5d3c0febdac501fea067399bf3c682075eb

data/imports/bookish.rb

@@ -33,10 +33,6 @@ module Bookish
     _out "</table>"
   end
 
-  # def comment
-  #   _body { }  # ignore body
-  # end
-
   def _errout(*args)
     ::STDERR.puts *args
   end
@@ -46,13 +42,15 @@ module Bookish
   end
 
   def _slug(str)
-    s2 = str.chomp.strip.gsub(/[?:,()'"\/]/,"").gsub(/ /, "-").downcase
-  # _errout "SLUG: #{str} => #{s2}"
-    s2
+    str2 = str.chomp.strip
+    str2 = str2.gsub(/[?:,()'"\/]/,"")
+    str2 = str2.gsub(/ /, "-")
+    str2.downcase!
+    str2
   end
 
-
   # FIXME duplicated?
+
   def image(args = nil, body = nil)
     name = @_args[0]
     _out "<img src='#{name}'></img>"
@@ -109,7 +107,7 @@ module Bookish
     next_output
     _out "<h3>#@section #{title}</h3>\n"
   rescue => err
-    STDERR.puts "#{err}\n#{err.backtrace}"
+    ::STDERR.puts "#{err}\n#{err.backtrace}"
     exit
   end
 
@@ -276,7 +274,7 @@ module Bookish
     _body {|line| _out line }
     _out "</blockquote>"
   rescue => err
-    STDERR.puts "#{err}\n#{err.backtrace}"
+    ::STDERR.puts "#{err}\n#{err.backtrace}"
     exit
   end
 

data/imports/pyggish.rb

@@ -1,5 +1,7 @@
 require 'rouge'
 
+# FIXME This file has suboptimal juju. See plugin/pyggish.rb also
+
 module Pyggish
   def self.pyg_change(code, klass, style)
     color = style[0..6]
@@ -29,7 +31,6 @@ module Pyggish
 
   def self.pyg_finalize(code, lexer=:elixir)
     Styles.each_pair {|klass, style| pyg_change(code, klass, style) }
-File.open("debug-pf1", "w") {|f| f.puts code }
     code.sub!(/<pre>/, "<pre>\n")
     code.gsub!(/<span class="[np]">/, "")
     code.gsub!(/<\/span>/, "")
@@ -37,9 +38,7 @@ File.open("debug-pf1", "w") {|f| f.puts code }
     code.sub!(/<td class="linenos"/, "<td width=2%></td><td width=5% bgcolor=#{color}")
     code.gsub!(/<td/, "<td valign=top ")
     code.gsub!(/ class="[^"]*?"/, "")    # Get rid of remaining Pygments CSS
-File.open("debug-pf2", "w") {|f| f.puts code }
     lines = code.split("\n")
-#   lines.each {|line| line << "\n" }
     n1 = lines.index {|x| x =~ /<pre>/ }
     n2 = lines.index {|x| x =~ /<\/pre>/ }
     # FIXME ?
@@ -48,12 +47,10 @@ File.open("debug-pf2", "w") {|f| f.puts code }
     lines[n1].sub!(/ 1$/, "  1 ")
     (n1+1).upto(n2) {|n| lines[n].replace(" " + lines[n] + " ") }
     code = lines.join("\n")
-File.open("debug-pf3", "w") {|f| f.puts code }
     code
   end
 
   def _process_code(text)
-  File.open("debug-pc1", "w") {|f| f.puts text }
     lines = text.split("\n")
     lines = lines.select {|x| x !~ /##~ omit/ }
     @refs = {}
@@ -66,7 +63,6 @@ File.open("debug-pf3", "w") {|f| f.puts code }
     end
     lines.map! {|line| "  " + line }
     text2 = lines.join("\n")
-  File.open("debug-pc2", "w") {|f| f.puts text2 }
     text.replace(text2)
   end
 
@@ -86,34 +82,6 @@ File.open("debug-pf3", "w") {|f| f.puts code }
     result
   end
 
-  def OLD_ruby
-    file = @_args.first 
-    if file.nil?
-      code = "# Ruby code\n"
-      _body {|line| code << line + "\n" }
-    else
-      code = "# Ruby code\n\n" + ::File.read(file)
-    end
-
-    _process_code(code)
-    html = _colorize(code, :ruby)
-    _out "\n#{html}\n "
-  end
-
-  def OLD_elixir
-    file = @_args.first 
-    if file.nil?
-      code = ""
-      _body {|line| code << line + "\n" }
-    else
-      code = ::File.read(file)
-    end
-
-    _process_code(code)
-    html = _colorize(code, :elixir)
-    _out "\n#{html}\n "
-  end
-
   def fragment
     lang = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
     @_args = []

data/imports/tutorial.rb

@@ -1,7 +1,7 @@
-# require 'cgi'
-
 require 'helpers'
 
+# Created as an "ad hoc" lib for generating the README
+
 module Tutorial
   include Helpers
 

data/lib/cmdargs.rb

@@ -65,14 +65,13 @@ class Livetext::CmdData
     # body:  true => this command has a body + .end
     # how raw is raw?
     #   remove comment - always/sometimes/never?
-    #   var_func_parse - always/sometimes/never?
-    #   var_func_parse inside body??
+    #   interpolate - always/sometimes/never?
+    #   interpolate inside body??
     @data = data.dup     # comment? vars? funcs?
     @raw  = data.dup     # comment? vars? funcs?
     @args  = data.split  # simple array
     @nargs = nargs       # not really "needed"
     check_num_args(nargs)
-    
     # @varfunc = Livetext.interpolate(data.dup)
   end
 

data/lib/formatline.rb

@@ -7,6 +7,8 @@ class FormatLine < StringParser
   SimpleFormats[:i] = %w[<i> </i>]
   SimpleFormats[:t] = ["<font size=+1><tt>", "</tt></font>"]
   SimpleFormats[:s] = %w[<strike> </strike>]
+
+  BITS = SimpleFormats.keys
  
   Null   = ""
   Space  = " "
@@ -45,7 +47,7 @@ class FormatLine < StringParser
 #   add grab
     loop do 
       case peek
-        when Escape; grab; add peek; grab; add peek
+        when Escape; grab; add peek; grab; #  add peek  # <-- last is an error??
         when "$"
           dollar
         when "*", "_", "`", "~"
@@ -107,22 +109,10 @@ class FormatLine < StringParser
       break if token.nil? 
       sym, val = *token
       case sym
-        when :str
-          @out << val unless val == "\n"   # BUG
-        when :var
-          @out << varsub(val)
-        when :func 
-          param = nil
-          arg = gen.peek
-          if [:colon, :brackets].include? arg[0] 
-            arg = gen.next  # for real
-            param = arg[1]
-            param = Livetext.interpolate(param)
-          end
-          @out << funcall(val, param)
-        when :b, :i, :t, :s
-          val = Livetext.interpolate(val)
-          @out << embed(sym, val)
+        when :str;   eval_str(val)
+        when :var;   eval_var(val)
+        when :func;  eval_func(val, gen)
+        when *BITS;  eval_bits(sym, val)
       else
         add_token :str
       end
@@ -131,46 +121,16 @@ class FormatLine < StringParser
     @out
   end
 
-  def grab_colon_param
-    grab  # grab :
-    param = ""
-    loop do 
-      case next!
-        when Escape
-          grab
-          param << next!
-          grab
-        when Space, LF, nil; break
-      else
-        param << next!
-        grab
-      end
-    end
-
-    param = nil if param.empty?
-    param
-  end
-
   def grab_func_param
-    grab # [
-    param = ""
-    loop do 
-      case next!
-        when Escape
-          grab
-          param << next!
-          grab
-        when "]", LF, nil; break
-      else
-        param << next!
-        grab
-      end
+    case lookahead
+      when "["
+        param = grab_bracket_param
+        add_token(:brackets, param)
+      when ":"
+        param = grab_colon_param
+        add_token(:colon, param)
+    else  # do nothing
     end
-
-    add peek
-    grab
-    param = nil if param.empty?
-    param
   end
 
   def add(str)
@@ -189,7 +149,7 @@ class FormatLine < StringParser
     loop do
       break if eos?
       str << peek
-      break if terminate?(NoAlpha, next!)
+      break if terminate?(NoAlpha, lookahead)
       grab
     end
     str
@@ -201,7 +161,7 @@ class FormatLine < StringParser
     loop do
       break if peek.nil?   # eos?
       str << peek
-      break if terminate?(NoAlphaDot, next!)
+      break if terminate?(NoAlphaDot, lookahead)
       grab
     end
     str
@@ -216,7 +176,7 @@ class FormatLine < StringParser
       when "$"; double_dollar
 #     when "."; dollar_dot
       when /[A-Za-z]/
-       add_token :str
+        add_token :str
         var = peek + grab_alpha_dot
         add_token(:var, var)
     else 
@@ -226,17 +186,14 @@ class FormatLine < StringParser
   end
 
   def double_dollar
-    case next!
+    case lookahead
       when Space; add_token :string, "$$ "; grab; return
       when LF, nil; add "$$"; add_token :str
       when Alpha
         add_token(:str, @token)
         func = grab_alpha
         add_token(:func, func)
-        case next!
-          when ":"; param = grab_colon_param; add_token(:colon, param)
-          when "["; param = grab_func_param; add_token(:brackets, param)
-        end
+        param = grab_func_param    # may be null/missing
       else
         grab; add_token :str, "$$" + peek; return
     end
@@ -276,7 +233,7 @@ class FormatLine < StringParser
   def double_marker(char)
     sym = Syms[char]
     kind = sym
-    case next!   # first char after **
+    case lookahead   # first char after **
       when Space, LF, nil
         pre, post = SimpleFormats[sym]
         add_token kind
@@ -317,13 +274,12 @@ class FormatLine < StringParser
     add str
     str
   rescue => err
-    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
-    STDERR.puts "=== str = #{str.inspect}"
+    ::STDERR.puts "ERR = #{err}\n#{err.backtrace}"
   end
 
   def escaped
-    grab
-    ch = grab
+    grab        # Eat the backslash
+    ch = grab   # Take next char
     ch
   end
 
@@ -350,20 +306,20 @@ class FormatLine < StringParser
     add str
     str
   rescue => err
-    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
-    STDERR.puts "=== str = #{str.inspect}"
+    ::STDERR.puts "ERR = #{err}\n#{err.backtrace}"
   end
 
   def funcall(name, param)
     err = "[Error evaluating $$#{name}(#{param})]"
+    func_name = name  # "func_" + name.to_s
     result = 
-      if self.respond_to?("func_" + name.to_s)
-        self.send("func_" + name.to_s, param)
+      if self.send?(func_name, param)  # self.respond_to?(func_name)
+        # do nothing
       else
         fobj = ::Livetext::Functions.new
         fobj.send(name, param) rescue err
       end
-    result
+    result.to_s
   end
 
   def varsub(name)
@@ -374,4 +330,76 @@ class FormatLine < StringParser
   def embedded?
     ! (['"', "'", " ", nil].include? prev)
   end
+
+  private 
+
+  def grab_colon_param
+    grab  # grab :
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when Space, LF, nil; break
+      else
+        param << lookahead
+        grab
+      end
+    end
+
+    param = nil if param.empty?
+    param
+  end
+
+  def grab_bracket_param
+    grab # [
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when "]", LF, nil
+          break
+      else
+        param << lookahead
+        grab
+      end
+    end
+    add peek
+    grab
+    param = nil if param.empty?
+    param
+  end
+
+  def eval_bits(sym, val)
+    val = Livetext.interpolate(val)
+    @out << embed(sym, val)
+  end
+
+  def eval_func(val, gen)
+    param = nil
+    arg = gen.peek rescue :bogus
+    unless arg == :bogus
+      if [:colon, :brackets].include? arg[0] 
+        arg = gen.next  # for real
+        param = arg[1]
+        # FIXME - unsure - interpolate again??
+        # param = Livetext.interpolate(param)
+      end
+    end
+    @out << funcall(val, param)
+  end
+
+  def eval_var(val)
+    @out << varsub(val)
+  end
+
+  def eval_str(val)
+    @out << val unless val == "\n"   # BUG
+  end
+
 end

data/lib/functions.rb

@@ -13,6 +13,21 @@ class Livetext::Functions
     attr_accessor :param   # kill this?
   end
 
+# FIXME Function parameters need to be fixed...
+
+  def isqrt(param = nil)      # "integer square root" - Just for testing
+    arg = num = param         #  Takes any number
+    if num.nil? || num.empty?
+      arg = "NO PARAM"        # Just for error text
+    end
+    # Integer()/Float() can raise error
+    num = num.include?(".") ? Float(num) : Integer(num)   
+    # Returns truncated integer
+    Math.sqrt(num).to_i       # user need not do to_s
+  rescue => err               # Malformed number? negative?
+    "[Error evaluating $$isqrt(#{arg})]"
+  end
+
   def date(param=nil)
     Time.now.strftime("%F")
   end
@@ -40,7 +55,7 @@ class Livetext::Functions
     "<br>"*n
   end
 
-  def yt(param)
+  def yt(param)   # FIXME uh, this is crap
     param = self.class.param
     "https://www.youtube.com/watch?v=#{param}"
   end

data/lib/handler/{icanhaz.rb → import.rb}

@@ -1,5 +1,5 @@
 
-class Livetext::Handler::ICanHaz
+class Livetext::Handler::Import
   include Helpers
 
   attr_reader :file

data/lib/handler.rb

@@ -1 +1 @@
-require_relative 'handler/icanhaz'
+require_relative 'handler/import'

data/lib/helpers.rb

@@ -55,12 +55,12 @@ module Helpers
     @backtrace = btrace
     @main.source(enum, fname, 0)
     line = nil
-    loop do 
+    loop do
       line = @main.nextline
       break if line.nil?
       process_line(line)
     end
-    val = @main.finalize if @main.respond_to? :finalize
+    val = @main.finalize rescue nil
     @body
   end
 
@@ -95,21 +95,21 @@ module Helpers
         result = @main.send(name)
 
         # NOTE: The above line is where the magic happens!
-        # A name like 'foobar' results in an invocation of 
+        # A name like 'foobar' results in an invocation of
         # @main.foobar (where @main is a Processor, and any
         # new methods (e.g. from a mixin) are added to @main
-        # 
+        #
         # So all the functionality from _args and _raw_args
         # and _data (among others?) will be encapsulated in
-        # 'some' kind of PORO which handles access to all 
+        # 'some' kind of PORO which handles access to all
         # these things as well as the 'body' between the
         # command and its corresponding .end
-        # 
+        #
         # The 'body' functionality is so commonly used, I plan
         # to pass it in separately as needed (even though the
         # args object should make it available also).
-        # 
-        # Every method corresponding to a dot commmand will 
+        #
+        # Every method corresponding to a dot commmand will
         # get args and body passed in as needed. Every one of
         # the signatures already has (args = nil, body = nil)
         # but nothing is being passed in that way yet.
@@ -169,10 +169,10 @@ module Helpers
       value = path if File.exist?(path)
       break if value
     end
-    STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
+    ::STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
 	  return value
   rescue
-    STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
+    ::STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
 	  return nil
   end
 

data/lib/livetext.rb

@@ -1,17 +1,25 @@
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.21"
+  VERSION = "0.9.22"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 
   module Handler
   end
 end
 
-# $LOAD_PATH << Livetext::Path
-
 require 'fileutils'
 
+class Object
+  def send?(meth, *args)
+    if self.respond_to?(meth)
+      self.send(meth, *args)
+    else
+      return nil
+    end
+  end
+end
+
 require_relative 'errors'
 require_relative 'functions'
 require_relative 'userapi'
@@ -62,8 +70,7 @@ class Livetext
   def customize(mix: [], call: [], vars: {})
     mix  = Array(mix)
     call = Array(call)
-    # FIXME HF won't this break??
-    mix.each {|lib| mixin(lib) }
+    mix.each {|lib| mixin(lib) }  # FIXME HF won't this break??
     call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
     vars.each_pair {|var, val| setvar(var, val.to_s) }
     self

data/lib/parser/set.rb

@@ -107,7 +107,6 @@ class Livetext::ParseSet < StringParser
       char = grab
       break if eos?
       break if char == quote
-#     break if char.nil?
       char = escaped if char == "\\"
       value << char
     end
@@ -123,8 +122,7 @@ class Livetext::ParseSet < StringParser
     value = ""
     loop do
       char = peek
-      break if eos?  #     FIXME oops???
-#     break if char.nil?
+      break if eos?
       break if char == " " || char == ","
       value << char
       char = grab

data/lib/parser/string.rb

@@ -24,7 +24,7 @@ class StringParser
     check_eos
   end
 
-  def next!
+  def lookahead
     @line[@i + 1]
   end
 
@@ -62,7 +62,7 @@ end
 
 =begin
   skip
-  next! skip! peek!(?)
+  lookahead skip! peek!(?)
   expect_alpha
   expect_number
   skip_spaces

data/lib/processor.rb

@@ -46,10 +46,14 @@ class Livetext
       @output = io
     end
 
+    def error(*args)
+      ::STDERR.puts *args
+    end
+
     def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
       where = @sources.last || @save_location
-      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
+      error "Error: #{err} (at #{where[1]} line #{where[2]})"
+      error(err.backtrace) rescue nil
       raise GenericError.new("Error: #{err}") if raise_error
     end