livetext 0.9.47 → 0.9.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f67c2785b935c3c940db118d04f6613e186df48b4473659e14c69089e23a35
-  data.tar.gz: 6b08485471ca1c9aa2d44a83d9e5670f876999e70f3c20e975caa8fb3aadc2ac
+  metadata.gz: 91574e23cbcbe19d5c06d7c1fbbe8fbbe33ca29b06511da502b532bbb28519c6
+  data.tar.gz: 553612fc90e8a6f3676158c3e98997415d0b568fb811fc9d273f8a2ae47478b0
 SHA512:
-  metadata.gz: 1becbb55d5267f754ee0c3dacc3c894fc6814aefd71386aaf0bc3f77f4dbefe76554d42ca78ade718e027b96874616219582dfcb0a4295eae10aac12bff11481
-  data.tar.gz: f169d21ca5e99b17869e10836fe4b4ae39cc5a239408562d95a3928e89b954f42184b2b51c8603e9d7570f3578acd81761417c56be7217942c7f4a8624089e8c
+  metadata.gz: 909f58be5cd6ee9d11262bb7213d2fab733d379ac678953c0e0225486cdc7a24152b8f5e5b208f2522bf4ea629abd9597c14b3cce1988b19c89b3b92d96f729b
+  data.tar.gz: e6e9aaec3cba4d466601d9b4d2f2d96bbb3c3697640684d96c23d70b41843d6a5674a4f41e659355df45a72c59842f7e91df44c76455a430425836db17f1e8e7

data/lib/livetext/{more.rb → core.rb}

@@ -2,59 +2,8 @@
 # Class Livetext reopened (top level).
 
 class Livetext
-
   include Helpers
 
-  class Variables      # FIXME - split out into file as Livetext::Variables
-    attr_reader :vars
-
-    def initialize(hash = {})   # Livetext::Variables
-      @vars = {}
-      hash.each_pair do |k, v| 
-        sym = k.to_sym
-        str = k.to_s
-        @vars[sym] = v 
-        @vars[str] = v 
-      end
-    end
-
-    def inspect
-      syms = @vars.keys.select {|x| x.is_a? Symbol }
-      out = "\nVariables:"
-      syms.each do |sym|
-        out << "    #{sym}: #{@vars[sym].inspect}\n"
-      end
-      out
-    end
-  
-    def [](var)
-      @vars[var.to_sym]
-    end
-
-    def []=(var, value)
-      @vars[var.to_sym] = value
-    end
-
-    def get(var)
-      @vars[var.to_sym] || "[#{var} is undefined]"
-    end
-
-    def set(var, value)
-      @vars[var.to_sym] = value.to_s
-    end
-
-    def setvars(pairs)
-      pairs = pairs.to_a if pairs.is_a?(Hash)
-      pairs.each do |var, value|
-        api.setvar(var, value)
-      end
-    end
-
-    def to_a
-      @vars.to_a
-    end
-  end
-
   Vars = Variables.new
 
   TTY = ::File.open("/dev/tty", "w")

data/lib/livetext/expansion.rb

@@ -8,6 +8,8 @@ class Livetext::Expansion
   Lbrack = "\\["
   Colon  = ":"
 
+  Formatter = ::Livetext::Formatter
+
   def initialize(instance)   # Livetext::Expansion
     @live = instance
   end

data/lib/livetext/formatter.rb

@@ -1,4 +1,4 @@
-module Formatter
+module Livetext::Formatter
 
   def self.format(str)    # FIXME - unneeded?
     str = str.chomp
@@ -15,188 +15,188 @@ module Formatter
   #  Brackt:  bits
   # 
 
-  class Delimited
-    def initialize(str, marker, tag)    # Delimited
-      @str, @marker, @tag = str.dup, marker, tag
-      @buffer = ""
-      @cdata  = ""
-      @state  = :INITIAL
-    end
+end
 
-    def status(where)
-      if $debug
-        STDERR.printf "%-11s %-7s #{@marker.inspect} \n #{' '*11} state = %-8s  str = %-20s  buffer = %-20s  cdata = %-20s\n", 
-          where, self.class, @state, @str.inspect, @buffer.inspect, @cdata.inspect
-      end
-    end
+class Livetext::Formatter::Delimited
+  def initialize(str, marker, tag)    # Delimited
+    @str, @marker, @tag = str.dup, marker, tag
+    @buffer = ""
+    @cdata  = ""
+    @state  = :INITIAL
+  end
 
