RubyGems - livetext - Versions diffs - 0.9.59 → 0.9.60 - Mend

livetext 0.9.59 → 0.9.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa6586e6dd32101565ed6f27e471db94eecd120927242debc0f7155c37810b19
-  data.tar.gz: f51a1aabb1ef4c17236903165c3791b11b72b665793b50def1bdb172d735c749
+  metadata.gz: 63cd6b938fdb29f4b900ffb1ded5d378a9ae5d9c6274ec593f8593c2bd47e718
+  data.tar.gz: d62dcbfc69af01c7dc3d15608e2b95c6c3abc0347769fac24b8b600727608f35
 SHA512:
-  metadata.gz: db5c47791d907813a31d31c603ddc3d8ff807d14b47a9ca8c480faba66d5f0685897e5a97541b470953a10cf1a7cc8092f6270713012877ff5cbc723c81a7a19
-  data.tar.gz: 342c91272464b87292314d0e819d94e63dd2d0ccf4e68c14628bd4909d5f462a3e012545f1b7f39987d4a90c66c5d5dda332d566685af6eb99113ac0be7207d4
+  metadata.gz: fb08277e4f424959940ba49f8dee3edc65347038a046b46235b618f70a11dfd92932316f325f83f2930938dd97bee26eae172e17951918638137055fc92599c6
+  data.tar.gz: 9834c220e9775071b4e2d5769e5aa0b518e0de760940db1d10a837024f879eb449b98da8eff90f9a2696277f780b6e8baa7595439815411c70795ef865328c12

data/lib/livetext/core.rb CHANGED Viewed

@@ -188,6 +188,7 @@ class Livetext
       break if line.nil?
       process_line(line)
     end
+    api.close_paragraph  # Close any open paragraph
     result = @body
 #   @body = ""
     result

data/lib/livetext/helpers.rb CHANGED Viewed

@@ -89,6 +89,7 @@ module Livetext::Helpers
       success = process_line(line)
       break unless success
     end
+    api.close_paragraph  # Close any open paragraph
     val = finalize rescue nil
     @body    # FIXME?   @body.join("\n")  # array
     return true

data/lib/livetext/userapi.rb CHANGED Viewed

@@ -188,15 +188,25 @@ class Livetext::UserAPI
     return if @live.nopass
     if line == "\n"
       unless @live.nopara
-        out "<p>"
-        out
+        out "</p>\n\n<p>"
       end
     else
+      # Start first paragraph if needed
+      if @live.body.empty? && !@live.nopara
+        out "<p>"
+      end
       text = @expander.format(line.chomp)
       out text
     end
   end
+  def close_paragraph
+    return if @live.nopara
+    return if @live.body.empty?
+    return if @live.body.end_with?("</p>")
+    out "</p>"
+  end
   def out(str = "", file = nil)
     return if str.nil?
     return file.puts str unless file.nil?

data/lib/livetext/version.rb CHANGED Viewed

@@ -2,5 +2,5 @@
 # Defining VERSION
 class Livetext
-  VERSION = "0.9.59"
+  VERSION = "0.9.60"
 end

data/test/snapshots/basic_formatting/expected-output.txt CHANGED Viewed

@@ -1,13 +1,17 @@
+<p>
 Here are examples of <b>boldface</b>
 and <i>italics</i>
 and <tt>code</tt>
 as well as <b>more complex</b> examples
 of <i>italicized text</i>
 and <tt>code font</tt>.
-<p>
+</p>
+<p>
 Here are some random punctuation marks:
 ; # . * _ ` : @ % ^ & $
