RubyGems - runeblog - Versions diffs - 0.3.18 → 0.3.23 - Mend

runeblog 0.3.18 → 0.3.23

Files changed (27) hide show

checksums.yaml +4 -4
data/bin/blog +77 -53
data/data/global.lt3 +3 -3
data/data/universal.lt3 +2 -0
data/empty_view/data/GIT_IS_DUMB +0 -0
data/empty_view/themes/standard/banner/top.lt3 +1 -1
data/empty_view/themes/standard/blog/generate.lt3 +1 -1
data/empty_view/themes/standard/etc/blog.css.lt3 +3 -1
data/empty_view/themes/standard/etc/github.css +209 -0
data/empty_view/themes/standard/post/generate.lt3 +8 -5
data/empty_view/themes/standard/post/permalink.lt3 +1 -1
data/lib/exceptions.rb +37 -0
data/lib/helpers-blog.rb +6 -4
data/lib/helpers-repl.rb +2 -6
data/lib/liveblog.rb +108 -31
data/lib/lowlevel.rb +23 -7
data/lib/menus.rb +5 -3
data/lib/newpost.rb +82 -0
data/lib/post.rb +6 -5
data/lib/processing.rb +23 -2
data/lib/publish.rb +3 -1
data/lib/repl.rb +68 -26
data/lib/runeblog.rb +94 -57
data/lib/runeblog_version.rb +2 -15
data/lib/view.rb +22 -3
data/runeblog.gemspec +2 -2
metadata +13 -9

data/empty_view/themes/standard/post/generate.lt3 CHANGED

@@ -8,12 +8,14 @@
 <html>
   <!-- Generated from $File on $$date; editing not recommended.   -->
-.seek global.lt3
+.include $ViewDir/data/global.lt3
+.variables! post metadata.txt
 . FIXME
 .head
-og:title    $title
-description $teaser
+og:title    $post.title
+description $post.teaser
 style       blog.css
 .end
@@ -23,7 +25,8 @@ style       blog.css
   <div class="recent-content">
     $.post_toolbar
     <table border=0 width=100%><tr>
-      <td align=left valign=bottom><h2 class="recent-title">$title</h2></td>
+      <td align=left valign=bottom><h2 class="recent-title">$post.title</h2></td>
+. FIXME - longdate is passed in from outside
       <td align=right valign=top><font size=-5><br></font>$longdate</td>
     </tr></table><hr>
     $.copy guts.html
@@ -31,6 +34,6 @@ style       blog.css
 </section>
 <br>
-.post_trailer
+.post_trailer $post.num
 </body>
 </html>

data/empty_view/themes/standard/post/permalink.lt3 CHANGED

@@ -12,7 +12,7 @@
   <!-- Editing this file is not recommended.   -->
   <!-- It was generated from $File on $$date.  -->
-.seek    global.lt3
+.include $ViewDir/data/global.lt3
 .head
 og:title    $title

data/lib/exceptions.rb ADDED

@@ -0,0 +1,37 @@
+def make_exception(sym, str, target_class = Object)
+  return if target_class.constants.include?(sym)
+  target_class.const_set(sym, StandardError.dup)
+  define_method(sym) do |*args|
+    msg = str.dup
+    args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg) }
+    target_class.class_eval(sym.to_s).new(msg)
+  end
+end
+make_exception(:NotImplemented,        "Feature not yet implemented")
+make_exception(:CantOpen,              "Can't open '%1'")
+make_exception(:CantDelete,            "Can't delete '%1'")
+make_exception(:InternalError,         "Glitch: %1 got arg '%2'")
+make_exception(:CantCopy,              "Can't copy %1 to %2")
+make_exception(:FileNotFound,          "File %1 was not found")
+make_exception(:FoundNeither,          "Found neither %1 nor %2")
+make_exception(:BlogRepoAlreadyExists, "Blog repo %1 already exists")
+make_exception(:CantAssignView,        "%1 is not a view")
+make_exception(:ViewAlreadyExists,     "View %1 already exists")
+make_exception(:DirAlreadyExists,      "Directory %1 already exists")
+make_exception(:CantCreateDir,         "Can't create directory %1")
+make_exception(:EditorProblem,         "Could not edit %1")
+make_exception(:NoSuchView,            "No such view: %1")
+make_exception(:NoBlogAccessor,        "Runeblog.blog is not set")
+make_exception(:ExpectedString,        "Expected nonempty string but got %1 (%2)")
+make_exception(:ExpectedView,          "Expected string or View object but got %1 (%2)")
+make_exception(:ExpectedInteger,       "Expected integer but got %1 (%2)")
+make_exception(:NoPostCall,            "Method #post not called (no metadata)")
+make_exception(:CantFindWidgetDir,     "Can't find widget dir '%1'")
+make_exception(:PublishError,          "Error during publishing")
+make_exception(:NoNumericPrefix,       "No numeric prefix on slug '%1'")
+make_exception(:NoExtensionExpected,   "No file extension expected on '%1'")

data/lib/helpers-blog.rb CHANGED

@@ -24,6 +24,7 @@ module RuneBlog::Helpers
       dir = root/:views/view/:settings
     end
     file = dir/"features.txt"
+# puts "-- in #{Dir.pwd} trying to read #{file}"
     pairs = read_pairs(file)
     enabled = {}
     pairs.each {|k,v| enabled[k] = (v == "1") }
@@ -54,11 +55,12 @@ module RuneBlog::Helpers
     puts
   end
-  def get_repo_config
+  def get_repo_config(root = ".blogs")
     log!(enter: __method__, level: 3)
-    @editor = File.read(".blogs/data/EDITOR").chomp
-    @current_view = File.read(".blogs/data/VIEW").chomp
-    @root = File.read(".blogs/data/ROOT").chomp
+    @editor = File.read("#{root}/data/EDITOR").chomp
+    @current_view = File.read("#{root}/data/VIEW").chomp
+    @root = File.read("#{root}/data/ROOT").chomp
+    # Huh? Why not just @root = root?  Hal.wtf?
   rescue => err
     puts "Can't read config: #{err}"
     puts err.backtrace.join("\n")

data/lib/helpers-repl.rb CHANGED

@@ -1,11 +1,7 @@
-# Reopening...
-make_exception(:CantOpen,        "Can't open '$1'")
-make_exception(:CantDelete,      "Can't open '$1'")
-make_exception(:InternalError,   "Glitch: $1 got arg '$2'")
-make_exception(:CantCopy,        "Can't copy $1 to $2")
+require 'exceptions'
+# Reopening...
 module RuneBlog::REPL
   Patterns =

data/lib/liveblog.rb CHANGED

@@ -12,6 +12,7 @@ require 'processing'
 def init_liveblog    # FIXME - a lot of this logic sucks
+  log!(enter: __method__)
   dir = Dir.pwd.sub(/\.blogs.*/, "")
   @blog = nil
   Dir.chdir(dir) { @blog = RuneBlog.new }
@@ -19,6 +20,8 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @view = @blog.view
   @view_name = @blog.view.name unless @view.nil?
   @vdir = @blog.view.dir rescue "NONAME"
+  setvar("View", @view_name)
+  setvar("ViewDir", @blog.root/:views/@view_name)
   @version = RuneBlog::VERSION
   @theme = @vdir/:themes/:standard
@@ -33,10 +36,10 @@ def init_liveblog    # FIXME - a lot of this logic sucks
       </a>
     HTML
   end
+  log!(str: "End of init_liveblog")
 rescue => err
   STDERR.puts "err = #{err}"
-  STDERR.puts err.backtrace.join("\n")
-# raise "Only works inside a blog repo"
+  STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
 end
 ##################
@@ -44,6 +47,7 @@ end
 ##################
 def dropcap
+  log!(enter: __method__)
   # Bad form: adds another HEAD
   text = _data
   _out " "
@@ -54,12 +58,15 @@ def dropcap
 end
 def post
+  log!(enter: __method__)
   @meta = OpenStruct.new
   @meta.num = _args[0]
+  setvar("post.num", @meta.num.to_i)
   _out "  <!-- Post number #{@meta.num} -->\n "
 end
   def _got_python?
+    log!(enter: __method__)
     # Dumb - fix later - check up front as needed
     # Should also check for praw lib
     str = `which python3`
@@ -67,6 +74,7 @@ end
   end
   def _reddit_post_url(vdir, date, title, url)
+    log!(enter: __method__)
     _got_python?
     tmpfile = "/tmp/reddit-post-url.txt"
     File.open(tmpfile, "w") do |tmp|
@@ -80,6 +88,7 @@ end
   end
 def post_toolbar
+  log!(enter: __method__)
   back_icon = %[<img src="assets/back-icon.png" width=24 height=24 alt="Go back"></img>]
   back = %[<a style="text-decoration: none" href="javascript:history.go(-1)">#{back_icon}</a>]
   _out <<~HTML
@@ -88,21 +97,36 @@ def post_toolbar
 end
 def post_trailer
-  perma = _var("publish.proto") + "://" + _var("publish.server") +
-          "/" + _var("publish.path") + "/" + _var("post.aslug") +
-          ".html"
-  tags = _var("post.tags")
+  log!(enter: __method__)
+  # Not called from *inside* a post, therefore no @meta --
+  # can/must call read_metadata
+  num = _var("post.num").to_i
+log! str:  "post_trailer: num = #{num}"
+  vp = _post_lookup(num)
+log! str:  "post_trailer: lookup = #{vp.num} #{vp.title}"
+  dir = @blog.root/:posts/vp.nslug
+log! str:  "  -- dir = #{dir}"
+  meta = Dir.chdir(dir) { @blog.read_metadata }
+  nslug = @blog.make_slug(meta)
+  aslug = nslug[5..-1]
+  proto  = _var("publish.proto")
+  server = _var("publish.server")
+  path   = _var("publish.path")
+  perma = "#{proto}://#{server}/#{path}/#{aslug}.html"
+  tags = meta.tags
   taglist = tags.empty? ? "" : "Tags: #{tags}"
   reddit_txt = ""
   if @reddit_enabled
     vdir  = @blog.root/:views/@blog.view
-    nslug = "#{_var("post.num")}-#{_var("post.aslug")}"
-    date  = _var("post.date")
+    date  = meta.date
     rid_file = vdir/:posts/nslug/"reddit.id"
-    rid = File.exist?(rid_file) ? File.read(rid_file).chomp : nil
-    if rid.nil?
-      title = _var("title")
+    if File.exist?(rid_file)
+ STDERR.puts "    reading #{rid_file}"
+      rid = File.read(rid_file).chomp
+    else
+ STDERR.puts "    creating #{rid_file}"
+      title = meta.title
       rid = _reddit_post_url(vdir, date, title, perma)
       dump(rid, rid_file)
     end
@@ -113,6 +137,7 @@ def post_trailer
     HTML
   # damned syntax highlighting </>
   end
+# STDERR.print "Pausing... "; getch
   _out <<~HTML
   #{reddit_txt}
   <hr>
@@ -124,6 +149,7 @@ def post_trailer
 end
 def faq
+  log!(enter: __method__)
   @faq_count ||= 0
   _out "<br>" if @faq_count == 0
   @faq_count += 1
@@ -138,15 +164,18 @@ def faq
 end
 def backlink
+  log!(enter: __method__)
   _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
 def code
+  log!(enter: __method__)
   lines = _body # _text
   _out "<font size=+1><pre>\n#{lines}\n</pre></font>"
 end
 def _read_navbar_data
+  log!(enter: __method__)
   vdir = @blog.root/:views/@blog.view
   dir = vdir/"themes/standard/banner/navbar/"
   datafile = dir/"list.data"
@@ -154,6 +183,7 @@ def _read_navbar_data
 end
 def banner
+  log!(enter: __method__)
   count = 0
   bg = "white"  # outside loop
   wide = nil
@@ -187,9 +217,9 @@ def banner
         if ! File.exist?(file)
           src = file.sub(/html$/, "lt3")
           if File.exist?(src)
-            preprocess src: src, dst: file, call: ".nopara" # , vars: @blog.view.globals
+            preprocess src: src, dst: file, call: ".nopara", vars: @blog.view.globals
           else
-            raise "Neither #{file} nor #{src} found"
+            raise FoundNeither(file, src)
           end
         end
         str2 << "<td>" + File.read(file) + "</td>" + "\n"
@@ -213,11 +243,11 @@ def banner
   _out navbar if navbar
 rescue => err
   STDERR.puts "err = #{err}"
-  STDERR.puts err.backtrace.join("\n")
-  gets
+  STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
 end
 def _svg_title(*args)
+  log!(enter: __method__)
   width    = "95%"
   height   = 90
   bgcolor  = "black"
@@ -273,6 +303,7 @@ def _svg_title(*args)
 end
 def quote
+  log!(enter: __method__)
   _passthru "<blockquote>"
   _passthru _body.join(" ")
   _passthru "</blockquote>"
@@ -280,9 +311,11 @@ def quote
 end
 def categories   # does nothing right now
+  log!(enter: __method__)
 end
 def style
+  log!(enter: __method__)
   fname = _args[0]
   _passthru %[<link rel="stylesheet" href="???/etc/#{fname}')">]
 end
@@ -299,6 +332,7 @@ def h6; _passthru "<h6>#{@_data}</h6>"; end
 def hr; _passthru "<hr>"; end
 def nlist
+  log!(enter: __method__)
   _out "<ol>"
   _body {|line| _out "<li>#{line}</li>" }
   _out "</ol>"
@@ -306,6 +340,7 @@ def nlist
 end
 def list
+  log!(enter: __method__)
   _out "<ul>"
   _body {|line| _out "<li>#{line}</li>" }
   _out "</ul>"
@@ -313,6 +348,7 @@ def list
 end
 def list!
+  log!(enter: __method__)
   _out "<ul>"
   lines = _body.each
   loop do
@@ -331,6 +367,7 @@ end
 ### inset
 def inset
+  log!(enter: __method__)
   lines = _body
   box = ""
   output = []
@@ -362,7 +399,8 @@ def inset
 end
 def title
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   title = @_data.chomp
   @meta.title = title
   setvar :title, title
@@ -371,7 +409,8 @@ def title
 end
 def pubdate
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   _debug "data = #@_data"
   # Check for discrepancy?
   match = /(\d{4}).(\d{2}).(\d{2})/.match @_data
@@ -383,21 +422,24 @@ def pubdate
 end
 def tags
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   _debug "args = #{_args}"
   @meta.tags = _args.dup || []
   _optional_blank_line
 end
 def views
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   _debug "data = #{_args}"
   @meta.views = _args.dup
   _optional_blank_line
 end
 def pin
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   _debug "data = #{_args}"  # verify only valid views?
   pinned = @_args
   @meta.pinned = pinned
@@ -412,22 +454,23 @@ def pin
   _optional_blank_line
 rescue => err
   STDERR.puts "err = #{err}"
-  STDERR.puts err.backtrace.join("\n")
-  gets
+  STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
 end
 def write_post
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   @meta.views = @meta.views.join(" ") if @meta.views.is_a? Array
   @meta.tags  = @meta.tags.join(" ") if @meta.tags.is_a? Array
   _write_metadata
 rescue => err
   puts "err = #{err}"
-  puts err.backtrace.join("\n")
+  puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
 end
 def teaser
-  raise "'post' was not called" unless @meta
+  log!(enter: __method__)
+  raise NoPostCall unless @meta
   text = _body.join("\n")
   @meta.teaser = text
   setvar :teaser, @meta.teaser
@@ -441,6 +484,7 @@ def teaser
 end
 def finalize
+  log!(str: "Now exiting livetext processing...")
   return unless @meta
   return @meta if @blog.nil?
@@ -452,6 +496,7 @@ def finalize
 end
 def head  # Does NOT output <head> tags
+  log!(enter: __method__)
   args = _args
   args.each do |inc|
     self.data = inc
@@ -507,6 +552,7 @@ end
 ########## newer stuff...
 def meta
+  log!(enter: __method__)
   args = _args
   enum = args.each
   str = "<meta"
@@ -526,6 +572,7 @@ def meta
 end
 def recent_posts    # side-effect
+  log!(enter: __method__)
   _out <<-HTML
     <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
       <iframe id="main" style="width: 70vw; height: 100vh; position: relative;"
@@ -536,6 +583,7 @@ def recent_posts    # side-effect
 end
 def _make_class_name(app)
+  log!(enter: __method__)
   if app =~ /[-_]/
     words = app.split(/[-_]/)
     name = words.map(&:capitalize).join
@@ -546,6 +594,7 @@ def _make_class_name(app)
 end
 def _load_local(widget)
+  log!(enter: __method__)
   Dir.chdir("../../widgets/#{widget}") do
     rclass = _make_class_name(widget)
     found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
@@ -554,12 +603,13 @@ def _load_local(widget)
   end
 rescue => err
   STDERR.puts err.to_s
-  STDERR.puts err.backtrace.join("\n")
+  STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
   sleep 6; RubyText.stop
   exit
 end
 def _handle_standard_widget(tag)
+  log!(enter: __method__)
   wtag = "../../widgets"/tag
   code = _load_local(tag)
   if code
@@ -571,6 +621,7 @@ def _handle_standard_widget(tag)
 end
 def sidebar
+  log!(enter: __method__)
   _debug "--- handling sidebar\r"
   if _args.include? "off"
     _body { }  # iterate, do nothing
@@ -584,9 +635,8 @@ def sidebar
   _body do |token|
     tag = token.chomp.strip.downcase
     wtag = "../../widgets"/tag
-    raise "Can't find #{wtag}" unless Dir.exist?(wtag)
+    raise CantFindWidgetDir(wtag) unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
     case
       when standard.include?(tag)
         _handle_standard_widget(tag)
@@ -599,12 +649,13 @@ def sidebar
   _out %[</div>]
 rescue => err
   puts "err = #{err}"
-  puts err.backtrace.join("\n")
+  puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
   sleep 6; RubyText.stop
   exit
 end
 def stylesheet
+  log!(enter: __method__)
   lines = _body
   url = lines[0]
   integ = lines[1]
@@ -613,6 +664,7 @@ def stylesheet
 end
 def script
+  log!(enter: __method__)
   lines = _body
   url = lines[0]
   integ = lines[1]
@@ -662,6 +714,7 @@ end
 def tag_cloud
+  log!(enter: __method__)
   title = _data
   title = "Tag Cloud" if title.empty?
   open = <<-HTML
@@ -685,18 +738,22 @@ def tag_cloud
 end
 def vnavbar
+  log!(enter: __method__)
   str = _make_navbar(:vert)
 end
 def hnavbar
+  log!(enter: __method__)
   str = _make_navbar  # horiz is default
 end
 def navbar
+  log!(enter: __method__)
   str = _make_navbar  # horiz is default
 end
 def _make_navbar(orient = :horiz)
+  log!(enter: __method__)
   vdir = @root/:views/@blog.view
   title = _var("view.title")
@@ -737,7 +794,7 @@ def _make_navbar(orient = :horiz)
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner/navbar"
       dest = vdir/"remote/banner/navbar"/basename+".html"
-      preprocess cwd: dir, src: basename, dst: dest, call: ".nopara" # , debug: true
+      preprocess cwd: dir, src: basename, dst: dest, call: ".nopara", vars: @blog.view.globals # , debug: true
       output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
   end
@@ -752,6 +809,7 @@ end
 ##################
 def _html_body(file, css = nil)
+  log!(enter: __method__)
   file.puts "<html>"
   if css
     file.puts "    <head>"
@@ -764,10 +822,12 @@ def _html_body(file, css = nil)
 end
 def _errout(*args)
+  log!(enter: __method__)
   ::STDERR.puts *args
 end
 def _passthru(line)
+  log!(enter: __method__)
   return if line.nil?
   line = _format(line)
   _out line + "\n"
@@ -775,6 +835,7 @@ def _passthru(line)
 end
 def _passthru_noline(line)
+  log!(enter: __method__)
   return if line.nil?
   line = _format(line)
   _out line
@@ -782,6 +843,7 @@ def _passthru_noline(line)
 end
 def _write_metadata
+  log!(enter: __method__)
   File.write("teaser.txt", @meta.teaser)
   fields = [:num, :title, :date, :pubdate, :views, :tags, :pinned]
   fname = "metadata.txt"
@@ -791,20 +853,32 @@ def _write_metadata
 end
 def _post_lookup(postid)    # side-effect
+  log!(enter: __method__)
   # .. = templates, ../.. = views/thisview
   slug = title = date = teaser_text = nil
+  view = @blog.view
+  vdir = view.dir rescue "NONAME"
+  setvar("View", view.name)
+  setvar("ViewDir", @blog.root/:views/view.name)
+tmp = File.new("/tmp/PL-#{Time.now.to_i}.txt", "w")
+tmp.puts "_post_lookup: blog.view = #{@blog.view.inspect}"
+tmp.puts "_post_lookup: vdir = #{vdir}"
   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) }
+tmp.puts "_post_lookup: postid = #{postid}"
+tmp.puts "_post_lookup: posts  = \n#{posts.inspect}"
+tmp.close
   posts = posts.select {|x| File.basename(x).to_i == postid }
-  postdir = exactly_one(posts)
+  postdir = exactly_one(posts, posts.inspect)
   vp = RuneBlog::ViewPost.new(@blog.view, postdir)
   vp
 end
 def _card_generic(card_title:, middle:, extra: "")
+  log!(enter: __method__)
   front = <<-HTML
     <div class="card #{extra} mb-3">
       <div class="card-body">
@@ -820,14 +894,17 @@ def _card_generic(card_title:, middle:, extra: "")
 end
 def _var(name)  # FIXME scope issue!
+  log!(enter: __method__)
   ::Livetext::Vars[name] || "[:#{name} is undefined]"
 end
 def _main(url)
+  log!(enter: __method__)
   %[href="javascript: void(0)" onclick="javascript:open_main('#{url}')"]
 end
 def _blank(url)
+  log!(enter: __method__)
   %[href='#{url}' target='blank']
 end