runeblog 0.2.94 → 0.3.01

data/{lib/exper/fbtw.rb → empty_view/config/twitter/twitter.rb}

@@ -1,18 +1,6 @@
-
 class Livetext::Functions
 
-  def facebook_init
-    fb_appid = _var("facebook.appid")
-    <<~HTML
-        window.fbAsyncInit = function() {
-          FB.init({
-            appId      : '#{fb_appid}',
-            xfbml      : true,
-            version    : 'v2.4'
-          });
-        };
-    HTML
-  end
+# Needed for Twitter??
 
 =begin
 <!-- Needed:  btw what is 'content'?
@@ -25,18 +13,8 @@ class Livetext::Functions
 -->
 =end
 
-  def facebook_likes
-    <<~HTML
-      <div class='fb-like'
-           data-share='true'
-           data-width='450'
-           data-show-faces='true'>
-      </div>
-    HTML
-  end
-
-  def twitter_share
-    name, title, url = "", "", ""  # FIXME
+  def twitter_share(title, url)
+    name = _var("twitter.user")
     <<~HTML
       <a href='https://twitter.com/share' 
          class='twitter-share-button' 
@@ -48,7 +26,7 @@ class Livetext::Functions
   end
 
   def twitter_follow
-    name = "hal_fulton"   # FIXME
+    name = _var("twitter.user")
     <<~HTML
       <a href='https://twitter.com/#{name}' class='twitter-follow-button' data-show-count='false'>Follow @#{name}</a>
     HTML

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     1   # 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,6 @@
+title.color  #010101
+title.size   28px
+text.color   #0101a1
+text.size    22px
+date.color   #9a9a9a
+date.size    15px

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/empty_view/themes/standard/blog/post_entry.lt3

@@ -10,7 +10,7 @@
         <font size=-1>#{date}</font>
       </td>
       <td> 
-        <span class="post-title-text"><a href="#{url}" style="margin-top: -5px">#{title}</a></span>
+        <span class="recent-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&nbsp;reading</small></a> 
       </td>

data/empty_view/themes/standard/etc/blog.css.lt3

@@ -3,40 +3,40 @@
 . Most of the global CSS goes here                  
 . --------------------------------------------------
 
-.seek themes/standard/global.lt3
+.seek global.lt3
 
 body { font-family: $font.family }
 
-\.post-title a {
-  color: $post.title.color;
+\.recent-title a {
+  color: $recent.title.color;
   font-family: $font.family;
-  font-size: $post.title.size;
+  font-size: $recent.title.size;
   float: right;
   display: inline-block;
   text-align: top;
   text-decoration: none;
 }
 
-\.post-title a:hover {
+\.recent-title a:hover {
   text-decoration: none;
 }
 
-\.post-title-text a {
-  color: $post.text.color;
+\.recent-title-text a {
+  color: $recent.text.color;
   font-family: $font.family;
-  font-size: $post.text.size; 
+  font-size: $recent.text.size; 
   display: block;
   text-decoration: none;
 }
 
-\.post-title-text a:hover {
+\.recent-title-text a:hover {
   text-decoration: none;
 }
 
-\.post-date {
-  color: $post.date.color;
+\.recent-date {
+  color: $recent.date.color;
   font-family: $font.family;
-  font-size: $post.date.size;
+  font-size: $recent.date.size;
   display: block;
   float: left;
   text-align: top;

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

@@ -22,9 +22,9 @@ style       blog.css
 <body>
 
 <section class="post">
-  <div class="entry-content">
+  <div class="recent-content">
     <table border=0 width=100%><tr>
-      <td align=left valign=bottom><h2 class="post-title">$title</h2></td>
+      <td align=left valign=bottom><h2 class="recent-title">$title</h2></td>
       <td align=right valign=top><font size=-5><br></font>$longdate</td>
     </tr></table><hr>
     $.copy guts.html
@@ -33,6 +33,6 @@ style       blog.css
 
 <br>
 <hr>
-.post_trailer
+.post_trailer 
 </body>
 </html>

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

@@ -21,7 +21,7 @@ description $teaser
 .end
 
 <section class="post">
-  <div class="entry-content">
+  <div class="recent-content">
     $.copy guts.html
   </div>
 </section>

data/lib/helpers-blog.rb

@@ -14,6 +14,18 @@ module RuneBlog::Helpers
     exit
   end
 
+  def read_features
+    hash = {}
+    file = @root/self.view/"settings/features.txt"
+    lines = File.readlines(file)
+    lines.each do |line|
+      char, line = line[0], line[1..-1].chomp
+      name = line.strip
+      hash[name] = (char != "-")
+    end
+    @features = hash
+  end
+
   def get_repo_config
     log!(enter: __method__, level: 3)
     @editor = File.read(".blogs/data/EDITOR").chomp
@@ -26,11 +38,16 @@ module RuneBlog::Helpers
   end
 
   def copy_data(tag, dest)
-    data = RuneBlog::Path + "/../data"  # files kept inside gem
+    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]
+      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
-    files.each {|file| copy(data + "/" + file, dest) }
   end
 
   def read_vars(file)
@@ -42,14 +59,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)
@@ -106,20 +124,11 @@ 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, "sequence")
+    dump(0, "data/sequence")
     version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
-    dump(version_info, "VERSION")
+    dump(version_info, "data/VERSION")
   end
 
   def subdirs(dir)

data/lib/liveblog.rb

@@ -45,23 +45,59 @@ def post
   _out "  <!-- Post number #{@meta.num} -->\n "
 end
 
+  def _got_python?
+    # Dumb - fix later - check up front as needed
+    # Should also check for praw lib
+    str = `which python3`
+    str.length > 0
+  end
+
+  def _reddit_post_url(vdir, title, url)
+    _got_python?
+    tmpfile = "/tmp/reddit-post-url.txt"
+    File.open(tmpfile, "w") do |tmp|
+      tmp.puts "[Post] " + title
+      tmp.puts url
+    end
+    rid = nil
+    Dir.chdir(vdir/:config) { rid = `python3 reddit/reddit_post_url.py` }
+    system("rm #{tmpfile}")
+    rid  # returns reddit id
+  end
+
 def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
           "/" + _var("publish.path") + "/" + _var("post.aslug") + 
           ".html"
   tags = _var("post.tags")
-  if tags.empty?
-    taglist = ""
-  else
-    taglist = "Tags: #{tags}"
+  taglist = tags.empty? ? "" : "Tags: #{tags}"
+
+  reddit_enabled = @blog.features["reddit"] rescue nil
+  reddit_txt = ""
+  if reddit_enabled
+    vdir  = @blog.root/:views/@blog.view
+    nslug = "#{_var("post.num")}-#{_var("post.aslug")}"
+    rid_file = vdir/:posts/nslug/"reddit.id"
+    rid = File.exist?(rid_file) ? File.read(rid_file).chomp : nil
+    if rid.nil?
+      title = _var("title")
+      rid = _reddit_post_url(vdir, title, perma)
+      dump(rid, rid_file)
+    end
+    reddit_txt = <<~HTML
+      <hr>
+      <script src='https://redditjs.com/post.js' 
+              data-url="#{rid}" data-width=800 ></script>
+    HTML
+  # damned syntax highlighting </>
   end
   _out <<~HTML
   <table width=100%><tr>
     <td width=10%><a style="text-decoration: none" href="javascript:history.go(-1)">[Back]</a></td>
     <td width=10%><a style="text-decoration: none" href="#{perma}"> [permalink] </a></td>
     <td width=80% align=right><font size=-3>#{taglist}</font></td></tr></table>
+  #{reddit_txt}
   HTML
-  # damned syntax highlighting
 end
 
 def faq
@@ -205,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
@@ -239,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>" }
@@ -403,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 = {}
@@ -646,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
@@ -47,4 +51,10 @@ def preprocess(cwd: Dir.pwd, src:,
   end
 end
 
+def get_live_vars(src)
+  live = Livetext.customize(call: [".nopara"])
+  live.xform_file(src)
+  live
+end
+
 end

data/lib/publish.rb

@@ -3,26 +3,27 @@ if ! defined?(Already_publish)
   Already_publish = nil
 
 require 'pathmagic'
+require 'processing'
 
 class RuneBlog::Publishing
   attr_reader :user, :server, :docroot, :path
 
-
   BadRemoteLogin = Exception.new("Can't login remotely")
   BadRemotePerms = Exception.new("Bad remote permissions")
 
   def initialize(view)
     log!(enter: __method__, args: [view.to_s])
     @blog = RuneBlog.blog
-    gfile = @blog.root/:views/view/"themes/standard/global.lt3"
-    data = File.readlines(gfile)
-    # Please refactor the Hal out of this
-    grab = ->(var) { data.grep(/^#{var} /).first.chomp.split(" ", 2)[1] }
-    @user    = grab.call("publish.user")
-    @server  = grab.call("publish.server")
-    @docroot = grab.call("publish.docroot")
-    @path    = grab.call("publish.path")
-    @proto   = grab.call("publish.proto")
+    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"]
+    @docroot = live.vars["publish.docroot"]
+    @path    = live.vars["publish.path"]
+    @proto   = live.vars["publish.proto"]
   end
 
   def to_h