livetext 0.9.21 → 0.9.25

data/test/unit/parser/mixin.rb

@@ -1,9 +1,7 @@
 
 require 'minitest/autorun'
 
-require_relative '../../../lib/parser/set'
-
-# ParseSet = Livetext::ParseSet
+require_relative '../parser'      # nested
 
 class TestParseSet < MiniTest::Test
 

data/test/unit/parser/set.rb

@@ -1,9 +1,9 @@
 
 require 'minitest/autorun'
 
-require_relative '../../../lib/parser/set'
+require_relative '../parser'      # nested
 
-ParseSet = Livetext::ParseSet
+ParseSet = ::Livetext::ParseSet
 
 class TestParseSet < MiniTest::Test
 
@@ -137,30 +137,26 @@ class TestParseSet < MiniTest::Test
     #  - allow/disallow escaping??
   end
 
-  # BUG: FormatLine doesn't know variables in this context!
-
   def test_var_eq_var
     set = ParseSet.new("file = $File").parse
     set = set.first  # [["var", "value"]]
     assert_equal set.first, "file"
-    refute set.last =~ /undefined/, "Found 'undefined' for variable value"
+    assert set.last =~ /undefined/, "Found 'undefined' for variable value"
+    # ^ ParseSet isn't smart enough to know about variables/functions
   end
 
-  # BUG: ...or functions.
-  # (Additional bug: Failing silently seems wrong.)
-
   def test_var_eq_func
     set = ParseSet.new("date = $$date").parse
     set = set.first  # [["var", "value"]]
     assert_equal set.first, "date"
-    refute set.last =~ /undefined/, "Found 'undefined' for variable value"
-    assert set.last =~ /^\d\d.\d\d.\d\d/, "Did not find 6-digit date with two separators"
+    assert set.last =~ /undefined/, "Found 'undefined' for variable value"
+    # ^ ParseSet isn't smart enough to know about variables/functions
   end
 
   def test_two_strings
-    line = %[bday="May_31", date="5/31"]
+    line = %[bday="May 31", date='5/31']
     set = ParseSet.new(line).parse
-    assert set == [["bday", "May_31"], ["date", "5/31"]]
+    assert set == [["bday", "May 31"], ["date", "5/31"]]
   end
 
 end

data/test/unit/parser/string.rb

@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 
-require_relative '../../../lib/parser/string'
+require_relative '../parser'      # nested
 
 class TestStringParser < MiniTest::Test
 
@@ -58,7 +58,7 @@ class TestStringParser < MiniTest::Test
     assert @zero.eos?
     
     @one.grab
-    assert @one.eos?   # FIXME??
+    assert @one.eos?
     @one.grab
     assert @one.eos?
 
@@ -90,7 +90,7 @@ class TestStringParser < MiniTest::Test
     assert char2 == char1
     assert char3 == @str1[1]
     assert @one.i == 1
-    assert @one.eos?     # FIXME??
+    assert @one.eos?
 
     char1 = @many.peek
     char2 = @many.grab
@@ -143,14 +143,14 @@ class TestStringParser < MiniTest::Test
     assert_equal parse.peek, "c"
   end
 
-  def test_next_bang
+  def test_lookahead
     parse = StringParser.new("abcdef")
     assert_equal parse.peek, "a"
-    assert_equal parse.next!, "b"
+    assert_equal parse.lookahead, "b"
     assert_equal parse.i, 0
     3.times { parse.grab }
     before = parse.i
-    assert_equal parse.next!, "e"
+    assert_equal parse.lookahead, "e"
     after = parse.i
     assert_equal before, after
   end

data/test/unit/parser.rb

@@ -3,4 +3,3 @@ require_relative 'parser/string'
 require_relative 'parser/set'
 require_relative 'parser/general'
 require_relative 'parser/mixin'       # currently empty
-require_relative 'parser/importable'  # currently empty

data/test/unit/standard.rb

@@ -1,11 +1,9 @@
 require 'minitest/autorun'
 
-
 require_relative '../../lib/livetext'
 
 class TestingLivetext < MiniTest::Test
   include Livetext::Standard
-  include Livetext::UserAPI
 
   # Only method here "really" belongs elsewhere?  FIXME
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.25
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -24,29 +24,32 @@ files:
 - imports/calibre.rb
 - imports/livemagick.rb
 - imports/markdown.rb
-- imports/markdown_importable.rb
 - imports/pyggish.rb
 - imports/tutorial.rb
 - lib/cmdargs.rb
-- lib/errors.rb
-- lib/formatline.rb
-- lib/functions.rb
-- lib/handler.rb
-- lib/handler/icanhaz.rb
-- lib/helpers.rb
-- lib/html.rb
 - lib/livetext.rb
-- lib/livetext/importable.rb
-- lib/parser.rb
-- lib/parser/file.rb
-- lib/parser/general.rb
-- lib/parser/import.rb
-- lib/parser/mixin.rb
-- lib/parser/set.rb
-- lib/parser/string.rb
-- lib/processor.rb
-- lib/standard.rb
-- lib/userapi.rb
+- lib/livetext/errors.rb
+- lib/livetext/formatline.rb
+- lib/livetext/funcall.rb
+- lib/livetext/functions.rb
+- lib/livetext/global_helpers.rb
+- lib/livetext/handler.rb
+- lib/livetext/handler/import.rb
+- lib/livetext/handler/mixin.rb
+- lib/livetext/helpers.rb
+- lib/livetext/html.rb
+- lib/livetext/parser.rb
+- lib/livetext/parser/general.rb
+- lib/livetext/parser/set.rb
+- lib/livetext/parser/string.rb
+- lib/livetext/parsing.rb
+- lib/livetext/paths.rb
+- lib/livetext/processor.rb
+- lib/livetext/reopen.rb
+- lib/livetext/skeleton.rb
+- lib/livetext/standard.rb
+- lib/livetext/userapi.rb
+- lib/livetext/version.rb
 - livetext.gemspec
 - plugin/bookish.rb
 - plugin/calibre.rb
@@ -72,6 +75,8 @@ files:
 - test/snapshots/def_method/expected-error.txt
 - test/snapshots/def_method/expected-output.txt
 - test/snapshots/def_method/source.lt3
+- test/snapshots/error_inc_line_num/OUT
+- test/snapshots/error_inc_line_num/README.txt
 - test/snapshots/error_inc_line_num/expected-output.txt
 - test/snapshots/error_inc_line_num/file2.lt3
 - test/snapshots/error_inc_line_num/match-error.txt
@@ -91,8 +96,10 @@ files:
 - test/snapshots/error_name_not_permitted/expected-output.txt
 - test/snapshots/error_name_not_permitted/match-error.txt
 - test/snapshots/error_name_not_permitted/source.lt3
+- test/snapshots/error_no_such_copy/duh
 - test/snapshots/error_no_such_copy/expected-output.txt
 - test/snapshots/error_no_such_copy/match-error.txt
+- test/snapshots/error_no_such_copy/mystery.txt
 - test/snapshots/error_no_such_copy/source.lt3
 - test/snapshots/error_no_such_inc/expected-output.txt
 - test/snapshots/error_no_such_inc/match-error.txt
@@ -112,17 +119,28 @@ files:
 - test/snapshots/hello_world/expected-error.txt
 - test/snapshots/hello_world/expected-output.txt
 - test/snapshots/hello_world/source.lt3
-- test/snapshots/icanhaz/expected-output.txt
-- test/snapshots/icanhaz/match-error.txt
-- test/snapshots/icanhaz/simple_import.rb
-- test/snapshots/icanhaz/source.lt3
-- test/snapshots/icanhaz2/expected-error.txt
-- test/snapshots/icanhaz2/expected-output.txt
-- test/snapshots/icanhaz2/simple_canhaz.rb
-- test/snapshots/icanhaz2/source.lt3
+- test/snapshots/import/expected-output.txt
+- test/snapshots/import/match-error.txt
+- test/snapshots/import/simple_import.rb
+- test/snapshots/import/source.lt3
+- test/snapshots/import2/expected-error.txt
+- test/snapshots/import2/expected-output.txt
+- test/snapshots/import2/simple_import.rb
+- test/snapshots/import2/source.lt3
+- test/snapshots/import_bookish/expected-error.txt
+- test/snapshots/import_bookish/expected-output.txt
+- test/snapshots/import_bookish/source.lt3
+- test/snapshots/import_bookish/toc.tmp
+- test/snapshots/mixin_bookish/expected-error.txt
+- test/snapshots/mixin_bookish/expected-output.txt
+- test/snapshots/mixin_bookish/source.lt3
+- test/snapshots/mixin_bookish/toc.tmp
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
+- test/snapshots/more_functions/expected-error.txt
+- test/snapshots/more_functions/expected-output.txt
+- test/snapshots/more_functions/source.lt3
 - test/snapshots/predef_vars/expected-error.txt
 - test/snapshots/predef_vars/match-output.txt
 - test/snapshots/predef_vars/source.lt3
@@ -166,7 +184,6 @@ files:
 - test/unit/parser.rb
 - test/unit/parser/all.rb
 - test/unit/parser/general.rb
-- test/unit/parser/importable.rb
 - test/unit/parser/mixin.rb
 - test/unit/parser/set.rb
 - test/unit/parser/string.rb

