runeblog 0.2.81 → 0.2.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d15f5bd6b7e8b87c3de63a77516dee2c6f57134a2a3c5b51db502aad0aaa3181
-  data.tar.gz: ff84de0a2c007a9f75f38295ea6bbcd7dcdcb3b3963294b7c74c2dd79cfbb8c4
+  metadata.gz: cf0392a5b2be6bcfaf114bedc0840674a9c7d2908015409ea79eef9908b0d624
+  data.tar.gz: 494acd91ce701943026f595ac91f8db9559b918a6831935d14e1fa3439bbe19c
 SHA512:
-  metadata.gz: ef4cfbb271c5711f0a55f771bed52e9d59327ffdccdc4eadda5eab8b9438c043224aeac21a766aa63dd0638887cfc3d16fd9eac0bf647a698b091cd282b330ca
-  data.tar.gz: 4de4e96e9f22e523c48d512267a0bd51fbdb3ed6aecf61b8724aa98cab92e7988fc151d5e9ca8cf27fe1ca926758e7e4236c57f4e288bde334abfe9de5c61915
+  metadata.gz: f69efa439801300a96ffe32b9d0f78abd36ea641e22b39f78102f3fc123bc2150cd600fc8818708f3ca3228907c0d618483a7822cd16acfb98f5fb999d67a4ac
+  data.tar.gz: da42919ea67d3393036663a3178f2223d7ad9aec800a78c13fc536d7f871d6e5a834233e94bd001ed9519d61302dd900e3847689530e322c05df00d54ebfd3a5

data/empty_view/themes/standard/widgets/pages/pages.rb

@@ -18,7 +18,7 @@ class ::RuneBlog::Widget
       children = Dir["*.lt3"] - ["pages.lt3"]
       children.each do |child|
         dest = child.sub(/.lt3$/, ".html")
-        xlate src: child, dst: dest
+        preprocess src: child, dst: dest
       end
       write_main
       write_card

data/lib/helpers-blog.rb

@@ -1,7 +1,7 @@
 require 'runeblog_version'
 require 'fileutils'
 
-require 'xlate'
+require 'processing'
 
 module RuneBlog::Helpers
 

data/lib/liveblog.rb

@@ -5,7 +5,7 @@ require 'find'
 
 require 'runeblog'
 require 'pathmagic'
-require 'xlate'
+require 'processing'
 
 
 def init_liveblog    # FIXME - a lot of this logic sucks
@@ -424,19 +424,12 @@ def pin
   pinned.each do |pinview|
     dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
     datafile = dir/"list.data"
-    if File.exist?(datafile)
-      pins = File.readlines(datafile)
-    else
-      pins = []
-    end
+    pins = File.exist?(datafile) ? File.readlines(datafile) : []
     pins << "#{@meta.num} #{@meta.title}\n"
     pins.uniq!
-    File.open(datafile, "w") do |outfile|
-      pins.each {|pin| outfile.puts pin }
-    end
+    File.open(datafile, "w") {|out| pins.each {|pin| out.puts pin } }
   end
   _optional_blank_line
-  pinned_rebuild    # FIXME experimental
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n")
@@ -585,21 +578,21 @@ rescue => err
   exit
 end
 
-def pinned_rebuild
-  view = @blog.view
-  view = _args[0] unless _args.empty?
-  Dir.chdir(@blog.root/:views/view/"themes/standard/") do
-    wtag = "widgets/pinned"
-    code = _load_local("pinned")
-    if code 
-      Dir.chdir(wtag) do 
-        widget = code.new(@blog)
-        widget.build
-      end
-      # _include_file wtag/"pinned-card.html"
-    end
-  end
-end
+# def pinned_rebuild
+#   view = @blog.view
+#   view = _args[0] unless _args.empty?
+#   Dir.chdir(@blog.root/:views/view/"themes/standard/") do
+#     wtag = "widgets/pinned"
+#     code = _load_local("pinned")
+#     if code 
+#       Dir.chdir(wtag) do 
+#         widget = code.new(@blog)
+#         widget.build
+#       end
+#       # _include_file wtag/"pinned-card.html"
+#     end
+#   end
+# end
 
 def _handle_standard_widget(tag)
   wtag = :widgets/tag
@@ -640,14 +633,10 @@ def sidebar
         File.open(wtag/"vars.lt3", "w") do |f| 
           f.puts ".set ad.image = #{img}"
         end
