livetext 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf150349564c9f613698a94db648859a5b03d3b
-  data.tar.gz: cea49f36d5db27d1fdff4d0c5484686044126104
+  metadata.gz: a7abb70149d3ce8d437180e80e90ff923284202f
+  data.tar.gz: e006a124c7ee1524774b996d6632203bc4d1f8be
 SHA512:
-  metadata.gz: c8ec7ac2f7028ef1fef91e3e1937e62e7f91fbd467a0a3e0c7c58d51796b05ada956fb89a04ecc8b2487d53591fa5ab211d18bfd095ddc4c5404ce92d178afad
-  data.tar.gz: 106ef65fea37b5d262d574f3adf7435ff95397508be3241d7e3711a050f2019f3303bce8bdf9f1b308518568d9c49dc3b5f9cf21066021050513ceb04798b7b9
+  metadata.gz: 162c8d389a83695a457046a6f57b1e4991f643c15c272a65d6689e5ba171933bcf83cb8fae9407b7cca2abeffe71f6f23085e397024ad1e0c0e2f0e64b7c488b
+  data.tar.gz: 9d1435ef7cb23a5bcd0293de2649d8d2cc3b4e5e9ff21213f7682621284a011b1a5357110b50c7ebfb0d604588fff6c425eb49600ae992b791358c9390703235

data/lib/formatline.rb

@@ -0,0 +1,197 @@
+
+class FormatLine
+  EOL    = :eol
+  Alpha  = /[a-z]/
+  Alpha2 = /[a-z0-9_]/
+  Other  = Object
+
+  SimpleFormats     = {}
+  SimpleFormats[:b] = %w[<b> </b>]
+  SimpleFormats[:i] = %w[<i> </i>]
+  SimpleFormats[:t] = %w[<tt> </tt>]
+  SimpleFormats[:s] = %w[<strike> </strike>]
+
+  def initialize
+    @buffer, @vname, @fname, @param, @substr = "", "", "", "", ""
+  end
+
+  def peek
+    @enum.peek
+  rescue StopIteration
+    EOL
+  end
+
+  def grab
+    @enum.next
+  rescue StopIteration
+    EOL
+  end
+
+  def skip
+    @enum.next
+    @enum.peek
+  rescue StopIteration
+    EOL
+  end
+
+  def keep(initial = "")
+    @buffer << initial
+    @buffer << @enum.next
+  rescue StopIteration
+    EOL
+  end
+
+  def emit(str = "")
+    @buffer << str
+  end
+
+  def varsub(name)
+    Livetext::Vars[name]
+  end
+
+  def funcall(name, param)
+    fobj = ::Livetext::Functions.new
+    fobj.send(name, param)
+  end
+
+  def vsub
+    @buffer << varsub(@vname)
+    @vname = ""
+  end
+
+  def fcall
+    @buffer << funcall(@fname, @param)
+    @fname, @param = "", ""
+  end
+
+  def bold
+    d0, d1 = SimpleFormats[:b]
+    @buffer << "#{d0}#@substr#{d1}"
+    @substr = ""
+  end
+
+  def ttype
+    d0, d1 = SimpleFormats[:t]
+    @buffer << "#{d0}#@substr#{d1}"
+    @substr = ""
+  end
+
+  def italics
+    d0, d1 = SimpleFormats[:i]
+    @buffer << "#{d0}#@substr#{d1}"
+    @substr = ""
+  end
+
+  def parse(line)
+    @enum = line.chomp.each_char
+    @buffer = ""
+    @substr = ""
+    @fname  = ""
+    @vname  = ""
+    @param  = ""
+    
+    loop do   # starting state
+      char = peek
+  #   puts "char = #{char.inspect}"
+      case char
+        when EOL
+          break
+        when "$"        # var or func or $
+          case skip
+            when EOL
+              emit("$")
+              break
+            when Alpha
+              loop { @vname << grab; break unless Alpha2 === peek } 
+              vsub
+            when "$" 
+              case skip
+                when Alpha
+                  loop { @fname << grab; break unless Alpha2 === peek }
+                  case peek
+                    when " "   # no param - just call
+                      fcall    # no param? Hmm
+                    when "["   # long param - may have spaces - can hit eol
+                      skip
+                      loop { break if ["]", EOL].include?(peek); @param << grab }
+                      fcall
+                    when ":"   # param (single token or to-eol)
+                      case skip
+                        when ":"   # param to eol
+                          skip
+                          loop { break if peek == EOL; @param << grab }
+                        when Other # grab until space or eol
+                          loop { @param << grab; break if [" ", EOL].include?(peek) }
+                          fcall
+                      end
+                    when Other # no param - just call
+                      fcall
+                  end
+                when Other
+                  emit "$$"
+              end
+            when Other
+              emit "$"
+          end
+        when "*"
+          case skip
+            when EOL
+              emit "*"
+            when " "
+              emit "*"
+            when "["
+              skip
+              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              skip
+              bold
+            when Other
+              loop { @substr << grab; break if [" ", EOL].include?(peek) }
+              bold
+          end
+        when "_"
+          case skip
+            when EOL
+              emit "_"
+            when " "
+              emit "_"
+            when "["
+              skip
+              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              skip
+              italics
+            when "_"   # doubled...
+              skip
+              loop { break if [".", ",", ")", EOL].include?(peek); @substr << grab }   # ";" ?? FIXME
+              italics
+            when Other
+              loop { @substr << grab; break if [" ", EOL].include?(peek) }
+              italics
+          end
+        when "`"
+          case skip
+            when EOL
+              emit "`"
+            when " "
+              emit "`"
+            when "["
+              skip
+              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              skip
+              ttype
+            when "`"   # doubled...
+              skip
+              loop { break if [".", ",", ")", EOL].include?(peek); @substr << grab }   # ";" ?? FIXME
+              ttype
+            when Other
+              loop { @substr << grab; break if [" ", EOL].include?(peek) }
+              ttype
+          end
+        when Other
+          keep
+      end
+    end
+
+    @buffer
+  end
+end
+

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end
 
 require 'fileutils'
@@ -11,6 +11,7 @@ $: << Path
 require 'functions'
 require 'userapi'
 require 'standard'
+require 'formatline'
 
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../dsl"))
 
@@ -21,6 +22,8 @@ TTY = ::File.open("/dev/tty", "w")
 
 class Livetext
 
+  Vars = {}
+
   class Processor
     include Livetext::Standard
     include Livetext::UserAPI
@@ -43,7 +46,6 @@ class Livetext
       @_nopass = false
       @_nopara = false
       @output = output
-      @vars = {}
       @sources = []
     end
 
@@ -89,6 +91,8 @@ class Livetext
 
   Space = " "
 
+  attr_reader :main
+
   def initialize(output = ::STDOUT)
     @source = nil
     @_mixins = []

data/lib/standard.rb

@@ -151,7 +151,7 @@ module Livetext::Standard
       var, val = a.split("=")
       val = val[1..-2] if val[0] == ?" and val[-1] == ?"
       val = val[1..-2] if val[0] == ?' and val[-1] == ?'
-      @vars[var] = val
+      Livetext::Vars[var] = val
     end
     _optional_blank_line
   end

data/lib/userapi.rb

@@ -1,7 +1,11 @@
 # User API
 
+require 'formatline'
+
 module Livetext::UserAPI
 
+  Parser = ::FormatLine.new
+
   def _check_existence(file, msg)
     _error! msg unless File.exist?(file)
     # puts "ERROR"  unless File.exist?(file)
@@ -80,7 +84,9 @@ module Livetext::UserAPI
     _body(sigil).join("\n")
   end
 
-  def _new_format(line, delim, sym)
+  def _full_format(line)
+    Parser.parse(line)
+=begin
     d0, d1 = Livetext::Standard::SimpleFormats[sym]
     s = line.each_char
     c = s.next
@@ -113,6 +119,7 @@ module Livetext::UserAPI
       getch.call
     end
     buffer
+=end
   end
 
   def _basic_format(line, delim, tag)
@@ -159,12 +166,13 @@ module Livetext::UserAPI
 
   def _formatting(line)
 #   l2 = _basic_format(line, "_", "i")
-    l2 = _new_format(line, "_", :i)
+ #  l2 = _new_format(line, "_", :i)
 #   l2 = _basic_format(l2, "*", "b")
-    l2 = _new_format(l2, "*", :b)
+ #  l2 = _new_format(l2, "*", :b)
 #   l2 = _basic_format(l2, "`", "tt")
-    l2 = _new_format(l2, "`", :t)
+ #  l2 = _new_format(l2, "`", :t)
 # Do strikethrough?
+    l2 = _full_format(line)
     l2 = _handle_escapes(l2, "_*`")
     line.replace(l2)
   end
@@ -197,7 +205,7 @@ module Livetext::UserAPI
     return if @_nopass
     _puts "<p>" if line == "\n" and ! @_nopara
     _formatting(line)
-    _substitution(line)
+#   _substitution(line)
     _puts line
   end
 

data/test/ftest.rb

