livetext 0.9.35 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4392b3c99d41bf20385de2f5cbb25846fb9193ab303072075d0baf904912d2
-  data.tar.gz: b7fb45dd41a63f9c2cf39afa6e8973f53a8828c1063a341ad8ecd78eb4468f96
+  metadata.gz: 2dceb322a5f44e776bab9ed9113c7c7a4adf29eff271be81a613c72a081a2d51
+  data.tar.gz: 70576d3a39fccbe7f3285ddca930f79400b8d770ef600d043e2b3690f173ba23
 SHA512:
-  metadata.gz: 06e2d46af57bb812baecb5afcc30147abc862df4c4a0619f0151b3b2e6db3c78d7ef7f05eb8cab1e388a7efd73d7ca67ac2143fb5fb901f0b5abcf233b9dcb86
-  data.tar.gz: 0575eaf1bcf527c19ba6ea7ecf7d28b36c6f4dab8b4b81a57185bb9454452af4127bf60dea9a8d15039f29a7919ad7930a99e8aacf6f74ad4f55554bb9ade072
+  metadata.gz: 8d91e26a1721ce60ca41ff49a323df2e4ef0a365b0b4eec9b224cbef8381e48b6ab4f3c0bb63e74ada905efb101c69a33e021f521420abe56927b16a46e02091
+  data.tar.gz: fa718856dcbb75bb4f60f49f31638041158b815335ba9df3680c2ca0b117a2584d66921e06dae30b266f3104a465f826904a797e3e1a546960d75d6dc79d9d4b

data/bin/livetext

@@ -93,8 +93,8 @@ def parse_command_line
     end
   end
   @live.dump if success
-# rescue => err
-#   STDERR.puts "Unexpected error! #{err.inspect}"
+rescue => err
+  STDERR.puts "Unexpected error! #{err.inspect}\n#{err.backtrace.join("\n")}"
 end
 
 # Main

data/lib/livetext/helpers.rb

@@ -2,6 +2,7 @@
 require_relative 'global_helpers'
 require_relative 'expansion'
 
+
 module Livetext::Helpers
 
   Space = " "
@@ -98,13 +99,16 @@ module Livetext::Helpers
     when Comment
       success = handle_scomment(line)
     when DotCmd
-      success = handle_dotcmd(line)
+      success = handle_dotcmd(line)       # was 102
     when DollarDot
       success = handle_dollar_dot(line)
     else
       api.passthru(line)  # must succeed?
     end
     success
+  rescue => err
+    STDERR.puts "ERROR: #{err}\n#{err.backtrace.join("\n")}"
+    exit
   end
 
   def handle_dollar_dot(line)
@@ -120,7 +124,7 @@ module Livetext::Helpers
     api.data = data0.dup   # should permit _ in function names at least
     args0 = data0.split
     api.args = args0.dup
-    retval = @main.send(name)  # , *args)
+    retval = @main.send(name)  # , *args)      # was 125
     retval
   rescue => err
     graceful_error(err)
@@ -135,7 +139,7 @@ module Livetext::Helpers
       when name == :end   # special case
         graceful_error EndWithoutOpening()
       when @main.respond_to?(name)
-        success = invoke_dotcmd(name, data)
+        success = invoke_dotcmd(name, data)    # was 141
     else
       graceful_error UnknownMethod(name)
     end
@@ -250,3 +254,9 @@ module Livetext::Helpers
   end
 
 end
+
+=begin
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:125:in `invoke_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:141:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:102:in `process_line'
+=end

data/lib/livetext/standard.rb

@@ -117,9 +117,10 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def say
-    str = api.format(api.data)
-    TTY.puts str
+  def say(arg=nil)
+    data = arg || api.args.join(" ")
+    str = api.format(data)
+    TTY.puts "(say) #{str}"
     api.optional_blank_line
   end
 
@@ -281,7 +282,7 @@ module Livetext::Standard
   end
 
   def debug
-    self.debug = onoff(api.args.first)
+    @debug = onoff(api.args.first)
     api.optional_blank_line
   end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.35"
+  VERSION = "0.9.36"
 end

data/plugin/pyggish.rb

@@ -82,14 +82,26 @@ def self.pyg_finalize(code, lexer=:elixir)
     result
   end
 
-  def fragment
+  def fragment(args = nil, body = nil)
     lang = api.args.empty? ? :elixir : api.args.first.to_sym   # ruby or elixir
     api.args = []
-  # TTY.puts "\n#{self.inspect}"
-    send(lang)
+    lines = api.body(true)  # .to_a  # raw
+    result = send(lang, lines)
+    api.out result
     api.out "\n"
+    api.optional_blank_line
+  rescue => err
+    STDERR.puts "fragment Error: #{__method__} err = #{err}\n#{err.backtrace.join("\n")}"
   end
 
+def dammit(args = nil, body = nil)
+  lines = api.body(true)
+  api.out "BODY:"
+  lines.each {|x| api.out x }
+  api.out "END BODY"
+  api.optional_blank_line
+end
+
   def code       # FIXME ?
     text = ""   
     api.body {|line| api.out "    " + line }
@@ -145,8 +157,9 @@ def self.pyg_finalize(code, lexer=:elixir)
     text
   end
 
-  def ruby
+  def xruby
     file = api.args.first 
+    code = nil
     if file.nil?
       code = "  # Ruby code\n\n"
       api.body {|line| code << "  " + line + "\n" }
@@ -158,15 +171,76 @@ def self.pyg_finalize(code, lexer=:elixir)
     api.out html
   end
 
-  def elixir
+  def xelixir
     file = api.args.first 
+    code = nil
     if file.nil?
       code = ""
       api.body {|line| code << "  " + line + "\n" }
     else
       code = ::File.read(file)
     end
-
     html = format_elixir(code)
     api.out html
+  end
+
+def ruby(lines)
+  theme = :Github  # default
+  source = lines.join("\n")
+  formatter = Rouge::Formatters::HTML.new
+  lexer = Rouge::Lexers::Ruby.new
+  body = formatter.format(lexer.lex(source))
+
+# css = Rouge::Themes.const_get(theme.to_s).render(scope: '.highlight')
+# added = ".highlight { font-family: courier; white-space: pre }"
+
+  result = <<~HTML
+    <div class="highlight">
+#{body}
+    </div>
+    <br>
+  HTML
+  return result
+
+  iheight = lines.size * 25
+  api.out <<~HTML
+    <center>
+      <iframe width=90% height=#{iheight} src='#{File.basename(html_file)}'></iframe>
+    </center>
+    <br>
+  HTML
+rescue => err
+  STDERR.puts "Error: #{__method__} err = #{err}\n#{err.backtrace.join("\n")}"
 end
+
+
+def elixir(lines)
+  theme = :Github  # default
+  source = lines.join("\n")
+  formatter = Rouge::Formatters::HTML.new
+  lexer = Rouge::Lexers::Elixir.new
+  body = formatter.format(lexer.lex(source))
+
+# css = Rouge::Themes.const_get(theme.to_s).render(scope: '.highlight')
+# added = ".highlight { font-family: courier; white-space: pre }"
+
+  result = <<~HTML
+    <div class="highlight">
+#{body}
+    </div>
+    <br>
+  HTML
+  return result
+
+  iheight = lines.size * 25
+  api.out <<~HTML
+    <center>
+      <iframe width=90% height=#{iheight} src='#{File.basename(html_file)}'></iframe>
+    </center>
+    <br>
+  HTML
+rescue => err
+  STDERR.puts "Error: #{__method__} err = #{err}\n#{err.backtrace}"
+end
+
+

data/test/unit/html.rb

@@ -9,29 +9,27 @@ class TestingLivetext < MiniTest::Test
   # Same is probably true of the methods that are testing them.
 
   def test_wrapped
-    cdata = "nothing much"
-    assert_equal wrapped(cdata, :b),     "<b>#{cdata}</b>"
-    assert_equal wrapped(cdata, :b, :i), "<b><i>#{cdata}</i></b>"
-
-    assert_equal wrapped(cdata, :table, :tr, :td),
-                          "<table><tr><td>#{cdata}</td></tr></table>"
+    live = Livetext.new
+    html = 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>"
+
+    assert_equal html.tag(:table, :tr, :td, cdata: str),
+                          "<table><tr><td>#{str}</td></tr></table>"
   end
 
-  def test_wrapped_bang
-    cdata = "nothing much"
-    assert_equal wrapped!(cdata, :td, valign: :top), 
-                     "<td valign='top'>#{cdata}</td>"
-    assert_equal wrapped!(cdata, :img, src: "foo.jpg"),
-                    "<img src='foo.jpg'>#{cdata}</img>"
-    assert_equal wrapped!(cdata, :a, style: 'text-decoration: none', 
+  def test_wrapped_extra
+    live = Livetext.new
+    html = HTML.new(live.api)
+    str = "nothing much"
+    assert_equal html.tag(:td, cdata: str, valign: :top), 
+                     "<td valign='top'>#{str}</td>"
+    assert_equal html.tag(:img, cdata: str, src: "foo.jpg"),
+                    "<img src='foo.jpg'>#{str}</img>"
+    assert_equal html.tag(:a, cdata: str, style: 'text-decoration: none', 
                      href: 'foo.com'),
-                     "<a style='text-decoration: none' href='foo.com'>#{cdata}</a>"
-  end
-
-  def xtest_wrap
-    # bogus!
-    wrap(:ul) { 2.times {|i| _out i } }
-    dump  # puts @body
+                     "<a style='text-decoration: none' href='foo.com'>#{str}</a>"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.35
+  version: 0.9.36
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com