livetext 0.8.43 → 0.8.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f616a0419bfa694f6b124dd9a9951571f5e9ca86f62c29d6c9f594a680b5abc
-  data.tar.gz: cf4ea38b26db10bd5756f3a6a37010b9d5a16af570114222b5ae35d6160a46ee
+  metadata.gz: fe26e3a5a5777c7242d5646bc6096ed115a5e58d63f9e88f0b2ca98cf2c2871a
+  data.tar.gz: 5c5448ea8b232973e0ee3998f94495db6b74aad14e7a14e22e63eabd028e486f
 SHA512:
-  metadata.gz: b195ba333856b2d1ac0e4a98b1a9cf1bec33f804eef68f11d8600a7e3e5e2ff4c529d2d06d6b82a4ab9871a6f86adbc44d8810b1b6711dfa163e949d10a17a1a
-  data.tar.gz: 7868ec91b536e5beca57b7bd955907935941b12e677ece9a6af886d377d32a17af810b94ccaddfe64e700be8d5589399b71af331777ede6ce841cdff59dc3be2
+  metadata.gz: c461c3f6a2a04dcce45120202d9c24d781085e5e906eec6fec97e02cc9a7e3a73e8334643941f458cc32e99d8a5bce5cbc840fc10c466b9ab9d4fe90fc626544
+  data.tar.gz: 572562a687cd022b5d7be7ab3a86e2bd6885232d8c4a673f13a691a93df7d794a822c9d0ea54998ec6d301e32d2a3bc932325918f2af4e18ca3b185b84df5f71

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.43"
+  VERSION = "0.8.44"
 end
 
 $Livetext = Livetext
@@ -28,18 +28,22 @@ class Livetext
     include Livetext::Standard
     include Livetext::UserAPI
 
-  Disallowed = [:nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
-                :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
-                :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
-                :to_s, :inspect, :methods, :singleton_methods, :protected_methods, 
-                :private_methods, :public_methods, :instance_variables, 
-                :instance_variable_get, :instance_variable_set, 
-                :instance_variable_defined?, :remove_instance_variable, 
-                :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, 
-                :respond_to?, :extend, :display, :method, :public_method, 
-                :singleton_method, :define_singleton_method, :object_id, :to_enum, 
-                :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
-                :instance_exec, :__send__, :__id__, :__binding__]
+    Disallowed = [:nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
+                  :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
+                  :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
+                  :to_s, :inspect, :methods, :singleton_methods, :protected_methods, 
+                  :private_methods, :public_methods, :instance_variables, 
+                  :instance_variable_get, :instance_variable_set, 
+                  :instance_variable_defined?, :remove_instance_variable, 
+                  :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, 
+                  :respond_to?, :extend, :display, :method, :public_method, 
+                  :singleton_method, :define_singleton_method, :object_id, :to_enum, 
+                  :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
@@ -124,6 +128,7 @@ class Livetext
     enum = text.each
     @backtrace = false
     @main.source(enum, fname, 0)
+    Livetext.parameters = args   # e.g., for liveblog
     loop do 
       line = @main.nextline
       break if line.nil?

data/plugin/liveblog.rb

@@ -30,14 +30,6 @@ class ::Livetext::Functions   # do this differently??
 
 end
 
-
-begin
-  ThisBlog
-rescue
-  ThisBlog    = RuneBlog.new
-# ThisConfig  = ThisBlog.open_blog
-end
-
 ### find_asset
 
 def find_asset(asset)
@@ -66,22 +58,23 @@ end
 #############
 
 def init_liveblog    # FIXME - a lot of this logic sucks
-  @blog = ThisBlog
-  @config = ThisBlog
+  @blog, @meta = Livetext.parameters
+  @config = @blog.config
   @root = @config.root
-  @title = ""
-  @teaser = ""
-  @body = ""
+  @view = @blog.view.name
+  @vdir = @blog.view.dir
+  @title, @teaser = meta.title, meta.teaser
   @body = ""
-  @meta = ::OpenStruct.new
-
-  @publish ||= {}
-  @config.views.each do |view|
-    publish = @config.viewdir(view) + "publish"
-    raise "File '#{publish}' not found" unless File.exist?(publish)
-    lines = File.readlines(publish).map {|x| x.chomp }
-    @publish[view] = lines
-  end
+  @slug = @blog.make_slug(meta)
+  @postdir = @blog.view.dir + "/#@slug"
+
+# @publish ||= {}
+# @config.views.each do |view|
+#   publish = @config.viewdir(view) + "publish"
+#   raise "File '#{publish}' not found" unless File.exist?(publish)
+#   lines = File.readlines(publish).map {|x| x.chomp }
+#   @publish[view] = lines
+# end
 end
 
 def _errout(*args)
@@ -96,12 +89,14 @@ def _passthru(line, context = nil)
 end
 
 def title 
-  @meta.title = @_data
-  @body << "<h1>#{@meta.title}</h1>"
+  title = @_data
+  raise "Title discrepancy? Found #{title.inspect} != #{@title.inspect}"
+  @body << "<h1>#@title</h1>"
 end
 
 def pubdate 
   _debug "data = #@_data"
+  # Check for discrepancy?
   match = /(\d{4}).(\d{2}).(\d{2})/.match @_data
   junk, y, m, d = match.to_a
   y, m, d = y.to_i, m.to_i, d.to_i
@@ -169,17 +164,30 @@ def assets
 # STDERR.puts red("\n  [DEBUG] ") + "Assets: #{_body.inspect}"
 end
 
-def finalize
-  @meta.body = @body
-File.open("/tmp/lblog.txt", "w") do |f|
-  f.puts 
-  f.puts @meta.inspect
-end
-  @meta
-end
+  def write_post(meta)
+    save = Dir.pwd
+    Dir.chdir(@postdir)
+    meta.views = meta.views.join(" ")
+    meta.tags  = meta.tags.join(" ")
+    File.write("index.html", @body)
+    File.write("teaser.txt", meta.teaser)
+    
+    fields = [:num, :title, :date, :pubdate, :views, :tags]
+    
+    fname2 = "metadata.txt"
+    f2 = File.open(fname2, "w") do |f2| 
+      fields.each {|fld| f2.puts "#{fld}: #{meta.send(fld)}" }
+    end
+    Dir.chdir(save)
+  end
 
 def teaser
   @meta.teaser = _body_text
   @body << @meta.teaser + "\n"
   # FIXME
 end
+
+def finalize
+  write_post(@meta) # FIXME
+end
+

metadata

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