-    def front
-      @str[0]
+  def status(where)
+    if $debug
+      STDERR.printf "%-11s %-7s #{@marker.inspect} \n #{' '*11} state = %-8s  str = %-20s  buffer = %-20s  cdata = %-20s\n", 
+        where, self.class, @state, @str.inspect, @buffer.inspect, @cdata.inspect
     end
+  end
 
-    def grab(n=1)
-      char = @str.slice!(0..(n-1))   # grab n chars
-      char
-    end
+  def front
+    @str[0]
+  end
 
-    def grab_terminator
-      @state = :LOOPING
-      # goes onto buffer by default
-      # Don't? what if searching for space_marker?
-      # @buffer << grab  
-    end
+  def grab(n=1)
+    char = @str.slice!(0..(n-1))   # grab n chars
+    char
+  end
 
-    def eol?
-      @str.empty?
-    end
+  def grab_terminator
+    @state = :LOOPING
+    # goes onto buffer by default
+    # Don't? what if searching for space_marker?
+    # @buffer << grab  
+  end
 
-    def space?
-      front == " "
-    end
+  def eol?
+    @str.empty?
+  end
 
-    def escape?
-      front == "\\"
-    end
+  def space?
+    front == " "
+  end
 
-    def terminated?
-      space?   # Will be overridden except in Single
-    end
+  def escape?
+    front == "\\"
+  end
 
-    def marker?
-      @str.start_with?(@marker)
-    end
+  def terminated?
+    space?   # Will be overridden except in Single
+  end
 
-    def space_marker?
-      @str.start_with?(" " + @marker)
-    end
+  def marker?
+    @str.start_with?(@marker)
+  end
 
-    def wrap(text)
-      if text.empty?
-        result = @marker
-        result = "" if @marker[1] == "["
-        return result
-      end
-      "<#{@tag}>#{text}</#{@tag}>"
+  def space_marker?
+    @str.start_with?(" " + @marker)
+  end
+
+  def wrap(text)
+    if text.empty?
+      result = @marker
+      result = "" if @marker[1] == "["
+      return result
     end
-    
-    def initial
-      n = @marker.length
-      case
-      when escape?
-        grab               # backslash
-        @buffer << grab    # char
-      when space_marker?
-        @buffer << grab   # append the space
-        grab(n)           # eat the marker
-        @state = :CDATA
-      when marker?
-        grab(n)  # Eat the marker
-        @state = :CDATA
-      when eol?
-        @state = :FINAL
-      else
-        @state = :BUFFER
-      end
+    "<#{@tag}>#{text}</#{@tag}>"
+  end
+  
+  def initial
+    n = @marker.length
+    case
+    when escape?
+      grab               # backslash
+      @buffer << grab    # char
+    when space_marker?
+      @buffer << grab   # append the space
+      grab(n)           # eat the marker
+      @state = :CDATA
+    when marker?
+      grab(n)  # Eat the marker
+      @state = :CDATA
+    when eol?
+      @state = :FINAL
+    else
+      @state = :BUFFER
     end
+  end
 
-    def buffer
-      @buffer << grab
-      @state = :LOOPING
-    end
+  def buffer
+    @buffer << grab
+    @state = :LOOPING
+  end
 
-    def cdata
-      case
-      when eol?
-        if @cdata.empty?
-          @buffer << @marker unless @marker[1] == "["
-        else
-          @buffer << wrap(@cdata)
-        end
-        @state = :FINAL
-      when terminated?
-        @buffer << wrap(@cdata)
-        grab_terminator    # "*a *b"  case???
-        @cdata = ""
-        @state = :LOOPING
+  def cdata
+    case
+    when eol?
+      if @cdata.empty?
+        @buffer << @marker unless @marker[1] == "["
       else
-        @cdata << grab
-        @state = :CDATA
+        @buffer << wrap(@cdata)
       end
+      @state = :FINAL
+    when terminated?
+      @buffer << wrap(@cdata)
+      grab_terminator    # "*a *b"  case???
+      @cdata = ""
+      @state = :LOOPING
+    else
+      @cdata << grab
+      @state = :CDATA
     end
+  end
 
