RubyGems - runeblog - Versions diffs - 0.2.38 → 0.2.43 - Mend

runeblog 0.2.38 → 0.2.43

Files changed (102) hide show

data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3 CHANGED

@@ -1,12 +1,3 @@
 .mixin liveblog
-.tag_cloud
-https://google.com/,btn btn-dark m-1,Programming
-https://google.com/,btn btn-danger m-1,Science Fiction
-https://google.com/,btn btn-light m-1,Art
-https://google.com/,btn btn-dark m-1,Robotics
-https://google.com/,btn btn-warning m-1,Food and Travel
-https://google.com/,btn btn-light m-1,DIY Hacks
-https://google.com/,btn btn-info m-1,Surfing
-.end
+<h3>Currently nothing here -- not implemented</h3)

data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb ADDED

@@ -0,0 +1,14 @@
+# Custom code for 'tag-cloud' widget
+class ::RuneBlog::Widget
+  class TagCloud
+    def self.build
+    end
+    def self.edit_menu
+    end
+    def self.refresh
+    end
+  end
+end

data/lib/default.rb CHANGED

@@ -28,6 +28,3 @@ TEXT
 end
 end

data/lib/liveblog.rb CHANGED

@@ -33,6 +33,25 @@ def post
   _out "  <!-- Post number #{@meta.num} -->\n "
 end
+def post_trailer
+  perma = _var("publish.proto") + "://" + _var("publish.server") +
+          "/" + _var("publish.path") + "/permalink/" + _var("post.aslug") +
+          ".html"
+  tags = _var("post.tags")
+  if tags.empty?
+    taglist = ""
+  else
+    taglist = "Tags: #{tags}"
+  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>
+  HTML
+  # damned syntax highlighting
+end
 def backlink
   _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
@@ -45,7 +64,7 @@ def dropcap
 p:first-child:first-letter {
   color: #0000ff;
   float: left;
-  font-family: Georgia;
+  font-family: Verdana;
   font-size: 75px;
   line-height: 60px;
   padding-top: 4px;
@@ -142,7 +161,7 @@ def inset
   end
   lr = _args.first
   wide = _args[1] || "25"
-  _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px; font-family:verdana'>"
+  _passthru "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px'>"   # ; font-family:verdana'>"
   _passthru '<b><i>'
   _passthru box
   _passthru_noline '</i></b></div>'
@@ -154,7 +173,8 @@ def title
   title = @_data.chomp
   @meta.title = title
   setvar :title, title
-  _out %[<h1 class="post-title">#{title}</h1><br>]
+  # FIXME refactor -- just output variables for a template
+# _out %[<h1 class="post-title">#{title}</h1><br>]
   _optional_blank_line
 end
@@ -285,7 +305,6 @@ def head  # Does NOT output  tags
   hash = defaults.dup.update(result)  # FIXME collisions?
   hash.each_value {|x| _out "  " + x }
-  _out "<body>"
 end
 ########## newer stuff...
@@ -319,9 +338,22 @@ def recent_posts    # side-effect
   HTML
 end
-def _run_local(widget)
+def _make_class_name(app)
+  if app =~ /[-_]/
+    words = app.split(/[-_]/)
+    name = words.map(&:capitalize).join
+  else
+    name = app.capitalize
+  end
+  return name
+end
+def _load_local(widget)
   Dir.chdir("widgets/#{widget}") do
-    require("./local") if File.exist?("local.rb")
+    rclass = _make_class_name(widget)
+    found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
+    code = found ? ::RuneBlog::Widget.class_eval(rclass) : nil
+    code
   end
 rescue => err
   STDOUT.puts err
@@ -342,7 +374,8 @@ def sidebar
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-    _run_local(tag)
+    code = _load_local(tag)
+    code && Dir.chdir(wtag) { code.build }
 #    if File.exist?(wtag/"SUBFILES")
 #      children = Dir[wtag/"*.lt3"] - [wtag/tag+".lt3"]
@@ -623,12 +656,44 @@ def page_type(tag, title)
   end
 end
+def _write_main_pages(mainfile, pairs, card_title, tag)
+  local = _local_tag?(tag)
+  pieces = @blog.view.dir/"themes/standard/widgets"/tag/:pieces
+  main_head = xlate! cwd: pieces, src: "main-head.lt3"
+  main_tail = xlate! cwd: pieces, src: "main-tail.lt3"
+  # ^ make into methods in pages.rb or whatever?
+  File.open("#{mainfile}.html", "w") do |f|
+    f.puts main_head
+    pairs.each do |file, title|
+      type, title = page_type(tag, title)
+      title = title.gsub(/\\/, "")  # kludge
+      case type
+        when :local;   url_ref = _widget_main(file, tag)  # local always frameable
+        when :frame;   url_ref = "href = '#{file}'"       # local always frameable
+        when :noframe; url_ref = _blank(file)             # local always frameable
+      end
+      css = "color: #8888FF; text-decoration: none; font-size: 21px"   # ; font-family: verdana"
+      f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
+    end
+    f.puts main_tail
+  end
+end
 def _write_main(mainfile, pairs, card_title, tag)
   log!(str: "Creating #{mainfile}.html", pwd: true)
+  if tag == "pages"   # temporary experiment
+    _write_main_pages(mainfile, pairs, card_title, tag)
+    return
+  end
   local = _local_tag?(tag)
+  setvar "card.title", card_title
+  css = "* { font-family: verdana }"
   File.open("#{mainfile}.html", "w") do |f|
-    _html_body(f) do
-      f.puts "<h1>#{card_title}</h1>"
+    _html_body(f, css) do
+      f.puts "<h1>#{card_title}</h1><br><hr>"
       pairs.each do |file, title|
         type, title = page_type(tag, title)
         title = title.gsub(/\\/, "")  # kludge
@@ -637,7 +702,7 @@ def _write_main(mainfile, pairs, card_title, tag)
           when :frame;   url_ref = "href = '#{file}'"       # local always frameable
           when :noframe; url_ref = _blank(file)             # local always frameable
         end
-        css = "color: #8888FF; text-decoration: none; font-size: 24px; font-family: verdana"
+        css = "color: #8888FF; text-decoration: none; font-size: 21px"  # ; font-family: verdana"
         f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
       end
     end

data/lib/runeblog.rb CHANGED

@@ -289,7 +289,7 @@ class RuneBlog
     vp
   end
-  def teaser(slug)
+  def index_entry(slug)
     log!(enter: __method__, args: [slug])
     id = slug.to_i
     text = nil
@@ -303,7 +303,7 @@ class RuneBlog
     path = vp.path
     url = aslug + ".html"
     date = ::Date.parse(date)
-    date = date.strftime("%B %e<br>%Y")
+    date = date.strftime("%B %e<br><div style='float: right'>%Y</div>")
     text = interpolate(@_post_entry, binding)
     text
   end
@@ -328,7 +328,7 @@ class RuneBlog
     wanted.times do
       postid = File.basename(enum.next)
       postid = postid.to_i
-      text << teaser(postid)    # side effect! calls _out
+      text << index_entry(postid)    # side effect! calls _out
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
@@ -393,13 +393,15 @@ class RuneBlog
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-    generate_index(view)   # recent posts (recent.html)
+#   generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
+    generate_index(view)   # recent posts (recent.html)
+#   ^ HERE
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
     puts err
@@ -434,11 +436,35 @@ class RuneBlog
   def _post_metadata(draft, pdraft)
     log!(enter: __method__, args: [draft, pdraft])
+    # FIXME store this somewhere
+    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
+    pnum = nslug[0..3]                  # 0001
     Dir.chdir(pdraft) do
       excerpt = File.read("teaser.txt")
+      date = _retrieve_metadata(:date)
+      longdate = ::Date.parse(date).strftime("%B %e, %Y")
       title = _retrieve_metadata(:title)
-      vars = %[.heredoc title\n#{title.chomp}\n.end\n] +
-             %[.heredoc teaser\n#{excerpt.chomp}\n.end\n]
+      tags = _retrieve_metadata(:tags)
+      vars = <<~LIVE
+        .set post.num = #{pnum}
+        .heredoc post.aslug
+        #{aslug}
+        .end
+        .heredoc title
+        #{title.chomp}
+        .end
+        .heredoc post.tags
+        #{tags.join(" ")}
+        .end
+        .heredoc teaser
+        #{excerpt.chomp}
+        .end
+        .heredoc longdate
+        #{longdate}
+        .end
+      LIVE
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
     end
   end
@@ -454,8 +480,8 @@ class RuneBlog
       rem = w.sub(/themes.standard/, "remote")
       create_dirs(rem)
       files = Dir[w/"*"]
-      next unless files.any? {|x| x =~ /html$/ }
-      system!("cp #{w}/*html #{rem}")
+      files = files.select {|x| x =~ /(html|css)$/ }
+      files.each {|file| system!("cp #{file} #{rem}") }
     end
   end
@@ -493,11 +519,12 @@ class RuneBlog
     views = _get_views(draft)
     views.each do |view|
       _handle_post(draft, view)
-      generate_view(view)  # FIXME leads to inefficiency?
+#     generate_view(view)  # FIXME leads to inefficiency?
+#     ^ HERE
     end
   end
-  def index_entry(view, meta)
+  def OLD_index_entry(view, meta)
     log!(enter: __method__, args: [view, meta])
     debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
     check_meta(meta, "index_entry1")

data/lib/runeblog_version.rb CHANGED

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

data/lib/xlate.rb CHANGED

@@ -35,3 +35,8 @@ LEXT = ".lt3"
     end
   end
+  def xlate!(cwd: Dir.pwd, src:, copy: nil, debug: false, force: false)
+    output = "/tmp/xlate-#{File.basename(src).sub(/.lt3$/, "")}"
+    xlate cwd: cwd, src: src, dst: output, debug: debug, force: force
+    File.read(output + ".html")  # return all content as string
+  end

data/test/austin.rb ADDED

@@ -0,0 +1,150 @@
+$LOAD_PATH << "./lib"
+major, minor = RUBY_VERSION.split(".").values_at(0,1)
+ver = major.to_i*10 + minor.to_i
+abort "Need Ruby 2.4 or greater" unless ver >= 24
+Home = Dir.pwd
+require 'global'
+require 'runeblog'
+require 'repl'
+def bold(str)
+  "\e[1m#{str}\e[0m"
+end
+def getch
+# sleep 5
+end
+def debug(str = "")
+  t = Time.now
+  time = t.to_f.to_s
+  n = time.index(".")
+  msec = time[n..(n+2)]
+  time = t.strftime("%H:%M:%S") + msec
+  STDERR.puts "#{'%-11s' % time}  #{str}"
+end
+def make_post(x, title, teaser, body, views=[])
+  debug "      make_post #{bold(title)}"
+  x.create_new_post(title, true, teaser: teaser, body: body, views: views)
+  views.each do |view|
+    debug
+    debug "** generate_index #{bold(view)}"
+    x.generate_index(view)
+  end  # recent.html
+end
+def show_lines(text)
+  lines = text.split("\n")
+  str = "#{lines.size} lines\n"
+  lines.each {|line| str << "  #{line.inspect}\n" }
+  str
+end
+#  "Main"...
+t0 = Time.now
+puts bold("\nGenerating test blog...")
+system("rm -rf .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...
+.end
+VARS
+File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
+  f.puts vars
+end
+####
+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, [])
+Stubbs has been around for longer than civilization.
+EXCERPT
+That's a good thing. But their music isn't always the greatest.
+BODY
+make_post(x, "The new amphitheatre is overrated", <<-EXCERPT, <<-BODY)
+It used to be that all major concerts played the Erwin Center.
+EXCERPT
+Now, depending on what you consider "major," blah blah blah...
+BODY
+make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
+RIP, Hope Gallery
+EXCERPT
+.dropcap
+It's been a while since I was there. They say it was torn down
+while I wasn't looking.
+This fake entry is a long one so as to demonstrate both drop-caps
+(above) and an inset quote. Blah blah blah. Lorem ipsum dolor and
+a partridge in a pear tree.
+Wherever you go, there you are. Last night I saw upon the stair
+a little man who was not there. He wasn't there again today; I
+wish, I wish he'd go away.
+As far as we know, our computer has never had an undetected error.
+And never let it be denied that pobbles are happier without their
+toes. And may your snark never be a boojum.
+Contact light. Houston, this is Tranquility Base. The Eagle has
+landed. That's one small step for (a) man, one giant leap for
+mankind.
+.inset left 20
+On a clean disk, you can seek forever.
+.end
+Pity this busy monster, manunkind, not. Pity rather... Listen:
+There's a hell of a universe next door; let's go.
+BODY
+make_post(x, "The Waller Creek project", <<-EXCERPT, <<-BODY)
+Will it ever be finished?
+EXCERPT
+Blah blah Waller Creek blah blah...
+BODY
+make_post(x, "Life on Sabine Street", <<-EXCERPT, <<-BODY)
+It's like Pooh Corner, except not.
+EXCERPT
+This is about Sabine St, blah blah lorem ipsum dolor...
+BODY
+make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY, [])
+They date to the 90s or before.
+EXCERPT
+But I first heard of them
+in 2005.
+BODY
+debug
+debug("** generate_view: #{bold('around_austin')}")
+x.generate_view("around_austin")
+x.change_view("around_austin")
+debug
+puts bold("...finished.\n")
+t1 = Time.now
+elapsed = t1 - t0
+puts "\nElapsed: #{'%3.2f' % elapsed} secs\n "