@@ -0,0 +1,109 @@
+require 'minitest/autorun'
+
+$LOAD_PATH << "./lib"
+require 'livetext'
+
+# How these tests work - see the block comment at the bottom.
+
+class TestingLivetext < MiniTest::Test
+
+  TTY = File.open("/dev/tty","w")
+
+  TestLines = []
+
+  f = File.open("test/testfiles/lines.txt")
+  loop do 
+    item = []
+    4.times { item << f.gets.chomp }
+    raise "Oops? #{item.inspect}" unless item.last == ""
+    TestLines << item
+    break if f.eof?
+  end
+
+STDERR.puts TestLines.inspect
+
+  TestLines.each.with_index do |item, i|
+    msg, src, exp, blank = *item
+    define_method("test_formatting_#{i}") do
+      STDERR.puts caller
+      x = FormatLine.new
+      actual = x.parse(src)
+      assert_equal(exp, actual, msg)
+    end
+  end
+
+#   def external_files
+#     tag = caller[0]
+#     n1, n2 = tag.index("`")+6, tag.index("'")-1
+#     base = tag[n1..n2]
+#     origin = Dir.pwd
+#     Dir.chdir("test/testfiles/#{base}") do
+#       src, out, exp = "source.ltx", "actual-output.txt", "expected-output.txt"
+#       err, erx = "actual-error.txt", "expected-error.txt"
+#       cmd = "../../../bin/livetext #{src} >#{out} 2>#{err}"
+#       system(cmd)
+#       output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
+# 
+#       out_ok = output == expected
+#       err_ok = errors == errexp
+#       bad_out = "--- Expected: \n#{expected}\n--- Output:  \n#{output}\n"
+#       bad_err = "--- Error Expected: \n#{errexp}\n--- Error Output:  \n#{errors}\n"
+# 
+#       assert(out_ok, bad_out)
+#       assert(err_ok, bad_err)
+#       system("rm -f #{out} #{err}")  # only on success
+#     end
+#   end
+# 
+#   def test_hello_world;         external_files end
+#   def test_basic_formatting;    external_files end
+# 
+#   def test_comments_ignored_1;  external_files end
+#   def test_block_comment;       external_files end
+# 
+#   def test_error_line_num;      external_files end
+#   def test_error_inc_line_num;  external_files end
+#   def test_error_invalid_name;  external_files end
+#   def test_error_no_such_mixin; external_files end
+#   def test_error_no_such_inc;   external_files end
+#   def test_error_no_such_copy;  external_files end
+#   def test_error_name_not_permitted;  external_files end
+#   def test_error_missing_end;   external_files end
+#   def test_error_mismatched_end; external_files end
+# 
+#   def test_simple_vars;         external_files end
+#   def test_more_complex_vars;   external_files end
+# 
+#   def test_def_method;          external_files end
+# 
+#   def test_single_raw_line;     external_files end
+# 
+#   def test_simple_include;      external_files end
+#   def test_simple_mixin;        external_files end
+#   def test_simple_copy;         external_files end
+#   def test_copy_is_raw;         external_files end
+#   def test_raw_text_block;      external_files end
+# 
+#   def test_example_alpha;       external_files end
+#   def test_example_alpha2;      external_files end
+# 
+#   def test_functions;           external_files end
+end
+
+
+=begin
+
+You can add any ordinary test method above. But so far, all these tests simply 
+call external_files.
+
+The external_files method works this way: 
+  - If the test (caller) method is test_my_silly_feature, then we will
+    look for a directory called testfiles/my_silly_feature
+  - In here, there must be a source.ltx, expected-output.txt, and expected-error.txt
+  - Technically, any of these can be empty
+  - We run livetext on the source and compare actual vs expected (stdout, stderr)
+  - The "real" output gets checked first
+  - Of course, both must compare correctly for the test to pass
+
+=end
+

data/test/test.rb

@@ -1,14 +1,36 @@
 require 'minitest/autorun'
 
 $LOAD_PATH << "./lib"
+
 require 'livetext'
 
 # How these tests work - see the block comment at the bottom.
 
-class TestingLiveText < MiniTest::Test
+class TestingLivetext < MiniTest::Test
 
   TTY = File.open("/dev/tty","w")
 
+  TestLines = []
+
+  f = File.open("test/testfiles/lines.txt")
+  loop do 
+    item = []
+    4.times { item << f.gets.chomp }
+    raise "Oops? #{item.inspect}" unless item.last == ""
+    TestLines << item
+    break if f.eof?
+  end
+
+  TestLines.each.with_index do |item, i|
+    msg, src, exp, blank = *item
+    define_method("test_formatting_#{i}") do
+      x = FormatLine.new
+      actual = x.parse(src)
+#     raise "Hello?"
+      assert_equal(exp, actual, msg)
+    end
+  end
+
   def external_files
     tag = caller[0]
     n1, n2 = tag.index("`")+6, tag.index("'")-1

data/test/testfiles/basic_formatting/expected-output.txt

@@ -4,7 +4,7 @@ and <tt>code font</tt>.
 <p>
 
 Here are some random punctuation marks:
-# . @ <b> <i></b> <tt></i></tt> : ; % ^ & $
+# . @ * _ ` : ; % ^ & $
 <p>
 
-Oops, forgot to escape these:  * _ `
+No need to escape these:  * _ `

data/test/testfiles/basic_formatting/source.ltx

@@ -1,8 +1,8 @@
 Here are examples of *boldface and _italics and `code
-as well as *(more complex) examples of _(italicized text)
-and `(code font).
+as well as *[more complex] examples of _[italicized text]
+and `[code font].
 
 Here are some random punctuation marks:
 # . @ * _ ` : ; % ^ & $
 
-Oops, forgot to escape these:  \* \_ \`
+No need to escape these:  * _ `

data/test/testfiles/functions/source.ltx

@@ -2,7 +2,7 @@ Testing out
 some functions 
 here...
 
-.func myfunc
+.func myfunc(x)
 "Eureka!"
 .end
 

data/test/testfiles/lines.txt

@@ -0,0 +1,96 @@
+tick: Single token, beginning of line
+`def is like a reserved word
+<tt>def</tt> is like a reserved word
+
+tick: Single token, middle of line
+They say `def is like a reserved word
+They say <tt>def</tt> is like a reserved word
+
+tick: Single token, end of line
+like a reserved word, is `def
+like a reserved word, is <tt>def</tt>
+
+tick: Bracketed, normal
+This is `[code font] here
+This is <tt>code font</tt> here
+
+tick: Bracketed, hits EOL
+This is `[code font here
+This is <tt>code font here</tt>
+
+tick: followed by space
+This is not ` code
+This is not ` code
+
+tick: followed by EOL
+This also isn't code: `
+This also isn't code: `
+
+tick: Doubled, ignores comma
+This is ``code, of course
+This is <tt>code</tt>, of course
+
+tick: Doubled, ignores period
+This is ``code. Hooray, I guess.
+This is <tt>code</tt>. Hooray, I guess.
+
+tick: Doubled, ignores right paren
+(By the way, this is ``code)
+(By the way, this is <tt>code</tt>)
+
+tick: Doubled, ignores EOL
+Up to EOL, this is ``code
+Up to EOL, this is <tt>code</tt>
+
+uscore: Single token, beginning of line
+_This is italics
+<i>This</i> is italics
+
+uscore: Single token, middle of line
+And _this is italics
+And <i>this</i> is italics
+
+uscore: Single token, end of line
+And so is _this
+And so is <i>this</i>
+
+uscore: Bracketed, normal
+The _[USS Enterprise] was here
+The <i>USS Enterprise</i> was here
+
+uscore: Bracketed, hits EOL
+Hey, it's the _[USS Enterprise
+Hey, it's the <i>USS Enterprise</i>
+
+uscore: followed by space
+This: _ is just an underscore
+This: _ is just an underscore
+
+uscore: followed by EOL
+This is just an underscore: _
+This is just an underscore: _
+
+uscore: Doubled, ignores comma
+Just a __second, ok?
+Just a <i>second</i>, ok?
+
+uscore: Doubled, ignores period
+Just a __second. OK?
+Just a <i>second</i>. OK?
+
+uscore: Doubled, ignores right paren
+I'll (just a __second) be right there.
+I'll (just a <i>second</i>) be right there.
+
+uscore: Doubled, ignores EOL
+Be there in a __second
+Be there in a <i>second</i>
+
+Tick has precedence over underscore
+This is a `piece_of_code here
+This is a <tt>piece_of_code</tt> here
+
+under: Starts after double quote?
+He said, "_Please go away."
+He said, "<i>Please</i> go away."
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -28,6 +28,7 @@ files:
 - dsl/markdown.rb
 - dsl/pyggish.rb
 - dsl/tutorial.rb
+- lib/formatline.rb
 - lib/functions.rb
 - lib/livetext.rb
 - lib/standard.rb
@@ -36,6 +37,7 @@ files:
 - test/affirm/kbks.jpg
 - test/affirm/lm-kbks.lt
 - test/cleanup
+- test/ftest.rb
 - test/newtest
 - test/test.rb
 - test/testfiles/basic_formatting/expected-error.txt
@@ -96,6 +98,7 @@ files:
 - test/testfiles/hello_world/expected-error.txt
 - test/testfiles/hello_world/expected-output.txt
 - test/testfiles/hello_world/source.ltx
+- test/testfiles/lines.txt
 - test/testfiles/more_complex_vars/expected-error.txt
 - test/testfiles/more_complex_vars/expected-output.txt
 - test/testfiles/more_complex_vars/source.ltx