-    def looping
-      n = @marker.length
-      case
-      when escape?
-        grab               # backslash
-        @buffer << grab    # char
-      when space_marker?
-        @buffer << grab   # append the space
-        grab(n)           # eat the marker
-        @state = :CDATA
-      when eol?
-        @state = :FINAL
-      else   # includes marker not preceded by space!
-        @buffer << grab
-      end
+  def looping
+    n = @marker.length
+    case
+    when escape?
+      grab               # backslash
+      @buffer << grab    # char
+    when space_marker?
+      @buffer << grab   # append the space
+      grab(n)           # eat the marker
+      @state = :CDATA
+    when eol?
+      @state = :FINAL
+    else   # includes marker not preceded by space!
+      @buffer << grab
     end
+  end
 
-    def handle
-      loop do
-        break if @state == :FINAL
-        meth = @state.downcase
-        send(meth)
-      end
-      return @buffer
-    end
-
-    def self.process(str)
-      bold = self.new(str, "*", "b")
-      sb   = bold.handle
-# return sb
-      ital = self.new(sb, "_", "i")
-      si   = ital.handle
-      code = self.new(si, "`", "tt")
-      sc   = code.handle
-      stri = self.new(sc, "~", "strike")
-      si   = stri.handle
-      si
+  def handle
+    loop do
+      break if @state == :FINAL
+      meth = @state.downcase
+      send(meth)
     end
+    return @buffer
   end
 
-  class Single < Delimited
-    # Yeah, this one is that simple
+  def self.process(str)
+    bold = self.new(str, "*", "b")
+    sb   = bold.handle
+# return sb
+    ital = self.new(sb, "_", "i")
+    si   = ital.handle
+    code = self.new(si, "`", "tt")
+    sc   = code.handle
+    stri = self.new(sc, "~", "strike")
+    si   = stri.handle
+    si
   end
+end
 
-  class Double < Delimited
-    def initialize(str, sigil, tag)    # Double
-      super
-      # Convention: marker is "**", sigil is "*"
-      @marker = sigil + sigil
-    end
+class Livetext::Formatter::Single < Livetext::Formatter::Delimited
+  # Yeah, this one is that simple
+end
 
-    def terminated?
-      terms = [" ", ".", ","]
-      terms.include?(front)
-    end
+class Livetext::Formatter::Double < Livetext::Formatter::Delimited
+  def initialize(str, sigil, tag)    # Double
+    super
+    # Convention: marker is "**", sigil is "*"
+    @marker = sigil + sigil
   end
 
-  class Bracketed < Delimited
-    def initialize(str, sigil, tag)   # Bracketed
-      super
-      # Convention: marker is "*[", sigil is "*"
-      @marker = sigil + "["
-    end
+  def terminated?
+    terms = [" ", ".", ","]
+    terms.include?(front)
+  end
+end
 
-    def terminated?
-      front == "]" || eol?
-    end
+class Livetext::Formatter::Bracketed < Livetext::Formatter::Delimited
+  def initialize(str, sigil, tag)   # Bracketed
+    super
+    # Convention: marker is "*[", sigil is "*"
+    @marker = sigil + "["
+  end
 
-    def grab_terminator
-      @state = :LOOPING
-      grab
-    end
+  def terminated?
+    front == "]" || eol?
   end
 
+  def grab_terminator
+    @state = :LOOPING
+    grab
+  end
 end
 

data/lib/livetext/global_helpers.rb

@@ -1,5 +1,5 @@
 
-module GlobalHelpers
+module Livetext::GlobalHelpers
 
   def check_disallowed(name)
     raise DisallowedName(name) if disallowed?(name)

data/lib/livetext/handler/import.rb

@@ -5,7 +5,7 @@ require_relative '../helpers'
 
 class Livetext::Handler::Import
   include Livetext::Helpers
-  include GlobalHelpers
+  include Livetext::GlobalHelpers
 
   attr_reader :file
 

data/lib/livetext/handler/mixin.rb

@@ -5,7 +5,7 @@ require_relative '../helpers'
 
 class Livetext::Handler::Mixin
   include Livetext::Helpers
-  include GlobalHelpers
+  include Livetext::GlobalHelpers
 
   attr_reader :file
 

data/lib/livetext/html.rb

@@ -1,4 +1,4 @@
-class HTML    # FIXME - better as Livetext::HTML ?
+class Livetext::HTML
 
   def initialize(api)   # HTML
     raise "API is nil!" unless api

