RubyGems - runeblog - Versions diffs - 0.2.39 → 0.2.44 - Mend

runeblog 0.2.39 → 0.2.44

Files changed (114) hide show

data/empty_view/themes/standard/widgets/tag-cloud/main.css ADDED

	@@ -0,0 +1,2 @@
1	+ # CSS for main area page
2	+ * { font-family: verdana }

data/empty_view/themes/standard/widgets/tag-cloud/pieces/card-head.lt3 ADDED

@@ -0,0 +1,8 @@
+.include ../local_vars.lt3
+. Material (if any) to go before card data
+<html>
+  <head>
+     <style src="card.css"></style>
+  </head>
+  <body>
+     <h1>Tag Cloud</h1>

data/empty_view/themes/standard/widgets/tag-cloud/pieces/card-tail.lt3 ADDED

@@ -0,0 +1,4 @@
+.include ../local_vars.lt3
+. Material (if any) to go after main data
+  </body>
+</html>

data/empty_view/themes/standard/widgets/tag-cloud/pieces/main-head.lt3 ADDED

@@ -0,0 +1,10 @@
+.include ../local_vars.lt3
+. Material (if any) to go before main data
+<html>
+  <head>
+     <style src="main.css"></style>
+     <!-- ^ Why doesn't this work? -->
+     <style>* { font-family: verdana }</style>
+  </head>
+  <body>
+     <h1>$card.title</h1><hr>

data/empty_view/themes/standard/widgets/tag-cloud/pieces/main-tail.lt3 ADDED

@@ -0,0 +1,4 @@
+.include ../local_vars.lt3
+. Material (if any) to go after main data
+  </body>
+</html>

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

@@ -5,7 +5,7 @@ class RuneBlog::Default
 def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view",
                        teaser: "No teaser", body: "No body", tags: ["untagged"],
                        views: [], back: "javascript:history.go(-1)", home: "no url")
-  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home])
+  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
 <<-TEXT
@@ -28,6 +28,3 @@ TEXT
 end
 end

data/lib/global.rb CHANGED

@@ -20,7 +20,7 @@ end
 # Refactor, move stuff elsewhere?
 def make_exception(sym, str)
-  log!(enter: __method__, args: [sym, str])
+  log!(enter: __method__, args: [sym, str], level: 3)
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -30,8 +30,9 @@ def make_exception(sym, str)
   end
 end
-  def system!(str)
-    log!(enter: __method__, args: [str])
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
     rc = system(str)
     if rc
       return rc
@@ -44,12 +45,12 @@ end
   end
 def prefix(num)
-  log!(enter: __method__, args: [num])
+  log!(enter: __method__, args: [num], level: 3)
   "#{'%04d' % num.to_i}"
 end
 def check_meta(meta, where = "")
-  log!(enter: __method__, args: [meta, where])
+  log!(enter: __method__, args: [meta, where], level: 3)
   str =  "--- #{where}\n"
   str << "\ncheck_meta: \n" + caller.join("\n") + "\n  meta = #{meta.inspect}\n"
   str << "  title missing!\n" unless meta.title
@@ -62,14 +63,14 @@ def check_meta(meta, where = "")
 end
 def verify(hash)
-  log!(enter: __method__, args: [hash])
+  log!(enter: __method__, args: [hash], level: 3)
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end
 end
 def assure(hash)  # really the same as verify for now...
-  log!(enter: __method__, args: [hash])
+  log!(enter: __method__, args: [hash], level: 3)
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end

data/lib/helpers-blog.rb CHANGED

@@ -6,14 +6,14 @@ require 'xlate'
 module RuneBlog::Helpers
   def copy(src, dst)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp #{src} #{dst} 2>/dev/null"
     rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
   def copy!(src, dst)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp -r #{src} #{dst} 2>/dev/null"
     rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
@@ -36,7 +36,7 @@ module RuneBlog::Helpers
 #  end
   def read_config(file, *syms)
-    log!(enter: __method__, args: [file, *syms])
+    log!(enter: __method__, args: [file, *syms], level: 3)
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
     lines.each do |line|
@@ -61,7 +61,7 @@ module RuneBlog::Helpers
   end
   def try_read_config(file, hash)
-    log!(enter: __method__, args: [file, hash])
+    log!(enter: __method__, args: [file, hash], level: 3)
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
     vals
@@ -80,7 +80,7 @@ module RuneBlog::Helpers
 # end
   def write_config(obj, file)
-    log!(enter: __method__, args: [obj, file])
+    log!(enter: __method__, args: [obj, file], level: 2)
     hash = obj.to_h
     File.open(file, "w") do |out|
       hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
@@ -88,13 +88,13 @@ module RuneBlog::Helpers
   end
   def get_views   # read from filesystem
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
-    log!(enter: __method__, args: [root, current_view, editor])
+    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
@@ -102,21 +102,21 @@ module RuneBlog::Helpers
   end
   def new_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dump(0, "sequence")
     version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
     dump(version_info, "VERSION")
   end
   def subdirs(dir)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 3)
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
   end
   def find_draft_slugs
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
     flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)
@@ -128,7 +128,7 @@ module RuneBlog::Helpers
   end
   def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs])
+    log!(enter: __method__, args: [*dirs], level: 3)
     dirs.each do |dir|
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
@@ -139,27 +139,27 @@ module RuneBlog::Helpers
   end
   def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind])
+    log!(enter: __method__, args: [str, bind], level: 3)
     wrap = "<<-EOS\n#{str}\nEOS"
     eval wrap, bind
   end
   def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err])
+    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
   def dump(obj, name)
-    log!(enter: __method__, args: [obj, name])
+    log!(enter: __method__, args: [obj, name], level: 3)
     File.write(name, obj)
   end
 end
 def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name])
+  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
   File.write(name, obj)
 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;
@@ -109,17 +128,17 @@ end
 def make_main_links
-  log!(enter: __method__)
+  log!(enter: __method__, level: 1)
   # FIXME remember strings may not be safe
   line = _data.chomp
   tag, card_title = *line.split(" ", 2)
   cardfile, mainfile = "#{tag}-card", "#{tag}-main"
   input = "list.data"
-  log!(str: "Reading #{input}", pwd: true)
+  log!(str: "Reading #{input}", pwd: true, level: 3)
   pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
   _write_main(mainfile, pairs, card_title, tag)
   _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "...returning from method", pwd: true)
+  log!(str: "...returning from method", pwd: true, level: 3)
 end
 ### inset
@@ -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,13 +338,21 @@ def recent_posts    # side-effect
   HTML
 end
+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
-# STDERR.puts "loadCP1 widget = #{widget.inspect}  pwd = #{Dir.pwd}"
+    rclass = _make_class_name(widget)
     found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
-# STDERR.puts "loadCP2 found = #{found}"
-    code = found ? ::RuneBlog::Widget.class_eval(widget.capitalize) : nil
-# STDERR.puts "loadCP3 code = #{code.inspect}"
+    code = found ? ::RuneBlog::Widget.class_eval(rclass) : nil
     code
   end
 rescue => err
@@ -348,16 +375,22 @@ def sidebar
     tcard = "#{tag}-card.html"
     code = _load_local(tag)
-    code && Dir.chdir(wtag) { code.build }
-#    if File.exist?(wtag/"SUBFILES")
-#      children = Dir[wtag/"*.lt3"] - [wtag/tag+".lt3"]
-#      children.each do |child|
-#        dest = child.sub(/.lt3$/, ".html")
-#        xlate src: child, dst: dest  # , debug: true
-#      end
-#    end
-    xlate cwd: wtag, src: tag, dst: tcard  # , debug: true
+    if code && tag == "pages"
+      Dir.chdir(wtag) { code.build }
+    else
+    end
+    if tag == "ad"
+      num = rand(1..4)
+      img = "widgets/ad/ad#{num}.png"
+      src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
+      system!("cp #{src} #{dst}")   # , show: true)
+      File.open(wtag/"vars.lt3", "w") do |f|
+        f.puts ".set ad.image = #{img}"
+      end
+    end
+    xlate cwd: wtag, src: tag, dst: tcard # , debug: (tag == "ad")
     _include_file wtag/tcard
   end
   _out %[</div>]
@@ -566,7 +599,7 @@ def _html_body(file, css = nil)
 end
 def _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{cardfile}.html", pwd: true)
+  log!(str: "Creating #{cardfile}.html", pwd: true, level: 2)
   url = mainfile
   url = :widgets/tag/mainfile + ".html"
   File.open("#{cardfile}.html", "w") do |f|
@@ -581,7 +614,7 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag)
           </h5>
           <div class="collapse" id="#{tag}">
     EOS
-    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true)
+    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true, level: 2)
     local = _local_tag?(tag)
     pairs.each do |file, title|
       url = file
@@ -646,7 +679,7 @@ def _write_main_pages(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
     f.puts main_tail
@@ -654,7 +687,7 @@ def _write_main_pages(mainfile, pairs, card_title, tag)
 end
 def _write_main(mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{mainfile}.html", pwd: true)
+  log!(str: "Creating #{mainfile}.html", pwd: true, level: 2)
   if tag == "pages"   # temporary experiment
     _write_main_pages(mainfile, pairs, card_title, tag)
@@ -663,9 +696,10 @@ def _write_main(mainfile, pairs, card_title, tag)
   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
@@ -674,7 +708,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