runeblog 0.1.99 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec5b477d7f2cb604623e089adbaae8bb87d5ddcb784ebc3d2935aa02892e9d1
-  data.tar.gz: f3a03f9555b4bc7a4d9e6149e0cd9606e1d1269ceb184cac04e8d579797647ff
+  metadata.gz: 7ecf2ea93c7b100f433d4cf9a822655ba6f4c95997e96b09dee870c8234a10e8
+  data.tar.gz: d1d6da2a7c78cb201b9fd6d3359347b6b6cf4534286f2c12c44ff72fcb545c85
 SHA512:
-  metadata.gz: 2956b5197b0d57215fdf7701eb3369755cdc04494b357b0dbfe538e8614c8f41f643f78cd26e67d6687a925a47b9486f6375af0d3a16810d2598625b7156ae0e
-  data.tar.gz: f788243f1c0c1802ecc99218de1d92f87d51a67093f8d31fbf330a8825b43e8c70f478c6b756c993a295f26c76dbe0dbcd5e7d3a9d4fa39e3b22bd365cc1c482
+  metadata.gz: b9af872813d5420811971839357debb0c6197302e832d15c5749164c8a87523def9370943fa0bd14b15a44ab3b8fbdf9eee97744df91d98920f23dcde8413e6d
+  data.tar.gz: e995fb01bdc9073957c2e762fdff55f4502a906cb0176df76af45d65ca2ea75b19934d74e6e0909c0c7f26ba370abaebad5d24bd3ae4e61007a171d2fa263114

data/lib/liveblog.rb

@@ -22,6 +22,25 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @theme = @vdir + "/themes/standard/"
 end
 
+# FIXME - stale? and livetext are duplicated from helpers-blog
+
+  def stale?(src, dst)
+    return true unless File.exist?(dst)
+    return true if File.mtime(src) > File.mtime(dst)
+    return false
+  end
+
+  def livetext(src, dst=nil)
+    src += ".lt3" unless src.end_with?(".lt3")
+    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
+
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
@@ -96,13 +115,14 @@ def make_magic_links
     end
   end
   # HTML for sidebar card
+STDERR.puts %[File is: '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">
             <a href="javascript: void(0)" 
-               onclick="javascript:open_main('#{mainfile}')" 
+               onclick="javascript:open_main('widgets/#{tag}/#{mainfile}.html')" 
                style="text-decoration: none; color: black">#{card_title}</a>
           </h5>
     EOS
@@ -396,30 +416,16 @@ end
 
 def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
-  _body do |line|
-    tag = line.chomp.strip.downcase
+  _args do |token|
+    tag = token.chomp.strip.downcase
     Dir.chdir("widgets/#{tag}") do
-      source = "#{tag}.lt3"
-      livetext source, "/dev/null"
-      _include_file "card-#{source}.html"
+      livetext tag, "card-#{tag}.html"
+      _include_file "card-#{tag}.html"
     end
   end
   _out %[</div>]
 end
 
-def sidebar!
-  _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
-  _args do |line|
-    tag = line.chomp.strip
-    source = "sidebar/#{tag.downcase}.lt3"
-    unless File.exist?(source)
-      source = "widgets/#{tag.downcase}/main.lt3"
-    end
-    _include_file source
-  end
-  _out %[</div>]
-end
-
 def stylesheet
   lines = _body
   url = lines[0]
@@ -614,6 +620,8 @@ def tag_cloud
     main = _main(url)
     _out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
+  close = %[       </div>\n  </div>]
+  _out close
 end
 
 def navbar

data/lib/runeblog.rb

@@ -180,8 +180,10 @@ class RuneBlog
       create_dirs(:staging, "remote/permalink", "remote/navbar")
       livetext "themes/standard/etc/blog.css.lt3" # strip ext
       copy!("themes/standard/*", "staging/")
+
       copy!("themes/standard/etc", "remote/")
       copy!("themes/standard/assets", "remote/")
+      copy!("themes/standard/widgets", "remote/")
 
       pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
       dump(pub, "publish")

data/lib/runeblog_version.rb

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

data/themes/standard/blog/index.lt3

@@ -1,6 +1,6 @@
 .recent_posts
 
-.sidebar! news ad tag-cloud
+.sidebar news tag-cloud
 
 . for now, skip: ad calendar tag-cloud
 

data/themes/standard/widgets/ad/ad.lt3

@@ -1,11 +1,12 @@
-. This is the "card" (sidebar) version.
-
-. In real life, there may be complex code here
-. referencing some advertiser or ad network 
-. which will bring up a random ad.
-
-.card1 Advertisement
-Build your amazing website with blabla.com.
-https://google.com/,btn btn-light float-right,Visit Page
-.end
+.set classname="btn btn-light float-right"
+.set card.title="Advertisement"
+.set card.text="Build your amazing website with blabla.com."
+.set extra="bg-dark text-white"
 
+<div class="card #{_var[:extra]} mb-3">
+  <div class="card-body">
+    <h5 class="card-title">#{_var["card.title"]}</h5>
+    <p class="card-text">#{_var["card.text"]}</p>
+    <a #{main} class="#{classname}">#{_var["card.text"]}</a>
+  </div>
+</div>

data/themes/standard/widgets/tag-cloud/tag-cloud.lt3

@@ -1,3 +1,5 @@
+.mixin liveblog
+
 .tag_cloud
 https://google.com/,btn btn-dark m-1,Programming
 https://google.com/,btn btn-danger m-1,Science Fiction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.99
+  version: 0.2.1
 platform: ruby
 authors:
 - Hal Fulton
@@ -97,7 +97,6 @@ files:
 - themes/standard/sidebar/README
 - themes/standard/widgets/README
 - themes/standard/widgets/ad/ad.lt3
-- themes/standard/widgets/ad/ad2.lt3
 - themes/standard/widgets/calendar/calendar.lt3
 - themes/standard/widgets/news/card-news.html
 - themes/standard/widgets/news/list.data

data/themes/standard/widgets/ad/ad2.lt3

@@ -1,12 +0,0 @@
-.set classname="btn btn-light float-right"
-.set card.title="Advertisement"
-.set card.text="Build your amazing website with blabla.com."
-.set extra="bg-dark text-white"
-
-<div class="card #{_var[:extra]} mb-3">
-  <div class="card-body">
-    <h5 class="card-title">#{_var["card.title"]}</h5>
-    <p class="card-text">#{_var["card.text"]}</p>
-    <a #{main} class="#{classname}">#{_var["card.text"]}</a>
-  </div>
-</div>