livetext 0.9.15 → 0.9.21

data/imports/pyggish.rb

@@ -0,0 +1,204 @@
+require 'rouge'
+
+module Pyggish
+  def self.pyg_change(code, klass, style)
+    color = style[0..6]
+    modifier = style[8]
+    mod_open = modifier ? "<#{modifier}>" : ""
+    mod_close = modifier ? "</#{modifier}>" : ""
+    rx = /<span class="#{klass}">(?<cname>[^<]+?)<\/span>/
+    loop do
+      md = rx.match(code)
+      break if md.nil?
+      str = md[:cname]
+      result = code.sub!(rx, "<font color=#{color}>#{mod_open}#{str}#{mod_close}</font>")
+      break if result.nil?
+    end
+  end
+
+  def self._codebar_color(lexer)
+    color = case lexer
+      when :elixir
+        "#fc88fc"
+      when :ruby
+        "#fc8888"
+      else
+        raise "Unknown lexer"
+    end
+  end
+
+  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>/, "")
+    color = _codebar_color(lexer)
+    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 ?
+    n1 ||= 0
+    n2 ||= -1
+    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 = {}
+    lines.each.with_index do |line, i|
+      if line =~ /##~ ref/
+        frag, name = line.split(/ *##~ ref/)
+        @refs[name.strip] = i
+        line.replace(frag)
+      end
+    end
+    lines.map! {|line| "  " + line }
+    text2 = lines.join("\n")
+  File.open("debug-pc2", "w") {|f| f.puts text2 }
+    text.replace(text2)
+  end
+
+  def _colorize(code, lexer=:elixir)
+    text = ::Pygments.highlight(code, lexer: lexer, options: {linenos: "table"})
+    _debug "--- in _colorize: text = #{text.inspect}"
+    text2 = PygmentFix.pyg_finalize(text, lexer)
+    result = "<!-- colorized code -->\n" + text2
+    result
+  end
+
+  def _colorize!(code, lexer=:elixir)
+    text = ::Pygments.highlight(code, lexer: lexer, options: {})
+    _debug "--- in _colorize!: text = #{text.inspect}"
+    text2 = PygmentFix.pyg_finalize(text, lexer)
+    result = "<!-- colorized code -->\n" + text2
+    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 = []
+    send(lang)
+    _out "\n"
+  end
+
+  def code       # FIXME ?
+    text = ""   
+    _body {|line| _out "    " + line }
+  end
+
+  def mono
+    _out "<pre>"
+    _body {|line| _out "    " + line }
+    _out "</pre>"
+  end
+
+  def create_code_styles
+    dir = @_outdir || "."
+    theme, back = "Github", "white"
+    css = Rouge::Themes.const_get(theme).render(scope: '.rb_highlight')
+    added = <<~CSS
+      .rb_highlight { 
+      font-family: 'Monaco', 'Andale Mono', 'Lucida Grande', 'Courier', 'Lucida Console', 'Courier New', monospace;
+      white-space: pre; 
+      background-color: #{back} 
+      }
+    CSS
+
+    css.gsub!(/{\n/, "{\n  font-family: courier;")
+    css = added + "\n" + css
+    # STDERR.puts "Writing #{theme} theme to ruby.css"
+    File.write("#{dir}/ruby.css", css)
+
+    css = Rouge::Themes.const_get(theme).render(scope: '.ex_highlight')
+    added = added.sub(/rb/, "ex")
+    css.gsub!(/{\n/, "{\n  font-family: courier;")
+    css = added + "\n" + css 
+    # STDERR.puts "Writing #{theme} theme to elixir.css"
+    File.write("#{dir}/elixir.css", css)
+  end
+
+
+  def format_ruby(source, theme = "Github", back = "black")
+    # theme/back not used now
+    formatter = Rouge::Formatters::HTML.new
+    lexer = Rouge::Lexers::Ruby.new
+    body = formatter.format(lexer.lex(source))
+    text = "<div class=rb_highlight>#{body}</div>"
+    text
+  end
+
+  def format_elixir(source, theme = "Github", back = "black")
+    # theme/back not used now
+    formatter = Rouge::Formatters::HTML.new
+    lexer = Rouge::Lexers::Elixir.new
+    body = formatter.format(lexer.lex(source))
+    text = "<div class=ex_highlight>#{body}</div>"
+    text
+  end
+
+  def ruby
+    file = @_args.first 
+    if file.nil?
+      code = "  # Ruby code\n\n"
+      _body {|line| code << "  " + line + "\n" }
+    else
+      code = "# Ruby code\n\n" + ::File.read(file)
+    end
+
+    html = format_ruby(code)
+    _out html
+  end
+
+  def elixir
+    file = @_args.first 
+    if file.nil?
+      code = ""
+      _body {|line| code << "  " + line + "\n" }
+    else
+      code = ::File.read(file)
+    end
+
+    html = format_elixir(code)
+    _out html
+  end
+end

data/imports/tutorial.rb

@@ -0,0 +1,95 @@
+# require 'cgi'
+
+require 'helpers'
+
+module Tutorial
+  include Helpers
+
+  def title(args = nil, body = nil)
+    h1
+    _optional_blank_line
+  end
+
+  def section(args = nil, body = nil)
+    h3
+    _optional_blank_line
+  end
+
+  def code(args = nil, body = nil)
+    first = true  # dumb hack! fixes blank space
+    _body do |line| 
+      tag, first = "<pre>", false if first
+      _out "#{tag}   #{escape_html(line)}"   # indentation
+    end
+    _out "</pre>"
+    _optional_blank_line
+  end
+
+  def rx(str)
+    ::Regexp.compile(::Regexp.escape(str))
+  end
+
+  def inout(args = nil, body = nil)
+    src, out = _args
+    t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
+    t2 = ::File.readlines(out) rescue (abort "t2 = #{out}")
+    # To pacify markdown for README (FIXME later)
+    t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+    t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+
+    _out <<-HTML
+      <table width=80% cellpadding=4>
+      <tr>
+        <td width=50%><b>Input</b></td>
+        <td width=50%><b>Output</b></td>
+      </tr>
+      <tr>
+        <td width=50% bgcolor=#fee0fe valign=top>
+          <pre>#{t1}</pre>
+        </td>
+        <td width=50% bgcolor=#eeeeee valign=top>
+          <pre>#{t2}</pre>
+        </td>
+      </tr>
+      </table>
+    HTML
+    _optional_blank_line
+  end
+
+  def put_table(src, exp)
+    t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
+    t2 = ::File.readlines(exp) rescue (abort "t2 = #{out}")
+    t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+    t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+
+    _out <<-HTML
+      <font size=+1>
+      <table width=80% cellpadding=4>
+      <tr>
+        <td width=50%><b>Input</b></td>
+        <td width=50%><b>Output</b></td>
+      </tr>
+      <tr>
+        <td width=50% bgcolor=#fee0fe valign=top>
+          <pre>#{t1}</pre>
+        </td>
+        <td width=50% bgcolor=#eeeeee valign=top>
+          <pre>#{t2}</pre>
+        </td>
+      </tr>
+      </table>
+      </font>
+    HTML
+  end
+
+  def testcase(args = nil, body = nil)
+    name = _args.first
+    _out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
+    src, exp = "test/snapshots/#{name}/source.lt3", "test/snapshots/#{name}/expected-output.txt"
+    @_args = [src, exp]   # Better way to do this??
+    put_table(src, exp)
+    _out "<br>"
+    _optional_blank_line
+  end
+end
+

data/lib/cmdargs.rb

@@ -4,44 +4,53 @@ require_relative 'livetext'
   Weird concepts to understand here...
 
     1. A Livetext dot-command (flush left) usually looks like:
-       .foobar
+         .foobar
+
     2. A dot-command (left-indented) usually looks like:
-           $.foobar
+         $.foobar
+
     3. More generally, it may have any number of parameters (0, 1, ...)
-       .redirect somefile.txt append
+         .redirect somefile.txt append
+
     4. Variables and functions *can* appear (rare in practice??)
-       .redirect somefile$my_suffix $$my_mode
+         .redirect somefile$my_suffix $$my_mode
+
     5. A trailing # comment may appear 
        a. Stripped... saved in #raw ? #data ? #comment ? elsewhere?
        b. NOT the "dot" as a comment!
+
     6. .foobar  # This here is a comment
+
     7. #data accessor returns all data on the .foo line...
        a. ...After the initial space
-       b. ...Including spaces
+       b. ...Including later spaces
        c. Including comment??
        d. .foo This is  o n l y   a test.
           # #data returns: "This is  o n l y   a test."
        e. What about formatting???
        f. What about: comments? variables? functions? 
 
-    7. Some commands have NO body while others have an OPTIONAL or REQUIRED body
+    8. Some commands have NO body while others have an OPTIONAL or REQUIRED body
        a. Assume .cmd1 definition forbids a body (then a body is an error)
           .cmd1   # may NOT have a body
        b. Assume .cmd2 definition PERMITS a body
           .cmd2   # may or MAY NOT have body/.end  
-       c. Assume .cmd3 definition PERMITS a body
+       c. Assume .cmd3 definition REQUIRES a body
           .cmd3   # REQUIRES a body/.end  
           . stuff...
           .end
-    8. Inside a body:
-    8a. Leading dot has no special meaning (though the associated method may parse it!)
-    8b. BUG? Currently leading dot is a comment INSIDE a body?
-    8a. No leading char is special (though the associated method may parse it!)
-    8a. No trailing #-comments (though the associated method may parse it!)
-    8c. ?? We should or shouldn't look for variables/functions? or make it an option?
-    8d. .end may naturally not be used (but see .raw where it may)
-    9. the args accessor is a simple array of strings
 
+    9. Inside a body:
+       a. Leading dot has no special meaning (though the associated method may parse it!)
+       b. BUG? Currently leading dot is a comment INSIDE a body?
+       c. No leading char is special (though the associated method may parse it!)
+       d. No trailing #-comments (though the associated method may parse it!)
+       e. ?? We should or shouldn't look for variables/functions? or make it an option?
+       f. .end may naturally not be used (but see .raw where it may)
+
+   10. The args accessor is a simple array of strings
+       a. there is also raw_args (without variables/functions, etc.)
+       b. Much of this HAS NOT been thought through yet!      
 
 =end
 
@@ -64,11 +73,11 @@ class Livetext::CmdData
     @nargs = nargs       # not really "needed"
     check_num_args(nargs)
     
-    # @varfunc = _var_func_parse(data.dup)
+    # @varfunc = Livetext.interpolate(data.dup)
   end
 
   def check_num_args(num)
-    num_range = /(\d{0,2})(\.\.)(\d{0,2})/
+    num_range = /(\d{0,2})(\.\.)(\d{0,2})/   # Not "really" right...
     min, max = 0, 9999
     md = num_range.match(@nargs).to_a
     bad_args = nil

data/lib/formatline.rb

@@ -52,7 +52,7 @@ class FormatLine < StringParser
           marker peek
           add peek
         when LF
-          break if @i >= line.size - 1
+          break if eos?  # @i >= line.size - 1
         when nil
           break
         else
@@ -117,11 +117,11 @@ class FormatLine < StringParser
           if [:colon, :brackets].include? arg[0] 
             arg = gen.next  # for real
             param = arg[1]
-            param = FormatLine.var_func_parse(param)
+            param = Livetext.interpolate(param)
           end
           @out << funcall(val, param)
         when :b, :i, :t, :s
-          val = FormatLine.var_func_parse(val)
+          val = Livetext.interpolate(val)
           @out << embed(sym, val)
       else
         add_token :str
@@ -199,7 +199,7 @@ class FormatLine < StringParser
     str = Null.dup
     grab
     loop do
-      break if eos?   # peek.nil?
+      break if peek.nil?   # eos?
       str << peek
       break if terminate?(NoAlphaDot, next!)
       grab

data/lib/handler/icanhaz.rb

@@ -0,0 +1,35 @@
+
+class Livetext::Handler::ICanHaz
+  include Helpers
+
+  attr_reader :file
+
+  def initialize(name)
+    @name = name
+    @file = find_file(name)
+  end
+
+  def self.get_module(name)
+    handler = self.new(name)
+    const1 = Object.constants
+    @file = handler.file.sub(/.rb$/, "")
+    require @file   # + ".rb"
+    const2 = Object.constants
+    names = (const2 - const1)
+    abort "Expected ONE new constant: #{names.inspect}" if names.size != 1
+    modname = names.first.to_s
+    newmod = Object.const_get("::" + modname)
+    newmod   # return actual module
+  end
+
+  private
+
+  def cwd_root?
+    File.dirname(File.expand_path(".")) == "/"
+  end
+
+  def fname2module(name)
+  end
+
+end
+

data/lib/handler.rb

@@ -0,0 +1 @@
+require_relative 'handler/icanhaz'

data/lib/helpers.rb

@@ -4,6 +4,40 @@ module Helpers
   Space = " "
   Sigil = "." # Can't change yet
 
+  ESCAPING = { "'" => ''', '&' => '&', '"' => '"',
+               '<' => '&lt;', '>' => '&gt;' }
+
+  def escape_html(string)
+    enc = string.encoding
+    unless enc.ascii_compatible?
+      if enc.dummy?
+        origenc = enc
+        enc = Encoding::Converter.asciicompat_encoding(enc)
+        string = enc ? string.encode(enc) : string.b
+      end
+      table = Hash[ESCAPING.map {|pair|pair.map {|s|s.encode(enc)}}]
+      string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
+      string.encode!(origenc) if origenc
+      return string
+    end
+    string.gsub(/['&\"<>]/, ESCAPING)
+  end
+
+  def find_file(name, ext=".rb")
+    paths = [Livetext::Path.sub(/lib/, "imports/"), "./"]
+    base  = "#{name}#{ext}"
+    paths.each do |path|
+      file = path + base
+      return file if File.exist?(file)
+    end
+
+    raise "No such mixin '#{name}'"
+
+    # # Really want to search upward??
+    # raise "No such mixin '#{name}'" if cwd_root?
+    # Dir.chdir("..") { find_file(name) }
+  end
+
   def self.rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
@@ -30,7 +64,7 @@ module Helpers
     @body
   end
 
-  def process_line(line)  # FIXME inefficient?
+  def process_line(line)
     nomarkup = true
     case line  # must apply these in order
       when Comment
@@ -59,6 +93,29 @@ module Helpers
         raise EndWithoutOpening()
       when @main.respond_to?(name)
         result = @main.send(name)
+
+        # NOTE: The above line is where the magic happens!
+        # 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 
+        # 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 
+        # 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.
+        #
+        # Refer to lib/cmdargs.rb for more! This is *strictly*
+        # experimental and a "work in progress."
     else
       puts @body  # earlier correct output, not flushed yet
       raise "Name '#{name}' is unknown"
@@ -74,8 +131,8 @@ module Helpers
     name, data = line.split(" ", 2)
     name = name[1..-1]  # chop off sigil
     name = "dot_" + name if %w[include def].include?(name)
-    @main.data = data
     @main.check_disallowed(name)
+    @main.data = data
     name
   end
 

data/lib/livetext.rb

@@ -1,8 +1,11 @@
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.15"
+  VERSION = "0.9.21"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
+
+  module Handler
+  end
 end
 
 # $LOAD_PATH << Livetext::Path
@@ -16,8 +19,10 @@ require_relative 'standard'
 require_relative 'formatline'
 require_relative 'processor'
 require_relative 'helpers'
+require_relative 'handler'
 
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
+Imports = File.expand_path(File.join(File.dirname(__FILE__), "../imports"))
 
 TTY = ::File.open("/dev/tty", "w")
 

data/lib/parser/general.rb

@@ -27,7 +27,7 @@ class Livetext::ParseGeneral < StringParser
     lines.each do |line|
       next if line.strip.empty?
       var, value = line.split(" ", 2)
-      val = FormatLine.var_func_parse(value)
+      val = Livetext.interpolate(value)
       var = prefix + "." + var if prefix
       pairs << [var, value]
     end

data/lib/parser/import.rb

@@ -4,9 +4,7 @@ require '../livetext/importable'
 make_exception(:BadVariableName, "Error: invalid variable name")
 make_exception(:NoEqualSign,     "Error: no equal sign found")
 
-# FIXME probably belongs elsewhere?
-
-class Livetext::ParseImport
+class Livetext::Handler::Import
   def use_import(name)
     require name
     include name

data/lib/parser/mixin.rb

@@ -2,13 +2,9 @@ require_relative '../livetext'
 require_relative '../helpers'
 require_relative 'string'
 
-make_exception(:BadVariableName, "Error: invalid variable name")
 make_exception(:NoEqualSign,     "Error: no equal sign found")
 
-# FIXME probably belongs elsewhere?
-
-class Livetext::ParseMixin   # < StringParser
-
+class Livetext::ParseMixin
   include Helpers
 
   def initialize(name)
@@ -37,17 +33,6 @@ class Livetext::ParseMixin   # < StringParser
     File.dirname(File.expand_path(".")) == "/"
   end
 
-  def find_file(name, ext=".rb")
-    base = "./#{name}#{ext}"
-    file = "#{Plugins}/#{base}"
-    return file if File.exist?(file)
-
-    file = base
-    return file if File.exist?(file)
-
-    raise "No such mixin '#{name}'" if cwd_root?
-    Dir.chdir("..") { find_file(name) }
-  end
 
 end
 

data/lib/parser/set.rb

@@ -31,8 +31,8 @@ class Livetext::ParseSet < StringParser
     pairs = []
     char = nil
     loop do
-      break if eos?   # end of string
       char = skip_spaces
+      break if eos?   # end of string
       raise "Expected alpha to start var name" unless char =~ /[a-z]/i
       pairs << assignment
       char = skip_spaces
@@ -56,7 +56,7 @@ class Livetext::ParseSet < StringParser
     var = get_var
     skip_equal
     value = get_value
-    value = FormatLine.var_func_parse(value)    # FIXME broken now?
+    value = Livetext.interpolate(value)
     pair = [var, value]
     pair
   end

data/lib/parser/string.rb

@@ -15,12 +15,13 @@ class StringParser
     return nil if @eos
     char = @line[@i]
     @i += 1
-    @eos = true if @i > @len
+    check_eos
     char
   end
 
   def ungrab
-    @i -= 1    # FIXME what about eos...?
+    @i -= 1
+    check_eos
   end
 
   def next!
@@ -32,12 +33,7 @@ class StringParser
     @line[@i-1]
   end
 
-  def last?
-    @i > @len - 1
-  end
-
   def eos?
-    @eos = true if last? # duh?
     @eos
   end
 
@@ -52,11 +48,16 @@ class StringParser
       char = peek
       break if eos?
       break if char != " "
-      grab
+      char = grab
     end
     char
   end
 
+  private
+
+  def check_eos
+    @eos = @i >= @len
+  end
 end
 
 =begin