data/lib/livetext/processor.rb

@@ -35,7 +35,7 @@ class Processor
     @indentation = @parent.indentation
     @_mixins = []
     @_imports = []
-    @html = HTML.new(@parent.api)
+    @html = Livetext::HTML.new(@parent.api)
   end
 
   def api

data/lib/livetext/skeleton.rb

@@ -3,10 +3,19 @@ require_relative 'parser/string'    # FIXME eh, should fix this
 # Class Livetext skeleton (top level).
 
 class Livetext
+  class Variables
+  end
+
   module Handler
   end
 
-  module ParsingConstants
+  module Formatter
+  end
+
+  class HTML
+  end
+
+  class ParsingConstants
   end
 
   class LineParser < StringParser

data/lib/livetext/standard.rb

@@ -11,8 +11,6 @@ make_exception(:FileNotFound,     "Error: file '%1' not found")
 # Module Standard comprises most of the standard or "common" methods.
 
 module Livetext::Standard
-
-# include HTMLHelper
   include Livetext::Helpers
 
   TTY = ::File.open("/dev/tty", "w")

data/lib/livetext/userapi.rb

@@ -16,7 +16,7 @@ class Livetext::UserAPI
   def initialize(live)  # Livetext::UserAPI
     @live = live
     @vars = live.vars
-    @html = HTML.new(self)
+    @html = Livetext::HTML.new(self)
     @expander = Livetext::Expansion.new(live)
   end
 

data/lib/livetext/variables.rb

@@ -0,0 +1,50 @@
+  class Livetext::Variables      # FIXME - split out into file as Livetext::Variables
+    attr_reader :vars
+
+    def initialize(hash = {})   # Livetext::Variables
+      @vars = {}
+      hash.each_pair do |k, v| 
+        sym = k.to_sym
+        str = k.to_s
+        @vars[sym] = v 
+        @vars[str] = v 
+      end
+    end
+
+    def inspect
+      syms = @vars.keys.select {|x| x.is_a? Symbol }
+      out = "\nVariables:"
+      syms.each do |sym|
+        out << "    #{sym}: #{@vars[sym].inspect}\n"
+      end
+      out
+    end
+  
+    def [](var)
+      @vars[var.to_sym]
+    end
+
+    def []=(var, value)
+      @vars[var.to_sym] = value
+    end
+
+    def get(var)
+      @vars[var.to_sym] || "[#{var} is undefined]"
+    end
+
+    def set(var, value)
+      @vars[var.to_sym] = value.to_s
+    end
+
+    def setvars(pairs)
+      pairs = pairs.to_a if pairs.is_a?(Hash)
+      pairs.each do |var, value|
+        api.setvar(var, value)
+      end
+    end
+
+    def to_a
+      @vars.to_a
+    end
+  end
+

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.47"
+  VERSION = "0.9.48"
 end

data/lib/livetext.rb

@@ -1,19 +1,21 @@
 
-require_relative 'livetext/skeleton'
-require_relative 'livetext/version'
-require_relative 'livetext/helpers'
-require_relative 'livetext/more'
-require_relative 'livetext/paths'
+if !defined?(Livetext)
+  require_relative 'livetext/skeleton'
+  require_relative 'livetext/version'
+  require_relative 'livetext/helpers'
+  require_relative 'livetext/variables'
+  require_relative 'livetext/core'
+  require_relative 'livetext/formatter'
+  require_relative 'livetext/paths'
 
-require_relative 'livetext/reopen'
-
-require_relative 'livetext/errors'
-require_relative 'livetext/standard'
-require_relative 'livetext/functions'
-require_relative 'livetext/userapi'
-require_relative 'livetext/formatter'
-require_relative 'livetext/processor'
-
-require_relative 'livetext/handler'
+  require_relative 'livetext/reopen'
 
+  require_relative 'livetext/errors'
+  require_relative 'livetext/standard'
+  require_relative 'livetext/functions'
+  require_relative 'livetext/userapi'
+  # require_relative 'livetext/formatter'
+  require_relative 'livetext/processor'
 
+  require_relative 'livetext/handler'
+end

data/test/all.rb

@@ -5,5 +5,8 @@
 #   add_filter "/test/"
 # end
 
+# FIXME - this file is broken - path issues
+
 require_relative 'unit/all'
