runeblog 0.2.59 → 0.2.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2d47a65fa785c2f35b7f5609cc790eae415a33f7be148d2ffd7ac1dfa20cbe
-  data.tar.gz: 425c8a969db5a7ad6b3716e6141715a7e44d31d4eea21a2faf11e0995d612ddc
+  metadata.gz: 1ee0e8ea5eca8141bc128304f9f3025cff30bf7db3d6dc963ca9e826e7ec48fa
+  data.tar.gz: a46e8e6675cde4d9e43bdb5248eed70d732d86d28a0e80cf0c89d118c0ddbc3d
 SHA512:
-  metadata.gz: d19541de995f0fbd20b3193166db86410226e2fc53018fa61cfda5b8c39789288e4ee7f30946cf5779422b3181d2c0c3dc5530d46af8ee95f8392ba1164972fb
-  data.tar.gz: 855b0768c3c79e6026e5ddcc4d079c53f2f45162a520cbe1b38b1b4b297e81e44c0bfe734abdfda6a8993bfdeab0b50078aa1db1e94e0e2a121e5c1895f2171b
+  metadata.gz: 347dd447053e6d41532372c24c259716ae93c2ad9808ef63cc4ddf8d54d6e08c0e0cb2d06938f445115b1be79526b95e01672f6bd685ce00841bead8ada8c690
+  data.tar.gz: 719c98793354389ac974e1d45ee3e8d891380881938ec72676d6697cd49c233311d7bc9854624e235cfc87e3247632fb5a66794da5fb686f668ce9eaa130de22

data/README.lt3

@@ -1,6 +1,6 @@
 .mixin markdown
 <div style="float: left; align: left; vertical-align: bottom">
-<img src="raido4.png" width="210" height="295" align="left"></img>
+<img src="readme/raido4.png" width="210" height="295" align="left"></img>
 </div>
 <h1>runeblog</h1><b>Runeblog</b> is a blogging tool written in Ruby. It has these basic characteristics:
 <ul>
@@ -80,11 +80,12 @@ a new blog repo. Enter `y for yes.
 
 You'll then enter the editor (vim for now) to add configuration info to the `global.lt3 file.
 
-<pre><b>FIXME add menu screenshot here</b></pre>
-<pre><b>FIXME add vim screenshot here</b></pre>
+<!-- <pre><b>FIXME add menu screenshot here</b></pre> -->
+<!-- <pre><b>FIXME add vim screenshot here</b></pre> -->
+<img src="readme/vim-global.png" width="494" height="696" align="center"></img>
 
-The next thing you should do is to create at least one view of your own. Use the
-`[new view] command for this. Note that the current view is displayed as part of the prompt.
+The next thing you should do is to create at least one view of your own. Use the `[new view] 
+command for this. Note that the current view is displayed as part of the prompt.
 
 <pre>
 <b>[no view]</b> new view mystuff<br>
@@ -95,13 +96,13 @@ To create a new post, use the `[new post] command (also abbreviated `post or sim
 prompted for a title:
 
 <pre>
-<b>[around_austin]</b> new post<br>
+<b>[mystuff]</b> new post<br>
 <b>Title:</b> This is my first post
 </pre>
 
 Then you'll be sent into the editor (currently vim but can be others):
 
-<pre><b>FIXME add example here</b></pre>
+<img src="readme/edit-first.png" width="506" height="383" align="center"></img>
 
 <pre>
 <b>FIXME wizard?</b>
@@ -118,7 +119,7 @@ browse...
 
 You can use the `config command to choose a file to edit.
 
-<pre><b>FIXME add screenshot here</b></pre>
+<img src="readme/config-menu.png" width="700" height="547" align="center"></img>
 
 The meaning and interaction of these files will be explained later. *FIXME
 
@@ -127,6 +128,42 @@ are needed.
 
 .h2 The directory structure for a view
 
+<b>Subject to change</b>
+TBD: Add details
+
+<pre>
+    .blogs/views/mystuff/
+    ├── assets
+    ├── posts
+    ├── remote
+    │   ├── assets
+    │   ├── banner
+    │   ├── etc
+    │   ├── permalink
+    │   └── widgets
+    │       ├── ad
+    │       ├── links
+    │       ├── news
+    │       ├── pages
+    │       └── pinned
+    └── themes
+        └── standard
+            ├── banner
+            ├── blog
+            ├── etc
+            ├── post
+            └── widgets
+                ├── ad
+                ├── bydates
+                ├── links
+                ├── news
+                ├── pages
+                ├── pinned
+                ├── search
+                ├── sitemap
+                └── tag-cloud
+</pre>
+
 <pre><b>FIXME add details here</b></pre>
 
 
@@ -157,11 +194,11 @@ are needed.
 <b>Predefined functions and variables</b>
 <pre>
   \$File
-  \$\$date
+  `[\$\$date]
   etc.
 </pre>
 
-.h2 Runeblog-specific features (Liveblog</b>
+.h2 Runeblog-specific features (Liveblog)</b>
 
 <b>TBD</b>
 
@@ -224,7 +261,7 @@ are needed.
 
 <b>Creating your own widgets</b>
 
-<b>Special tags coming "soon"</b>
+<b>Special tags/functions coming "soon"</b>
 <pre>
   github, gitlab, gist
   wikipedia

data/README.md

@@ -1,5 +1,5 @@
 <div style="float: left; align: left; vertical-align: bottom">
-<img src="raido4.png" width="210" height="295" align="left"></img>
+<img src="readme/raido4.png" width="210" height="295" align="left"></img>
 </div>
 <h1>runeblog</h1><b>Runeblog</b> is a blogging tool written in Ruby. It has these basic characteristics:
 <ul>
@@ -82,12 +82,13 @@ a new blog repo. Enter y  for yes.
 You'll then enter the editor (vim for now) to add configuration info to the <font size=+1><tt>global.lt3</tt></font>  file.
 <p>
 
-<pre><b>FIXME add menu screenshot here</b></pre>
-<pre><b>FIXME add vim screenshot here</b></pre>
+<!-- <pre><b>FIXME add menu screenshot here</b></pre> -->
+<!-- <pre><b>FIXME add vim screenshot here</b></pre> -->
+<img src="readme/vim-global.png" width="494" height="696" align="center"></img>
 <p>
 
-The next thing you should do is to create at least one view of your own. Use the
-`[new view] command for this. Note that the current view is displayed as part of the prompt.
+The next thing you should do is to create at least one view of your own. Use the <font size=+1><tt>new view</tt></font> 
+command for this. Note that the current view is displayed as part of the prompt.
 <p>
 
 <pre>
@@ -101,7 +102,7 @@ prompted for a title:
 <p>
 
 <pre>
-<b>[around_austin]</b> new post<br>
+<b>[mystuff]</b> new post<br>
 <b>Title:</b> This is my first post
 </pre>
 <p>
@@ -109,7 +110,7 @@ prompted for a title:
 Then you'll be sent into the editor (currently vim but can be others):
 <p>
 
-<pre><b>FIXME add example here</b></pre>
+<img src="readme/edit-first.png" width="506" height="383" align="center"></img>
 <p>
 
 <pre>
@@ -129,7 +130,7 @@ browse...
 You can use the <font size=+1><tt>config</tt></font>  command to choose a file to edit.
 <p>
 
-<pre><b>FIXME add screenshot here</b></pre>
+<img src="readme/config-menu.png" width="700" height="547" align="center"></img>
 <p>
 
 The meaning and interaction of these files will be explained later. <b>FIXME</b>
@@ -140,6 +141,44 @@ are needed.
 <p>
 
 ## The directory structure for a view
+<b>Subject to change</b>
+TBD: Add details
+<p>
+
+<pre>
+    .blogs/views/mystuff/
+    ├── assets
+    ├── posts
+    ├── remote
+    │   ├── assets
+    │   ├── banner
+    │   ├── etc
+    │   ├── permalink
+    │   └── widgets
+    │       ├── ad
+    │       ├── links
+    │       ├── news
+    │       ├── pages
+    │       └── pinned
+    └── themes
+        └── standard
+            ├── banner
+            ├── blog
+            ├── etc
+            ├── post
+            └── widgets
+                ├── ad
+                ├── bydates
+                ├── links
+                ├── news
+                ├── pages
+                ├── pinned
+                ├── search
+                ├── sitemap
+                └── tag-cloud
+</pre>
+<p>
+
 <pre><b>FIXME add details here</b></pre>
 <p>
 
@@ -175,12 +214,12 @@ are needed.
 <b>Predefined functions and variables</b>
 <pre>
   $File
-  $\[date is undefined]
+  <font size=+1><tt></tt></font>
   etc.
 </pre>
 <p>
 
-## Runeblog-specific features (Liveblog</b>
+## Runeblog-specific features (Liveblog)</b>
 <b>TBD</b>
 <p>
 
@@ -252,7 +291,7 @@ are needed.
 <b>Creating your own widgets</b>
 <p>
 
-<b>Special tags coming "soon"</b>
+<b>Special tags/functions coming "soon"</b>
 <pre>
   github, gitlab, gist
   wikipedia

data/bin/blog

@@ -56,10 +56,11 @@ end
 
 def cmdline_rebuild
   _need_view
-  puts "Generating view..."
+  print "Generating view... "
   @blog.generate_view(@view)
-  puts "Generating index..."
-  @blog.generate_index(@view)
+  print "Generating index... "
+  num = @blog.generate_index(@view)
+  puts "#{num} posts\n "
 end
 
 def handle_cmdline

data/empty_view/remote/widgets/ad/GIT_IS_DUMB

@@ -0,0 +1,2 @@
+
+

data/empty_view/remote/widgets/links/GIT_IS_DUMB

@@ -0,0 +1,2 @@
+
+

data/empty_view/remote/widgets/news/GIT_IS_DUMB

@@ -0,0 +1,2 @@
+
+

data/empty_view/remote/widgets/pages/GIT_IS_DUMB

@@ -0,0 +1,2 @@
+
+

data/empty_view/remote/widgets/pinned/GIT_IS_DUMB

@@ -0,0 +1,2 @@
+
+

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

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

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

@@ -7,9 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      # f = File.new("/tmp/mehhh", "w")
       @lines = File.exist?(@datafile) ? File.readlines(@datafile) : []
-      # f.puts #{@lines.inspect} in #{Dir.pwd}" 
       File.open("/tmp/mehhh", "w") {|f| f.puts "#{@lines.inspect} in #{Dir.pwd}" }
     end
 
@@ -50,7 +48,7 @@ class ::RuneBlog::Widget
       mainfile = "#{tag}-main"
       File.open("#{mainfile}.html", "w") do |f|
         _html_body(f, css) do
-f.puts "<!-- #{@lines.inspect} in #{Dir.pwd} -->"
+          f.puts "<!-- #{@lines.inspect} in #{Dir.pwd} -->"
           f.puts "<h1>#{card_title}</h1><br><hr>"
           @links.each do |title, file| 
             title = title.gsub(/\\/, "")  # kludge

data/lib/liveblog.rb

@@ -28,8 +28,6 @@ end
 # "dot" commands
 ##################
 
-
-
 def dropcap
   # Bad form: adds another HEAD
   text = _data
@@ -72,11 +70,8 @@ def faq
   ques = _data.chomp
   ans  = _body_text
   id = "faq#@faq_count"
-# _out %[&nbsp;<a class="btn btn-default btn-xs" data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample">+</a>]
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
-# _out "<font size=-2><br></font>" if @faq_count == 1
-# _out "<br>" unless @faq_count == 1
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
   _out "<br>" unless @faq_count == 1
   _optional_blank_line
@@ -93,11 +88,21 @@ def _read_navbar_data
 end
 
 def banner  # still experimental
-  _out "<table width=100% bgcolor=#101035>"
-  _out "  <tr>"
   enum = _args.each
   count = 0
   span = 1
+  first = enum.peek
+  if first.start_with?("bgcolor:")
+    enum.next
+    bg = enum.next
+  else
+    bg = nil # bg = white - do nothing
+  end
+  str =  "<table width=100%"
+  str << (bg ? " bgcolor=##{bg}>" : ">")
+  _out str
+  _out "  <tr>"
+
   loop do
     count += 1
     arg = enum.next
@@ -119,17 +124,14 @@ def banner  # still experimental
         _out "<td colspan=#{span}>" + File.read(file) + "</td>" + 
              " <!-- #{arg} -->"
       when "navbar"
-# STDERR.puts "-- navbar: pwd = #{Dir.pwd}:  #{`ls`}"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
-        hnavbar
-        # xlate cwd: dir, src: "navbar.lt3", dst: "navbar.html"   # , debug: true
+        _make_navbar  # horiz is default
         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
-        # xlate cwd: dir, src: "vnavbar.lt3", dst: "vnavbar.html"   # , debug: true
+        _make_navbar(:vert)
         file = "banner/vnavbar.html"
         _out "<td colspan=#{span}>" + File.read(file) + "</td>" +
              "<!-- #{arg} -->"
@@ -197,21 +199,6 @@ def list!
   _optional_blank_line
 end
 
-
-def make_main_links
-  log!(enter: __method__, level: 1)
-  # FIXME remember strings may not be safe
-  line = _data.chomp
-  tag, card_title = *line.split(" ", 2)
-  cardfile, mainfile = "#{tag}-card", "#{tag}-main"
-  input = "list.data"
-  log!(str: "Reading #{input}", pwd: true, level: 3)
-  pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
-  _write_main(mainfile, pairs, card_title, tag)
-  _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "...returning from method", pwd: true, level: 3)
-end
-
 ### inset
 
 def inset
@@ -232,7 +219,6 @@ def inset
     else  # Only into body
       output << line 
     end
-#   _passthru(line)
   end
   lr = _args.first
   wide = _args[1] || "25"
@@ -241,10 +227,6 @@ def inset
   _out "</p>"   #  kludge!! nopara
   0.upto(2) {|i| _passthru output[i] }
   _passthru stuff
-# _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px'>"   # ; font-family:verdana'>"
-# _passthru '<b><i>'
-# _passthru box
-# _passthru_noline '</i></b></div>'
   3.upto(output.length-1) {|i| _passthru output[i] }
   _out "<p>"  #  kludge!! para
   _optional_blank_line
@@ -256,7 +238,6 @@ def title
   @meta.title = title
   setvar :title, title
   # FIXME refactor -- just output variables for a template
-# _out %[<h1 class="post-title">#{title}</h1><br>]
   _optional_blank_line
 end
 
@@ -346,14 +327,8 @@ def teaser
 end
 
 def finalize
-  # FIXME simplify this!
-  unless @meta
-    puts @live.body
-    return
-  end
-  if @blog.nil?
-    return @meta
-  end
+  return unless @meta
+  return @meta if @blog.nil?
 
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
@@ -456,7 +431,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 +444,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 
@@ -478,7 +454,18 @@ def pinned_rebuild
         widget = code.new(@blog)
         widget.build
       end
-      _include_file wtag/"pinned-card.html"
+      # _include_file wtag/"pinned-card.html"
+    end
+  end
+end
+
+def _handle_standard_widget(tag)
+  wtag = :widgets/tag
+  code = _load_local(tag)
+  if code 
+    Dir.chdir(wtag) do 
+      widget = code.new(@blog)
+      widget.build
     end
   end
 end
@@ -492,7 +479,7 @@ def sidebar
 
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
 
-  standard = %w[pinned pages links]
+  standard = %w[pinned pages links news]
 
   _body do |token|
     tag = token.chomp.strip.downcase
@@ -500,27 +487,18 @@ def sidebar
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
 
-    code = _load_local(tag)
-    if code 
-      if ["news", "pages", "links", "pinned"].include? tag
-        Dir.chdir(wtag) do 
-          widget = code.new(@blog)
-          widget.build
+    case
+      when standard.include?(tag)
+        _handle_standard_widget(tag)
+      when tag == "ad"
+        num = rand(1..4)
+        img = "widgets/ad/ad#{num}.png"
+        src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
+        system!("cp #{src} #{dst}")   # , show: true)
+        File.open(wtag/"vars.lt3", "w") do |f| 
+          f.puts ".set ad.image = #{img}"
         end
-      end
-      _include_file wtag/tcard
-      next
-    end
-
-    if tag == "ad"
-      num = rand(1..4)
-      img = "widgets/ad/ad#{num}.png"
-      src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
-      system!("cp #{src} #{dst}")   # , show: true)
-      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
+        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
     end
 
     _include_file wtag/tcard
@@ -605,17 +583,6 @@ class Livetext::Functions
   def _var(name)
     ::Livetext::Vars[name] || "[:#{name} is undefined]"
   end
-
-#   def link(param = nil)
-# puts "--- WTF?? param = #{param.inspect}"; gets
-#     file, cdata = param.split("||", 2)
-#     %[<a href="assets/#{file}">#{cdata}</a>]
-#   end
-# 
-#   def link(param = nil)
-#     file, cdata = param.split("||", 2)
-#     %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
-#   end
 end
 
 ###
@@ -684,18 +651,14 @@ end
 
 def vnavbar
   str = _make_navbar(:vert)
-  _out str
 end
 
 def hnavbar
   str = _make_navbar  # horiz is default
-STDERR.puts "STR = #{str.inspect}"
-  _out str
 end
 
 def navbar
   str = _make_navbar  # horiz is default
-  _out str
 end
 
 def _make_navbar(orient = :horiz)
@@ -718,14 +681,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 +699,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
 
@@ -760,123 +719,6 @@ def _html_body(file, css = nil)
   file.puts "  </body>\n</html>"
 end
 
-def _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{cardfile}.html", pwd: true, level: 2)
-  url = mainfile
-  url = :widgets/tag/mainfile + ".html"
-  File.open("#{cardfile}.html", "w") do |f|
-    f.puts <<-EOS
-      <div class="card mb-3">
-        <div class="card-body">
-          <h5 class="card-title">
-            <button type="button" class="btn btn-primary" data-toggle="collapse" data-target="##{tag}">+</button>
-            <a href="javascript: void(0)" 
-               onclick="javascript:open_main('#{url}')" 
-               style="text-decoration: none; color: black"> #{card_title}</a>
-          </h5>
-          <div class="collapse" id="#{tag}">
-    EOS
-    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true, level: 2)
-    local = _local_tag?(tag)
-    pairs.each do |file, title| 
-      url = file
-      type, title = page_type(tag, title)
-      case type
-        when :local;   url_ref = _widget_card(file, tag)  # local always frameable
-        when :frame;   url_ref = _main(file)              # remote, frameable
-        when :noframe; url_ref = _blank(file)             # remote, not frameable
-      end
-      anchor = %[<a #{url_ref}>#{title}</a>]
-      wrapper = %[<li class="list-group-item">#{anchor}</li>]
-      f.puts wrapper
-    end
-     _include_file cardfile+".html"
-    f.puts <<-EOS
-          </div>
-        </div>
-      </div>
-    EOS
-  end
-end
-
-def _local_tag?(tag)
-  case tag.to_sym
-    when :pages
-      true
-    when :news, :links
-      false
-  else
-    true  # Hmmm...
-  end
-end
-
-def page_type(tag, title)
-  yesno = "yes"
-  yesno, title = title.split(/, */) if title =~ /^[yes|no]/
-  local = _local_tag?(tag)
-  frameable = (yesno == "yes")
-  if local
-    return [:local, title]
-  elsif frameable 
-    return [:frame, title]
-  else
-    return [:noframe, title]
-  end
-end
-
-def _write_main_pages(mainfile, pairs, card_title, tag)
-  local = _local_tag?(tag)
-  pieces = @blog.view.dir/"themes/standard/widgets"/tag/:pieces
-  main_head = xlate! cwd: pieces, src: "main-head.lt3"
-  main_tail = xlate! cwd: pieces, src: "main-tail.lt3"
-  # ^ make into methods in pages.rb or whatever?
-                    
-  File.open("#{mainfile}.html", "w") do |f|
-    f.puts main_head
-    pairs.each do |file, title| 
-      type, title = page_type(tag, title)
-      title = title.gsub(/\\/, "")  # kludge
-      case type
-        when :local;   url_ref = _widget_main(file, tag)  # local always frameable
-        when :frame;   url_ref = "href = '#{file}'"       # local always frameable
-        when :noframe; url_ref = _blank(file)             # local always frameable
-      end
-      css = "color: #8888FF; text-decoration: none; font-size: 21px"   # ; font-family: verdana"
-      f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
-    end
-    f.puts main_tail
-  end
-end
-
-def _write_main(mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{mainfile}.html", pwd: true, level: 2)
-
-  if tag == "pages"   # temporary experiment
-    _write_main_pages(mainfile, pairs, card_title, tag)
-    return
-  end
-
-  local = _local_tag?(tag)
-  setvar "card.title", card_title
-  css = "* { font-family: verdana }"
-  File.open("#{mainfile}.html", "w") do |f|
-    _html_body(f, css) do
-      f.puts "<h1>#{card_title}</h1><br><hr>"
-      pairs.each do |file, title| 
-        type, title = page_type(tag, title)
-        title = title.gsub(/\\/, "")  # kludge
-        case type
-          when :local;   url_ref = _widget_main(file, tag)  # local always frameable
-          when :frame;   url_ref = "href = '#{file}'"       # local always frameable
-          when :noframe; url_ref = _blank(file)             # local always frameable
-        end
-        css = "color: #8888FF; text-decoration: none; font-size: 21px"  # ; font-family: verdana"
-        f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
-      end
-    end
-  end
-end
-
 def _errout(*args)
   ::STDERR.puts *args
 end
@@ -951,12 +793,3 @@ def _blank(url)
   %[href='#{url}' target='blank']
 end
 
-def _widget_main(url, tag)
-  %[href="#{url}"]
-end
-
-def _widget_card(url, tag)
-  url2 = :widgets/tag/url
-  %[href="javascript: void(0)" onclick="javascript:open_main('#{url2}')"]
-end
-

data/lib/repl.rb

@@ -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,8 +156,11 @@ module RuneBlog::REPL
 
   def cmd_preview(arg, testing = false)
     reset_output
-    check_empty(arg)
     local = @blog.view.local_index
+    unless File.exist?(local)
+      puts "\n  No index. Rebuilding..."
+      cmd_rebuild(nil)
+    end
     result = system!("open #{local}")
     raise CantOpen(local) unless result
     @out
@@ -182,7 +177,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 +219,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 +278,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 +350,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 +363,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 +385,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 +405,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 +500,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

@@ -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,21 +364,30 @@ 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
+      entry = index_entry(postid)
+      entries << entry
+      text << entry
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
+    return posts.size
   rescue => err
     _tmp_error(err)
   end
@@ -427,7 +438,8 @@ class RuneBlog
     log!(enter: __method__, args: [view], pwd: true, dir: true)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
-    collect_recent_posts("recent.html")
+    num = collect_recent_posts("recent.html")
+    return num
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

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

data/runeblog.gemspec

@@ -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...

data/test/austin.rb

@@ -50,7 +50,8 @@ end
 
 t0 = Time.now
 
-puts bold("\nGenerating test blog...")
+puts
+debug bold("Generating test blog...")
 
 system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo(".blogs")
@@ -151,12 +152,10 @@ x.generate_index("around_austin")
 
 debug
 x.change_view("around_austin")
-debug
-
-puts bold("...finished.\n")
+debug bold("...finished.\n")
 
 t1 = Time.now
 
 elapsed = t1 - t0
-puts "\nElapsed: #{'%3.2f' % elapsed} secs\n "
+puts "Elapsed: #{'%3.2f' % elapsed} secs\n "
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.59
+  version: 0.2.64
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2019-11-18 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
@@ -69,6 +69,11 @@ files:
 - empty_view/remote/banner/top.html
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
+- empty_view/remote/widgets/ad/GIT_IS_DUMB
+- empty_view/remote/widgets/links/GIT_IS_DUMB
+- empty_view/remote/widgets/news/GIT_IS_DUMB
+- empty_view/remote/widgets/pages/GIT_IS_DUMB
+- empty_view/remote/widgets/pinned/GIT_IS_DUMB
 - empty_view/themes/standard/README
 - empty_view/themes/standard/banner/about.lt3
 - empty_view/themes/standard/banner/austin-pano.jpg
@@ -97,7 +102,6 @@ files:
 - empty_view/themes/standard/widgets/ad/ad3.png
 - empty_view/themes/standard/widgets/ad/ad4.png
 - empty_view/themes/standard/widgets/bydates/README
-- empty_view/themes/standard/widgets/bydates/bydates.lt3
 - empty_view/themes/standard/widgets/bydates/bydates.rb
 - empty_view/themes/standard/widgets/bydates/card.css
 - empty_view/themes/standard/widgets/bydates/custom.rb
@@ -110,7 +114,6 @@ files:
 - empty_view/themes/standard/widgets/links/README
 - empty_view/themes/standard/widgets/links/card.css
 - empty_view/themes/standard/widgets/links/custom.rb
-- empty_view/themes/standard/widgets/links/links.lt3
 - empty_view/themes/standard/widgets/links/links.rb
 - empty_view/themes/standard/widgets/links/list.data
 - empty_view/themes/standard/widgets/links/local-vars.lt3
@@ -125,7 +128,6 @@ files:
 - empty_view/themes/standard/widgets/news/list.data
 - empty_view/themes/standard/widgets/news/local-vars.lt3
 - empty_view/themes/standard/widgets/news/main.css
-- empty_view/themes/standard/widgets/news/news.lt3
 - empty_view/themes/standard/widgets/news/news.rb
 - empty_view/themes/standard/widgets/news/pieces/card-head.lt3
 - empty_view/themes/standard/widgets/news/pieces/card-tail.lt3
@@ -142,7 +144,6 @@ files:
 - empty_view/themes/standard/widgets/pages/local.rb
 - empty_view/themes/standard/widgets/pages/main.css
 - empty_view/themes/standard/widgets/pages/other-stuff.lt3
-- empty_view/themes/standard/widgets/pages/pages.lt3
 - empty_view/themes/standard/widgets/pages/pages.rb
 - empty_view/themes/standard/widgets/pages/pieces/card-head.lt3
 - empty_view/themes/standard/widgets/pages/pieces/card-tail.lt3
@@ -157,7 +158,6 @@ files:
 - empty_view/themes/standard/widgets/pinned/pieces/card-tail.lt3
 - empty_view/themes/standard/widgets/pinned/pieces/main-head.lt3
 - empty_view/themes/standard/widgets/pinned/pieces/main-tail.lt3
-- empty_view/themes/standard/widgets/pinned/pinned.lt3
 - empty_view/themes/standard/widgets/pinned/pinned.rb
 - empty_view/themes/standard/widgets/search/README
 - empty_view/themes/standard/widgets/search/card.css
@@ -168,7 +168,6 @@ files:
 - empty_view/themes/standard/widgets/search/pieces/card-tail.lt3
 - empty_view/themes/standard/widgets/search/pieces/main-head.lt3
 - empty_view/themes/standard/widgets/search/pieces/main-tail.lt3
-- empty_view/themes/standard/widgets/search/search.lt3
 - empty_view/themes/standard/widgets/search/search.rb
 - empty_view/themes/standard/widgets/sitemap/README
 - empty_view/themes/standard/widgets/sitemap/card.css
@@ -179,7 +178,6 @@ files:
 - empty_view/themes/standard/widgets/sitemap/pieces/card-tail.lt3
 - empty_view/themes/standard/widgets/sitemap/pieces/main-head.lt3
 - empty_view/themes/standard/widgets/sitemap/pieces/main-tail.lt3
-- empty_view/themes/standard/widgets/sitemap/sitemap.lt3
 - empty_view/themes/standard/widgets/sitemap/sitemap.rb
 - empty_view/themes/standard/widgets/tag-cloud/OLD-example.lt3
 - empty_view/themes/standard/widgets/tag-cloud/README

data/empty_view/themes/standard/widgets/bydates/bydates.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links bydates Posts by Date

data/empty_view/themes/standard/widgets/links/links.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links links External Links

data/empty_view/themes/standard/widgets/news/news.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links news Recent News

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

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links pages Pages

data/empty_view/themes/standard/widgets/pinned/pinned.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links pinned Pinned Posts

data/empty_view/themes/standard/widgets/search/search.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links search Search Posts

data/empty_view/themes/standard/widgets/sitemap/sitemap.lt3

@@ -1,2 +0,0 @@
-.mixin liveblog
-.make_main_links sitemap Site Map