-        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
+        preprocess cwd: wtag, src: tag, dst: tcard, force: true # , debug: true # , deps: depend 
     end
 
     _include_file wtag/tcard
-#   depend = %w[card.css main.css custom.rb local.rb] 
-#   depend += ["#{wtag}.lt3", "#{wtag}.rb"]
-#   depend.map! {|x| @blog.view.dir/"themes/standard/widgets"/wtag/x }
-# _debug "--- call xlate #{tag} src = #{tag}  dst = #{tcard}\r"
   end
   _out %[</div>]
 rescue => err
@@ -787,7 +776,7 @@ def _make_navbar(orient = :horiz)
       output.puts %[#{li1} <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> #{li2}]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
-      xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
+      preprocess cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
       output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
   end

data/lib/processing.rb

@@ -0,0 +1,49 @@
+if ! defined?(LIVE)
+
+require 'livetext'
+
+LIVE = Livetext.new
+LEXT = ".lt3"
+
+def newer?(f1, f2)
+  File.mtime(f1) > File.mtime(f2)
+end
+
+def stale?(src, dst, deps, force = false)
+  meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
+  log!(enter: __method__, args: [src, dst], level: 3)
+  raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
+  return true if force
+  return true unless File.exist?(dst)
+  return true if newer?(src, dst)
+  deps.each {|dep| return true if newer?(dep, dst) }
+  return false
+end
+
+def preprocess(cwd: Dir.pwd, src:, 
+          dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
+          deps: [], copy: nil, debug: false, force: false)
+  src += LEXT unless src.end_with?(LEXT)
+  dst += ".html" unless (dst.end_with?(".html") || strip)
+  sp = " "*12
+  Dir.chdir(cwd) do
+    if debug
+      STDERR.puts "#{sp} -- preprocess "
+      STDERR.puts "#{sp}      src:  #{src}"
+      STDERR.puts "#{sp}      dst:  #{dst}"
+      STDERR.puts "#{sp}      in:   #{Dir.pwd}"
+      STDERR.puts "#{sp}      from: #{caller[0]}"
+      STDERR.puts "#{sp}      copy: #{copy}" if copy
+    end
+    stale = stale?(src, dst, deps, force)
+    if stale
+      live = Livetext.new
+      out = live.xform_file(src)
+      File.write(dst, out)
+      system!("cp #{dst} #{copy}") if copy
+    end
+    puts "#{sp} -- ^ Already up to date!" if debug && ! stale
+  end
+end
+
+end

data/lib/publish.rb

@@ -1,9 +1,14 @@
+if ! defined?(Already_publish)
+
+  Already_publish = nil
+
 require 'global'
 require 'pathmagic'
 
 class RuneBlog::Publishing
   attr_reader :user, :server, :docroot, :path
 
+
   BadRemoteLogin = Exception.new("Can't login remotely")
   BadRemotePerms = Exception.new("Bad remote permissions")
 
@@ -80,3 +85,4 @@ class RuneBlog::Publishing
   end
 end
 
+end

data/lib/runeblog.rb

@@ -1,3 +1,7 @@
+if ! defined?(Already_runeblog)
+
+  Already_runeblog = nil
+
 require 'date'
 require 'find'
 require 'ostruct'
@@ -160,7 +164,7 @@ STDERR.puts "Remember: fix global.lt3"
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
+    preprocess cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -332,7 +336,7 @@ STDERR.puts "Remember: fix global.lt3"
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
     depend = [post_entry_name]
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
+    preprocess src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -448,10 +452,10 @@ STDERR.puts "Remember: fix global.lt3"
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    xlate cwd: vdir/"themes/standard/etc", # deps: depend, debug: true,
-          src: "blog.css.lt3", copy: vdir/"remote/etc/" # , dst: "blog.css"
-    xlate cwd: vdir/"themes/standard", deps: depend, force: true,
-          src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
+    preprocess cwd: vdir/"themes/standard/etc", # deps: depend, debug: true,
+               src: "blog.css.lt3", copy: vdir/"remote/etc/" # , dst: "blog.css"
+    preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
+               src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
     copy_widget_html(view)
   rescue => err
@@ -559,7 +563,7 @@ STDERR.puts "Remember: fix global.lt3"
     # Step 1...
     create_dirs(pdraft)
     # FIXME dependencies?
-    xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+    preprocess cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
     vposts = @root/:views/view_name/:posts
@@ -569,11 +573,11 @@ STDERR.puts "Remember: fix global.lt3"
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
     # FIXME dependencies?
-    xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
-          dst: remote/ahtml, copy: @theme/:post    # , debug: true
+    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
+               dst: remote/ahtml, copy: @theme/:post    # , debug: true
     # FIXME dependencies?
-    xlate cwd: @theme/:post, src: "permalink.lt3", 
-          dst: remote/:permalink/ahtml  # , debug: true
+    preprocess cwd: @theme/:post, src: "permalink.lt3", 
+               dst: remote/:permalink/ahtml  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)
@@ -658,3 +662,4 @@ STDERR.puts "Remember: fix global.lt3"
   end
 end
 
+end

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.81"
+  VERSION = "0.2.82"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/test/austin.rb

@@ -73,9 +73,6 @@ File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
 end
 ####
 
-debug("** generate_view: #{bold('around_austin')}")
-x.generate_view("around_austin")
-
 debug("-- change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
@@ -150,8 +147,9 @@ debug
 debug "** generate_index #{bold("around_austin")}"
 x.generate_index("around_austin") 
 
-debug
-x.change_view("around_austin")
+debug("** generate_view: #{bold('around_austin')}")
+x.generate_view("around_austin")
+
 debug bold("...finished.\n")
 
 t1 = Time.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.81
+  version: 0.2.82
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -191,12 +191,12 @@ files:
 - lib/logging.rb
 - lib/pathmagic.rb
 - lib/post.rb
+- lib/processing.rb
 - lib/publish.rb
 - lib/repl.rb
 - lib/runeblog.rb
 - lib/runeblog_version.rb
 - lib/view.rb
-- lib/xlate.rb
 - test/austin.rb
 - test/fakeimage.jpg
 - test/general_test.rb

data/lib/xlate.rb

@@ -1,77 +0,0 @@
-require 'livetext'
-
-LIVE = Livetext.new
-LEXT = ".lt3"
-
-def newer?(f1, f2)
-  File.mtime(f1) > File.mtime(f2)
-end
-
-def stale?(src, dst, deps, force = false)
-  meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
-  log!(enter: __method__, args: [src, dst], level: 3)
-  raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
-  return true if force
-  return true unless File.exist?(dst)
-  return true if newer?(src, dst)
-  deps.each {|dep| return true if newer?(dep, dst) }
-  return false
-end
-
-def preprocess(cwd: Dir.pwd, src:, 
-          dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
-          deps: [], copy: nil, debug: false, force: false)
-  src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html") || strip)
-  sp = " "*12
-  Dir.chdir(cwd) do
-    if debug
-      puts "#{sp} -- preprocess "
-      puts "#{sp}      src:  #{src}"
-      puts "#{sp}      dst:  #{dst}"
-      puts "#{sp}      in:   #{Dir.pwd}"
-      puts "#{sp}      from: #{caller[0]}"
-      puts "#{sp}      copy: #{copy}" if copy
-    end
-    stale = stale?(src, dst, deps, force)
-    if stale
-      out = LIVE.xform_file(src)
-      File.write(dst, out)
-      system!("cp #{dst} #{copy}") if copy
-    else
-      puts "#{sp} -- ^ Already up to date!" if debug
-      return
-    end
-  end
-end
-
-def xlate(cwd: Dir.pwd, src:, 
-          dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
-          deps: [], copy: nil, debug: false, force: false)
-  src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html") || strip)
-  indent = " "*12
-  Dir.chdir(cwd) do
-    if debug
-      puts "#{indent} -- xlate #{src} >#{dst}"
-      puts "#{indent}      in:   #{Dir.pwd}"
-      puts "#{indent}      from: #{caller[0]}"
-      puts "#{indent}      copy: #{copy}" if copy
-    end
-    stale = stale?(src, dst, deps, force)
-    if stale
-      rc = system("livetext #{src} >#{dst}")
-      puts "...completed (shell returned #{rc})" if debug
-      system!("cp #{dst} #{copy}") if copy
-    else
-      puts "#{indent} -- ^ Already up to date!" if debug
-      return
-    end
-  end
-end
-
-def xlate!(cwd: Dir.pwd, src:, copy: nil, debug: false, force: false)
-  output = "/tmp/xlate-#{File.basename(src).sub(/.lt3$/, "")}"
-  xlate cwd: cwd, src: src, dst: output, debug: debug, force: force
-  File.read(output + ".html")  # return all content as string
-end