-<p>
+</p>
+<p>
 No need to escape these:  * _ `
+</p>

data/test/snapshots/block_comment/expected-output.txt CHANGED Viewed

@@ -1,5 +1,7 @@
+<p>
 abc 123
 xyz
 one
 more
 time
+</p>

data/test/snapshots/comments_ignored_1/expected-output.txt CHANGED Viewed

@@ -1,4 +1,6 @@
+<p>
 abc 123
 this is a test
 more stuff
 still more stuff
+</p>

data/test/snapshots/complex_body/expected-output.txt CHANGED Viewed

@@ -1,8 +1,11 @@
-Testing complex function body logic...
 <p>
+Testing complex function body logic...
+</p>
+<p>
 Testing with nil: nil
 Testing with empty: nil
 Testing with number: number
 Testing with string: HELLO
 Testing explicit empty: empty
+</p>

data/test/snapshots/copy_is_raw/expected-output.txt CHANGED Viewed

@@ -1,3 +1,4 @@
+<p>
 A copy command
 does not interpret its input:
 This is not a comment:
@@ -5,3 +6,4 @@ This is not a comment:
 This is not a method:
 .no_such_method
 That's all.
+</p>

data/test/snapshots/def_method/expected-output.txt CHANGED Viewed

@@ -1,7 +1,10 @@
+<p>
 abc
 123
 xyz
-<p>
+</p>
+<p>
 xyzzy
 123
+</p>

data/test/snapshots/def_parameters/expected-output.txt CHANGED Viewed

@@ -1,12 +1,15 @@
+<p>
 Testing no parameters:
 No parameters method called
-<p>
+</p>
+<p>
 Testing with args and data:
 Args: ["arg1", "arg2"], Data: "arg1 arg2"
 This is the data line
-<p>
+</p>
+<p>
 Testing with body:
 Args: ["arg1", "arg2"], Data: "arg1 arg2"
 Body has 3 lines:
@@ -19,3 +22,4 @@ Raw body has 3 lines:
   1: This is line 1 of the raw body
   2: This is line 2 of the raw body
   3: This is line 3 of the raw body
+</p>

data/test/snapshots/error_inc_line_num/expected-output.txt CHANGED Viewed

@@ -1,3 +1,4 @@
+<p>
 This is my
 source file
 which includes file2 here:

data/test/snapshots/error_invalid_name/expected-output.txt CHANGED Viewed

@@ -1,5 +1,7 @@
+<p>
 This file has
 a defined method
 that is invalid:
-<p>
+</p>
+<p>

data/test/snapshots/error_line_num/expected-output.txt CHANGED Viewed

@@ -1,3 +1,4 @@
+<p>
 This file
 will have an error
 on line 4

data/test/snapshots/error_mismatched_end/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
+<p>
 It is an error
 to specify .end
 without something
 beginning a block:
-<p>
+</p>
+<p>

data/test/snapshots/error_missing_end/expected-output.txt CHANGED Viewed

@@ -1,4 +1,6 @@
+<p>
 Blah
 blah
-<p>
+</p>
+<p>

data/test/snapshots/error_name_not_permitted/expected-output.txt CHANGED Viewed

@@ -1,4 +1,6 @@
+<p>
 Names such as 'class'
 are not permitted here...
-<p>
+</p>
+<p>

data/test/snapshots/error_no_such_copy/expected-output.txt CHANGED Viewed

@@ -1,5 +1,7 @@
+<p>
 Make sure a
 nonexistent file with .copy
 gives an error.
-<p>
+</p>
+<p>

data/test/snapshots/error_no_such_inc/expected-output.txt CHANGED Viewed

@@ -1,5 +1,7 @@
+<p>
 Make sure
 a nonexistent include
 will give an error.
-<p>
+</p>
+<p>

data/test/snapshots/error_no_such_mixin/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
+<p>
 Test that
 we give an error
 when a mixin does not
 exist:
-<p>
+</p>
+<p>

data/test/snapshots/example_alpha/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
-Here is an alphabetized list:
 <p>
+Here is an alphabetized list:
+</p>
+<p>
     aardvark
     anamorphic
     anarchist
@@ -18,6 +20,8 @@ Here is an alphabetized list:
     quark
     zootrope
     zymurgy
-<p>
+</p>
+<p>
 That's all.
+</p>

data/test/snapshots/example_alpha2/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
-Here is an alphabetized list:
 <p>
+Here is an alphabetized list:
+</p>
+<p>
 aardvark       anamorphic     anarchist
 bellicose      cytology       ectomorph
 fishmonger     fusillade      glyph
@@ -8,3 +10,4 @@ gryphon        halcyon        manicotti
 mataeotechny   pareidolia     quark
 zootrope       zymurgy
 And that is all.
+</p>

data/test/snapshots/functions/expected-output.txt CHANGED Viewed

@@ -1,20 +1,27 @@
+<p>
 Testing out
 some functions
 here...
-<p>
+</p>
+<p>
 I am calling Eureka! here...
 Let's see
 what happens.
-<p>
+</p>
+<p>
 Functions can take a parameter in brackets
 (which it can parse itself as needed):
-<p>
+</p>
-The result is 4.0 as I see it.
 <p>
+The result is 4.0 as I see it.
+</p>
-Some functions like date and time are predefined.
 <p>
+Some functions like date and time are predefined.
+</p>
+<p>
+</p>

data/test/snapshots/functions_reflection/expected-output.txt CHANGED Viewed

@@ -25,3 +25,4 @@
 <li><strong>$$weekday</strong> - builtin</li>
 <li><strong>$$year</strong> - builtin</li>
 </ul>
+</p>

data/test/snapshots/hello_world/expected-output.txt CHANGED Viewed

@@ -1,2 +1,4 @@
+<p>
 Hello,
 world!
+</p>

data/test/snapshots/import/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
+<p>
 Test .import:
 we give an error
 when a .rb does not
 exist:
-<p>
+</p>
+<p>

data/test/snapshots/import2/expected-output.txt CHANGED Viewed

@@ -1,8 +1,12 @@
-Testing .import:
 <p>
+Testing .import:
+</p>
+<p>
 Now call a method:
 Hello, world.
-<p>
+</p>
+<p>
 That's all.
+</p>

data/test/snapshots/import_bookish/expected-output.txt CHANGED Viewed

@@ -8,3 +8,4 @@
   <td width=0% valign=top>bar</td>
 </tr>
 </table>
+</p>

data/test/snapshots/mixin_booktool/expected-output.txt CHANGED Viewed

@@ -8,3 +8,4 @@
   <td width=[0, 0]% valign=top>bar</td>
 </tr>
 </table>
+</p>

data/test/snapshots/mixin_functions/expected-output.txt CHANGED Viewed

@@ -1,18 +1,25 @@
-Testing functions defined in external .rb files
 <p>
+Testing functions defined in external .rb files
+</p>
+<p>
 Now calling a function defined in the .rb file:
 External function called with: test_parameter
-<p>
+</p>
+<p>
 And another one with brackets:
 Another function called with: with brackets
-<p>
+</p>
+<p>
 And a function with no parameters:
 Simple function with no parameters
-<p>
+</p>
-That's all.
 <p>
+That's all.
+</p>
+<p>
+</p>

data/test/snapshots/mixin_functions_class/expected-output.txt CHANGED Viewed

@@ -1,20 +1,27 @@
-Testing functions defined in Livetext::Functions class
 <p>
+Testing functions defined in Livetext::Functions class
+</p>
+<p>
 Now calling functions defined in Livetext::Functions class:
 Class function called with: test_parameter
-<p>
+</p>
+<p>
 And another one with brackets:
 Another class function called with: with brackets
-<p>
+</p>
+<p>
 And a function with no parameters:
 Simple class function with no parameters
-<p>
+</p>
+<p>
 Testing that the functions have access to Livetext::Vars:
 Vars test: param=some_value, View=[View is undefined]
-<p>
+</p>
+<p>
 That's all.
+</p>

data/test/snapshots/more_complex_vars/expected-output.txt CHANGED Viewed

@@ -1,4 +1,6 @@
+<p>
 Just some more text.
 My birthday is May 31, so they tell me.
 That's 5/31 if you're American.
 That's all.
+</p>

data/test/snapshots/more_functions/expected-output.txt CHANGED Viewed

@@ -1,37 +1,50 @@
-Testing some more functions here...
 <p>
+Testing some more functions here...
+</p>
+<p>
 Here I am calling a function  with
 a colon parameter...
-<p>
+</p>
 <p>
+</p>
-Next let's <b>do</b> something with our parameter:
 <p>
+Next let's <b>do</b> something with our parameter:
+</p>
-I'll call these variants...
 <p>
+I'll call these variants...
+</p>
-"Motel" spelled backwards is letom :)
 <p>
+"Motel" spelled backwards is letom :)
+</p>
-"lamina" reversed is animal
 <p>
+"lamina" reversed is animal
+</p>
-I can also use the erutaef tekcarb here.
 <p>
+I can also use the erutaef tekcarb here.
+</p>
+<p>
 If I don't use a parameter for [Error evaluating $$reverse()] - it gives
 me an error. (Bug or feature??)
-<p>
+</p>
+<p>
 What if a function doesn't use parameters at all, but
 we pass them? Hmm...
-<p>
+</p>
+<p>
 Now we succeed and succeed some more
 and finally we succeed in life.
-<p>
+</p>
+<p>
 But can we succeed, when our beds are burning?
+</p>

data/test/snapshots/multiple_functions/expected-output.txt CHANGED Viewed

@@ -1,5 +1,8 @@
-Testing multiple user functions in the same document...
 <p>
+Testing multiple user functions in the same document...
+</p>
+<p>
 Calling all functions:
 one
+</p>

data/test/snapshots/nested_includes/expected-output.txt CHANGED Viewed

@@ -1,68 +1,83 @@
+<p>
 # Main file - Level 1
 # This file includes level2 and tests all variables and functions from all levels
-<p>
+</p>
+<p>
 # Include level2 (which includes level3)
 # Level 2 - Middle level
 # This file includes level3 and defines its own variables and functions
-<p>
+</p>
+<p>
 # Level 3 - Deepest level
 # This file defines variables and functions that should be accessible to all higher levels
-<p>
+</p>
+<p>
 This is content from level 3.
 The deep variable is: I am from level 3
 The deep number is: 42
+</p>
 This is content from level 2.
 The middle variable is: I am from level 2
 The middle number is: 100
-<p>
+</p>
+<p>
 # Test using deep level variables and functions
 Deep variable from level 2: I am from level 3
 Deep function call: Deep function called with: from level 2
 Deep math: 42 = 42
-<p>
+</p>
+<p>
 # Test our own variables and functions
 Middle function call: Middle function called with: from level 2
 Combined variables: Deep: I am from level 3, Middle: I am from level 2
-<p>
+</p>
+<p>
 # Test deep method from level 3
 Deep method called from level 3
+</p>
 # Test all variables from all levels
 Main variable: I am from main level
 Middle variable: I am from level 2
 Deep variable: I am from level 3
-<p>
+</p>
+<p>
 # Test all functions from all levels
 Main function: Main function called with: from main
 Middle function: Middle function called with: from main
 Deep function: Deep function called with: from main
-<p>
+</p>
+<p>
 # Test math functions
 Deep math: 20 = 20
 Main number: 999
 Middle number: 100
 Deep number: 42
-<p>
+</p>
+<p>
 # Test combined functions
 Combine vars: Deep: I am from level 3, Middle: I am from level 2
 Test all levels: Main: I am from main level, Middle: I am from level 2, Deep: I am from level 3
-<p>
+</p>
+<p>
 # Test methods from all levels
 Main method called from main level
 Middle method called from level 2
 Deep method called from level 3
-<p>
+</p>
+<p>
 # Test that we can still access everything after the include
 Final test - deep function: Deep function called with: final call
 Final test - middle function: Middle function called with: final call
 Final test - main function: Main function called with: final call
+</p>

data/test/snapshots/parameter_handling/expected-output.txt CHANGED Viewed

@@ -1,7 +1,10 @@
-Testing function parameter handling...
 <p>
+Testing function parameter handling...
+</p>
+<p>
 Testing with no parameter: nil
 Testing with empty parameter: nil
 Testing with string parameter: hello
 Testing with number parameter: 42
+</p>

data/test/snapshots/predef_vars/match-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
- 1  Here we go...
- 2  File = source.lt3
- 3  /FileDir = .*.test.snapshots.predef_vars/
- 4  /User = [A-Za-z][A-Za-z0-9]*/
- 5  /Version = 0\.\d{1,2}\.\d{1,2}/
- 6  NoSuchVar = [NoSuchVar is undefined]
+ 1  <p>
+ 2  Here we go...
+ 3  File = source.lt3
+ 4  /FileDir = .*.test.snapshots.predef_vars/
+ 5  /User = [A-Za-z][A-Za-z0-9]*/
+ 6  /Version = 0\.\d{1,2}\.\d{1,2}/
+ 7  NoSuchVar = [NoSuchVar is undefined]
+ 8  </p>

data/test/snapshots/raw_lines/expected-output.txt CHANGED Viewed

@@ -1,7 +1,9 @@
+<p>
 The .r can be used to output single lines
 without interpretation:
-<p>
+</p>
+<p>
 Ordinary line... plus two blank lines:
@@ -9,3 +11,4 @@ No formatting: *foo `foo _foo ~foo
 No variables: $alpha $beta
 No functions: $$this $$that
 That's all.
+</p>

data/test/snapshots/raw_text_block/expected-output.txt CHANGED Viewed

@@ -1,3 +1,4 @@
+<p>
 This text block will be passed thru
 with no interpretation or processing:
 .comment
@@ -14,3 +15,4 @@ Or these:
   `(alpha male)
   _(beta max)
   *(gamma rays)
+</p>

data/test/snapshots/simple_copy/expected-output.txt CHANGED Viewed

@@ -1,3 +1,4 @@
+<p>
 The copy command
 copies any file
 without interpretation,
@@ -5,3 +6,4 @@ such as:
 a simple
 include file.
 That is all.
+</p>

data/test/snapshots/simple_import/expected-output.txt CHANGED Viewed

@@ -1,9 +1,13 @@
+<p>
 Here I am
 testing a simple import
-<p>
+</p>
+<p>
 Now call a method:
 Hello, world.
-<p>
+</p>
+<p>
 That's all.
+</p>

data/test/snapshots/simple_include/expected-output.txt CHANGED Viewed

@@ -1,7 +1,10 @@
+<p>
 Here I am
 trying to
 include
 a simple
 include file.
+</p>
 I hope that
 worked.
+</p>

data/test/snapshots/simple_mixin/expected-output.txt CHANGED Viewed

@@ -1,5 +1,7 @@
+<p>
 Here I am
 testing a simple mixin
 Now call a method:
 Hello, world.
 That's all.
+</p>

data/test/snapshots/simple_vars/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
+<p>
 Just
 some text.
 Hi, there.
 GulliverFoyle is my name, and Terra is my nation.
 I'm GulliverFoyle, from Terra.
 That's all.
+</p>

data/test/snapshots/single_raw_line/expected-output.txt CHANGED Viewed

@@ -1,8 +1,11 @@
+<p>
 The .r can be used to output single lines
 without interpretation:
-<p>
+</p>
+<p>
 .comment This is not a real comment.
 This is not _italics or *boldface
 This is not a $variable reference
 That's all.
+</p>

data/test/snapshots/system_info/match-output.txt CHANGED Viewed

@@ -1,18 +1,22 @@
- 1  System Info Variables:
- 2  Hostname: HAL9000
- 3  /Platform: .*x86_64-darwin\d+/
- 4  /Ruby Version: \d+\.\d+\.\d+/
- 5  Livetext Version: 0.9.58
- 6  <p>
- 7
- 8  System Info Functions:
- 9  Hostname: HAL9000
-10  /Platform: .*x86_64-darwin\d+/
-11  /Ruby Version: \d+\.\d+\.\d+/
-12  Livetext Version: \d+\.\d+\.\d+/
-13  <p>
-14
-15  Date Formatting Functions:
-16  /Default: \d{4}-\d{2}-\d{2}/
-17  /Days ago: \d{4}-\d{2}-\d{2}/
-18  /Days from now: \d{4}-\d{2}-\d{2}/
+ 1  <p>
+ 2  System Info Variables:
+ 3  Hostname: HAL9000
+ 4  /Platform: .*x86_64-darwin\d+/
+ 5  /Ruby Version: \d+\.\d+\.\d+/
+ 6  Livetext Version: 0.9.59
+ 7  </p>
+ 8
+ 9  <p>
+10  System Info Functions:
+11  Hostname: HAL9000
+12  /Platform: .*x86_64-darwin\d+/
+13  /Ruby Version: \d+\.\d+\.\d+/
+14  /Livetext Version: \d+\.\d+\.\d+/
+15  </p>
+16
+ 17  <p>
+ 18  Date Formatting Functions:
+ 19  /Default: \d{4}-\d{2}-\d{2}/
+ 20  /Days ago: \d{4}-\d{2}-\d{2}/
+ 21  /Days from now: \d{4}-\d{2}-\d{2}/
+ 22  </p>

data/test/snapshots/table_with_heredocs/expected-output.txt CHANGED Viewed

@@ -1,6 +1,8 @@
-Testing heredocs (used in a table)
 <p>
+Testing heredocs (used in a table)
+</p>
+<p>
 <br>
 <center><table width=90% cellpadding=5>
@@ -21,3 +23,4 @@ row 2<br><br>
 col 2<br></td>
 </tr>
 </table></center>
+</p>

data/test/snapshots/var_into_func/expected-output.txt CHANGED Viewed

@@ -1,16 +1,23 @@
-<p>
+</p>
-Testing STILL more functions here...
 <p>
+Testing STILL more functions here...
+</p>
 <p>
+</p>
-Now... let's try passing a variable to a function. Will this work??
 <p>
+Now... let's try passing a variable to a function. Will this work??
+</p>
-Variable $alpha is regal, which reversed is lager
 <p>
+Variable $alpha is regal, which reversed is lager
+</p>
-That's all.
 <p>
+That's all.
+</p>
+<p>
+</p>

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.59
+  version: 0.9.60
 platform: ruby
 authors:
 - Hal Fulton
@@ -216,11 +216,7 @@ files:
 - test/snapshots/single_raw_line/expected-output.txt
 - test/snapshots/single_raw_line/source.lt3
 - test/snapshots/subset.txt
-- test/snapshots/system_info/actual-error.txt
-- test/snapshots/system_info/actual-output.txt
-- test/snapshots/system_info/err-sdiff.txt
 - test/snapshots/system_info/expected-error.txt
-- test/snapshots/system_info/expected-output.txt
 - test/snapshots/system_info/match-output.txt
 - test/snapshots/system_info/source.lt3
 - test/snapshots/table_with_heredocs/expected-error.txt

data/test/snapshots/system_info/actual-error.txt DELETED Viewed

File without changes

data/test/snapshots/system_info/actual-output.txt DELETED Viewed

@@ -1,20 +0,0 @@
-System Info Variables:
-Hostname: HAL9000
-Platform: x86_64-darwin22
-Ruby Version: 3.2.3
-Livetext Version: 0.9.58
-</p>
-<p>
-System Info Functions:
-Hostname: HAL9000
-Platform: x86_64-darwin22
-Ruby Version: 3.2.3
-Livetext Version: 0.9.58
-</p>
-<p>
-Date Formatting Functions:
-Default: 2025-09-06
-Days ago: 2025-08-30
-Days from now: 2025-09-13

data/test/snapshots/system_info/err-sdiff.txt DELETED Viewed

	@@ -1 +0,0 @@
1	- ACTUAL \| EXPECTED

data/test/snapshots/system_info/expected-output.txt DELETED Viewed

@@ -1,20 +0,0 @@
-System Info Variables:
-Hostname: HAL9000
-Platform: x86_64-darwin22
-Ruby Version: 3.2.3
-Livetext Version: 0.9.58
-</p>
-<p>
-System Info Functions:
-Hostname: HAL9000
-Platform: x86_64-darwin22
-Ruby Version: 3.2.3
-Livetext Version: 0.9.58
-</p>
-<p>
-Date Formatting Functions:
-Default: 2025-09-06
-Days ago: 2025-08-30
-Days from now: 2025-09-13