RubyGems - runeblog - Versions diffs - 0.2.73 → 0.2.78 - Mend

runeblog 0.2.73 → 0.2.78

Files changed (14) hide show

checksums.yaml +4 -4
data/empty_view/themes/standard/blog/generate.lt3 +1 -0
data/empty_view/themes/standard/blog/post_entry.lt3 +4 -8
data/empty_view/themes/standard/etc/misc.js +1 -0
data/empty_view/themes/standard/post/generate.lt3 +3 -0
data/lib/global.rb +1 -0
data/lib/helpers-blog.rb +1 -2
data/lib/liveblog.rb +32 -24
data/lib/runeblog.rb +37 -47
data/lib/runeblog_version.rb +1 -1
data/lib/view.rb +1 -0
data/lib/xlate.rb +15 -11
data/runeblog.gemspec +1 -1
metadata +8 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0afccf0c622078eba670e387c4fec271552c9b2d289c25b1f325a266d94da6c7
-  data.tar.gz: 3cea7d0e10b8e393d2845b10c4d466f54bbfc92f1ea326eec4ee42ad8fba3927
+  metadata.gz: 6baabb9426c6b2e8d316203e12b941a357a31463425810721d8a72f3add24ecd
+  data.tar.gz: 9e823dba18e88f9e6159724fbdbb228392eb6433d21f91e6e922b2e7d850cb4d
 SHA512:
-  metadata.gz: e69baf6404c61da8028502b554008a663ec405c359707d9a33f103dd47f17b0e9a00482f09a32cb2e52c5457fe9904177db067b2592b7021ef1ddf0a5c15b698
-  data.tar.gz: d6942079ebdcb48d948b938bf06377caa55eabe7ea3b4de6566ed0586b83920e6c51fee272d7e35e38cb7f00e812a20cc3b0a2c66252ca03e66bcf6cc5df9337
+  metadata.gz: 8bc8bc41c43fec627fb6184ce3b9b44fb4f442a8f462b1396ce180c64d00663772e306701e6b4c7edf466eb930162a39ede08bc642d724fde0c2327b97852c45
+  data.tar.gz: 4c5f370aa66624daac8355ddf03b7824e890e27b97eaaa27cb81e788c38352e9a6be90ea37c7e501fd7f198e4a6727054c951cb3a26992d88751e45ab0535e16

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

@@ -4,6 +4,7 @@
 . The user will more often edit blog/index.lt3 in
 . the process of blog setup.
 . --------------------------------------------------
+.nopara
 .mixin liveblog

data/empty_view/themes/standard/blog/post_entry.lt3 CHANGED

@@ -8,16 +8,12 @@
   <table width=100% cellpadding=7>
     <tr>
       <td width=14% valign=top align=right style="margin-top: -1px;">
-<!--        <span class="post-date mt-1 mb-1" style="margin-top: 3px; text-align: right"> -->
-          <font size=-1>#{date}</font>
-<!--        </span> -->
+        <font size=-1>#{date}</font>
       </td>
       <td>
-        <!--        <span class="post-title-box"> -->
-          <span class="post-title-text"><a href="#{url}" style="margin-top: -5px">#{title}</a></span>
-          <b>#{teaser_text}</b>&nbsp;&nbsp;
-          <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a>
-        <!--        </span>  -->
+        <span class="post-title-text"><a href="#{url}" style="margin-top: -5px">#{title}</a></span>
+        <b>#{teaser_text}</b>&nbsp;&nbsp;
+        <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a>
       </td>
     </tr>
   </table>

data/empty_view/themes/standard/etc/misc.js CHANGED

@@ -1,4 +1,5 @@
 <!-- Miscellaneous local JS pieces are defined here -->
+.nopara
 <script>
   function open_main(url) {

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

@@ -11,9 +11,12 @@
 .seek global.lt3
 .include vars.lt3
+. FIXME
 .head
 og:title    $title
 description $teaser
+style       blog.css
 .end
 <body>

data/lib/global.rb CHANGED

@@ -39,6 +39,7 @@ def system!(str, show: false)
   else
     STDERR.puts "FAILED: #{str.inspect}"
     STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+exit
     return rc
   end
   rc

data/lib/helpers-blog.rb CHANGED

@@ -80,12 +80,11 @@ module RuneBlog::Helpers
   def get_views   # read from filesystem
     log!(enter: __method__, level: 3)
-    dirs = subdirs("#@root + "/" + views/").sort
+    dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
   def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "#{root}/data/EDITOR")
-p root
     File.write(root + "/data/ROOT",   root + "\n")
     File.write(root + "/data/VIEW",   view.to_s + "\n")
     File.write(root + "/data/EDITOR", editor + "\n")

data/lib/liveblog.rb CHANGED

@@ -9,11 +9,9 @@ require 'xlate'
 def init_liveblog    # FIXME - a lot of this logic sucks
-  here = Dir.pwd
-  dir = here
-# loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
-  Dir.chdir(here)     #  here??? or dir??
-  @blog = RuneBlog.new(dir)
+  dir = Dir.pwd.sub(/\.blogs.*/, "")
+  @blog = nil
+  Dir.chdir(dir) { @blog = RuneBlog.new }
   @root = @blog.root
   @view = @blog.view
   @view_name = @blog.view.name unless @view.nil?
@@ -93,10 +91,11 @@ end
 def banner
   count = 0
   span = 1
-  bg = "white"  # outside loop
+  @bg = "white"  # outside loop
   wide = nil
   high = 250
   str2 = ""
+  navbar = nil
   lines = _body.to_a
   lines.each do |line|
@@ -109,7 +108,7 @@ def banner
       when "height"
         high = data[0]
       when "bgcolor"
-        bg = data[0] || "white"
+        @bg = data[0] || "white"
       when "image"
         image = data[0] || "banner.jpg"
         image = "banner"/image
@@ -118,7 +117,6 @@ def banner
         str2 << "      <td colspan=#{span}><img src=#{image} #{width} height=#{high}></img></td>" + "\n"
       when "svg_title"
         stuff, hash = _svg_title(*data)
-STDERR.puts hash.inspect
         wide = hash["width"]
         str2 << "      <td colspan=#{span} width=#{wide}>#{stuff}</td>" + "\n"
       when "text"
@@ -128,13 +126,15 @@ STDERR.puts hash.inspect
       when "navbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
         _make_navbar  # horiz is default
-        stuff = File.read("banner/navbar.html")
-        str2 << "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" + "\n"
+        file = "banner/navbar.html"
+        navbar = File.read(file)
+        # str2 << "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" + "\n"
       when "vnavbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
         _make_navbar(:vert)
         file = "banner/vnavbar.html"
-        str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
+        navbar = File.read(file)
+        # str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
       when "break"
          span = count - 1
          str2 << "  </tr>\n  <tr>"  + "\n"
@@ -142,11 +142,12 @@ STDERR.puts hash.inspect
       str2 << "        '#{tag}' isn't known" + "\n"
     end
   end
-  _out "<table width=100% height=#{high} bgcolor=##{bg}>"
+  _out "<table width=100% height=#{high} bgcolor=##{@bg}>"
   _out "  <tr>"
   _out str2
   _out "  </tr>"
   _out "</table>"
+  _out navbar if navbar
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n")
@@ -499,7 +500,7 @@ def head  # Does NOT output  tags
 #              "style"          => %[<link rel="stylesheet" href="etc/blog.css">],
 # ^ FIXME
                "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:blog)}">],
-               "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="../etc/favicon.ico">\n <link rel="apple-touch-icon" href="../etc/favicon.ico">]
+               "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="etc/favicon.ico">\n <link rel="apple-touch-icon" href="etc/favicon.ico">]
              }
   result = {}
   lines = _body
@@ -514,7 +515,7 @@ def head  # Does NOT output  tags
         text = File.read(file)
         result["script"] = Livetext.new.transform(text)
       when "style"
-        result["style"] = %[<link rel="stylesheet" href="('/etc/#{remain}')">]
+        result["style"] = %[<link rel="stylesheet" href="etc/#{remain}">]
       # Later: allow other overrides
       when ""; break
     else
@@ -748,24 +749,31 @@ def navbar
 end
 def _make_navbar(orient = :horiz)
-  vdir = @blog.view.dir
+  vdir = @root/:views/@blog.view
   title = _var(:blog)
-  extra = ""
-  extra = "navbar-expand-lg" if orient == :horiz
+  if orient == :horiz
+    name = "navbar.html"
+    li1, li2 = "", ""
+    extra = "navbar-expand-lg"
+    list1 = list2 = ""
+  else
+    name = "vnavbar.html"
+    li1, li2 = '<li class="nav-item">', "</li>"
+    extra = ""
+    list1, list2 = '<l class="navbar-nav mr-auto">', "</ul>"
+  end
   start = <<-HTML
        <!-- FIXME weird bug here!!! -->
    <nav class="navbar #{extra} navbar-light bg-light">
-      <ul class="navbar-nav mr-auto">
+      #{list1}
   HTML
   finish = <<-HTML
-      </ul>
+      #{list2}
     </nav>
   HTML
-  name = (orient == :horiz) ? "navbar.html" : "vnavbar.html"
   html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name
   output = File.new(html_file, "w")
   output.puts start
@@ -776,11 +784,11 @@ def _make_navbar(orient = :horiz)
     full = :banner/basename+".html"
     href_main = _main(full)
     if basename == "index"  # special case
-      output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
+      output.puts %[#{li1} <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> #{li2}]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
       xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
-      output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
+      output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
   end
   output.puts finish

data/lib/runeblog.rb CHANGED

@@ -53,55 +53,48 @@ class RuneBlog
     puts "Error: See #{out}"
   end
-  def self.create_new_blog_repo(root = ".blogs")
-    log!(enter: __method__, args: [root])
-    raise ArgumentError unless root.is_a?(String) && ! root.empty?
-    root_dir = Dir.pwd/root
+  def self.create_new_blog_repo(root_rel = ".blogs")
+    log!(enter: __method__, args: [root_rel])
+    raise ArgumentError unless root_rel.is_a?(String) && ! root_rel.empty?
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    root = Dir.pwd/root
-    raise BlogRepoAlreadyExists if Dir.exist?(root)
-    create_dirs(root)
-    Dir.chdir(root) do
-      create_dirs(:drafts, :views, :posts)
+    repo_root = Dir.pwd/root_rel
+    raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
+    create_dirs(repo_root)
+    Dir.chdir(repo_root) do
+      create_dirs(:data, :drafts, :views, :posts)
       new_sequence
     end
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
-    write_config(x, root/ConfigFile)
-    write_repo_config
-    @blog = self.new(root)
+    copy_data(:config, repo_root/:data)
+    write_repo_config(root: repo_root)
+    @blog = self.new
     @blog
   rescue => err
-    puts "Can't create blog repo: '#{root}' - #{err}"
+    puts "Can't create blog repo: '#{repo_root}' - #{err}"
     puts err.backtrace.join("\n")
   end
-  def self.open(root = ".blogs")
-    log!(enter: __method__, args: [root])
-    # Crude - FIXME later -  # What views are there? Publishing, etc.
+  def self.open(root_rel = ".blogs")
+    log!(enter: __method__, args: [root_rel])
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    root = Dir.pwd/root
-    blog = self.new(root)
+    blog = self.new(root_rel)
   rescue => err
     _tmp_error(err)
   end
-  def initialize(root_dir = ".blogs")   # always assumes existing blog
-    log!(enter: "initialize", args: [root_dir])
-    # Crude - FIXME later -  # What views are there? Publishing, etc.
+  def initialize(root_rel = ".blogs")   # always assumes existing blog
+    log!(enter: "initialize", args: [root_rel])
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    @root = root_dir
-    file = @root/ConfigFile
-    errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}"
-    raise errmsg unless File.exist?(file)
+    @root = Dir.pwd/root_rel
+    copy_data(:config, @root/:data)
+    write_repo_config(root: @root)
     get_repo_config
-    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
-    md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    @view_name = md[1] if md
     @views = get_views
-    @view = str2view(@view_name)
+    md = Dir.pwd.match(%r[.*/views/(.*?)/])
+    if md
+      @view_name = md[1]
+      @view = str2view(@view_name)
+    end
     @sequence = get_sequence
     @post_views = []
     @post_tags = []
@@ -228,15 +221,15 @@ class RuneBlog
   def viewdir(v = nil)   # delete?
     log!(enter: __method__, args: [v], level: 3)
+    v ||= @view
     v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
-    v ||= @view
     return @root/:views/v
   end
   def self.exist?
     log!(enter: __method__, level: 3)
-    Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
+    Dir.exist?(DotDir)
   end
   def mark_last_published(str)
@@ -247,7 +240,8 @@ class RuneBlog
   def add_view(view_name)
     log!(enter: __method__, args: [view_name], level: 2)
     view = RuneBlog::View.new(view_name)
-    @view = view    # current view
+    self.view = view    # current view
+    File.write(@root/"data/VIEW", view_name)
     @views << view  # all views
     view
   end
@@ -276,7 +270,6 @@ class RuneBlog
   def create_view(view_name)
     log!(enter: __method__, args: [view_name], level: 2)
-    check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
     add_view(view_name)
     mark_last_published("Initial creation")
@@ -325,11 +318,8 @@ class RuneBlog
     text = nil
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
-# STDERR.puts "--  @pename = #{post_entry_name}"
-# STDERR.puts "--  @pe = #{@_post_entry.inspect}"
     depend = [post_entry_name]
     xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
-# STDERR.puts "-- xlate result: #{`ls -l /tmp/post_entry.html`}"
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text =
@@ -422,10 +412,8 @@ class RuneBlog
   def change_view(view)
     log!(enter: __method__, args: [view], level: 3)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
-    copy_data(:config, @root/:data)
-    write_config(x, @root/ConfigFile)
+    File.write(@root/"data/VIEW", view)
+    # write_repo_config
     self.view = view   # error checking?
   end
@@ -443,18 +431,20 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
-    depend = [vdir/"remote/etc/blog.css", @theme/"global.lt3",
+    depend = [vdir/"remote/etc/blog.css.lt3", @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/etc", # deps: depend, debug: true,
+          src: "blog.css.lt3", copy: vdir/"remote/etc/" # , dst: "blog.css"
     xlate cwd: vdir/"themes/standard", deps: depend, force: true,
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
     copy_widget_html(view)
   rescue => err
-    _tmp_error(err)
+    STDERR.puts err
+    STDERR.puts err.backtrace.join("\n")
+    # _tmp_error(err)
   end
   def _get_views(draft)

data/lib/runeblog_version.rb CHANGED

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

data/lib/view.rb CHANGED

@@ -14,6 +14,7 @@ class RuneBlog::View
     @name = name
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
+    @blog.view = self
   end
   def dir

data/lib/xlate.rb CHANGED

@@ -1,4 +1,6 @@
+require 'livetext'
+LIVE = Livetext.new
 LEXT = ".lt3"
 def newer?(f1, f2)
@@ -16,26 +18,28 @@ def stale?(src, dst, deps, force = false)
   return false
 end
-def prerprocess(cwd: Dir.pwd, src:,
+def preprocess(cwd: Dir.pwd, src:,
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")),
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html"))   # || strip)
-  indent = " "*12
+  dst += ".html" unless (dst.end_with?(".html") || strip)
+  sp = " "*12
   Dir.chdir(cwd) do
     if debug
-      puts "#{indent} -- xlate #{src} >#{dst}"
-      puts "#{indent}      in:   #{Dir.pwd}"
-      puts "#{indent}      from: #{caller[0]}"
-      puts "#{indent}      copy: #{copy}" if copy
+      puts "#{sp} -- preprocess "
+      puts "#{sp}      src:  #{src}"
+      puts "#{sp}      dst:  #{dst}"
+      puts "#{sp}      in:   #{Dir.pwd}"
+      puts "#{sp}      from: #{caller[0]}"
+      puts "#{sp}      copy: #{copy}" if copy
     end
     stale = stale?(src, dst, deps, force)
     if stale
-      rc = system("livetext #{src} >#{dst}")
-      puts "...completed (shell returned #{rc})" if debug
+      out = LIVE.xform_file(src)
+      File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     else
-      puts "#{indent} -- ^ Already up to date!" if debug
+      puts "#{sp} -- ^ Already up to date!" if debug
       return
     end
   end
@@ -45,7 +49,7 @@ def xlate(cwd: Dir.pwd, src:,
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")),
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html"))   # || strip)
+  dst += ".html" unless (dst.end_with?(".html") || strip)
   indent = " "*12
   Dir.chdir(cwd) do
     if debug

data/runeblog.gemspec CHANGED

@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.95'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
-  s.add_development_dependency 'minitest', '>= 5.10.0'
+  s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
   # Files...
   main = Find.find("bin").to_a +

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.73
+  version: 0.2.78
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -57,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com
 executables: