runeblog 0.2.56 → 0.2.61

data/lib/post.rb

@@ -9,12 +9,12 @@ class RuneBlog::Post
 
   include RuneBlog::Helpers
 
-  def self.files(num, root)
-    log!(enter: __method__, args: [num, root], level: 3)
-    files = ::Find.find(root).to_a
-    result = files.grep(/#{prefix(num)}-/)
-    result
-  end
+# def self.files(num, root)
+#   log!(enter: __method__, args: [num, root], level: 3)
+#   files = ::Find.find(root).to_a
+#   result = files.grep(/#{prefix(num)}-/)
+#   result
+# end
   
   def self.load(post)
     log!(enter: __method__, args: [post], level: 3)

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,18 +364,31 @@ 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
+STDERR.puts "Posts = "
+posts.each {|x| STDERR.puts "  " + x }
     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.size} chars"
+      entries << entry
+      text << entry
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
@@ -432,18 +447,29 @@ 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
     @theme = @root/:views/view/:themes/:standard
     depend = [vdir/"remote/etc/blog.css", @theme/"global.lt3", 
-             @theme/"blog/head.lt3", @theme/"navbar/navbar.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,
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     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

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.56"
+  VERSION = "0.2.61"
 
   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

@@ -78,7 +78,7 @@ x.generate_view("around_austin")
 debug("-- change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
-make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY, [])
+make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY)
 Stubbs has been around for longer than civilization.
 EXCERPT
 That's a good thing. But their music isn't always the greatest.
@@ -87,6 +87,7 @@ BODY
 make_post(x, "The new amphitheatre is overrated", <<-EXCERPT, <<-BODY)
 It used to be that all major concerts played the Erwin Center.
 EXCERPT
+.pin around_austin
 Now, depending on what you consider "major," blah blah blah...
 BODY
 
@@ -137,7 +138,7 @@ EXCERPT
 This is about Sabine St, blah blah lorem ipsum dolor...
 BODY
 
-make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY, [])
+make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY)
 They date to the 90s or before. 
 EXCERPT
 But I first heard of them

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.56
+  version: 0.2.61
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-12 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
@@ -68,7 +68,6 @@ files:
 - empty_view/remote/banner/austin-pano.jpg
 - empty_view/remote/banner/top.html
 - empty_view/remote/etc/GIT_IS_DUMB
-- empty_view/remote/navbar/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/themes/standard/README
 - empty_view/themes/standard/banner/about.lt3
@@ -76,7 +75,7 @@ files:
 - empty_view/themes/standard/banner/blog-banner.jpg
 - empty_view/themes/standard/banner/contact.lt3
 - empty_view/themes/standard/banner/faq.lt3
-- empty_view/themes/standard/banner/navbar.lt3
+- empty_view/themes/standard/banner/list.data
 - empty_view/themes/standard/banner/top.html
 - empty_view/themes/standard/blog/generate.lt3
 - empty_view/themes/standard/blog/head.lt3
@@ -87,10 +86,6 @@ files:
 - empty_view/themes/standard/etc/favicon.ico
 - empty_view/themes/standard/etc/misc.js
 - empty_view/themes/standard/global.lt3
-- empty_view/themes/standard/navbar/about.lt3
-- empty_view/themes/standard/navbar/contact.lt3
-- empty_view/themes/standard/navbar/faq.lt3
-- empty_view/themes/standard/navbar/navbar.lt3
 - empty_view/themes/standard/post/generate.lt3
 - empty_view/themes/standard/post/head.lt3
 - empty_view/themes/standard/post/index.lt3

data/empty_view/remote/navbar/GIT_IS_DUMB

@@ -1 +0,0 @@
-meh

data/empty_view/themes/standard/banner/navbar.lt3

@@ -1,17 +0,0 @@
-. --------------------------------------------------
-. This defines the content of the navigation bar.   
-. The first one is a special case.
-. The others are understood to refer to .lt3 files  
-. such as navbar/about.lt3 (which is processed into 
-. HTML).
-. The title may be more than one word. Quotes are   
-. not needed.
-. --------------------------------------------------
-
-.navbar2
-  index   Home
-  about   About
-  contact Contact
-  faq     FAQ
-.end
-

data/empty_view/themes/standard/navbar/about.lt3

@@ -1,18 +0,0 @@
-. --------------------------------------------------
-. This is a sample file typical of page referenced  
-. directly from the navigation bar.
-. It is like a special case of a page in the "pages"
-. widget.
-. --------------------------------------------------
-
-.set this.title="About me"
-. make this better later
-<html><body>
-    <div class="content container-fluid mt-4">
-      <div class="row">
-        <h1>$this.title</h1>
-. content starts here...
-Blah blah blah...
-      </div>
-    </div>
-</body></html>

data/empty_view/themes/standard/navbar/contact.lt3

@@ -1,18 +0,0 @@
-. --------------------------------------------------
-. This is a sample file typical of page referenced  
-. directly from the navigation bar.
-. It is like a special case of a page in the "pages"
-. widget.
-. --------------------------------------------------
-
-.set this.title="Contact"
-. make this better later
-<html><body>
-    <div class="content container-fluid mt-4">
-      <div class="row">
-        <h1>$this.title</h1>
-. content starts here...
-How to contact me by email, smoke signals, ICBM, seance, ...
-      </div>
-    </div>
-</body></html>

data/empty_view/themes/standard/navbar/faq.lt3

@@ -1 +0,0 @@
-.include ../widgets/pages/faq.lt3

data/empty_view/themes/standard/navbar/navbar.lt3

@@ -1,16 +0,0 @@
-. --------------------------------------------------
-. This defines the content of the navigation bar.   
-. The first one is a special case.
-. The others are understood to refer to .lt3 files  
-. such as navbar/about.lt3 (which is processed into 
-. HTML).
-. The title may be more than one word. Quotes are   
-. not needed.
-. --------------------------------------------------
-
-.navbar
-  about   About
-  contact Contact
-  faq     FAQ
-.end
-