RubyGems - runeblog - Versions diffs - 0.1.81 → 0.1.82 - Mend

runeblog 0.1.81 → 0.1.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40ca6858d4ca38b504ef54bb5a8f87433abb297b8ec63c88ae1b5d2aa3762eb
-  data.tar.gz: 960b06aadc8ab29c28bf46c8907722b9dc91ce095157ca9cfc554fc3fbd05675
+  metadata.gz: d1767dd929fb222d5107da06ce3cafb3b0916fe6ff13fda0bf23e649c59fa678
+  data.tar.gz: 572f0934dcf02a10cc922b5910d5c4602a64078eb46b9304613000e7bd426868
 SHA512:
-  metadata.gz: 5a81c6cb6fe18bc970997818775e8ce8e348acb9fd75e83f2f8fd75a83bee3875f83cf5bead1e6f9bbddf7da9060ff20a228b1f7d0ad632a8f52c139e90f621d
-  data.tar.gz: 59a0c7e1da3d22d22ebf207d1543850355048fca50cae82483739c9a0ce65d49fbd3bb0ea8d6c43556a04c7fc64c33d7f44b692edb210cdde680ecf1735be4a8
+  metadata.gz: 1d0f9babd073538726699c6c41ee4022be7d998ede5af13d10ac36034908f83f6090ffec1de555e754bf64103bb220761d7cd7f25e06533385e384b1348f0e16
+  data.tar.gz: 414278f412434ab9acbaf4be6675c3228844f62d7c4ab62d41953aed5901ee19cac81756ef0271442826a705afdca32e9ba2b515fa564b9830c619a2f9707085

data/data/standard.tgz CHANGED Viewed

Binary file

data/lib/default.rb CHANGED Viewed

@@ -23,6 +23,9 @@ def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_vie
 #{teaser}
 .end
 #{body}
+<br>
+<a href="javascript:history.go(-1)">[Back]</a>
 TEXT
 end

data/lib/helpers-blog.rb CHANGED Viewed

@@ -4,6 +4,20 @@ require 'runeblog_version'
 module RuneBlog::Helpers
+  def copy(src, dst)
+    system("cp #{src}  #{dst}")
+  end
+  def copy!(src, dst)
+    system("cp -r #{src}  #{dst}")
+  end
+  def livetext(src, dst)
+    src << ".lt3" unless src.end_with?(".lt3")
+    dst << ".html" unless src.end_with?(".html")
+    system("livetext #{src} >#{dst}")
+  end
   def get_root
     if $_blog
       if $_blog.root
@@ -114,9 +128,9 @@ module RuneBlog::Helpers
     raise CantCreateDir(dir) unless result
   end
-  def interpolate(str)
+  def interpolate(str, binding)
     wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
+    eval wrap, binding
   end
   def error(err)  # Hmm, this is duplicated

data/lib/liveblog.rb CHANGED Viewed

@@ -32,6 +32,7 @@ end
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
+  _out "  <!-- Post number #{@meta.num} -->\n "
 end
 def _view_from_cwd
@@ -300,7 +301,7 @@ def head
                "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(:title)}">],
-               "style"          => %[<link rel="stylesheet" href="blog-application.css">],
+               "style"          => %[<link rel="stylesheet" href="assets/blog.css">],
                "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:title)}">],
                "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="../assets/favicon.ico">\n <link rel="apple-touch-icon" href="../assets/favicon.ico">]
              }
@@ -325,7 +326,7 @@ def head
     end
   end
   hash = defaults.dup.update(result)  # FIXME collisions?
-  _out "<html lang=en_US>"
+#  _out "<html lang=en_US>"
   _out "<head>"
   hash.each_value {|x| _out "  " + x }
   _out "</head>"
@@ -402,6 +403,7 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 ### How this next bit works:
 ###
 ###   all_teasers will call _find_recent_posts
@@ -439,7 +441,7 @@ def all_teasers
   text = <<-HTML
     <html>
-    <head><link rel="stylesheet" href="blog-application.css"></head>
+    <head><link rel="stylesheet" href="assets/blog.css"></head>
     <body>
   HTML
   posts = _find_recent_posts
@@ -491,6 +493,7 @@ def _teaser(slug)
   text
 end
 def card_iframe
   title = _data
   lines = _body

data/lib/post.rb CHANGED Viewed

@@ -153,5 +153,18 @@ class RuneBlog::ViewPost
     @title = lines.grep(/title:/).first[7..-1].chomp
     @date  = lines.grep(/pubdate:/).first[9..-1].chomp
   end
+  def get_dirs
+    fname = File.basename(draft)
+    noext = fname.sub(/.lt3$/, "")
+    vdir = "#@root/views/#{view}"
+    dir = "#{vdir}/posts/#{noext}/"
+    Dir.mkdir(dir) unless Dir.exist?(dir)
+    system("cp #{draft} #{dir}")
+    viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
+    theme = viewdir + "/themes/standard"
+    [noext, viewdir, slugdir, aslug, theme]
+  end
 end

data/lib/runeblog.rb CHANGED Viewed

@@ -1,4 +1,5 @@
-require 'livetext'
+require 'date'
+# require 'livetext'
 require 'runeblog_version'
 require 'global'
@@ -24,7 +25,7 @@ class RuneBlog
   make_exception(:CantCreateDir,     "Can't create directory $1")
   make_exception(:EditorProblem,     "Could not edit $1")
   make_exception(:NoSuchView,        "No such view: $1")
-  make_exception(:LivetextError,     "Livetext#process_file returned nil for $1")
+# make_exception(:LivetextError,     "Livetext#process_file returned nil for $1")
   make_exception(:NoBlogAccessor, "Runeblog.blog is not set")
@@ -169,8 +170,14 @@ class RuneBlog
     create_dir('assets')
     create_dir('posts')
+    create_dir('staging')
+    create_dir('staging/assets')
+    create_dir('remote')
+    create_dir('remote/assets')
     Dir.chdir("themes") { system("tar zxvf #{GemData}/standard.tgz >/dev/null 2>&1") }
-#   system("cp themes/standard/blog/assets/* assets/")
+    copy!("themes/standard/*", "staging/")
+    copy("themes/standard/assets/*", "remote/assets/")
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
@@ -210,6 +217,71 @@ class RuneBlog
     result
   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 }
+    posts.select! {|x| File.directory?(x) }
+    post = posts.select {|x| File.basename(x).to_i == postid }
+    raise "Error: More than one post #{postid}" if post.size > 1
+    postdir = post.first
+    vp = RuneBlog::ViewPost.new(self.view, postdir)
+    vp
+  end
+  def teaser(slug)
+    id = slug.to_i
+    text = nil
+    post_entry_name = @theme + "/blog-_postentry.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
+    url = "#{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 collect_recent_posts(file)
+    @vdir = ".."
+    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 = posts[0..19]  # return 20 at most
+    text = <<-HTML
+      <html>
+      <head><link rel="stylesheet" href="assets/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(file, text) # FIXME ???
+    iframe_text = <<-HTML
+      <iframe style="width: 100vw;height: 100vh;position: relative;"
+              src='recent.html' width=100% frameborder="0" allowfullscreen>
+      </iframe>
+    HTML
+    # _out iframe_text # FIXME ??
+  end
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
     save = Dir.pwd
     Dir.chdir(self.view.dir)
@@ -309,25 +381,26 @@ class RuneBlog
   def generate_post(draft)
     views = _get_views(draft)
     views.each do |view|
-      noext, viewdir, slugdir, aslug, theme = _copy_get_dirs(draft, view)
+      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+      staging = viewdir + "/staging"
       Dir.chdir(slugdir) do
-        html = noext[5..-1] + ".html"
-        system("livetext #{draft} >#{html}")
-        Dir.mkdir("sidebar") unless Dir.exist?("sidebar")
-        system("cp #{theme}/sidebar/*.lt3 ./sidebar/")
-        files = ["blog-generate.lt3", "blog-index.lt3", "global.lt3", "blog-head.lt3",
-                 "meta.lt3", "navbar.lt3", "blog-application.css"]
-        files2 = files.map {|x| theme + "/" + x }
-        files2.each do |f|
-          system("cp #{f} .")
+        copy(draft, ".")
+        lt3 = draft.split("/")[-1]
+        # Remember: Some posts may be in more than one view -- careful with links back
+        # system("livetext #{draft} >staging/#{name}/index.html")  # permalink?
+# Structure is borked?
+        copy!("#{@theme}/*", "#{staging}")
+        copy(lt3, staging)
+        html = noext[5..-1]
+        Dir.chdir(staging) do
+          livetext draft, html
+          # link to POST??
+          copy html, "../remote"
+          collect_recent_posts("recent.html")
+          copy("recent.html", "../remote")
+          livetext "blog-generate",  "../remote/index"
         end
-#       system("livetext blog-generate.lt3 >bgen.html")
-#       files.each {|fname| system("rm ./#{fname}") }
-#       system("rm -rf ./sidebar/")
       end
-      # create framed pure slug (where?)
     end
   end

data/lib/runeblog_version.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 class RuneBlog
-  VERSION = "0.1.81"
+  VERSION = "0.1.82"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/lib/view.rb CHANGED Viewed

@@ -25,7 +25,7 @@ class RuneBlog::View
   end
   def local_index
-    dir + "/generated/index.html"
+    dir + "/remote/index.html"
   end
   def index
@@ -39,7 +39,7 @@ class RuneBlog::View
   def publishable_files
     vdir = dir()
     files = [local_index()]
-    others = Dir.entries(vdir + "/generated").grep(/^\d\d\d\d/).map {|x| "#{vdir}/generated/#{x}" }
+    others = Dir.entries(vdir + "/remote").grep(/^\d\d\d\d/).map {|x| "#{vdir}/remote/#{x}" }
 abort "FIXME... publishable_files"
     deep_assets = Dir["#{vdir}/themes/standard/assets/*"]
     deep_assets.each do |file|   # Do this at view creation

data/test/make_blog.rb CHANGED Viewed

@@ -19,7 +19,8 @@ def debug(str)
 end
 def make_post(x, title, teaser, body, views=[])
-STDERR.puts "\n========= make_post '#{title}'"
+# STDERR.puts "\n========= make_post '#{title}'"
+  print "."
   meta = OpenStruct.new
   num = x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
   num
@@ -32,6 +33,10 @@ def show_lines(text)
   str
 end
+puts
 system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
 x = RuneBlog.new
@@ -61,36 +66,36 @@ EXCERPT
 Now, depending on what you consider "major," blah blah blah...
 BODY
-# x.change_view("computing")     # 3 5 6
-#
-# make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
-# The next Elixir Conf is always coming up.
-# EXCERPT
-# I mean, unless the previous one was the last one ever, which I don't expect to
-# happen for a couple of decades.
-# BODY
-#
-# x.change_view("music")    # 4 10
-#
-# make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
-# Indie msic blah blah blah blah....
-# EXCERPT
-# And more about indie music.
-# BODY
-#
-# x.change_view("computing")
-#
-# make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
-# Boyd Multerer is a genius.
-# EXCERPT
-# And so is Scenic.
-# BODY
-#
-# make_post(x, "The future of coding", <<-EXCERPT, <<-BODY)
-# Someday you can forget your text editor entirely.
-# EXCERPT
-# But that day hasn't come yet.
-# BODY
+x.change_view("computing")     # 3 5 6
+make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
+The next Elixir Conf is always coming up.
+EXCERPT
+I mean, unless the previous one was the last one ever, which I don't expect to
+happen for a couple of decades.
+BODY
+x.change_view("music")    # 4 10
+make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
+Indie msic blah blah blah blah....
+EXCERPT
+And more about indie music.
+BODY
+x.change_view("computing")
+make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
+Boyd Multerer is a genius.
+EXCERPT
+And so is Scenic.
+BODY
+make_post(x, "The future of coding", <<-EXCERPT, <<-BODY)
+Someday you can forget your text editor entirely.
+EXCERPT
+But that day hasn't come yet.
+BODY
 x.change_view("around_austin")
@@ -124,3 +129,4 @@ BODY
 x.change_view("around_austin")
+puts

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.82
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext