runeblog 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a43db71861d8f4f4c0fb7d53a105c2a53046bf7750dbf027ab02e613369861
-  data.tar.gz: 882e0d89b642866fdb87f3be48bebbcf3af37ebcc3d0a8cb1671adc21722cb2d
+  metadata.gz: 8d6961e05ec2e2b61542ec6d149bf2af83f77d8870549707bdde78764fbce0aa
+  data.tar.gz: 9e58ad2e2a60078de58c82fba9ce656b255836f38ac36840131e31ec864b4e7e
 SHA512:
-  metadata.gz: 0720c49855701a7b032012b951efd315dfe882a0498a8e7d7d771741ed3849b58f3519329fdcc93939e0a7ee9c7827c41d4d3720737d48d9926109171ba1b609
-  data.tar.gz: f0092498f40e784bee2847ae5ca11966e03fb9a59d5d9fca2c9a3142050f43df1e0fbff8607ebcc5d683869ab5fc0883ab681dbe87fb51e1e1644d2cd762e998
+  metadata.gz: cb5a93d9fabf6ad9e16c433590ee58a4b15946873ad7e50cb051159eb03694dcd3c4b31abc9d7cb0854216b18caee832d888a4ef44ed999f6a81a2311b995fab
+  data.tar.gz: 85e551c444ca1099de08e4885c2d657b8564e482bca77a5b3fac4733826248c1726217c06b371625a30317149d87b25a98614bd441c88b3b9e1f82856a2260df

data/empty_view/themes/standard/post/generate.lt3

@@ -9,10 +9,8 @@
   <!-- Generated from $File on $$date; editing not recommended.   -->
 
 .seek global.lt3
-.include vars.lt3
 
 . FIXME
-
 .head
 og:title    $title 
 description $teaser

data/empty_view/themes/standard/post/permalink.lt3

@@ -13,7 +13,6 @@
   <!-- It was generated from $File on $$date.  -->
 
 .seek    global.lt3
-.include vars.lt3
 
 .head
 og:title    $title

data/lib/liveblog.rb

@@ -33,8 +33,10 @@ def init_liveblog    # FIXME - a lot of this logic sucks
       </a>
     HTML
   end
-rescue
-  raise "Only works inside a blog repo"
+rescue => err
+  STDERR.puts "err = #{err}"
+  STDERR.puts err.backtrace.join("\n")
+# raise "Only works inside a blog repo"
 end
 
 ##################

data/lib/lowlevel.rb

@@ -121,3 +121,10 @@
     list.first
   end
 
+  def addvar(vars, hash)
+    hash.each_pair do |k, v| 
+      vars[k.to_s] = v
+      vars[k.to_sym] = v
+    end
+    vars
+  end

data/lib/processing.rb

@@ -2,7 +2,7 @@ if ! defined?(LIVE)
 
 require 'livetext'
 
-LIVE = Livetext.new
+LIVE = "defined"
 LEXT = ".lt3"
 
 def newer?(f1, f2)
@@ -39,6 +39,7 @@ def preprocess(cwd: Dir.pwd, src:,
       STDERR.puts "#{sp}      in:   #{Dir.pwd}"
       STDERR.puts "#{sp}      from: #{caller[0]}"
       STDERR.puts "#{sp}      copy: #{copy}" if copy
+      STDERR.puts "#{sp}      vars: #{vars.inspect}" unless vars == {}
     end
     stale = stale?(src, dst, deps, force)
     if stale

data/lib/runeblog.rb

@@ -625,6 +625,7 @@ class RuneBlog
     nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
     pnum = nslug[0..3]                 # 0001
+    hash = {}
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
       meta = read_metadata
@@ -633,29 +634,12 @@ class RuneBlog
       title = meta.title
       tags = meta.tags
       # FIXME simplify
-      vars = <<~LIVE
-        .set post.num = #{pnum}
-        .heredoc post.aslug
-        #{aslug}
-        .end
-        .heredoc post.date
-        #{date}
-        .end
-        .heredoc title
-        #{title.chomp}
-        .end
-        .heredoc post.tags
-        #{tags.join(" ")}
-        .end
-        .heredoc teaser
-        #{excerpt.chomp}
-        .end
-        .heredoc longdate
-        #{longdate}
-        .end
-      LIVE
-      File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
+      addvar(hash, "post.num" => pnum,      "post.aslug" => aslug,
+             "post.date" => date,           title: title.chomp, 
+             "post.tags" => tags.join(" "), teaser: excerpt.chomp,
+             longdate: longdate)
     end
+    hash
   rescue => err
     _tmp_error(err)
   end
@@ -681,8 +665,6 @@ class RuneBlog
 
   def _handle_post(draft, view_name = self.view.to_s)
     log!(enter: __method__, args: [draft, view_name], level: 2)
-    # break into separate methods?
-
     return unless _check_view?(view_name)
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
@@ -693,22 +675,16 @@ class RuneBlog
     remote = @root/:views/view_name/:remote
     @theme = @root/:views/view_name/:themes/:standard
 
-    # Step 1...
-    create_dirs(pdraft)
-    # FIXME dependencies?
-    preprocess cwd: pdraft, src: draft, dst: "guts.html",
-               mix: "liveblog"  # , debug: true
-    _post_metadata(draft, pdraft)
-    # Step 2...
-    vposts = @root/:views/view_name/:posts
+    create_dirs(pdraft)                                # Step 1...
+    preprocess cwd: pdraft, src: draft,                # FIXME dependencies?
+               dst: "guts.html", mix: "liveblog"
+    hash = _post_metadata(draft, pdraft)
+    vposts = @root/:views/view_name/:posts             # Step 2...
     copy!(pdraft, vposts)    # ??
-    # Step 3..
-    copy(pdraft/"guts.html", @theme/:post) 
-    copy(pdraft/"vars.lt3",  @theme/:post) 
-    # Step 4...
-    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
-               dst: remote/ahtml, # copy: @theme/:post,
-               call: ".nopara"    # , debug: true
+    copy(pdraft/"guts.html", @theme/:post)             # Step 3...
+    preprocess cwd: @theme/:post, src: "generate.lt3", # Step 4...
+               force: true, vars: hash, 
+               dst: remote/ahtml, call: ".nopara" 
     FileUtils.rm_f(remote/"published")
     timelog("Generated", remote/"history")
     copy_widget_html(view_name)

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext