runeblog 0.2.98 → 0.3.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248dd46a09bcde995ae04c6f20c0c510446c0377ac9709a33109b0ade0da392e
-  data.tar.gz: ed6064e271145b44759401b2192cbe21d1475338db779c9b14a861e3c643599b
+  metadata.gz: fad63c680c64fff5ca7fab06ee3c95a2d1b51f4bd4d3c0e74b21b917599f9086
+  data.tar.gz: '0906af618397683f84fd78d43b6f7742fbc64d9872290ea96067447079f45637'
 SHA512:
-  metadata.gz: 67b27edb3c7a18781eec1e3edfd885fca1edf8606d03cd62ea4e11c890eb9f4f15b7f94868827ea815f110042729d162bcaaa77171a6a6b8727dc78e78669cf2
-  data.tar.gz: 9698861365fb1d6f9be3eb33adead8b0e48e0effd8aaafb6cec44010ebfd4ea086ba98a3d3b3d803393fd5f18b75d77ed4b67ad81a0efa6947daf324d6137056
+  metadata.gz: b0aa69a9da231a7fa90f64f86ebcf0d4d1cc135d59682f5fb313b129374a8e976011578ad1f962baca9fbe0a095134b7d22d185a542f195f317ed0d56e6172a4
+  data.tar.gz: da1e4bd77770d91aa872fe61d2a8e17fad3f26fbc5ed766a84adb15c5087a780e57940a6ceebf5656e169bde4b05a439d138e696c00ef1c7fd8b2ab2b15c330c

data/bin/blog

@@ -25,12 +25,14 @@ end
 def get_universal
   univ = "#{@blog.root}/data/universal.lt3"
   if yesno("Faster initial setup? (no: edit universal.lt3)")
-    author = ask!("Author name: ")
-    site   = ask!("Site/domain: ")
+    author = ask!("    Author name: ")
+    site   = ask!("    Site/domain: ")
     # Now stash it...
     str = File.read(univ)
     str = str.gsub(/AUTHOR/, author)
     str = str.gsub(/SITE_DOMAIN/, site)
+    File.write(univ, str)
+# STDERR.puts "------ universal ------\n#{`cat #{univ}`}\n------------------------"
   else
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
     edit_file(univ, vim: vim_params)
@@ -39,18 +41,20 @@ end
 
 def get_global
   if yesno("Faster view setup? (no: edit global.lt3)")
-    view_name = ask!("\nFilename: ")
+    view_name = ask!("\n    Filename: ")
     @blog.create_view(view_name)   # call change_view??
-    title     = ask!("View title: ")
-    subtitle  = ask!("Subtitle  : ")
-    gname = "#{@blog.root}/views/#{view_name}/themes/standard/global.lt3" 
-    text = File.read(gname)
-    text = text.gsub(/VIEW_NAME/,     view_name)
-    text = text.gsub(/VIEW_TITLE/,    title)
-    text = text.gsub(/VIEW_SUBTITLE/, subtitle)
-    File.write(gname, text)
+    title     = ask!("    View title: ")
+    subtitle  = ask!("    Subtitle  : ")
+    domain    = ask!("    Domain    : ")
+
+    vfile = "#{@blog.root}/views/#{view_name}/settings/view.txt"
+    hash = {/VIEW_NAME/     => view_name,
+            /VIEW_TITLE/    => title,
+            /VIEW_SUBTITLE/ => subtitle,
+            /VIEW_DOMAIN/   => domain}
+    @blog.complete_file(vfile, nil, hash)
   else
-    view_name = ask!("\nFilename: ")
+    view_name = ask!("\n    Filename: ")
     @blog.create_view(view_name)   # call change_view??
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)

data/data/features.txt

@@ -0,0 +1,18 @@
+# 0 = disabled (installed but disabled)
+# 1 = enabled (implies installed)
+# x = excluded (not installed; does it even exist?)
+
+reddit     0   # autopost, embed thread after blog post
+facebook   0   # reader-like, reader post, autopost?
+twitter    0   # reader-tweet, reader-follow, autotweet?
+
+links      1   # widget: external links
+news       1   # widget: news (external)
+pages      1   # widget: internal pages
+pinned     1   # widget: pinned posts
+
+ad         x   # widget: embed advertising 
+bydates    x   # widget: browse posts by date
+search     x   # widget: search posts
+sitemap    x   # widget: site map
+tag_cloud  x   # widget: tag cloud (clickable)

data/data/global.lt3

@@ -3,12 +3,13 @@
 .   <variable>  <value>                             
 . --------------------------------------------------
 
-.variables
-author      AUTHOR
-blog        VIEW_TITLE
-blog.desc   VIEW_SUBTITLE
-site        SITE
+.variables view     ../../settings/view.txt
+
+.variables recent   ../../settings/recent.txt
+
+.variables publish  ../../settings/publish.txt
 
+.variables
 host        http://SITE
 charset     utf-8
 url         http://SITE
@@ -17,22 +18,3 @@ locale      en_US
 font.family       verdana
 .end
 
-.variables recent
-title.color  #010101
-title.size   28px
-
-text.color   #0101a1
-text.size    22px
-
-date.color   #9a9a9a
-date.size    15px
-.end
-
-.variables publish
-user      root
-server    SITE
-docroot   /var/www/
-path      VIEW_NAME
-proto     http
-.end
-

data/data/universal.lt3

@@ -8,14 +8,11 @@
 .nopara
 
 .variables
-. Identity
-author        AUTHOR
-site          SITE_DOMAIN
+univ.author        AUTHOR
+univ.site          SITE_DOMAIN
 
-. Style
 font.family   verdana
 
-. Details
 charset       utf-8
 locale        en_US
 .end

data/empty_view/settings/features.txt

@@ -0,0 +1,18 @@
+# 0 = disabled (installed but disabled)
+# 1 = enabled (implies installed)
+# x = excluded (not installed; does it even exist?)
+
+reddit     0   # autopost, embed thread after blog post
+facebook   0   # reader-like, reader post, autopost?
+twitter    0   # reader-tweet, reader-follow, autotweet?
+
+links      1   # widget: external links
+news       1   # widget: news (external)
+pages      1   # widget: internal pages
+pinned     1   # widget: pinned posts
+
+ad         x   # widget: embed advertising 
+bydates    x   # widget: browse posts by date
+search     x   # widget: search posts
+sitemap    x   # widget: site map
+tag_cloud  x   # widget: tag cloud (clickable)

data/empty_view/settings/publish.txt

@@ -0,0 +1,5 @@
+user      root
+server    SITE
+docroot   /var/www/html
+path      VIEW_NAME        # can be different
+proto     https

data/empty_view/settings/recent.txt

@@ -0,0 +1,11 @@
+title.color  #010101
+title.size   28px
+
+text.color   #0101a1
+text.size    22px
+
+date.color   #9a9a9a
+date.size    15px
+
+bgcolor      #ffffff  # white
+count        4

data/empty_view/settings/view.txt

@@ -0,0 +1,4 @@
+author      VIEW_AUTHOR
+title       VIEW_TITLE
+subtitle    VIEW_SUBTITLE
+site        VIEW_SITE

data/empty_view/themes/standard/banner/top.lt3

@@ -15,6 +15,6 @@
 
 <rect x="20" y="20" rx="15" ry="15" width="98%" height="100" fill="url(#grad1)"/>
 
-<text x="45" y="70" class=heavy>$blog</text>
-<text x="45" y="98" class=small>$blog.desc</text>
+<text x="45" y="70" class=heavy>$view.title</text>
+<text x="45" y="98" class=small>$view.subtitle</text>
 </svg>

data/lib/helpers-blog.rb

@@ -14,6 +14,26 @@ module RuneBlog::Helpers
     exit
   end
 
+  def read_features(view = nil)
+    hash = {}
+    if view.nil?  # toplevel default
+      dir = @root/"data"
+    else
+      dir = @root/:views/self.view/:settings
+    end
+    file = dir/"features.txt"
+    lines = File.readlines(file)
+    lines.each do |line|
+      line = line.strip
+      line.sub!(/ #.*/, "")   # trailing
+      next if line =~ /^ *#/  # leading
+      next if line.empty?
+      name, status = line.split
+      hash[name] = (status == "1")  # enabled
+    end
+    @features = hash
+  end
+
   def get_repo_config
     log!(enter: __method__, level: 3)
     @editor = File.read(".blogs/data/EDITOR").chomp
@@ -27,15 +47,9 @@ module RuneBlog::Helpers
 
   def copy_data(tag, dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
-    extra = RuneBlog::Path + "/../config"  # files kept inside gem
-    # FIXME names are confusing
-    case tag
-      when :config 
-        files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
-        files.each {|file| copy(data + "/" + file, dest) }
-      when :extra  # FIXME remove later
-#        copy!(extra, dest)
-    end
+    # FIXME tag no longer used
+    files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3 features.txt]
+    files.each {|file| copy(data + "/" + file, dest) unless File.exist?(dest/file) }
   end
 
   def read_vars(file)
@@ -47,14 +61,15 @@ module RuneBlog::Helpers
       line = line.strip
       next if skip.include?(line[0])
       key, val = line.split(" ", 2)
-      hash[key] = val
+      next if key.nil?
+      hash[key] = hash[key.to_sym] = val
     end
     hash
   rescue => err
     puts "Can't read vars file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    stop_RubyText
+    stop_RubyText rescue nil
   end
 
   def read_config(file, *syms)
@@ -111,15 +126,6 @@ module RuneBlog::Helpers
     File.write(root + "/data/EDITOR", editor + "\n")
   end
 
-  # def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
-  #   log!(enter: __method__, args: [root, current_view, editor], level: 3)
-  #   root = Dir.pwd + "/" + root
-  #   x = OpenStruct.new
-  #   x.root, x.current_view, x.editor = root, current_view, editor
-  #   write_config(x, root + "/" + RuneBlog::ConfigFile)
-  #   write_repo_config
-  # end
-
   def new_sequence
     log!(enter: __method__, level: 3)
     dump(0, "data/sequence")

data/lib/liveblog.rb

@@ -72,7 +72,7 @@ def post_trailer
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
 
-  reddit_enabled = false   # FIXME
+  reddit_enabled = @blog.features["reddit"]
   reddit_txt = ""
   if reddit_enabled
     vdir  = @blog.root/:views/@blog.view
@@ -110,7 +110,7 @@ def faq
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
-  _out "<br>" unless @faq_count == 1
+  _out "<br>" # unless @faq_count == 1
   _optional_blank_line
 end
 
@@ -241,8 +241,8 @@ def _svg_title(*args)
         .subtitle { font: #{style2} #{size2} #{font2}; fill: #{color2} }
       </style>
       <rect x="10" y="10" rx="10" ry="10" width="#{width}" height="#{height}" fill="url(#grad1)"/>
-      <text text-anchor="#{align}"  x="#{x}" y="#{y}" class="title">#{Livetext::Vars[:blog]} </text>
-      <text text-anchor="#{align2}" x="#{x2}" y="#{y2}" class="subtitle">#{Livetext::Vars["blog.desc"]} </text>
+      <text text-anchor="#{align}"  x="#{x}" y="#{y}" class="title">#{Livetext::Vars["view.title"]} </text>
+      <text text-anchor="#{align2}" x="#{x2}" y="#{y2}" class="subtitle">#{Livetext::Vars["view.subtitle"]} </text>
     </svg> 
     <!-- ^ how does syntax highlighting get messed up? </svg> -->
   HTML
@@ -275,6 +275,13 @@ def h6; _passthru "#{@_data}"; end
 
 def hr; _passthru "<hr>"; end
 
+def nlist
+  _out "<ol>"
+  _body {|line| _out "<li>#{line}</li>" }
+  _out "</ol>"
+  _optional_blank_line
+end
+
 def list
   _out "<ul>"
   _body {|line| _out "<li>#{line}</li>" }
@@ -439,18 +446,18 @@ def head  # Does NOT output  tags
   defaults = {}
   defaults = { "charset"        => %[<meta charset="utf-8">],
                "http-equiv"     => %[<meta http-equiv="X-UA-Compatible" content="IE=edge">],
-               "title"          => %[<title>\n  #{_var(:blog)} | #{_var("blog.desc")}\n  </title>],
+               "title"          => %[<title>\n  #{_var("view.title")} | #{_var("view.subtitle")}\n  </title>],
                "generator"      => %[<meta name="generator" content="Runeblog v #@version">],
-               "og:title"       => %[<meta property="og:title" content="#{_var(:blog)}">],
+               "og:title"       => %[<meta property="og:title" content="#{_var("view.title")}">],
                "og:locale"      => %[<meta property="og:locale" content="#{_var(:locale)}">],
-               "description"    => %[<meta name="description" content="#{_var("blog.desc")}">],
-               "og:description" => %[<meta property="og:description" content="#{_var("blog.desc")}">],
+               "description"    => %[<meta name="description" content="#{_var("view.subtitle")}">],
+               "og:description" => %[<meta property="og:description" content="#{_var("view.subtitle")}">],
                "linkc"          => %[<link rel="canonical" href="#{_var(:host)}">],
                "og:url"         => %[<meta property="og:url" content="#{_var(:host)}">],
-               "og:site_name"   => %[<meta property="og:site_name" content="#{_var(:blog)}">],
+               "og:site_name"   => %[<meta property="og:site_name" content="#{_var("view.title")}">],
 #              "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)}">],
+               "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var("view.title")}">],
                "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="etc/favicon.ico">\n <link rel="apple-touch-icon" href="etc/favicon.ico">]
              }
   result = {}
@@ -682,7 +689,7 @@ end
 
 def _make_navbar(orient = :horiz)
   vdir = @root/:views/@blog.view
-  title = _var(:blog)
+  title = _var("view.title")
 
   if orient == :horiz
     name = "navbar.html"

data/lib/processing.rb

@@ -21,11 +21,15 @@ def stale?(src, dst, deps, force = false)
 end
 
 def preprocess(cwd: Dir.pwd, src:, 
-          dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
+          dst: nil, strip: false,
           deps: [], copy: nil, debug: false, force: false, 
           mix: [], call: [], vars: {})
   src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html") || strip)
+  if strip
+    dst = File.basename(src).sub(/.lt3$/,"")
+  else
+    dst += ".html" unless dst.end_with?(".html")
+  end
   sp = " "*12
   Dir.chdir(cwd) do
     if debug

data/lib/publish.rb

@@ -16,6 +16,8 @@ class RuneBlog::Publishing
     @blog = RuneBlog.blog
     dir = @blog.root/:views/view/"themes/standard/"
     gfile = dir/"global.lt3"
+    return unless File.exist?(gfile)  # FIXME Hackish as hell
+
     live = get_live_vars(gfile)
     @user    = live.vars["publish.user"]
     @server  = live.vars["publish.server"]

data/lib/repl.rb

@@ -14,20 +14,21 @@ module RuneBlog::REPL
     result = system!("#{@blog.editor} #{file} #{params}")
     raise EditorProblem(file) unless result
     STDSCR.restback
-#   cmd_clear(nil)
+    cmd_clear(nil)
   end
 
   def cmd_quit(arg, testing = false)
     cmd_clear(nil)
+    sleep 0.1
     RubyText.stop
     sleep 0.1
-    
+    system("clear")
     sleep 0.1
     exit
   end
 
   def cmd_clear(arg, testing = false)
-#   STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
+    STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
     STDSCR.clear
   end
 
@@ -39,19 +40,24 @@ module RuneBlog::REPL
   end
 
   def cmd_config(arg, testing = false)
-    hash = {"global.lt3           Global configuration"                     => "global.lt3",
-            "banner/top.lt3       Text portion of banner"                   => "banner/top.lt3",
-            "blog/generate.lt3    Generator for view (usu not edited)"      => "blog/generate.lt3",
-            ".... head.lt3        HEAD info for view"                       => "blog/head.lt3",
-            ".... banner.lt3      banner description"                       => "blog/banner.lt3",
-            ".... index.lt3       User-edited detail for view"              => "blog/index.lt3",
-            ".... post_entry.lt3  Generator for post entry in recent-posts" => "blog/post_entry.lt3",
-            "etc/blog.css.lt3     Global CSS"                               => "etc/blog.css.lt3",
-            "... externals.lt3    External JS/CSS (Bootstrap, etc.)"        => "/etc/externals.lt3",
-            "post/generate.lt3    Generator for a post"                     => "post/generate.lt3",
-            ".... head.lt3        HEAD info for post"                       => "post/head.lt3",
-            ".... index.lt3       Content for post"                         => "post/index.lt3",
-            ".... permalink.lt3   Generator for permalink"                  => "post/permalink.lt3",
+    hash = {"Global configuration"                     => "global.lt3",
+            "   View-specific variables"               => "../../settings/view.txt",
+            "   Recent posts"                          => "../../settings/recent.txt",
+            "   Publishing vars"                       => "../../settings/publish.txt",
+            "   Config for reddit"                     => "../../config/reddit/credentials.txt",
+            "   Config for Facebook"                   => "../../config/facebook/credentials.txt",
+            "   Config for Twitter"                    => "../../config/twitter/credentials.txt",
+            "View generator"                           => "blog/generate.lt3",
+            "   Banner: Description"                   => "blog/banner.lt3",
+            "   Banner: Text portion"                  => "banner/top.lt3",
+            "   HEAD info for view"                    => "blog/head.lt3",
+            "   User-edited detail for view"           => "blog/index.lt3",
+            "   Generator for recent-posts entry"      => "blog/post_entry.lt3",
+            "Generator for a post"                     => "post/generate.lt3",
+            "   HEAD info for post"                    => "post/head.lt3",
+            "   Content for post"                      => "post/index.lt3",
+            "Global CSS"                               => "etc/blog.css.lt3",
+            "External JS/CSS (Bootstrap, etc.)"        => "/etc/externals.lt3"
            }
 
     dir = @blog.view.dir/"themes/standard/"

data/lib/runeblog.rb

@@ -40,7 +40,7 @@ class RuneBlog
   end
 
   attr_reader :views, :sequence
-  attr_accessor :root, :editor
+  attr_accessor :root, :editor, :features
   attr_accessor :view  # overridden
 
   attr_accessor :post_views, :post_tags, :dirty_views
@@ -120,8 +120,9 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-    write_repo_config(root: @root)
+    write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
+    read_features   # top level
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
@@ -134,16 +135,67 @@ class RuneBlog
     @post_tags = []
   end
 
+  def complete_file(name, vars, hash)
+    debugging = vars.nil?
+    return if hash.empty?
+    text = File.read(name)
+    if vars.nil?   # FIXME dumbest hack ever?
+      vars = {}
+      hash.values.each {|val| vars[val] = val }
+    end
+
+    hash.each_pair {|key, var| text.gsub!(key, vars[var]) }
+    File.write(name, text)
+  end
+
+  def _generate_settings(view = nil)
+    vars = read_vars("#@root/data/universal.lt3")
+    hash = {/AUTHOR/  => "view.author",
+            /SITE/    => "view.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+
+    # rubytext.txt - LATER
+    # complete_file(settings/"rubytext.txt", {}
+
+    if view
+      settings = @root/view/"settings"
+      ### ??? Where to get hash of view-specific vars?
+
+      # features.txt - handle specially
+      fname = settings/"features.txt"
+
+      # view.txt
+      complete_file(settings/"view.txt", 
+                        /AUTHOR/   => "view.author",
+                        /TITLE/    => "view.title",
+                        /SUBTITLE/ => "view.subtitle",
+                        /SITE/     => "view.site")
+
+      # publish.txt
+      complete_file(settings/"publish.txt", 
+                        /USER/    => "publish.user",
+                        /SERVER/  => "publish.server",
+                        /DOCROOT/ => "publish.docroot",
+                        /PATH/    => "publish.path",
+                        /PROTO/   => "publish.proto")
+                
+      # recent.txt - SKIP THIS?
+      complete_file(settings/"recent.txt",  {})
+    end
+  end
+
   def _generate_global
     vars = read_vars("#@root/data/universal.lt3")
     gfile = "#@root/data/global.lt3"
-    global = File.read(gfile)
-    global.gsub!(/AUTHOR/,  vars["author"])
-    global.gsub!(/SITE/,    vars["site"])
-    global.gsub!(/FONT/,    vars["font.family"])
-    global.gsub!(/CHARSET/, vars["charset"])
-    global.gsub!(/LOCALE/,  vars["locale"])
-    File.write(gfile, global)
+    hash = {/AUTHOR/  => "univ.author",
+            /SITE/    => "univ.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+    complete_file(gfile, vars, hash)
+    _generate_settings
   end
 
   def _deploy_local(dir)
@@ -151,10 +203,7 @@ class RuneBlog
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each do |v| 
-        unless self.view?(v)
-          puts "#{fx("Warning:", :red)} #{fx(v, :bold)} is not a view"
-          next
-        end
+        next unless _check_view?(v)
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
     end
@@ -162,6 +211,8 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  # FIXME reconcile with _get_draft data
+
   def _retrieve_metadata(key)
     key = key.to_s
     lines = File.readlines("metadata.txt")
@@ -244,11 +295,15 @@ class RuneBlog
         @view = nil
       when RuneBlog::View
         @view = arg
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
+        read_features(@view)
+        @view.get_globals
         _set_publisher
       else 
         raise CantAssignView(arg.class.to_s)
@@ -324,6 +379,7 @@ class RuneBlog
     add_view(view_name)
     mark_last_published("Initial creation")
     system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
+    @view.get_globals
   rescue => err
     _tmp_error(err)
   end
@@ -373,7 +429,7 @@ class RuneBlog
     html = "/tmp/post_entry.html"
     preprocess src: post_entry_name, dst: html,
                call: ".nopara"  # , deps: depend  # , debug: true
-    @_post_entry ||= File.read(html)
+    @_post_entry = File.read(html)
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
@@ -404,16 +460,18 @@ class RuneBlog
     return posts[0..19]  # return 20 at most
   end
 
-  def collect_recent_posts(file)
+  def collect_recent_posts(file = "recent.html")
     log!(enter: __method__, args: [file], level: 3)
+    vars = self.view.globals
     text = <<-HTML
       <html>
       <head><link rel="stylesheet" href="etc/blog.css"></head>
-      <body>
+      <body style="background-color: #{vars["recent.bgcolor"]}">
     HTML
     posts = _sorted_posts
     if posts.size > 0
-      wanted = [8, posts.size].min  # estimate how many we want?
+      # estimate how many we want
+      wanted = [vars["recent.count"].to_i, posts.size].min
       enum = posts.each
       entries = []
       wanted.times do
@@ -485,7 +543,7 @@ class RuneBlog
     log!(enter: __method__, args: [view], pwd: true, dir: true)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
-    num = collect_recent_posts("recent.html")
+    num = collect_recent_posts
     return num
   rescue => err
     _tmp_error(err)
@@ -499,15 +557,14 @@ class RuneBlog
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    preprocess cwd: vdir/"themes/standard/etc", # deps: depend, debug: true,
-               src: "blog.css.lt3", copy: vdir/"remote/etc/", 
-               call: ".nopara" # , dst: "blog.css"
+    preprocess cwd: vdir/"themes/standard/etc", src: "blog.css.lt3", 
+               copy: vdir/"remote/etc/", call: [".nopara"], strip: true
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
                src: "blog/generate.lt3", dst: vdir/:remote/"index.html", 
                call: ".nopara"
     copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
-# rebuild widgets
+    # rebuild widgets?
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -515,6 +572,27 @@ class RuneBlog
     # _tmp_error(err)
   end
 
+  def _get_draft_data(num, sym)
+    tag = prefix(num)
+    front = @blog.root/:drafts/tag
+    files = Dir[front + "*"]
+    raise "No draft #{num} found" if files.empty?
+    raise "Too many files found for #{num}!" if files.size > 1
+    file = files.first
+    lines = File.readlines(file)
+    case sym
+      when :views
+        view_line = lines.grep(/^.views /)
+        raise "More than one .views call in #{draft}" if view_line.size > 1
+        raise "No .views call in #{draft}" if view_line.size < 1
+        view_line = view_line.first
+        views = view_line[7..-1].split
+        return views.uniq 
+    else
+      raise "Unknown symbol #{sym.inspect}"
+    end
+  end
+
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
@@ -604,6 +682,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft, view_name], level: 2)
     # break into separate methods?
 
+    return unless _check_view?(view_name)
+
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
     nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
@@ -633,30 +713,16 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  def _check_view?(view)
+    flag = self.view?(view)
+    puts "  Warning: '#{view}' is not a view" unless flag
+    flag
+  end
+
   def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
-    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
-
-  def rebuild_post(file)
-    log!(enter: __method__, args: [file])
-    raise "Doesn't currently work"
-    debug "Called rebuild_post(#{file.inspect})"
-    raise ArgumentError unless file.is_a?(String)
-    meta = process_post(file)
-    @views_dirty ||= []
-    @views_dirty << meta.views
-    @views_dirty.flatten!
-    @views_dirty.uniq!
+    views.each {|view| _handle_post(draft, view) }
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.98"
+  VERSION = "0.3.04"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -14,7 +14,13 @@ class RuneBlog::View
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
     @blog.view = self
+    get_globals
+  end
+
+  def get_globals
     gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
+    return unless File.exist?(gfile)  # Hackish!! how is View.new called from create_view??
+
     live = Livetext.customize(call: ".nopara")
     live.xform_file(gfile)
     @globals = live.vars

data/runeblog.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.99'
+  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.01'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.20'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'

data/test/austin.rb

@@ -31,7 +31,7 @@ end
 @fake_date = Date.today - 20
 
 def make_post(x, title, teaser, body, views=[])
-  debug "      make_post #{bold(title)}"
+  debug "  make_post #{bold(title)}"
   pubdate = @fake_date.strftime("%Y-%m-%d")
   @fake_date += (rand(2) + 1)
   x.create_new_post(title, true, teaser: teaser, body: body, views: views,
@@ -53,28 +53,26 @@ puts
 debug bold("Generating test blog...")
 
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo(".blogs")
-x = RuneBlog.new(".blogs")
+RuneBlog.create_new_blog_repo # (".blogs")
+x = RuneBlog.new  # (".blogs")
 
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
 
-#### FIXME later!!
-vars = <<-VARS
-
-.variables
-blog        Around Austin
-blog.desc   The view from downtown...
+#### FIXME
 
-font.family verdana
-.end
+vars = <<-VARS
+author     Hal Fulton
+title      Around Austin
+subtitle   The view from downtown...
+domain     foo.com
 VARS
-File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
-  f.puts vars
-end
+vfile = ".blogs/views/around_austin/settings/view.txt"
+File.open(vfile, "w") {|f| f.puts vars }
+
 ####
 
-debug("-- change_view: #{bold('around_austin')}")
+debug("change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY)
@@ -144,11 +142,10 @@ But I first heard of them
 in 2005.
 BODY
 
-debug
-debug "** generate_index #{bold("around_austin")}"
+debug "generate_index #{bold("around_austin")}"
 x.generate_index("around_austin") 
 
-debug("** generate_view: #{bold('around_austin')}")
+debug("generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 
 debug bold("...finished.\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.98
+  version: 0.3.04
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.99
+        version: 0.9.01
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.99
+        version: 0.9.01
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - data/EDITOR
 - data/ROOT
 - data/VIEW
+- data/features.txt
 - data/global.lt3
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
@@ -109,6 +110,7 @@ files:
 - empty_view/config/twitter/twitter.rb
 - empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
+- empty_view/remote/banner/navbar/GIT_IS_DUMB
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/ad/GIT_IS_DUMB
@@ -116,6 +118,10 @@ files:
 - empty_view/remote/widgets/news/GIT_IS_DUMB
 - empty_view/remote/widgets/pages/GIT_IS_DUMB
 - empty_view/remote/widgets/pinned/GIT_IS_DUMB
+- empty_view/settings/features.txt
+- empty_view/settings/publish.txt
+- empty_view/settings/recent.txt
+- empty_view/settings/view.txt
 - empty_view/themes/standard/README
 - empty_view/themes/standard/banner/banner.lt3
 - empty_view/themes/standard/banner/navbar/about.lt3
@@ -131,12 +137,10 @@ files:
 - empty_view/themes/standard/etc/externals.lt3
 - empty_view/themes/standard/etc/favicon.ico
 - empty_view/themes/standard/etc/misc.js
-- empty_view/themes/standard/global.lt3
 - empty_view/themes/standard/post/generate.lt3
 - empty_view/themes/standard/post/head.lt3
 - empty_view/themes/standard/post/index.lt3
 - empty_view/themes/standard/post/permalink.lt3
-- empty_view/themes/standard/recent.txt
 - empty_view/themes/standard/widgets/README
 - empty_view/themes/standard/widgets/ad/ad.lt3
 - empty_view/themes/standard/widgets/ad/ad1.png

data/empty_view/themes/standard/global.lt3

@@ -1,32 +0,0 @@
-. --------------------------------------------------
-. Global settings are stored here in the form       
-.   <variable>  <value>                             
-. --------------------------------------------------
-
-.variables
-author      Your name here
-blog        Blog title goes here
-blog.desc   Subtitle (if any) goes here
-site        rubyhacker.com
-
-host        localhost:4000//
-charset     utf-8
-url         localhost:4000//
-locale      en_US
-
-font.family       verdana
-
-recent.title.color  #010101
-recent.title.size   28px
-recent.text.color   #0101a1
-recent.text.size    22px
-recent.date.color   #9a9a9a
-recent.date.size    15px
-
-publish.user      root
-publish.server    rubyhacker.com
-publish.docroot   /var/www/
-publish.path      stuff
-publish.proto     http
-.end
-

data/empty_view/themes/standard/recent.txt

@@ -1,6 +0,0 @@
-recent.title.color  #010101
-recent.title.size   28px
-recent.text.color   #0101a1
-recent.text.size    22px
-recent.date.color   #9a9a9a
-recent.date.size    15px