RubyGems - runeblog - Versions diffs - 0.1.78 → 0.1.79 - Mend

runeblog 0.1.78 → 0.1.79

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 (9) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e483b3ec658dfbb130d8b2b090107155af6c5371066949ae9d78bf8b4851525
-  data.tar.gz: 91ae3aebfefc68e69ddea4aa9cb700a28a572a422f41b9c010b570271069c22e
+  metadata.gz: 6add0a9ef9437be9e4f41ee88ac0a067cc13a9120c73a4403a2a23d471f1034d
+  data.tar.gz: ec7b79a7c68f46b57e367043aff7db3524d88e8fd593ccd9a699ca1071ff83c0
 SHA512:
-  metadata.gz: bd0a51b5eef53f86f738e51dca6428bf2eefa6373912e023c61819aadef977b30f4e7735d0a3a183944f4071c136d797ba6f32f06e327e663bd75ba84db4efe2
-  data.tar.gz: a531739bb62e383d4e660a7f9e630a786934d739badfd179359d63392f23f5486c62b6f53922169b0ee12c319da71edad2fb7ec7839497fa2c3121be4d2bcf6c
+  metadata.gz: 2301c17418d3d5f1cb076e36d9b6583b8388f82f6c142ac67b4d2f88110dcd46c3d79f344bf59a0e3dd0858fbbf35d3469f6a7ab0ad11d587b5cd142c61eb124
+  data.tar.gz: e96e4521ecb8f542a58164ac20f2cac17b51113cd3096258a45124b05ad1a79e29f6059eabe154c1ae4576ece2bda8f51f50c5c3368740f5728fd137a0a50e03

data/bin/blog CHANGED

@@ -9,6 +9,9 @@ require 'repl'
 include RuneBlog::REPL
+errfile = File.new("stderr.out", "w")
+STDERR.reopen(errfile)
 def get_started
   puts
   puts fx(<<-TEXT, :bold)

data/data/standard.tgz CHANGED

Binary file

data/lib/liveblog.rb CHANGED

@@ -5,6 +5,9 @@ require 'date'
 require 'livetext'
 require 'runeblog'
+errfile = File.new("liveblog.out", "w")
+STDERR.reopen(errfile)
 # ::Home = Dir.pwd unless defined?(::Home)
 =begin
@@ -288,6 +291,7 @@ def finalize
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
   @postdir = @blog.view.dir + "/posts/#{slug_dir}"
+STDERR.puts "Got here!"
   write_post
   @meta
 end
@@ -359,7 +363,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="../assets/application.css">],
+               "style"          => %[<link rel="stylesheet" href="blog-application.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">]
              }
@@ -418,10 +422,12 @@ def main    # side-effect
 STDERR.puts "--- inside #main: which = #{which.inspect}"
   case which
     when "recent_posts"
-      all_teasers    # FIXME does nothing yet
-    when "post"
-      self.data = "post-index.lt3"
-      _include
+      all_teasers
+    when "post"   # FIXME!!!
+#     _out "<iframe src='./0001-whats-at-stubbs/whats-at-stubbs.html'><iframe>"
+      _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
+#     self.data = "post-index.lt3"
+#     _include
   end
   _out %[</div>]
 end
@@ -499,26 +505,26 @@ STDERR.puts "-- inside #all_teasers..."
   close = <<-HTML
       </section>
   HTML
-STDERR.puts "=== at01"
-  _out open
-  # FIXME: Now do the magic...
-STDERR.puts "=== at02"
+  text = <<-HTML
+    <html>
+    <head><link rel="stylesheet" href="blog-application.css"></head>
+    <body>
+  HTML
+# _out open
   posts = _find_recent_posts
-STDERR.puts "=== at03"
   wanted = [5, posts.size].min  # estimate how many we want?
-STDERR.puts "=== at04"
   enum = posts.each
-STDERR.puts "=== at05"
   wanted.times do
-STDERR.puts "=== at06 (loop)"
     postid = File.basename(enum.next)
-STDERR.puts "=== at07"
     postid = postid.to_i
-STDERR.puts "=== at08"
-    _teaser(postid)
-STDERR.puts "=== at09"
+    text << _teaser(postid)    # side effect! calls _out
   end
-  _out close
+  text << "</body></html>"
+  File.write("recent.html", text)
+# _out close
+# _out "<iframe src='./recent.html'><iframe>"
+  _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
 end
 def _post_lookup(postid)    # side-effect
@@ -532,15 +538,8 @@ def _post_lookup(postid)    # side-effect
   post = posts.select {|x| File.basename(x).to_i == postid }
   raise "Error: More than one post #{postid}" if post.size > 1
   postdir = post.first
-  fname = "#{postdir}/teaser.txt"
-  teaser_text = File.read(fname).chomp
-  # FIXME dumb hacks...
-  mdfile = "#{postdir}/metadata.txt"
-  lines = File.readlines(mdfile)
-  title = lines.grep(/title:/).first[7..-1].chomp
-  date  = lines.grep(/pubdate:/).first[9..-1].chomp
-  slug  = postdir
-  [slug, title, date, teaser_text]
+  vp = RuneBlog::ViewPost.new(@blog.view, postdir)
+  vp
 end
 def _interpolate(str, context)   # FIXME move this later
@@ -553,15 +552,19 @@ def _teaser(slug)
   text = nil
   post_entry_name = @theme + "blog-_postentry.lt3"
   @_post_entry ||= File.read(post_entry_name)
-  slug = title = date = teaser_text = nil
-  slug, title, date, teaser_text = _post_lookup(id)
-  # vdir = File.expand_path("../../..")
-  url = "#@vdir/#{slug}.html"
+  vp = _post_lookup(id)
+  nslug, aslug, title, date, teaser_text =
+    vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
+  path = vp.path
+STDERR.puts [">>>>> vp = ", vp].inspect
+  url = "#{path}/#{aslug}.html"    # Should be relative to .blogs!! FIXME
+STDERR.puts [slug, url].inspect
     date = Date.parse(date)
     date = date.strftime("%B %e<br>%Y")
     text = _interpolate(@_post_entry, binding)
 #   File.write("../../../generated/#{slug}.html", text)
-  _out text
+# _out text
+  text
 end
 def card_iframe

data/lib/post.rb CHANGED

@@ -134,5 +134,24 @@ STDERR.puts "---  cmd = #{cmd}\n "
     p err
     puts err.backtrace.join("\n")
   end
+end
+class RuneBlog::ViewPost
+  attr_reader :path, :nslug, :aslug, :title, :date,
+              :teaser_text
+  def initialize(view, postdir)
+    # Assumes already parsed/processed
+    @blog = RuneBlog.blog || raise(NoBlogAccessor)
+    @path = postdir.dup
+    @nslug = @path.split("/").last
+    @aslug = @nslug[5..-1]
+    fname = "#{postdir}/teaser.txt"
+    @teaser_text = File.read(fname).chomp
+    # FIXME dumb hacks...
+    mdfile = "#{postdir}/metadata.txt"
+    lines = File.readlines(mdfile)
+    @title = lines.grep(/title:/).first[7..-1].chomp
+    @date  = lines.grep(/pubdate:/).first[9..-1].chomp
+  end
 end

data/lib/repl.rb CHANGED

@@ -233,7 +233,8 @@ module RuneBlog::REPL
     # Simplify this
     tag = "#{'%04d' % id}"
     files = Find.find(@blog.root+"/drafts").to_a
