RubyGems - runeblog - Versions diffs - 0.2.59 → 0.2.60 - Mend

runeblog 0.2.59 → 0.2.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 (8) hide show

checksums.yaml +4 -4
data/empty_view/themes/standard/blog/generate.lt3 +0 -2
data/lib/liveblog.rb +10 -13
data/lib/repl.rb +0 -17
data/lib/runeblog.rb +28 -5
data/lib/runeblog_version.rb +1 -1
data/runeblog.gemspec +1 -1
metadata +4 -4

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2d47a65fa785c2f35b7f5609cc790eae415a33f7be148d2ffd7ac1dfa20cbe
-  data.tar.gz: 425c8a969db5a7ad6b3716e6141715a7e44d31d4eea21a2faf11e0995d612ddc
+  metadata.gz: f2e2d6239b2bc6f88fb80687c6facad5415fac4427618a7b2e47e760d326dc9e
+  data.tar.gz: 0e051d0b4adcc856fdf39451dfc2e85bcf80c80e4fc96b98edd34f736ac44796
 SHA512:
-  metadata.gz: d19541de995f0fbd20b3193166db86410226e2fc53018fa61cfda5b8c39789288e4ee7f30946cf5779422b3181d2c0c3dc5530d46af8ee95f8392ba1164972fb
-  data.tar.gz: 855b0768c3c79e6026e5ddcc4d079c53f2f45162a520cbe1b38b1b4b297e81e44c0bfe734abdfda6a8993bfdeab0b50078aa1db1e94e0e2a121e5c1895f2171b
+  metadata.gz: 400005cd7790c4d6af7e098f28c28697ea1a5a7e4b97a80dfcd121143a904f9504493d48f98085bcc07876cabd40f5ecbffcc4a5b7d7d37efca46780fd6ffb1c
+  data.tar.gz: f0713c12bb117df71c84f0f41ae9fc2d11c0cc9479882b7fe2154b5567dc68d2295bd099b8597fcac209738c86f6c511f256d25443e8bf95e6e9dd2b00b34207

data/empty_view/themes/standard/blog/generate.lt3 CHANGED

@@ -14,9 +14,7 @@
 .include blog/head.lt3
   <body>
-.say Hello
     $.banner text: top.html image: austin-pano.jpg // navbar
-.say Hello again
     <div class="content container-fluid mt-4">
       <div class="row">
         $.include blog/index.lt3

data/lib/liveblog.rb CHANGED

@@ -121,14 +121,14 @@ def banner  # still experimental
       when "navbar"
 # STDERR.puts "-- navbar: pwd = #{Dir.pwd}:  #{`ls`}"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
-        hnavbar
+        _make_navbar  # horiz is default
         # xlate cwd: dir, src: "navbar.lt3", dst: "navbar.html"   # , debug: true
         stuff = File.read("banner/navbar.html")
         _out "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" +
              " <!-- #{arg} -->"
       when "vnavbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
-        vnavbar
+        _make_navbar(:vert)
         # xlate cwd: dir, src: "vnavbar.lt3", dst: "vnavbar.html"   # , debug: true
         file = "banner/vnavbar.html"
         _out "<td colspan=#{span}>" + File.read(file) + "</td>" +
@@ -348,7 +348,8 @@ end
 def finalize
   # FIXME simplify this!
   unless @meta
-    puts @live.body
+STDERR.puts "META is nil: file = #{Livetext::Vars[:File]}"
+#   puts @live.body
     return
   end
   if @blog.nil?
@@ -456,7 +457,6 @@ def _make_class_name(app)
 end
 def _load_local(widget)
-STDERR.puts "widget = #{widget}  pwd = #{Dir.pwd}"
   Dir.chdir("widgets/#{widget}") do
     rclass = _make_class_name(widget)
     found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
@@ -470,7 +470,9 @@ rescue => err
 end
 def pinned_rebuild
-  Dir.chdir(@blog.root/:views/@blog.view/"themes/standard/") do
+  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
@@ -684,18 +686,17 @@ end
 def vnavbar
   str = _make_navbar(:vert)
-  _out str
+# _out str
 end
 def hnavbar
   str = _make_navbar  # horiz is default
-STDERR.puts "STR = #{str.inspect}"
-  _out str
+# _out str
 end
 def navbar
   str = _make_navbar  # horiz is default
-  _out str
+# _out str
 end
 def _make_navbar(orient = :horiz)
@@ -718,14 +719,11 @@ def _make_navbar(orient = :horiz)
   name = (orient == :horiz) ? "navbar.html" : "vnavbar.html"
   html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name
-# STDERR.puts "html = #{html_file.inspect}  pwd = #{Dir.pwd}"
   output = File.new(html_file, "w")
   output.puts start
   lines = _read_navbar_data
   lines = ["index  Home"] + lines  unless _args.include?("nohome")
-STDERR.puts "  #{lines.size} lines"
   lines.each do |line|
-STDERR.puts "  handling: #{line.inspect}"
     basename, cdata = line.chomp.strip.split(" ", 2)
     full = :banner/basename+".html"
     href_main = _main(full)
@@ -739,7 +737,6 @@ STDERR.puts "  handling: #{line.inspect}"
   end
   output.puts finish
   output.close
-STDERR.puts "-- html_file: #{`ls -l #{html_file}`}"
   return File.read(html_file)
 end

data/lib/repl.rb CHANGED

@@ -15,7 +15,6 @@ module RuneBlog::REPL
   end
   def cmd_quit(arg, testing = false)
-    check_empty(arg)
     RubyText.stop
     sleep 0.1
     cmd_clear(nil)
@@ -24,14 +23,12 @@ module RuneBlog::REPL
   end
   def cmd_clear(arg, testing = false)
-    check_empty(arg)
     STDSCR.cwin.clear
     STDSCR.cwin.refresh
   end
   def cmd_version(arg, testing = false)
     reset_output
-    check_empty(arg)
     output RuneBlog::VERSION
     puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red) unless testing
     @out
@@ -64,14 +61,12 @@ module RuneBlog::REPL
   end
   def _manage_pinned(arg, testing = false)   # cloned from manage_links
-    check_empty(arg)
     dir = @blog.view.dir/"themes/standard/widgets/pinned"
     data = dir/"list.data"
     edit_file(data)
   end
   def _manage_navbar(arg, testing = false)   # cloned from manage_pages
-    check_empty(arg)
     dir = @blog.view.dir/"themes/standard/navbar"
     files = Dir.entries(dir) - %w[. .. navbar.lt3]
     new_item = "  [New item]  "
@@ -107,7 +102,6 @@ module RuneBlog::REPL
   end
   def _manage_pages(arg, testing = false)
-    check_empty(arg)
     dir = @blog.view.dir/"themes/standard/widgets/pages"
     # Assume child files already generated (and list.data??)
     data = dir/"list.data"
@@ -143,14 +137,12 @@ module RuneBlog::REPL
   end
   def cmd_import(arg, testing = false)
-    check_empty(arg)
     files = ask("\n  File(s) = ")
     system!("cp #{files} #{@blog.root}/views/#{@blog.view.name}/assets/")
   end
   def cmd_browse(arg, testing = false)
     reset_output
-    check_empty(arg)
     url = @blog.view.publisher.url
     if url.nil?
       output! "Publish first."
@@ -164,7 +156,6 @@ module RuneBlog::REPL
   def cmd_preview(arg, testing = false)
     reset_output
-    check_empty(arg)
     local = @blog.view.local_index
     result = system!("open #{local}")
     raise CantOpen(local) unless result
@@ -182,7 +173,6 @@ module RuneBlog::REPL
 # Future Hal says please refactor this
     puts unless testing
     reset_output
-    check_empty(arg)
     unless @blog.view.can_publish?
       msg = "Can't publish... see globals.lt3"
       puts msg unless testing
@@ -225,7 +215,6 @@ module RuneBlog::REPL
   def cmd_rebuild(arg, testing = false)
     debug "Starting cmd_rebuild..."
     reset_output
-    check_empty(arg)
     puts unless testing
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
@@ -285,7 +274,6 @@ module RuneBlog::REPL
   def cmd_new_post(arg, testing = false)
     reset_output
-    check_empty(arg)
     if @blog.views.empty?
       puts "\n  Create a view before creating the first post!\n "
       return
@@ -358,7 +346,6 @@ module RuneBlog::REPL
   def cmd_list_views(arg, testing = false)
     reset_output("\n")
-    check_empty(arg)
     puts unless testing
     @blog.views.each do |v|
       v = v.to_s
@@ -372,7 +359,6 @@ module RuneBlog::REPL
   def cmd_list_posts(arg, testing = false)
     reset_output
-    check_empty(arg)
     posts = @blog.posts  # current view
     str = @blog.view.name + ":\n"
     output str
@@ -395,7 +381,6 @@ module RuneBlog::REPL
   def cmd_list_drafts(arg, testing = false)
     reset_output
-    check_empty(arg)
     drafts = @blog.drafts  # current view
     if drafts.empty?
       output! "No drafts"
@@ -416,7 +401,6 @@ module RuneBlog::REPL
   def cmd_list_assets(arg, testing = false)
     reset_output
-    check_empty(arg)
     dir = @blog.view.dir + "/assets"
     assets = Dir[dir + "/*"]
     if assets.empty?
@@ -512,7 +496,6 @@ module RuneBlog::REPL
   def cmd_help(arg, testing = false)
     reset_output
-    check_empty(arg)
     msg = Help
     output msg
     msg.each_line do |line|

data/lib/runeblog.rb CHANGED

@@ -331,8 +331,11 @@ class RuneBlog
     text = nil
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
+STDERR.puts "--  @pename = #{post_entry_name}"
+STDERR.puts "--  @pe = #{@_post_entry.inspect}"
     depend = [post_entry_name]
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html", deps: depend  # , debug: true
+    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
+STDERR.puts "-- xlate result: #{`ls -l /tmp/post_entry.html`}"
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text =
@@ -347,8 +350,7 @@ class RuneBlog
     _tmp_error(err)
   end
-  def collect_recent_posts(file)
-    log!(enter: __method__, args: [file], level: 3)
+  def _sorted_posts
     posts = nil
     dir_posts = @vdir/:posts
     entries = Dir.entries(dir_posts)
@@ -362,18 +364,29 @@ class RuneBlog
       nb = b[bi..(bi+3)].to_i
       nb <=> na
     end  # sort descending
-    posts = posts[0..19]  # return 20 at most
+    return posts[0..19]  # return 20 at most
+  end
+  def collect_recent_posts(file)
+    log!(enter: __method__, args: [file], level: 3)
     text = <<-HTML
       <html>
       <head><link rel="stylesheet" href="etc/blog.css"></head>
       <body>
     HTML
+    posts = _sorted_posts
     wanted = [8, posts.size].min  # estimate how many we want?
     enum = posts.each
+    entries = []
     wanted.times do
       postid = File.basename(enum.next)
       postid = postid.to_i
-      text << index_entry(postid)    # side effect! calls _out
+STDERR.puts "-- postid = #{postid}"
+# posts.each {|x| STDERR.puts "    #{x}" }
+      entry = index_entry(postid)
+STDERR.puts "--   entry = #{entry.inspect}"
+      entries << entry
+      text << entry
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
@@ -432,6 +445,15 @@ class RuneBlog
     _tmp_error(err)
   end
+  def _hack_pinned_rebuild(view)
+    tmp = "/tmp/pinned.lt3"
+    File.open(tmp, "w") do |f|
+      f.puts ".mixin liveblog\n.pinned_rebuild #{view}"
+    end
+    xlate src: tmp, dst: "/tmp/junk.html"
+    system("rm -f #{tmp} /tmp/junk.html")
+  end
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
     vdir = @root/:views/view
@@ -445,6 +467,7 @@ class RuneBlog
     xlate cwd: vdir/"themes/standard", deps: depend, force: true,
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+#   _hack_pinned_rebuild(view)    # FIXME experimental
     copy_widget_html(view)
   rescue => err
     _tmp_error(err)

data/lib/runeblog_version.rb CHANGED

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

data/runeblog.gemspec CHANGED

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.94'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.95'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
   # Files...

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.59
+  version: 0.2.60
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.94
+        version: 0.8.95
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.94
+        version: 0.8.95
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement