runeblog 0.2.54 → 0.2.59

data/lib/liveblog.rb

@@ -86,35 +86,66 @@ def backlink
   _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
 
+def _read_navbar_data
+  dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
+  datafile = dir/"list.data"
+  File.readlines(datafile)
+end
+
 def banner  # still experimental
-  _out "<table>"
-  _body do |line|
-    pieces = line.split
-    cols = pieces.size
-    span = cols == 2 ? 1 : 2   # whaaat?
-    _out "  <tr>"
-    pieces.each do |piece|
-      _out "    <td colspan=#{span}>"
-      case
-        when piece.start_with?("navbar")
-          file = "navbar/navbar.html"
-          _out File.read(file)
-        when piece.start_with?("text")
-          file = piece.split(":")[1]
-          file ||= "banner/text.html"
-          _out File.read(file)
-        when piece.start_with?("image")
-          image = piece.split(":")[1]
-          image ||= "banner/banner.jpg"
-          _out "      <img src=#{image} height=100></img>"
-      else
-        _out "        '#{piece}' isn't known"
-      end
-      _out "    </td>"
+  _out "<table width=100% bgcolor=#101035>"
+  _out "  <tr>"
+  enum = _args.each
+  count = 0
+  span = 1
+  loop do
+    count += 1
+    arg = enum.next
+    case arg
+      when "image"
+        image = "banner/banner.jpg"
+        _out "      <td colspan=#{span}><img src=#{image} height=150></img></td>" + 
+             " <!-- #{arg} -->"
+      when "image:"
+        image = "banner/#{enum.next}"
+        _out "      <td colspan=#{span}><img src=#{image} height=150></img></td>" + 
+             " <!-- #{arg} -->"
+      when "text"
+        file = "banner/top.html"
+        _out "<td colspan=#{span}>" + File.read(file) + "</td>" + 
+             " <!-- #{arg} -->"
+      when "text:"
+        file = "banner/#{enum.next}"
+        _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
+        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
+        file = "banner/vnavbar.html"
+        _out "<td colspan=#{span}>" + File.read(file) + "</td>" +
+             "<!-- #{arg} -->"
+      when "//"
+         span = count - 1
+         _out "  </tr>\n  <tr>" + "<!-- #{arg} -->"
+    else
+      _out "        '#{arg}' isn't known"
     end
-    _out "  </tr>"
   end
+  _out "  </tr>"
   _out "</table>"
+rescue => err
+  STDERR.puts "err = #{err}"
+  STDERR.puts err.backtrace.join("\n")
+  gets
 end
 
 def quote
@@ -278,16 +309,15 @@ def pin
     end
     pins << "#{@meta.num} #{@meta.title}\n"
     pins.uniq!
-    outfile = File.new(datafile, "w")
-    pins.each do |pin| 
-      outfile.puts pin 
+    File.open(datafile, "w") do |outfile|
+      pins.each {|pin| outfile.puts pin }
     end
-    outfile.close
   end
   _optional_blank_line
+  pinned_rebuild    # FIXME experimental
 rescue => err
-  puts "err = #{err}"
-  puts err.backtrace.join("\n")
+  STDERR.puts "err = #{err}"
+  STDERR.puts err.backtrace.join("\n")
   gets
 end
 
@@ -426,6 +456,7 @@ 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"))
@@ -438,6 +469,20 @@ rescue => err
   exit
 end
 
+def pinned_rebuild
+  Dir.chdir(@blog.root/:views/@blog.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 sidebar
   _debug "--- handling sidebar\r"
   if _args.include? "off"
@@ -457,7 +502,7 @@ def sidebar
 
     code = _load_local(tag)
     if code 
-      if ["pages", "links", "pinned"].include? tag
+      if ["news", "pages", "links", "pinned"].include? tag
         Dir.chdir(wtag) do 
           widget = code.new(@blog)
           widget.build
@@ -475,16 +520,16 @@ 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
     end
 
-    depend = %w[card.css main.css custom.rb local.rb] 
-    depend += ["#{wtag}.lt3", "#{wtag}.rb"]
-    depend += %w[pieces/card-head.lt3 pieces/card-tail.lt3]
-    depend += %w[pieces/main-head.lt3 pieces/main-tail.lt3]
-    depend.map! {|x| @blog.view.dir/"themes/standard/widgets"/wtag/x }
-_debug "--- call xlate #{tag} src = #{tag}  dst = #{tcard}\r"
-    xlate cwd: wtag, src: tag, dst: tcard, force: true, deps: depend # , debug: true
     _include_file wtag/tcard
+#   depend = %w[card.css main.css custom.rb local.rb] 
+#   depend += ["#{wtag}.lt3", "#{wtag}.rb"]
+#   depend += %w[pieces/card-head.lt3 pieces/card-tail.lt3]
+#   depend += %w[pieces/main-head.lt3 pieces/main-tail.lt3]
+#   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
@@ -638,96 +683,66 @@ def tag_cloud
 end
 
 def vnavbar
-  _custom_navbar(:vert)
+  str = _make_navbar(:vert)
+  _out str
 end
 
 def hnavbar
-  _custom_navbar  # horiz is default
+  str = _make_navbar  # horiz is default
+STDERR.puts "STR = #{str.inspect}"
+  _out str
 end
 
 def navbar
-  _custom_navbar  # horiz is default
+  str = _make_navbar  # horiz is default
+  _out str
 end
 
-def _custom_navbar(orient = :horiz)
+def _make_navbar(orient = :horiz)
   vdir = @blog.view.dir
   title = _var(:blog)
 
   extra = ""
   extra = "navbar-expand-lg" if orient == :horiz
 
-  open = <<-HTML
+  start = <<-HTML
+       <!-- FIXME weird bug here!!! -->
    <nav class="navbar #{extra} navbar-light bg-light">
       <ul class="navbar-nav mr-auto">
   HTML
-  close = <<-HTML
+  finish = <<-HTML
       </ul>
     </nav>
   HTML
 
-  html_file = @blog.root/:views/@blog.view/:themes/:standard/:navbar/"navbar.html"
-  output = File.new(@blog.root/:views/@blog.view/:themes/:standard/:navbar/"navbar.html", "w")
-  output.puts open
-  lines = _body
-  lines = ["  index  Home"] + lines  unless _args.include?("nohome")
+  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 = :navbar/basename+".html"
+    full = :banner/basename+".html"
     href_main = _main(full)
     if basename == "index"  # special case
       output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
-      xlate cwd: "navbar", src: basename, dst: vdir/"remote/navbar"/basename+".html" # , debug: true
+      dir = @blog.root/:views/@blog.view/"themes/standard/banner"
+      xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
       output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
     end
   end
-  output.puts close
+  output.puts finish
+  output.close
+STDERR.puts "-- html_file: #{`ls -l #{html_file}`}"
+  return File.read(html_file)
 end
 
-def _old_navbar
-  vdir = @blog.view.dir
-  title = _var(:blog)
-
-  open = <<-HTML
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-      <a class="navbar-brand" href="index.html">#{title}</a>
-      <button class="navbar-toggler" 
-              type="button" 
-              data-toggle="collapse" 
-              data-target="#navbarSupportedContent"
-              aria-controls="navbarSupportedContent" 
-              aria-expanded="false" 
-              aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse pull-right" 
-           id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
-  HTML
-  close = <<-HTML
-        </ul>
-      </div>
-    </nav>
-  HTML
-
-  first = true
-  _out open
-  lines = _body
-  lines.each do |line|
-    basename, cdata = line.chomp.strip.split(" ", 2)
-    full = :navbar/basename+".html"
-    href_main = _main(full)
-    if first
-      first = false # hardcode this part??
-      _out %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
-    else
-      depend = Find.find(@blog.root/:views/@blog.view.to_s/"themes/standard/navbar/").to_a
-      xlate cwd: "navbar", src: basename, dst: vdir/"remote/navbar"/basename+".html", deps: depend # , debug: true
-      _out %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
-    end
-  end
-  _out close
-end
 
 ##################
 # helper methods

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/runeblog.rb

@@ -437,7 +437,8 @@ class RuneBlog
     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

data/lib/runeblog_version.rb

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

data/runeblog.gemspec

@@ -34,6 +34,7 @@ spec = Gem::Specification.new do |s|
   s.files       =  main + misc + test + empty_view
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby"
+  s.post_install_message = "\n  Success! Run 'blog' command and type h for help.\n "
 end
 
 spec

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.54
+  version: 0.2.59
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -65,15 +65,18 @@ files:
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg
 - empty_view/remote/assets/GIT_IS_DUMB
+- 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
+- empty_view/themes/standard/banner/austin-pano.jpg
 - 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
 - empty_view/themes/standard/blog/index.lt3
@@ -83,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
@@ -218,7 +217,7 @@ homepage: https://github.com/Hal9000/runeblog
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message: "\n  Success! Run 'blog' command and type h for help.\n "
 rdoc_options: []
 require_paths:
 - lib

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
-