livetext 0.8.1 → 0.8.2

data/bin/livetext

@@ -4,28 +4,31 @@ require_relative '../lib/livetext'
 
 def handle_ltx(src)
   abort "Unknown file extension" unless src =~ /.ltx$/
-  x = Livetext.new
-  x.process_file(src)
 end
 
 # Main
 
+x = Livetext.new
+
 case ARGV.first 
   when  "-v", "--version"
     puts "#{Livetext::VERSION}\n "
-    exit
+  when "-t", "--test"
+    dir = File.dirname(__FILE__)
+    system("ruby #{dir}/../test/test.rb")
+  when "-s", "--stdin"
+    src = STDIN.read
+    x.process(src)
   when nil
     puts <<-EOF
     Usage: 
       livetext -v
       livetext --version
       livetext filename
-    
     EOF
-    exit
-  else
+    puts
+  when Object
     src = ARGV.first
+    x.process_file(src)
 end
 
-handle_ltx(src)
-

data/dsl/markdown.rb

@@ -13,6 +13,14 @@ def h4; _puts "#### #{@_data}"; end
 def h5; _puts "##### #{@_data}"; end
 def h6; _puts "###### #{@_data}"; end
 
+def title
+  h1
+end
+
+def section
+  h3
+end
+
 def bq   # block quote
   _body {|line| _puts "> #{line}" }
 end
@@ -23,13 +31,13 @@ def list
   _body {|line| _puts " * #{line}" }
 end
 
-alias nlist olist
-
 def olist   # Doesn't handle paragraphs yet
   n = 0
   _body do |line|
     n += 1
-    _puts "#{n}. #{line}"
+    _puts "#{n}. #{_formatting(line)}"
   end
 end
 
+alias nlist olist
+

data/dsl/tutorial.rb

@@ -1,11 +1,11 @@
 require 'cgi'
 
 def title
-  puts "<center><h2>#{@_data}</h2></center>"
+  h1
 end
 
 def section
-  puts "<br>" * 2 + "<b><font size=+1>#{@_data}</font></b>" + "<br>"
+  h3
 end
 
 def code
@@ -18,33 +18,6 @@ def rx(str)
   ::Regexp.compile(::Regexp.escape(str))
 end
 
-def list
-  puts "<ul>"
-  _body {|line| puts "<li>#{_formatting(line)}</li>" }
-  _puts "</ul>"
-end
-
-def nlist
-  puts "<ol>"
-  _body {|line| puts "<li>#{_formatting(line)}</li>" }
-  _puts "</ol>"
-end
-
-def dlist
-  delim = "~~"
-  _puts "<table>"
-  _body do |line|
-# @tty.puts "Line = #{line}"
-    line = _formatting(line)
-# @tty.puts "Line = #{line}\n "
-    term, defn = line.split(delim)
-    _puts "<tr>"
-    _puts "<td width=3%><td width=10%>#{term}</td><td>#{defn}</td>"
-    _puts "</tr>"
-  end
-  _puts "</table>"
-end
-
 def inout
   src, out = _args
   t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
@@ -52,8 +25,6 @@ def inout
   # To pacify markdown for README (FIXME later)
   t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
   t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
-# t1 = ::CGI.escape_html(t1)
-# t2 = ::CGI.escape_html(t2)
 
   puts <<-HTML
     <center>
@@ -103,11 +74,9 @@ end
 
 def testcase
   name = _args.first
-# _puts "\n<b>Test: <tt>#{name.gsub(/_/, "\\_")}</tt></b><br>"
   _puts "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
   src, exp = "test/testfiles/#{name}/source.ltx", "test/testfiles/#{name}/expected-output.txt"
   @_args = [src, exp]   # Better way to do this??
-# inout                 # Weird - only place I've done this yet.
   put_table(src, exp)
   _puts "<br>"
 end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end
 
 require 'fileutils'
@@ -109,8 +109,8 @@ class Livetext
   end
 
   def process_file(fname)
-    enum = File.readlines(fname).each
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
+    enum = File.readlines(fname).each
     @main.source(enum, fname, 0)
     loop do 
       line = @main.nextline
@@ -119,6 +119,16 @@ class Livetext
     end
   end
 
+  def process(text)
+    enum = text.each_line
+    @main.source(enum, "STDIN", 0)
+    loop do 
+      line = @main.nextline
+      break if line.nil?
+      process_line(line)
+    end
+  end
+
   def rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end

data/lib/standard.rb

@@ -239,7 +239,7 @@ module Livetext::Standard
   end
 
   def dlist
-    delim = "~~"
+    delim = _args.first
     _puts "<table>"
     _body do |line|
       line = _formatting(line)

data/test/test.rb

@@ -26,8 +26,12 @@ class TestingLivetext < MiniTest::Test
     define_method("test_formatting_#{i}") do
       x = FormatLine.new
       actual = x.parse(src)
-#     raise "Hello?"
-      assert_equal(exp, actual, msg)
+      if exp[0] == "/" # regex!
+        exp = Regexp.compile(exp[1..-2])   # skip slashes
+        assert_match(exp, actual, msg)
+      else
+        assert_equal(exp, actual, msg)
+      end
     end
   end
 

data/test/testfiles/lines.txt

@@ -274,3 +274,11 @@ Escape brackets inside ~
 There are brackets ~[\[\]] here
 There are brackets <strike>[]</strike> here
 
+Check output of $$date
+Today is $$date, I guess
+/Today is \d\d\d\d-\d\d-\d\d, I guess/
+
+Check output of $$time
+Tick tock, it's $$time right now
+/Tick tock, it's \d\d:\d\d:\d\d right now/
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Hal Fulton