runeblog 0.2.18 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f937d26af0033b5370fb7057e148cf2a0c9574f1fd2a3575f19ba11a9fb412f
-  data.tar.gz: 54ee56282b161b3b114d968f31d818f35eb9d9116bebda68f2de380d8aa5d290
+  metadata.gz: cd57361521e7c935c03e98dbdfdabea0d04a36ff4082c67017d2a5d90a889af8
+  data.tar.gz: 10aab8f0bf2dda01cbd2f65d16bb5808a865360527c878262df9cf02b1247394
 SHA512:
-  metadata.gz: b820edb205e03e5a4ba420daa50b8e163e2dc74fdc3dcebb96deecc963e0ef0e64d1a9c592bd0825e2589fca6998323990b6b76c1c015483038693bf7af500dc
-  data.tar.gz: 07e9915006923ba7de0e33963ce4ecf9a63d4fbe20368f8962f13d0ed131951905219ccaafdff636f6100bd230546877ab6122e4cc48151e06dcdbeb7469cdc6
+  metadata.gz: '007719e1eb7df131e68b470f53e292ea82742bcccb2226979af578258645b21fc6d9904a6ebce028621709858363f364baa3b0d72957901f7c1cdff28c377ab7'
+  data.tar.gz: 459286ef17981cfb9a322e2e8210a50e294eb282639993a352c1f611d83992b3986ce5009ace7762a26bff85fd0304b0d427a62424ffa656cd9306139c8be127

data/lib/liveblog.rb

@@ -103,16 +103,16 @@ def _html_body(file)
 end
 
 def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
-  # HTML for card
   log!(str: "Creating #{cardfile}.html", pwd: true)
-# TTY.puts "Creating #{cardfile}.html - pwd = #{Dir.pwd}"
+  url = mainfile
+  url = :widgets/tag/mainfile + ".html"  #  if tag == "pages"   # FIXME
   File.open("#{cardfile}.html", "w") do |f|
     f.puts <<-EOS
       <div class="card mb-3">
         <div class="card-body">
           <h5 class="card-title">
             <a href="javascript: void(0)" 
-               onclick="javascript:open_main('widgets/#{tag}/#{mainfile}.html')" 
+               onclick="javascript:open_main('#{url}')" 
                style="text-decoration: none; color: black">#{card_title}</a>
           </h5>
     EOS
@@ -131,9 +131,6 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
         url = :widgets/tag/file
         anchor = %[<a href="javascript: void(0)" onclick="javascript:open_main('#{url}')">#{title}</a>]
       end
-STDERR.puts [file, title].inspect
-STDERR.puts [tag, frameable, anchor].inspect
-STDERR.puts 
       wrapper = %[<li class="list-group-item">#{anchor}</li>]
       f.puts wrapper
     end
@@ -144,17 +141,23 @@ STDERR.puts
   end
 end
 
-def _write_main(mainfile, pairs, card_title)
+def _write_main(mainfile, pairs, card_title, tag)
   log!(str: "Creating #{mainfile}.html", pwd: true)
+STDERR.puts "---- tag = #{tag.inspect}"
   File.open("#{mainfile}.html", "w") do |f|
     _html_body(f) do
       f.puts "<h1>#{card_title}</h1>"
       pairs.each do |file, title| 
-        main = (file.start_with?("http") ? _main(file) : file)
-        f.puts %[<a style="text-decoration: none; font-size: 24px" #{main}>#{title}</a> <br>]
+        # FIXME please!
+STDERR.puts "----     title1 = #{title.inspect}"
+        yesno, title = title.split(/, */) if title =~ /^[yes|no]/
+STDERR.puts "----     title2 = #{title.inspect}"
+        url = (file.start_with?("http") ? _main(file) : :widgets/tag/file)
+        f.puts %[<a style="text-decoration: none; font-size: 24px" href='#{url}'>#{title}</a> <br>]
       end
     end
   end
+STDERR.puts 
 end
 
 def make_main_links
@@ -166,7 +169,7 @@ def make_main_links
   input = "list.data"
   log!(str: "Reading #{input}", pwd: true)
   pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
-  _write_main(mainfile, pairs, card_title)
+  _write_main(mainfile, pairs, card_title, tag)
   widget_relative = false  # (tag != "news")  # FIXME kludge!!!
   _write_card(cardfile, mainfile, pairs, card_title, tag, relative: widget_relative)
   log!(str: "...returning from method", pwd: true)
@@ -543,7 +546,7 @@ def card_iframe
 end
 
 def _main(url)
-  %[href="javascript: void(0)" onclick="javascript:open_main('#{url}')"]
+  %["javascript: void(0)" onclick="javascript:open_main('#{url}')"]
 end
 
 def card1
@@ -605,6 +608,7 @@ def tag_cloud
 end
 
 def navbar
+  vdir = @blog.view.dir
   title = _var(:blog)
 
   open = <<-HTML
@@ -631,15 +635,17 @@ def navbar
 
   first = true
   _out open
-  _body do |line|
-    href, cdata = line.chomp.strip.split(" ", 2)
-    main = _main(href)
+  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
-      _out %[<li class="nav-item active"> <a class="nav-link" href="#{href}">#{cdata}<span class="sr-only">(current)</span></a> </li>]
+      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
-      main = _main(:navbar/href)
-      _out %[<li class="nav-item"> <a class="nav-link" #{main}>#{cdata}</a> </li>]
+      xlate cwd: "navbar", src: basename, dst: vdir/"remote/navbar"/basename+".html" # , debug: true
+      _out %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
     end
   end
   _out close

data/lib/runeblog_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.22
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext