livetext 0.8.44 → 0.8.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe26e3a5a5777c7242d5646bc6096ed115a5e58d63f9e88f0b2ca98cf2c2871a
-  data.tar.gz: 5c5448ea8b232973e0ee3998f94495db6b74aad14e7a14e22e63eabd028e486f
+  metadata.gz: 3c1b90db53faea8df11c07499ca77bc7b077cfe2fc4867871c0b88d8f1672490
+  data.tar.gz: 05e540d23ed3b440310adfe6e435649750726d7b098d00ff32397953a98c7d27
 SHA512:
-  metadata.gz: c461c3f6a2a04dcce45120202d9c24d781085e5e906eec6fec97e02cc9a7e3a73e8334643941f458cc32e99d8a5bce5cbc840fc10c466b9ab9d4fe90fc626544
-  data.tar.gz: 572562a687cd022b5d7be7ab3a86e2bd6885232d8c4a673f13a691a93df7d794a822c9d0ea54998ec6d301e32d2a3bc932325918f2af4e18ca3b185b84df5f71
+  metadata.gz: 89f9ca4b5247b2baa3ac877e22f6512ba21fbd54f003624f243f0628399f590a30624c92fbb367516b2f087fe76b1e73e8dbbc5f0a38f4f8619d10b91a5faf9e
+  data.tar.gz: a8725687b4da2a9f5acd5c036aef107e62040923662d2eebf417075478eab8f5e2cb901a2b801df1b8a52ff5c6caa4f1c959f8a6d2c440ffd7e898357eaa9563

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.44"
+  VERSION = "0.8.45"
 end
 
 $Livetext = Livetext
@@ -24,6 +24,10 @@ class Livetext
 
   attr_reader :main, :context
 
+  class << self
+    attr_accessor :parameters  # from outside world (process_text)
+  end
+
   class Processor
     include Livetext::Standard
     include Livetext::UserAPI
@@ -41,10 +45,6 @@ class Livetext
                   :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
                   :instance_exec, :__send__, :__id__, :__binding__]
 
-    class << self
-      attr_accessor :parameters  # from outside world (process_text)
-    end
-
     def initialize(parent, output = nil)
       @parent = parent
       @_nopass = false
@@ -60,7 +60,8 @@ class Livetext
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if @backtrace && err.respond_to?(:backtrace)
+#     STDERR.puts err.backtrace if @backtrace && err.respond_to?(:backtrace)
+      STDERR.puts err.backtrace if err.respond_to?(:backtrace)
       exit if abort
     end
 
@@ -123,12 +124,21 @@ class Livetext
     end
   end
 
-  def process_text(text, *args)
+  def process(text)
+    enum = text.each_line
+    @main.source(enum, "STDIN", 0)
+    loop do 
+      line = @main.nextline
+      break if line.nil?
+      process_line(line)
+    end
+  end
+
+  def process_text(text)
     text = text.split("\n") if text.is_a? String
     enum = text.each
     @backtrace = false
-    @main.source(enum, fname, 0)
-    Livetext.parameters = args   # e.g., for liveblog
+    @main.source(enum, "(text)", 0)
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -136,6 +146,9 @@ class Livetext
     end
     val = @main.finalize if @main.respond_to? :finalize
     val
+  rescue => err
+    puts "process_text: err = #{err}"
+    puts err.backtrace.join("\n")
   end
 
   def process_file(fname, context=nil)
@@ -168,16 +181,6 @@ class Livetext
     @main.finalize if @main.respond_to? :finalize
   end
 
-  def process(text)
-    enum = text.each_line
-    @main.source(enum, "STDIN", 0)
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)
-    end
-  end
-
   def rx(str, space=nil)
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end

data/lib/standard.rb

@@ -10,7 +10,7 @@ module Livetext::Standard
 
   def data=(val)
     @_data = val
-    @_args = val.split
+    @_args = val.split rescue []
     @_mixins = []
   end
 

data/plugin/liveblog.rb

@@ -13,6 +13,7 @@ end
 class ::Livetext::Functions   # do this differently??
 
   def asset   # FIXME this is baloney...
+    raise "meh"
     param = ::Livetext::Functions.param
     context = ::Livetext::Functions.context
     main = context.eval("@main") rescue "NO MAIN?"
@@ -33,6 +34,7 @@ end
 ### find_asset
 
 def find_asset(asset)
+  raise "meh2"
   views = @config.views
   views.each do |view| 
     vdir = @config.viewdir(view)
@@ -59,14 +61,15 @@ end
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   @blog, @meta = Livetext.parameters
-  @config = @blog.config
-  @root = @config.root
+puts "init: #{[@blog, @meta].inspect}"
+  @root = @blog.root
   @view = @blog.view.name
   @vdir = @blog.view.dir
-  @title, @teaser = meta.title, meta.teaser
+  @title, @teaser = @meta.title, @meta.teaser
   @body = ""
-  @slug = @blog.make_slug(meta)
+  @slug = @blog.make_slug(@meta)
   @postdir = @blog.view.dir + "/#@slug"
+puts "postdir = #{@postdir.inspect}"
 
 # @publish ||= {}
 # @config.views.each do |view|
@@ -89,8 +92,7 @@ def _passthru(line, context = nil)
 end
 
 def title 
-  title = @_data
-  raise "Title discrepancy? Found #{title.inspect} != #{@title.inspect}"
+  title = @_data.chomp
   @body << "<h1>#@title</h1>"
 end
 
@@ -165,11 +167,12 @@ def assets
 end
 
   def write_post(meta)
+puts "\npostdir = #{@postdir.inspect}\n "
     save = Dir.pwd
     Dir.chdir(@postdir)
     meta.views = meta.views.join(" ")
     meta.tags  = meta.tags.join(" ")
-    File.write("index.html", @body)
+    File.write("body.txt", @body)  # Actually HTML...
     File.write("teaser.txt", meta.teaser)
     
     fields = [:num, :title, :date, :pubdate, :views, :tags]
@@ -189,5 +192,6 @@ end
 
 def finalize
   write_post(@meta) # FIXME
+  @meta
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.44
+  version: 0.8.45
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com