runeblog 0.2.43 → 0.2.48

data/lib/helpers-blog.rb

@@ -6,37 +6,21 @@ 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
   end
 
-#  def get_root
-#    log!(enter: __method__)
-#    if $_blog
-#      if $_blog.root
-#        puts "0. Returned: #{$_blog.root}/"
-#        return $_blog.root + "/"
-#      else
-#        puts "1. Returned: ./"
-#        return "./"
-#      end
-#    else
-#      puts "2. Returned: ./"
-#      return "./"
-#    end
-#  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,26 +45,14 @@ 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
   end
 
-# def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
-#   log!(enter: __method__, args: [root, view, editor])
-#   Dir.mkdir(root) unless Dir.exist?(root)
-#   Dir.chdir(root) do 
-#     File.open("config", "w") do |cfg|
-#       cfg.puts "root: #{root}"
-#       cfg.puts "current_view: #{view}"
-#       cfg.puts "editor: #{editor}"
-#     end
-#   end
-# 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 +60,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 +74,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 +100,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 +111,26 @@ 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

@@ -17,7 +17,7 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @blog = RuneBlog.new(dir)
   @root = @blog.root
   @view = @blog.view
-  @view_name = @blog.view.name
+  @view_name = @blog.view.name unless @view.nil?
   @vdir = @blog.view.dir
   @version = RuneBlog::VERSION
   @theme = @vdir/:themes/:standard
@@ -27,6 +27,18 @@ end
 # "dot" commands
 ##################
 
+
+
+def dropcap
+  # Bad form: adds another HEAD
+  text = _data
+  _out " "
+  letter = text[0]
+  remain = text[1..-1]
+  _out %[<div class='mydrop'>#{letter}</div>]
+  _out %[<div style="padding-top: 1px">#{remain}]
+end
+
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
@@ -56,30 +68,9 @@ def backlink
   _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
 
-def dropcap
-  # Bad form: adds another HEAD
-  _out <<-HTML
-<head>
-<style>
-p:first-child:first-letter {
-  color: #0000ff;
-  float: left;
-  font-family: Verdana;
-  font-size: 75px;
-  line-height: 60px;
-  padding-top: 4px;
-  padding-right: 8px;
-  padding-left: 3px;
-}
-</style>
-</head>
-HTML
-  _out " "
-end
-
 def quote
   _passthru "<blockquote>"
-  _passthru _body
+  _passthru _body.join(" ")
   _passthru "</blockquote>"
   _optional_blank_line
 end
@@ -128,17 +119,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
@@ -146,25 +137,36 @@ end
 def inset
   lines = _body
   box = ""
+  output = []
   lines.each do |line| 
-    line = line.dup
-    if line[0] == "/"  # Only into inset
-      line[0] = ' '
-      box << line.dup + " "
-      line.replace(" ")
-    end
-    if line[0] == "|"  # Into inset and body
-      line[0] = ' '
-      box << line.dup + " "
+    line = line
+    case line[0]
+      when "/"  # Only into inset
+        line[0] = ' '
+        box << line
+        line.replace(" ")
+      when "|"  # Into inset and body
+        line[0] = ' '
+        box << line
+        output << line
+    else  # Only into body
+      output << line 
     end
-    _passthru(line)
+#   _passthru(line)
   end
   lr = _args.first
   wide = _args[1] || "25"
-  _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>'
+  stuff = "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px'>"
+  stuff << '<b><i>' + box + '</i></b></div>'
+  _out "</p>"   #  kludge!! nopara
+  0.upto(2) {|i| _passthru output[i] }
+  _passthru stuff
+# _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>'
+  3.upto(output.length-1) {|i| _passthru output[i] }
+  _out "<p>"  #  kludge!! para
   _optional_blank_line
 end
 
@@ -232,10 +234,16 @@ end
 
 def teaser
   raise "'post' was not called" unless @meta
-  @meta.teaser = _body_text
+  text = _body_text
+  @meta.teaser = text
   setvar :teaser, @meta.teaser
-  _out @meta.teaser + "\n"
-  # FIXME
+  if _args[0] == "dropcap"   # FIXME doesn't work yet!
+    letter, remain = text[0], text[1..-1]
+    _out %[<div class='mydrop'>#{letter}</div>]
+    _out %[<div style="padding-top: 1px">#{remain}] + "\n"
+  else
+    _out @meta.teaser + "\n"
+  end
 end
 
 def finalize
@@ -356,8 +364,8 @@ def _load_local(widget)
     code
   end
 rescue => err
-  STDOUT.puts err
-  STDOUT.puts err.backtrace.join("\n")
+  STDERR.puts err.to_s
+  STDERR.puts err.backtrace.join("\n")
   exit
 end
 
@@ -375,16 +383,26 @@ 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 
+      if ["pages", "links"].include? tag
+        Dir.chdir(wtag) do 
+          widget = code.new(@blog)
+          widget.build
+        end
+      end
+    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>]
@@ -462,10 +480,16 @@ class Livetext::Functions
     ::Livetext::Vars[name] || "[:#{name} is undefined]"
   end
 
-  def link
-    file, cdata = self.class.param.split("||", 2)
-    %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
-  end
+#   def link(param = nil)
+# puts "--- WTF?? param = #{param.inspect}"; gets
+#     file, cdata = param.split("||", 2)
+#     %[<a href="assets/#{file}">#{cdata}</a>]
+#   end
+# 
+#   def link(param = nil)
+#     file, cdata = param.split("||", 2)
+#     %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
+#   end
 end
 
 ###
@@ -593,7 +617,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|
@@ -608,7 +632,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
@@ -681,7 +705,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)

data/lib/logging.rb

@@ -2,8 +2,17 @@ unless self.respond_to?("log!")
   $logging = true
   $log = File.new("/tmp/runeblog.log","w")
 
-  def log!(str: "", enter: nil, args: [], pwd: false, dir: false)
+  def outlog(str = "", stderr: false)
+    $log.puts str
+    STDERR.puts str if stderr
+  end
+
+  def log!(str: "", enter: nil, args: [], pwd: false, dir: false, level: 0, stderr: false)
     return unless $logging
+    @err_level ||= ENV['RUNEBLOG_ERROR_LEVEL']
+    @err_level ||= 0
+    return if level < @err_level 
+
     time = Time.now.strftime("%H:%M:%S")
 
     meth = ""
@@ -17,16 +26,16 @@ unless self.respond_to?("log!")
     str = "  ... #{str}" unless str.empty?
     indent = " "*12
 
-    $log.puts "#{time} #{meth}#{para}"
-    $log.puts "#{indent} #{str} " unless str.empty?
-    $log.puts "#{indent} #{source}"
-    $log.puts "#{indent} pwd = #{Dir.pwd} " if pwd
+    outlog "#{time} #{meth}#{para}"
+    outlog "#{indent} #{str} " unless str.empty?
+    outlog "#{indent} #{source}"
+    outlog "#{indent} pwd = #{Dir.pwd} " if pwd
     if dir
       files = (Dir.entries('.') - %w[. ..]).join(" ")
-      $log.puts "#{indent} dir/* = #{files}"
+      outlog "#{indent} dir/* = #{files}"
     end
-#   $log.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
-    $log.puts
+#   outlog "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
+    outlog 
     $log.close
     $log = File.new("/tmp/runeblog.log","a")
   end

data/lib/post.rb

@@ -10,19 +10,18 @@ class RuneBlog::Post
   include RuneBlog::Helpers
 
   def self.files(num, root)
-    log!(enter: __method__, args: [num, root])
-    files = Find.find(root).to_a
+    log!(enter: __method__, args: [num, root], level: 3)
+    files = ::Find.find(root).to_a
     result = files.grep(/#{prefix(num)}-/)
     result
   end
   
   def self.load(post)
-    log!(enter: __method__, args: [post])
+    log!(enter: __method__, args: [post], level: 3)
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
     pdir = RuneBlog.blog.view.dir/post
-    verify(Dir.exist?(pdir) => "Directory #{pdir} not found")
     meta = nil
     Dir.chdir(pdir) do
       meta = read_config("metadata.txt")
@@ -36,7 +35,7 @@ class RuneBlog::Post
   end
 
   def write_metadata(meta)   # FIXME ???
-    log!(enter: __method__, args: [meta])
+    log!(enter: __method__, args: [meta], level: 3)
     debug "=== write_metadata:"
     debug "-----\n#{meta.inspect}\n-----"
     fname2 = "metadata.txt"
@@ -57,14 +56,14 @@ class RuneBlog::Post
   end
 
   def initialize
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @meta = OpenStruct.new
   end
 
   def self.create(title:, teaser:, body:, pubdate: Time.now.strftime("%Y-%m-%d"),
-                  views:[])
-    log!(enter: __method__, args: [title, teaser, body, pubdate, views])
+                  views:[], file: nil)
+    log!(enter: __method__, args: [title, teaser, body, pubdate, views], stderr: true)
     post = self.new
     # NOTE: This is the ONLY place next_sequence is called!
     num = post.meta.num   = post.blog.next_sequence
@@ -73,27 +72,29 @@ class RuneBlog::Post
     post.meta.title, post.meta.teaser, post.meta.body, post.meta.pubdate = 
       title, teaser, body, pubdate
     post.meta.views = [post.blog.view.to_s] + views
-# STDERR.puts "Post.create: views = #{views.inspect}"
     post.meta.tags = []
     post.blog.make_slug(post.meta)  # adds to meta
 
     # create_draft
     viewhome = post.blog.view.publisher.url
     meta = post.meta
-    text = RuneBlog.post_template(num: meta.num, title: meta.title, date: meta.pubdate, 
-               view: meta.view, teaser: meta.teaser, body: meta.body,
-               views: meta.views, tags: meta.tags, home: viewhome)
-    srcdir = post.blog.root/:drafts + "/"
-    vpdir = post.blog.root/:drafts + "/"
-    fname  = meta.slug + ".lt3"
-    post.draft = srcdir + fname
-    dump(text, post.draft)
+    if file.nil?
+      text = RuneBlog.post_template(num: meta.num, title: meta.title, date: meta.pubdate, 
+                 view: meta.view, teaser: meta.teaser, body: meta.body,
+                 views: meta.views, tags: meta.tags, home: viewhome)
+      srcdir = post.blog.root/:drafts + "/"
+      vpdir = post.blog.root/:drafts + "/"
+      fname  = meta.slug + ".lt3"
+      post.draft = srcdir + fname
+      dump(text, post.draft)
+    else
+      dump(File.read(file), post.draft)
+    end
     return post
   end
 
   def edit
     log!(enter: __method__)
-    verify(File.exist?(@draft) => "File #{@draft} not found")
     result = system!("vi #@draft +8")  # TODO improve this
     raise EditorProblem(draft) unless result
     nil
@@ -115,7 +116,7 @@ class RuneBlog::ViewPost
               :teaser_text
               
   def initialize(view, postdir)
-    log!(enter: __method__, args: [view, postdir])
+    log!(enter: __method__, args: [view, postdir], level: 3)
     # Assumes already parsed/processed
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @path = postdir.dup
@@ -128,10 +129,13 @@ class RuneBlog::ViewPost
     lines = File.readlines(mdfile)
     @title = lines.grep(/title:/).first[7..-1].chomp
     @date  = lines.grep(/pubdate:/).first[9..-1].chomp
+# print "-- date = #{@date.inspect} "; gets
+  rescue => err
+    STDERR.puts "--- #{err}\n #{err.backtrace.join("\n  ")}"
   end
 
   def get_dirs
-    log!(enter: __method__, args: [view, postdir])
+    log!(enter: __method__, args: [view, postdir], level: 3)
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
     vdir = @root/:views/view