+
 require_relative 'snapshots'             # snapshots

data/test/extra/README.txt

@@ -11,6 +11,7 @@ The tests here include:
    double.txt        Double sigil (see Formatting below)
    bracketed.txt     Bracketed sigil (see Formatting below)
 
+NOTE: These are moved under test/unit/ now.
 
 Variables:
 ----------

data/test/unit/all.rb

@@ -2,3 +2,10 @@
 require_relative 'standard'
 require_relative 'parser'      # nested
 require_relative 'html'
+
+require_relative 'single'
+require_relative 'double'
+require_relative 'bracketed'
+require_relative 'variables'
+require_relative 'functions'
+

data/test/unit/html.rb

@@ -12,7 +12,7 @@ class TestingLivetext < MiniTest::Test
 
   def test_wrapped
     live = Livetext.new
-    html = HTML.new(live.api)
+    html = Livetext::HTML.new(live.api)
     str = "nothing much"
     assert_equal html.tag(:b, cdata: str), "<b>#{str}</b>"
     assert_equal html.tag(:b, :i, cdata: str), "<b><i>#{str}</i></b>"
@@ -23,7 +23,7 @@ class TestingLivetext < MiniTest::Test
 
   def test_wrapped_extra
     live = Livetext.new
-    html = HTML.new(live.api)
+    html = Livetext::HTML.new(live.api)
     str = "nothing much"
     assert_equal html.tag(:td, cdata: str, valign: :top), 
                      "<td valign='top'>#{str}</td>"

data/test/{extra → unit}/single.rb

@@ -7,7 +7,6 @@ require 'livetext'
 # Just another testing class. Chill.
 
 class TestingLivetextSingle < MiniTest::Test
-
   def setup
     @live = Livetext.new
   end
@@ -131,11 +130,9 @@ class TestingLivetextSingle < MiniTest::Test
   def test_single_013_escaped_marker_is_ignored   
     # Escaped marker is ignored
     # No special initialization
-    src = "\\\\*escaped"
+    src = '\\' + "*escaped"   # Note single quote
     exp = "*escaped"
     actual = @live.api.format(src)
     check_match(exp, actual)
   end
- 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.47
+  version: 0.9.48
 platform: ruby
 authors:
 - Hal Fulton
@@ -27,6 +27,7 @@ files:
 - imports/pyggish.rb
 - imports/tutorial.rb
 - lib/livetext.rb
+- lib/livetext/core.rb
 - lib/livetext/errors.rb
 - lib/livetext/expansion.rb
 - lib/livetext/formatter.rb
@@ -37,7 +38,6 @@ files:
 - lib/livetext/handler/mixin.rb
 - lib/livetext/helpers.rb
 - lib/livetext/html.rb
-- lib/livetext/more.rb
 - lib/livetext/parser.rb
 - lib/livetext/parser/general.rb
 - lib/livetext/parser/set.rb
@@ -49,6 +49,7 @@ files:
 - lib/livetext/skeleton.rb
 - lib/livetext/standard.rb
 - lib/livetext/userapi.rb
+- lib/livetext/variables.rb
 - lib/livetext/version.rb
 - livetext.gemspec
 - plugin/booktool.rb
@@ -60,16 +61,11 @@ files:
 - plugin/tutorial.rb
 - test/all.rb
 - test/extra/README.txt
-- test/extra/bracketed.rb
 - test/extra/bracketed.txt
-- test/extra/double.rb
 - test/extra/double.txt
-- test/extra/functions.rb
 - test/extra/functions.txt
-- test/extra/single.rb
 - test/extra/single.txt
 - test/extra/testgen.rb
-- test/extra/variables.rb
 - test/extra/variables.txt
 - test/snapshots.rb
 - test/snapshots/basic_formatting/expected-error.txt
@@ -191,6 +187,9 @@ files:
 - test/snapshots/var_into_func/expected-output.txt
 - test/snapshots/var_into_func/source.lt3
 - test/unit/all.rb
+- test/unit/bracketed.rb
+- test/unit/double.rb
+- test/unit/functions.rb
 - test/unit/html.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb
@@ -198,8 +197,10 @@ files:
 - test/unit/parser/mixin.rb
 - test/unit/parser/set.rb
 - test/unit/parser/string.rb
+- test/unit/single.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
+- test/unit/variables.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby