runeblog 0.2.11 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd97f1cfd9631550e0ef799e14f8c5dfd621d29c4231dfb9f5bbc0f065b436e
-  data.tar.gz: 449f13d68fc2a247e9e307083c7b0f4c9034bc4e85d307d7775d8a7a881284a7
+  metadata.gz: bf71088966e7393574d792a3508bb35f8a581e774a250dbe88b61fee08cd7588
+  data.tar.gz: 991d387f3649a4defbdee3500d2a275ab2b5b6b2956ad46188c50a8c3c393513
 SHA512:
-  metadata.gz: 476e0804dd0085123c19019548bd7803ccfeff526d27e70b5bab1dcf3904fe8ec414b69a9562b34a9fd2e0574843cdbe66cdf9ed226b94d0d2aca92aebb1a7b5
-  data.tar.gz: 598f65529e5a1d52558142a3ad5230fa53bab77f12325efedc9a6c9f688a737633b4937088bf234e5e5b2fbee8bb17fc0778968e7547797ded0d116dbe024abc
+  metadata.gz: 57eaf8b41cb76dd92e2a4f5ba45c3461248761e433e2f1fefc4ab6373ac414fcfbe2c4c04016465438b7a68b3ef7d666ad848634afa37f1cbac36c01e7be5385
+  data.tar.gz: 3bd8ed4c9776f71b2787cdb484c981b314b53993b3d31bb125176e576d91f752830813eba24f1cacf84b1cf455a7f4743fc0bc866009217c3afe09a44b67d8c2

data/lib/default.rb

@@ -2,7 +2,6 @@ class RuneBlog::Default
 
 # This will all become much more generic later.
 
-
 def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
                        teaser: "No teaser", body: "No body", tags: ["untagged"], 
                        views: [], back: "javascript:history.go(-1)", home: "no url")

data/lib/helpers-blog.rb

@@ -1,89 +1,22 @@
 require 'runeblog_version'
 require 'fileutils'
 
-# Home = Dir.pwd # unless Home
-
-LEXT = ".lt3"
+require 'xlate'
 
 module RuneBlog::Helpers
 
   def copy(src, dst)
     log!(enter: __method__, args: [src, dst])
-    cmd = "cp #{src}  #{dst} 2>/dev/null"
-#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
-#   if src =~ /\*/
-      rc = system(cmd)
-      puts "    FROM #{caller[0]}" unless rc
-exit unless rc
-#   else
-#     FileUtils.cp(src, dst)
-#   end
+    cmd = "cp #{src} #{dst} 2>/dev/null"
+    rc = system(cmd)
+    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
   def copy!(src, dst)
     log!(enter: __method__, args: [src, dst])
-    cmd = "cp -r #{src}  #{dst} 2>/dev/null"
-#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
-#   if src =~ /\*/
-      rc = system(cmd)
-      puts "    FROM #{caller[0]}" unless rc
-exit unless rc
-#   else
-#     FileUtils.cp_r(src, dst)
-#   end
-  end
-
-  def stale?(src, dst, force = false)
-    log!(enter: __method__, args: [src, dst])
-    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 false
-  end
-
-#  def livetext(src, dst=nil, dir=".")
-#    log!(enter: __method__, args: [src, dst])
-#    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)
-#    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
-#  end
-#
-#  def livetext!(src, dst=nil, dir=".")
-#    log!(enter: __method__, args: [src, dst])
-#    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)
-#STDERR.puts "-- livetext #{src} >#{dst} \n       in: #{Dir.pwd}\n      from: #{caller[0]}"
-#    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
-#STDERR.puts "... completed"
-#  end
-
-  def xlate(cwd: Dir.pwd, src:, 
-            dst: (strip = true; src.sub(/.lt3$/,"")), 
-            copy: nil, debug: false, force: false)
-    src += LEXT unless src.end_with?(LEXT)
-    dst += ".html" unless dst.end_with?(".html") || strip
-    Dir.chdir(cwd) do
-      return unless stale?(src, dst, force)
-      if debug
-        STDERR.puts "-- xlate #{src} >#{dst}"
-        STDERR.puts "     in:   #{Dir.pwd}"
-        STDERR.puts "     from: #{caller[0]}"
-        STDERR.puts "     copy: #{copy}" if copy
-      end
-      rc = system("livetext #{src} >#{dst}")
-    end
-    STDERR.puts "...completed (shell returned #{rc})" if debug
+    cmd = "cp -r #{src} #{dst} 2>/dev/null"
+    rc = system(cmd)
+    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
   def get_root
@@ -131,7 +64,6 @@ exit unless rc
     log!(enter: __method__, args: [file, hash])
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
-# STDERR.puts vals.inspect
     vals
   end
 
@@ -150,30 +82,19 @@ end
   def write_config(obj, file)
     log!(enter: __method__, args: [obj, file])
     hash = obj.to_h
-# Dir.chdir(::Home)
-# puts "--- wc: pwd = #{Dir.pwd}"
-    File.open(file, "w") do |f| 
-      hash.each_pair do |key, val|
-        f.puts "#{key}: #{val}"
-      end
+    File.open(file, "w") do |out|
+      hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
     end
   end
 
   def get_views   # read from filesystem
     log!(enter: __method__)
-#   Dir.chdir(::Home) do
-      verify(@root => "#@root is nil",
-             Dir.exist?(@root) => "#@root doesn't exist",
-             Dir.exist?("#@root/views") => "#@root/views doesn't exist")
-      dirs = subdirs("#@root/views/").sort
-      dirs.map {|name| RuneBlog::View.new(name) }
-#   end
+    dirs = subdirs("#@root/views/").sort
+    dirs.map {|name| RuneBlog::View.new(name) }
   end
 
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
     log!(enter: __method__, args: [root, current_view, editor])
-#   raise BlogAlreadyExists if Dir.exist?(".blogs")
-#   Dir.mkdir(".blogs")
     root = Dir.pwd + "/" + root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
@@ -189,7 +110,6 @@ end
 
   def subdirs(dir)
     log!(enter: __method__, args: [dir])
-    verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
@@ -197,9 +117,6 @@ end
 
   def find_draft_slugs
     log!(enter: __method__)
-    verify(@root => "#@root is nil",
-           Dir.exist?(@root) => "#@root doesn't exist",
-           Dir.exist?("#@root/drafts") => "#@root/drafts doesn't exist")
     files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
     flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)

data/lib/helpers-repl.rb

@@ -161,7 +161,6 @@ module RuneBlog::REPL
     n.times { @out << "\n" }
   end
 
-
   def check_empty(arg)
     raise InternalError(caller[0], arg.inspect)  unless arg.nil?
   end
@@ -209,8 +208,6 @@ module RuneBlog::REPL
   end
 
   def ask_publishing_info   # returns Publishing object
-    verify(@blog => "@blog is nil", 
-           @blog.view => "@blog.view is nil")
     # user, server, root, path, protocol = "http"
     puts "Please enter publishing data for view #{@blog.view}..."
     user = ask("User: ")
@@ -241,28 +238,4 @@ module RuneBlog::REPL
     all.sort + ["NEW TAG"]
   end
 
-  ### find_asset
-
-  # FIXME is this per-post?
-
-  def find_asset(asset_name)    # , views)
-    search_path = proc do |path| 
-      full_path = path + asset_name
-      return full_path if File.exist?(full_path)
-    end 
-    check_meta(@meta, "find_asset")
-    views = @meta.views
-    views.each do |view| search_path.call("#{view.dir}/#{@meta.slug}/assets/") end
-    views.each do |view| search_path.call(view.dir + "/assets/") end
-    search_path.call(@root + "/assets/", asset_name)
-    # If all fail... return nil
-    return nil
-  end
-
-  ### find_all_assets
-
-  def find_all_assets(list, views)
-    list ||= []
-    list.each {|asset| puts "#{asset} => #{find_asset(asset, views)}" }
-  end
 end

data/lib/liveblog.rb

@@ -2,11 +2,15 @@ require 'ostruct'
 require 'pp'
 require 'date'
 
-require 'livetext'
+# require 'livetext'
 require 'runeblog'
 
-errfile = File.new("/tmp/liveblog.out", "w")
-STDERR.reopen(errfile)
+require 'pathmagic'
+
+require 'xlate'
+
+# errfile = File.new("/tmp/liveblog.out", "w")
+# STDERR.reopen(errfile)
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
@@ -19,26 +23,22 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @view_name = @blog.view.name
   @vdir = @blog.view.dir
   @version = RuneBlog::VERSION
-  @theme = @vdir + "/themes/standard/"
+  @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$/, "")
+  def livetext(src, dst=nil, cwd=Dir.pwd)
+    Dir.chdir(cwd) do 
+      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
-    return unless stale?(src, dst)
-    system("livetext #{src} >#{dst}")
   end
 
 def post
@@ -96,41 +96,33 @@ def list!
   _optional_blank_line
 end
 
-def html_body(file)
+def _html_body(file)
   file.puts "<html>\n  <body>"
   yield
   file.puts "  </body>\n</html>"
 end
 
-def make_news_links
-  # FIXME remember strings may not be safe
-  line = _data.chomp
-  input, cardfile, mainfile, card_title = *line.split(" ", 4)
-  pairs = File.readlines(input).map {|line| line.chomp.split(",", 2) }
-  # HTML for main area (iframe)
-  File.open("#{mainfile}.html", "w") do |f|
-    html_body(f) do
-      f.puts "<h1>#{card_title}</h1>"
-      pairs.each do |file, title| 
-        f.puts %[<a style="text-decoration: none; font-size: 24px" href="#{file}">#{title}</a> <br>]
-      end
-    end
-  end
-  # HTML for sidebar card
+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}"
   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/news/#{mainfile}.html')" 
+               onclick="javascript:open_main('widgets/#{tag}/#{mainfile}.html')" 
                style="text-decoration: none; color: black">#{card_title}</a>
           </h5>
     EOS
+    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true)
+    top = ""
+    top = :widgets/tag + "/" unless tag == "news"   # FIXME !!
     pairs.each do |file, title| 
       f.puts <<-EOS
         <li class="list-group-item"> <a href="javascript: void(0)" 
-        onclick="javascript:open_main('#{file}')">#{title}</a> </li>
+        onclick="javascript:open_main('#{top}#{file}')">#{title}</a> </li>
       EOS
     end
     f.puts <<-EOS
@@ -140,6 +132,34 @@ def make_news_links
   end
 end
 
+def _write_main(mainfile, pairs, card_title)
+  log!(str: "Creating #{mainfile}.html", pwd: true)
+  File.open("#{mainfile}.html", "w") do |f|
+    _html_body(f) do
+      f.puts "<h1>#{card_title}</h1>"
+      pairs.each do |file, title| 
+        main = _main(file)
+        f.puts %[<a style="text-decoration: none; font-size: 24px" #{main}>#{title}</a> <br>]
+      end
+    end
+  end
+end
+
+def make_main_links
+  log!(enter: __method__)
+  # FIXME remember strings may not be safe
+  line = _data.chomp
+  tag, card_title = *line.split(" ", 2)
+  cardfile, mainfile = "#{tag}-card", "#{tag}-main"
+  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)
+  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)
+end
+
 ### inset
 
 def inset
@@ -209,7 +229,7 @@ end
 def image   # primitive so far
   _debug "img: huh? <img src=#{_args.first}></img>"
   fname = _args.first
-  path = "assets/#{fname}"
+  path = :assets/fname
   _out "<img src=#{path}></img>"
   _optional_blank_line
 end
@@ -264,25 +284,18 @@ def teaser
 end
 
 def finalize
-STDERR.puts :cp1
   unless @meta
     puts @live.body
     return
   end
-STDERR.puts :cp4
   if @blog.nil?
     return @meta
   end
 
-STDERR.puts :cp6
   @slug = @blog.make_slug(@meta)
-STDERR.puts :cp7
   slug_dir = @slug
-  @postdir = @blog.view.dir + "/posts/#{slug_dir}"
-  STDERR.puts "--- finalize: pwd = #{Dir.pwd} postdir = #@postdir"
-STDERR.puts :cp8
+  @postdir = @blog.view.dir/:posts/slug_dir
   write_post
-STDERR.puts :cp9
   @meta
 end
  
@@ -375,10 +388,8 @@ def head  # Does NOT output  tags
       # Later: allow other overrides
       when ""; break
     else
-STDERR.puts "-- got '#{word}'; old value = #{result[word].inspect}"
       if defaults[word]
         result[word] = %[<meta property="#{word}" content="#{remain}">]
-STDERR.puts "-- new value = #{result[word].inspect}"
       else
         puts "Unknown tag '#{word}'"
       end
@@ -386,7 +397,6 @@ STDERR.puts "-- new value = #{result[word].inspect}"
   end
   hash = defaults.dup.update(result)  # FIXME collisions?
 
-# _out "<!-- "; _out hash.inspect; _out "--> "
   hash.each_value {|x| _out "  " + x }
   _out "<body>"
 end
@@ -423,14 +433,34 @@ def recent_posts    # side-effect
 end
 
 def sidebar
+STDERR.puts "---- SIDEBAR pwd = #{Dir.pwd}"
+  _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
+  _body do |token|
+    tag = token.chomp.strip.downcase
+    wtag = :widgets/tag
+    raise "Can't find #{wtag}" unless Dir.exist?(wtag)
+    tcard = "#{tag}-card.html"
+#   livetext tag, tcard, wtag
+    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    _include_file wtag/tcard
+  end
+  _out %[</div>]
+end
+
+def sidebar!
+# if _args.include? "off"
+#   _body { }  # iterate, do nothing
+#   return 
+# end
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |token|
     tag = token.chomp.strip.downcase
-# Doesn't handle "split personality" widgets yet
-    Dir.chdir("widgets/#{tag}") do
-      livetext tag, "card-#{tag}.html"
-      _include_file "card-#{tag}.html"
-    end
+    wtag = :widgets/tag
+    raise "Can't find #{wtag}" unless Dir.exist?(wtag)
+    tcard = "#{tag}-card.html"
+#   livetext tag, tcard, wtag
+    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    _include_file wtag/tcard
   end
   _out %[</div>]
 end
@@ -451,50 +481,12 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 
-# def _find_recent_posts
-#   @vdir = _var(:FileDir).match(%r[(^.*/views/.*?)/])[1]
-#   posts = nil
-#   dir_posts = @vdir + "/posts"
-#   entries = Dir.entries(dir_posts)
-#   posts = entries.grep(/^\d\d\d\d/).map {|x| dir_posts + "/" + x }
-#   posts.select! {|x| File.directory?(x) }
-#   # directories that start with four digits
-#   posts = posts.sort {|a, b| b.to_i <=> a.to_i }  # sort descending
-#   posts[0..19]  # return 20 at most
-# end
-# 
-# def all_teasers
-#   open = <<-HTML
-#       <section class="posts">
-#   HTML
-#   close = <<-HTML
-#       </section>
-#   HTML
-# 
-#   text = <<-HTML
-#     <html>
-#     <head><link rel="stylesheet" href="etc/blog.css"></head>
-#     <body>
-#   HTML
-#   posts = _find_recent_posts
-#   wanted = [5, posts.size].min  # estimate how many we want?
-#   enum = posts.each
-#   wanted.times do
-#     postid = File.basename(enum.next)
-#     postid = postid.to_i
-#     text << _teaser(postid)    # side effect! calls _out
-#   end
-#   text << "</body></html>"
-#   File.write("recent.html", text)
-#   _out %[<iframe id="main" style="width: 100vw; height: 100vh; position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
-# end
-
 def _post_lookup(postid)    # side-effect
   # .. = templates, ../.. = views/thisview
   slug = title = date = teaser_text = nil
 
-  dir_posts = @vdir + "/posts"
-  posts = Dir.entries(dir_posts).grep(/^\d\d\d\d/).map {|x| dir_posts + "/" + x }
+  dir_posts = @vdir/:posts
+  posts = Dir.entries(dir_posts).grep(/^\d\d\d\d/).map {|x| dir_posts/x }
   posts.select! {|x| File.directory?(x) }
 
   post = posts.select {|x| File.basename(x).to_i == postid }
@@ -509,22 +501,6 @@ def _interpolate(str, context)   # FIXME move this later
   eval(wrapped, context)
 end
 
-# def _teaser(slug)
-#   id = slug.to_i
-#   text = nil
-#   post_entry_name = @theme + "blog/post_entry.lt3"
-#   @_post_entry ||= File.read(post_entry_name)
-#   vp = _post_lookup(id)
-#   nslug, aslug, title, date, teaser_text = 
-#     vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
-#   path = vp.path
-#   url = "#{path}/#{aslug}.html"    # Should be relative to .blogs!! FIXME
-#     date = Date.parse(date)
-#     date = date.strftime("%B %e<br>%Y")
-#     text = _interpolate(@_post_entry, binding)
-#   text
-# end
-
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML
     <div class="card #{extra} mb-3">
@@ -609,7 +585,7 @@ def tag_cloud
   _out open
   _body do |line|
     line.chomp!
-    url, classname, cdata = line.split(",", 4)
+    url, classname, cdata = line.split(",", 3)
     main = _main(url)
     _out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
@@ -651,7 +627,7 @@ def navbar
       first = false
       _out %[<li class="nav-item active"> <a class="nav-link" href="#{href}">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
-      main = _main("navbar/#{href}")
+      main = _main(:navbar/href)
       _out %[<li class="nav-item"> <a class="nav-link" #{main}>#{cdata}</a> </li>]
     end
   end