runeblog 0.1.96 → 0.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e0f35e5c032653d07acda3b5cfcaf0ff06cb8fe53d77f32969e37447200c41
-  data.tar.gz: dd558ffa5a91dd1ef68cd4935517844cdf3c9deba18ff349d92b2f36e1fd790a
+  metadata.gz: 5eca7ee5a581fc5af8c648cd0dce750f120753d30f550f49bdd5053196fd79ad
+  data.tar.gz: 84bcf2f35639ea08c61b9ed4171e97a7502ac71fd48fe2d1967efac0c7d62fa8
 SHA512:
-  metadata.gz: 19161f1b4000f4ede35cb7c8393c1f8fcee3d0f190a61abe231ef098adedcaf99fc15ce7ccd2a7f983db924b05f110e279cf8c79417b61ee40bbdf9201c297b0
-  data.tar.gz: d06e92c711e868357b8c67f8da49dcddd7d2d983bd457675ac7c61c070fb5e1cfae2244d592327af6c1660b9fcaff05993cc80c90343af6c5d4476f493b5b0f4
+  metadata.gz: 5a3810d114c88ef15c583a811c5dda94d4722b6b051f63a683dafae31c06e14be0fe8cb65bc939fee9545a53acd5977c39e68df694241a205918263f73f6bf56
+  data.tar.gz: 9aa1d0e162b1c7c1ecaec21530b17596b62aff75e69c0cf04ac7b341e5b0b2c5bf04ccb2c4bf609d42f42af4e24b8ce36c4448f823bf9439e7f3ec2b8a505f95

data/lib/helpers-blog.rb

@@ -18,9 +18,13 @@ module RuneBlog::Helpers
     return false
   end
 
-  def livetext(src, dst)
+  def livetext(src, dst=nil)
     src << ".lt3" unless src.end_with?(".lt3")
-    dst << ".html" unless dst.end_with?(".html")
+    if dst
+      dst << ".html" unless dst.end_with?(".html")
+    else
+      dst = src.sub(/.lt3$/, "")
+    end
     return unless stale?(src, dst)
     system("livetext #{src} >#{dst}")
   end

data/lib/liveblog.rb

@@ -368,8 +368,11 @@ def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _body do |line|
     tag = line.chomp.strip
-    self.data = "sidebar/#{tag.downcase}.lt3"
-    _include 
+    source = "sidebar/#{tag.downcase}.lt3"
+    unless File.exist?(source)
+      source = "widgets/#{tag.downcase}.lt3"
+    end
+    _include_file source
   end
   _out %[</div>]
 end
@@ -378,8 +381,11 @@ def sidebar!
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |line|
     tag = line.chomp.strip
-    self.data = "sidebar/#{tag.downcase}.lt3"
-    _include 
+    source = "sidebar/#{tag.downcase}.lt3"
+    unless File.exist?(source)
+      source = "widgets/#{tag.downcase}/main.lt3"
+    end
+    _include_file source
   end
   _out %[</div>]
 end
@@ -520,16 +526,21 @@ def card_iframe
   _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
 end
 
+def _main(url)
+  %[href="javascript: void(0)" onclick="javascript:open_main('#{url}')"]
+end
+
 def card1
   title, lines = _data, _body
   lines.map!(&:chomp)
 
   card_text = lines[0]
   url, target, classname, cdata = lines[1].split(",", 4)
+  main = _main(url)
 
   middle = <<-HTML
     <p class="card-text">#{card_text}</p>
-    <a href="#{url}" target="#{target}" class="#{classname}">#{cdata}</a>
+    <a #{main} class="#{classname}">#{cdata}</a>
   HTML
 
   _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
@@ -550,7 +561,8 @@ def card2
   _out open
   _body do |line|
     url, target, cdata = line.chomp.split(",", 3)
-    _out %[<li class="list-group-item"><a href="#{url}" target="#{target}">#{cdata}</a> </li>]
+    main = _main(url)
+    _out %[<li class="list-group-item"><a #{main}}">#{cdata}</a> </li>]
   end
   close = %[       </ul>\n    </div>]
   _out close
@@ -570,7 +582,8 @@ def tag_cloud
   _body do |line|
     line.chomp!
     url, target, classname, cdata = line.split(",", 4)
-    _out %[<a href="#{url}" target="#{target}" class="#{classname}">#{cdata}</a>]
+    main = _main(url)
+    _out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
 rescue
   puts @live.body
@@ -605,14 +618,13 @@ def navbar
   _out open
   _body do |line|
     href, cdata = line.chomp.strip.split(" ", 2)
-# <!-- href="javascript:void(0);" onClick="urlChange('www.mypdf.com/test.pdf')" -->
+    main = _main(href)
     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>]
     else
-      href = "navbar/#{href}"
-      href_click = %[href="javascript:void(0)" onclick="javascript:open_main('#{href}')"]
-      _out %[<li class="nav-item"> <a class="nav-link" #{href_click}>#{cdata}</a> </li>]
+      main = _main("navbar/#{href}")
+      _out %[<li class="nav-item"> <a class="nav-link" #{main}>#{cdata}</a> </li>]
     end
   end
   _out close

data/lib/runeblog.rb

@@ -178,7 +178,7 @@ class RuneBlog
       copy!("#{Themes}", "themes")
       create_dirs(:assets, :posts)
       create_dirs(:staging, "remote/permalink", "remote/navbar")
-      livetext "themes/standard/etc/blog.css.lt3", "themes/standard/etc/blog.css"   # simplify this
+      livetext "themes/standard/etc/blog.css.lt3" # strip ext
       copy!("themes/standard/*", "staging/")
       copy!("themes/standard/etc", "remote/")
       copy!("themes/standard/assets", "remote/")

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.1.96"
+  VERSION = "0.1.97"
 
   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.91'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.92'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
   # Files...

data/themes/standard/navbar/contact.html

@@ -0,0 +1,6 @@
+    <div class="content container-fluid mt-4">
+      <div class="row">
+  <h1>Contact</h1>
+  How to contact me by email, smoke signals, ICBM, seance, ...
+      </div>
+    </div>

data/themes/standard/widgets/README

@@ -0,0 +1,4 @@
+bydates   Browse blog entries for past dates
+links     List of links (typically offsite)
+pages     List of pages (my own local stuff)
+search    Search posts by tag, title, body, etc.

data/themes/standard/widgets/pages/README

@@ -0,0 +1,2 @@
+This is a work in progress...
+

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

@@ -0,0 +1,6 @@
+.page_title Disclaimer
+
+This is 
+just a 
+dummy file
+for now

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

@@ -0,0 +1,6 @@
+.page_title Freqently Asked Questions
+
+This is 
+just a 
+dummy file
+for now

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

@@ -0,0 +1,4 @@
+        <a href="faq.lt3">Frequently Asked Questions</a> <br>
+        <a href="like-dislike.lt3">Likes and Dislikes</a> <br>
+        <a href="disclaim.lt3">Disclaimer</a> <br>
+        <a href="lifestory.lt3">My Life Story</a> <br>

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

@@ -0,0 +1,6 @@
+.page_title My Life Story
+
+This is 
+just a 
+dummy file
+for now

data/themes/standard/widgets/pages/like-dislike.lt3

@@ -0,0 +1,6 @@
+.page_title Likes and Dislikes
+
+This is 
+just a 
+dummy file
+for now

data/themes/standard/widgets/pages/list.data

@@ -0,0 +1,4 @@
+faq.lt3           Frequently Asked Questions
+like-dislike.lt3  Likes and Dislikes
+disclaim.lt3      Disclaimer
+lifestory.lt3     My Life Story

data/themes/standard/widgets/pages/main.html

@@ -0,0 +1,9 @@
+<h1>Pages</h1>
+<p>
+
+<p>
+
+        <a href="faq.lt3">Frequently Asked Questions</a> <br>
+        <a href="like-dislike.lt3">Likes and Dislikes</a> <br>
+        <a href="disclaim.lt3">Disclaimer</a> <br>
+        <a href="lifestory.lt3">My Life Story</a> <br>

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

@@ -0,0 +1,18 @@
+.card_iframe
+<h1>Pages</h1>
+
+.def make_links
+  pairs = File.readlines("list.data").map {|line| line.chomp.split(" ", 2) }
+  File.open("generated.lt3", "w") do |f|
+    pairs.each do |file, title| 
+      f.puts <<-EOS
+        <a href="#{file}">#{title}</a> <br>
+      EOS
+    end
+  end
+.end
+
+.make_links
+
+.include generated.lt3
+.end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.96
+  version: 0.1.97
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-17 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.91
+        version: 0.8.92
   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.91
+        version: 0.8.92
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ files:
 - themes/standard/etc/misc.js
 - themes/standard/global.lt3
 - themes/standard/navbar/about.html
+- themes/standard/navbar/contact.html
 - themes/standard/navbar/navbar.lt3
 - themes/standard/post/generate.lt3
 - themes/standard/post/head.lt3
@@ -97,6 +98,16 @@ files:
 - themes/standard/sidebar/calendar.lt3
 - themes/standard/sidebar/news.lt3
 - themes/standard/sidebar/tag-cloud.lt3
+- themes/standard/widgets/README
+- themes/standard/widgets/pages/README
+- themes/standard/widgets/pages/disclaim.lt3
+- themes/standard/widgets/pages/faq.lt3
+- themes/standard/widgets/pages/generated.lt3
+- themes/standard/widgets/pages/lifestory.lt3
+- themes/standard/widgets/pages/like-dislike.lt3
+- themes/standard/widgets/pages/list.data
+- themes/standard/widgets/pages/main.html
+- themes/standard/widgets/pages/main.lt3
 homepage: https://github.com/Hal9000/runeblog
 licenses:
 - Ruby