-    files = files.grep(/#{tag}-/)
+p files
+    files = files.grep(/#{tag}-.*lt3/)
     files = files.map {|f| File.basename(f) }
     if files.size > 1
       msg = "Multiple files: #{files}"

data/lib/runeblog.rb CHANGED

@@ -1,4 +1,4 @@
-require 'find'
+#equire 'find'
 require 'livetext'
 require 'runeblog_version'
@@ -223,9 +223,13 @@ class RuneBlog
     Dir.chdir(self.view.dir)
     # change to create_draft ?
     post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
+puts "cnp: num = #{post.meta.num}"
     post.edit unless testing
-    meta = post.build
+    post.build
+    meta = post.meta
     Dir.chdir(save)
+puts "cnp: title = #{title.inspect}\n meta = #{meta.inspect}"
+    meta.num ||= 999
 return meta.num
     Dir.chdir(save)
     meta.num = 999
@@ -297,6 +301,16 @@ return meta.num
   def generate_view(view)
   end
+  def _get_views(draft)
+    # FIXME dumb code
+    view_line = File.readlines(draft).grep(/^.views /)
+    raise "More than one .views call!" if view_line.size > 1
+    raise "No .views call!" if view_line.size < 1
+# STDERR.puts view_line.inspect
+    view_line = view_line.first
+    views = view_line[7..-1].split
+  end
   # Remember: A post in multiple views will trigger multiple
   #   views needing to be rebuilt (and published)
@@ -313,7 +327,45 @@ return meta.num
 #   livetext ??/recent.lt3 >VIEW/working/recent.html
 #   livetext VIEW/blog/generate.lt3 ??
+  def _copy_get_dirs(draft, view)
+    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
   def generate_post(draft)
+    views = _get_views(draft)
+    views.each do |view|
+      noext, viewdir, slugdir, aslug, theme = _copy_get_dirs(draft, view)
+      Dir.chdir(slugdir) do
+        html = noext[5..-1] + ".html"
+STDERR.puts "--- NEW gp into #{slugdir}: livetext #{draft} >#{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"]
+        files2 = files.map {|x| theme + "/" + x }
+        files2.each do |f|
+          system("cp #{f} .")
+        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
+  def old_generate_post(draft)
     dir = File.dirname(draft)
     fname = File.basename(draft)
 # STDERR.puts "--- gp01 dir/fname = #{dir}  #{fname}"
@@ -323,37 +375,36 @@ return meta.num
     raise "No .views call!" if view_line.size < 1
     view_line = view_line.first
-# STDERR.puts "--- gp01b view_line = #{view_line}"
     views = view_line[7..-1].split
     slug_dir = fname.sub(/.lt3$/, "")
-# STDERR.puts "--- gp02 preloop"
     views.each do |view|
-# STDERR.puts "--- gp03 view = #{view}"
       vdir = "#@root/views/#{view}"
       dir = "#{vdir}/posts/#{slug_dir}/"
-STDERR.puts "--- gp03b vdir = #{vdir} dir = #{dir}"
       Dir.mkdir(dir) unless Dir.exist?(dir)
-puts
-#  --- gp04 system: cp /Users/Hal/Dropbox/files/runeblog/.blogs/data/drafts/0007-the-graffiti-wall.lt3
-#                      /Users/Hal/Dropbox/files/runeblog/.blogs/data/around_austin/posts/0007-the-graffiti-wall.lt3/
-STDERR.puts "--- gp04 system: cp #{draft} #{dir}"
-STDERR.puts
       system("cp #{draft} #{dir}")
       Dir.chdir(dir) do
-STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{draft}.html"
-        system("livetext #{draft} >#{draft}.html")
+        html = draft.sub(/.lt3$/, ".html")
+STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{html}"
+        system("livetext #{draft} >#{html}")
         # copy from theme?
         theme = vdir + "/themes/standard"
-        files = ["blog-generate.lt3", "blog-index.lt3", "global.lt3", "blog-head.lt3", "meta.lt3", "navbar.lt3"]
-        files = files.map {|x| theme + "/" + x }
-STDERR.puts "---- Files = #{files.inspect}"
-        files.each do |f|
-STDERR.puts "---- cp #{f} ."
+        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"]
+        files2 = files.map {|x| theme + "/" + x }
+        # STDERR.puts "---- gp06: In #{Dir.pwd}: files = #{files.inspect}"
+        files2.each do |f|
+          # STDERR.puts "---- gp07: cp #{f} ."
           system("cp #{f} .")
         end
-STDERR.puts "---- Files copied from theme"
+        # STDERR.puts "---- gp08: Files copied from theme"
         system("livetext blog-generate.lt3 >bgen.html")
-STDERR.puts "---- Files went thru livetext"
+        # STDERR.puts "---- gp09: Files went thru livetext"
+#       files.each {|fname| system("rm ./#{fname}") }
+#       system("rm -rf ./sidebar/")
       end
       # create framed pure slug (where?)
     end

data/lib/runeblog_version.rb CHANGED

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

metadata CHANGED

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