data/imports/markdown_importable.rb

@@ -1,45 +0,0 @@
-# This file is intended to be used via a Livetext .mixin
-# or the equivalent.
-
-require_relative '../lib/livetext/importable'
-
-class MarkdownImportable < LiveText::Importable
-
-  SimpleFormats[:b] = %w[* *]
-  SimpleFormats[:i] = %w[_ _]
-  SimpleFormats[:t] = %w[` `]
-  SimpleFormats[:s] = %w[<strike> </strike>]
-
-  def h1; _out "# #{Livetext.interpolate(@_data)}"; _optional_blank_line end       # atx style for now
-  def h2; _out "## #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h3; _out "### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h4; _out "#### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h5; _out "##### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h6; _out "###### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-
-  def title
-    h1
-  end
-
-  def section
-    h3
-  end
-
-  def bq   # block quote
-    _body {|line| _out "> #{line}" }
-  end
-
-  def list
-    _body {|line| _out " * #{line}" }
-  end
-
-  def olist   # Doesn't handle paragraphs yet
-    n = 0
-    _body do |line|
-      n += 1
-      _out "#{n}. #{_format(line)}"
-    end
-  end
-
-  alias nlist olist
-end

data/lib/handler/icanhaz.rb

@@ -1,35 +0,0 @@
-
-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

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

data/lib/livetext/importable.rb

@@ -1,2 +0,0 @@
-class LiveText::Importable
-end

data/lib/parser/file.rb

@@ -1,8 +0,0 @@
-
-require_relative '../livetext'
-
-# Hmm. not today?
-
-class Livetext::ParseFile
-
-end

data/lib/parser/import.rb

@@ -1,15 +0,0 @@
-
-require '../livetext/importable'
-
-make_exception(:BadVariableName, "Error: invalid variable name")
-make_exception(:NoEqualSign,     "Error: no equal sign found")
-
-class Livetext::Handler::Import
-  def use_import(name)
-    require name
-    include name
-    init = "init_#{name}"
-    self.send(init) if self.respond_to? init
-  end
-end
-

data/lib/parser/mixin.rb

@@ -1,38 +0,0 @@
-require_relative '../livetext'
-require_relative '../helpers'
-require_relative 'string'
-
-make_exception(:NoEqualSign,     "Error: no equal sign found")
-
-class Livetext::ParseMixin
-  include Helpers
-
-  def initialize(name)
-    @name = name
-    @file = find_file(name)
-  end
-
-  def self.get_module(name)
-    parse = self.new(name)
-    modname, code = parse.read_mixin
-    eval(code)   # Avoid in the future
-    newmod = Object.const_get("::" + modname)
-    # return actual module
-    newmod
-  end
-
-  def read_mixin
-    modname = @name.gsub("/","_").capitalize
-    meths = grab_file(@file)
-    [modname, "module ::#{modname}; #{meths}\nend"]
-  end
-
-  private
-
-  def cwd_root?
-    File.dirname(File.expand_path(".")) == "/"
-  end
-
-
-end
-

data/lib/processor.rb

@@ -1,83 +0,0 @@
-# Class Livetext is the actual top-level class.
-
-class Livetext
-
-  def self.interpolate(str)
-    FormatLine.var_func_parse(str)
-  end
-
-  # Class Processor does the actual work of processing input.
-
-  class Processor
-
-    GenericError = Class.new(StandardError)
-
-    include Livetext::Standard
-    include Livetext::UserAPI
-
-    Disallowed = 
-       %i[ __binding__        __id__            __send__          class
-           clone              display           dup               enum_for
-           eql?               equal?            extend            freeze
-           frozen?            hash              inspect           instance_eval   
-           instance_exec      instance_of?      is_a?             kind_of?
-           method             methods           nil?              object_id          
-           pretty_inspect     private_methods   protected_methods public_method
-           public_methods     public_send       respond_to?       send
-           singleton_class    singleton_method  singleton_methods taint
-           tainted?           tap               to_enum           to_s
-           trust              untaint           untrust           untrusted?
-           define_singleton_method              instance_variable_defined?
-           instance_variable_get                instance_variable_set
-           remove_instance_variable             instance_variables ]
-
-    def initialize(parent, output = nil)
-      @parent = parent
-      @_nopass = false
-      @_nopara = false
-      # Meh?
-      @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
-      @sources = []
-      @indentation = @parent.indentation
-      @_mixins = []
-    end
-
-    def output=(io)
-      @output = io
-    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
-      raise GenericError.new("Error: #{err}") if raise_error
-    end
-
-    def disallowed?(name)
-      Disallowed.include?(name.to_sym)
-    end
-
-    def source(enum, file, line)
-      @sources.push([enum, file, line])
-    end
-
-    def peek_nextline
-      line = @sources.last[0].peek
-    rescue StopIteration
-      @sources.pop
-      nil
-    rescue => err
-      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
-  end
-end

data/lib/userapi.rb

@@ -1,160 +0,0 @@
-# User API
-
-require_relative 'formatline'
-
-# UserAPI deals mostly with user-level methods.
-
-module Livetext::UserAPI
-
-  def setvar(var, val)
-    str, sym = var.to_s, var.to_sym
-    Livetext::Vars[str] = val
-    Livetext::Vars[sym] = val
-  end
-
-  def _check_existence(file, msg)
-    _error! msg unless File.exist?(file)
-  end
-
-  def _source
-    @input
-  end
-
-  def _args
-    @_args = _format(@_data).chomp.split
-    if block_given?
-      @_args.each {|arg| yield arg }
-    else
-      @_args
-    end
-  end
-
-  def _vars
-    @_vars.dup
-  end
-
-  def _optional_blank_line
-    peek = peek_nextline
-    return if peek.nil?
-    @line = nextline if peek =~ /^ *$/
-  end
-
-  def _comment?(str)
-    sigil = Livetext::Sigil
-    c1 = sigil + Livetext::Space
-    c2 = sigil + sigil + Livetext::Space
-    str.index(c1) == 0 || str.index(c2) == 0
-  end
-
-  def _trailing?(char)
-    return true if ["\n", " ", nil].include?(char)
-    return false
-  end
-
-  def _end?(str)
-    return true if str == ".end" || str =~ / *\$\.end/
-    return false
-  end
-
-  def _raw_body(tag = "__EOF__")
-    lines = []
-#   @save_location = @sources.last
-    loop do
-      @line = nextline
-      break if @line.nil?
-      break if @line.chomp.strip == tag
-      lines << @line
-    end
-    _optional_blank_line
-    if block_given?
-      lines.each {|line| yield line }
-    else
-      lines
-    end
-    lines
-  end
-
-  def _body(raw=false)
-    lines = []
-    end_found = false
-    loop do
-      @line = nextline
-      break if @line.nil?
-      @line.chomp!
-      break if _end?(@line)
-      next if _comment?(@line)
-      @line = _format(@line) unless raw
-      lines << @line 
-    end
-
-    raise "Expected .end, found end of file" unless _end?(@line)
-
-    _optional_blank_line
-    if block_given?
-      lines.each {|line| yield line }   # FIXME what about $. ?
-    else
-      lines
-    end
-  end
-
-  def _body_text(raw=false)
-    _raw_body.join("\n")
-  end
-
-  def _raw_body!
-    _raw_body(Livetext::Sigil).join("\n")
-  end
-
-  def _handle_escapes(str, set)
-    str = str.dup
-    set.each_char do |ch|
-      str.gsub!("\\#{ch}", ch)
-    end
-    str
-  end
-
-  def _format(line)
-    return "" if line == "\n" || line.nil?
-    line2 = FormatLine.parse!(line)
-    line.replace(line2)
-    line
-  end
-
-  def _passthru(line)
-    return if @_nopass
-    _out "<p>" if line == "\n" and ! @_nopara
-    line = _format(line)
-    _out line
-  end
-
-  def _out(str = "", file = nil)
-    return if str.nil?
-    if file.nil?   # FIXME  do this elsewhere?
-      @parent.body << str 
-      @parent.body << "\n" unless str.end_with?("\n")
-    else
-      file.puts str
-    end
-  end
-
-  def _out!(str = "")
-    @parent.body << str  # no newline
-  end
-
-  def _puts(*args)
-    @output.puts *args 
-  end
-
-  def _print(*args)
-    @output.print *args 
-  end
-
-  def _debug=(val)
-    @_debug = val
-  end
-
-  def _debug(*args)
-    TTY.puts *args if @_debug
-  end
-
-end

data/test/snapshots/icanhaz/match-error.txt

@@ -1 +0,0 @@
-1 /No such mixin 'nonexistent'/

data/test/snapshots/icanhaz2/source.lt3

@@ -1,6 +0,0 @@
-Testing fake command .icanhaz:
-
-.icanhaz simple_canhaz
-Now call a method:
-.hello_world
-That's all.

data/test/unit/parser/importable.rb

@@ -1,19 +0,0 @@
-
-require 'minitest/autorun'
-
-require_relative '../../../lib/parser/set'
-
-# ParseSet = Livetext::ParseSet
-
-class TestParseSet < MiniTest::Test
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  # FIXME no tests yet
-  # Bad syntax? File not found? not found searching upward?
-
-end