runeblog 0.2.50 → 0.2.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420d1360e5f860c1396eb2ba36a804c999b18d25da0b7157d577280d0cb2d42b
-  data.tar.gz: 65c66113d384de0e752b1abc5a2c9b68074319958f4a7762b8e00781b8a46c91
+  metadata.gz: 600dac0389d976fd41b8c3a5f4f63e4896a1b3f330525faa6b703dfb38e0b825
+  data.tar.gz: 52472d46f783f209ad13e95f8e230c89173780a98867389a075833fb3cb1edd9
 SHA512:
-  metadata.gz: d4a17c66ba757ea6b350d13a9a777e637157065392bfb7096e7c3de302b36c24e7d875ea8ad7cc8143fc384025dc590d5c8e03047b8b6c6477d4a2a967881c43
-  data.tar.gz: ce5188e490205aca014c158fe5f5202664c7d6ac9821c1408c761e2a3185d2c74eec38e9c2c0c98407f7f8e02591d2b1290a07bcc8909aa2dab22d2b65ff5f8a
+  metadata.gz: 9a650511f857069328ec4295e4ab1c70add5730118b68c16d45113844215f8db540bad78580225228b24ae4b26022abda6ab1e5af487edc231360d1a1c50fbda
+  data.tar.gz: 641d6ae9269a77d36929f36810ff779736cee66e81e0bb27660f8e7832f2f6ecce57977362a2128585789365d503a4f79b03580674293bf7a8575facadc296ac

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

@@ -8,7 +8,7 @@
 . not needed.
 . --------------------------------------------------
 
-.navbar
+.navbar2
   index   Home
   about   About
   contact Contact

data/lib/liveblog.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'pp'
 require 'date'
+require 'find'
 
 require 'runeblog'
 require 'pathmagic'
@@ -96,15 +97,19 @@ def banner  # still experimental
       _out "    <td colspan=#{span}>"
       case
         when piece.start_with?("hnav")
-          _out "<center>hnav1 hnav2 hnav3 hnav4</center>"
+          # horizontal navbar
+          # _out "<center>hnav1 hnav2 hnav3 hnav4</center>"
         when piece.start_with?("vnav")
-          _out "vnav1<br>vnav2<br>vnav3<br>vnav4<br>"
+          # vertical navbar
+          # _out "vnav1<br>vnav2<br>vnav3<br>vnav4<br>"
         when piece.start_with?("text")
           file = piece.split(":")[1]
+          file ||= "banner/text.html"
           _out File.read(file)
         when piece.start_with?("image")
-          file = piece.split(":")[1]
-          _out "      <img src=#{file} height=100></img>"
+          image = piece.split(":")[1]
+          image ||= "banner/banner.jpg"
+          _out "      <img src=#{image} height=100></img>"
       else
         _out "        '#{piece}' isn't known"
       end
@@ -461,7 +466,12 @@ def sidebar
       end
     end
 
-    xlate cwd: wtag, src: tag, dst: tcard, force: true  # , debug: (tag == "ad")
+    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 }
+    xlate cwd: wtag, src: tag, dst: tcard, force: true, deps: depend  , debug: (tag == "ad")
     _include_file wtag/tcard
   end
   _out %[</div>]
@@ -471,6 +481,26 @@ rescue => err
   exit
 end
 
+=begin
+ets/widgets/pages//card.css
+ets/widgets/pages//custom.rb
+ets/widgets/pages//disclaim.lt3
+ets/widgets/pages//faq.lt3
+ets/widgets/pages//like-dislike.lt3
+ets/widgets/pages//list.data
+ets/widgets/pages//local-vars.lt3
+ets/widgets/pages//local.rb
+ets/widgets/pages//main.css
+ets/widgets/pages//other-stuff.lt3
+ets/widgets/pages//pages.lt3
+ets/widgets/pages//pages.rb
+ets/widgets/pages//pieces
+ets/widgets/pages//pieces/card-head.lt3
+ets/widgets/pages//pieces/card-tail.lt3
+ets/widgets/pages//pieces/main-head.lt3
+ets/widgets/pages//pieces/main-tail.lt3
+=end
+
 def stylesheet
   lines = _body
   url = lines[0]
@@ -688,7 +718,8 @@ def navbar
       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
-      xlate cwd: "navbar", src: basename, dst: vdir/"remote/navbar"/basename+".html" # , debug: true
+      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

data/lib/repl.rb

@@ -265,6 +265,10 @@ puts "Got to #{__method__}"
 
   def cmd_new_view(arg, testing = false)
     reset_output
+    if arg.nil?
+      arg = ask("\nFilename: ")
+      puts
+    end
     @blog.create_view(arg)
     edit_file(@blog.view.dir/"themes/standard/global.lt3")
     @blog.change_view(arg)

data/lib/runeblog.rb

@@ -116,7 +116,13 @@ class RuneBlog
     log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
-      views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
+      views.each do |v| 
+        unless @blog.view?(v)
+          puts "Warning: '#{v}' is not a view"
+          next
+        end
+        system!("cp *html #@root/views/#{v}/remote")
+      end
     end
   rescue => err
     _tmp_error(err)
@@ -152,6 +158,7 @@ class RuneBlog
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
     create_dir(dir)
+    # FIXME dependencies?
     xlate cwd: dir, src: sourcefile  # , debug: true
     _deploy_local(dir)
   rescue => err
@@ -323,7 +330,8 @@ class RuneBlog
     text = nil
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , debug: true
+    depend = [post_entry_name]
+    xlate src: post_entry_name, dst: "/tmp/post_entry.html", deps: depend  # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -436,9 +444,12 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
-    xlate cwd: vdir/"themes/standard/etc",
+    depend = [vdir/"remote/etc/blog.css", @theme/"global.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", force: true,
+    xlate cwd: vdir/"themes/standard", deps: depend, 
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
@@ -543,6 +554,7 @@ class RuneBlog
     @theme = @root/:views/view_name/:themes/:standard
     # Step 1...
     create_dirs(pdraft)
+    # FIXME dependencies?
     xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
@@ -552,8 +564,10 @@ class RuneBlog
     copy(pdraft/"guts.html", @theme/:post) 
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
+    # FIXME dependencies?
     xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
           dst: remote/ahtml, copy: @theme/:post    # , debug: true
+    # FIXME dependencies?
     xlate cwd: @theme/:post, src: "permalink.lt3", 
           dst: remote/:permalink/ahtml  # , debug: true
     copy_widget_html(view_name)
@@ -564,7 +578,13 @@ class RuneBlog
   def generate_post(draft)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
-    views.each {|view| _handle_post(draft, view) }
+    views.each do |view| 
+      unless self.view?(view)
+        puts "Warning: '#{view}' is not a view"
+        next
+      end
+      _handle_post(draft, view)
+    end
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

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

data/lib/xlate.rb

@@ -1,19 +1,24 @@
 
 LEXT = ".lt3"
 
-def stale?(src, dst, force = false)
+def newer?(f1, f2)
+  File.mtime(f1) > File.mtime(f2)
+end
+
+def stale?(src, dst, deps, force = false)
   meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
   log!(enter: __method__, args: [src, dst], level: 3)
   raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
   return true if force
   return true unless File.exist?(dst)
-  return true if File.mtime(src) > File.mtime(dst)
+  return true if newer?(src, dst)
+  deps.each {|dep| return true if newer?(dep, dst) }
   return false
 end
 
 def xlate(cwd: Dir.pwd, src:, 
           dst: (strip = true; src.sub(/.lt3$/,"")), 
-          copy: nil, debug: false, force: false)
+          deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
   dst += ".html" unless dst.end_with?(".html") || strip
   indent = " "*12
@@ -24,7 +29,7 @@ def xlate(cwd: Dir.pwd, src:,
       STDERR.puts "#{indent}      from: #{caller[0]}"
       STDERR.puts "#{indent}      copy: #{copy}" if copy
     end
-    stale = stale?(src, dst, force)
+    stale = stale?(src, dst, deps, force)
     if stale
       rc = system("livetext #{src} >#{dst}")
       STDERR.puts "...completed (shell returned #{rc})" if debug

metadata

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