runeblog 0.1.98 → 0.2.5

data/lib/default.rb

@@ -6,6 +6,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])
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
 <<-TEXT

data/lib/global.rb

@@ -20,6 +20,7 @@ end
 # Refactor, move stuff elsewhere?
 
 def make_exception(sym, str)
+  log!(enter: __method__, args: [sym, str])
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -30,10 +31,12 @@ def make_exception(sym, str)
 end
 
 def prefix(num)
+  log!(enter: __method__, args: [num])
   "#{'%04d' % num.to_i}"
 end
 
 def check_meta(meta, where = "")
+  log!(enter: __method__, args: [meta, where])
   str =  "--- #{where}\n"
   str << "\ncheck_meta: \n" + caller.join("\n") + "\n  meta = #{meta.inspect}\n"
   str << "  title missing!\n" unless meta.title
@@ -46,12 +49,14 @@ def check_meta(meta, where = "")
 end
 
 def verify(hash)
+  log!(enter: __method__, args: [hash])
   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])
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end

data/lib/helpers-blog.rb

@@ -1,35 +1,57 @@
 require 'runeblog_version'
+require 'fileutils'
 
 # Home = Dir.pwd # unless Home
 
 module RuneBlog::Helpers
 
   def copy(src, dst)
-    system("cp #{src}  #{dst}")
+    log!(enter: __method__, args: [src, dst])
+    cmd = "cp #{src}  #{dst} 2>/dev/null"
+#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
+#   if src =~ /\*/
+      rc = system(cmd)
+      puts "    FROM #{caller[0]}" unless rc
+exit unless rc
+#   else
+#     FileUtils.cp(src, dst)
+#   end
   end
 
   def copy!(src, dst)
-    system("cp -r #{src}  #{dst}")
+    log!(enter: __method__, args: [src, dst])
+    cmd = "cp -r #{src}  #{dst} 2>/dev/null"
+#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
+#   if src =~ /\*/
+      rc = system(cmd)
+      puts "    FROM #{caller[0]}" unless rc
+exit unless rc
+#   else
+#     FileUtils.cp_r(src, dst)
+#   end
   end
 
   def stale?(src, dst)
+    log!(enter: __method__, args: [src, dst])
     return true unless File.exist?(dst)
     return true if File.mtime(src) > File.mtime(dst)
     return false
   end
 
   def livetext(src, dst=nil)
+    log!(enter: __method__, args: [src, dst])
     src << ".lt3" unless src.end_with?(".lt3")
     if dst
       dst << ".html" unless dst.end_with?(".html")
     else
       dst = src.sub(/.lt3$/, "")
     end
-    return unless stale?(src, dst)
+#   return unless stale?(src, dst)
     system("livetext #{src} >#{dst}")
   end
 
   def get_root
+    log!(enter: __method__)
     if $_blog
       if $_blog.root
         puts "0. Returned: #{$_blog.root}/"
@@ -45,7 +67,7 @@ module RuneBlog::Helpers
   end
 
   def read_config(file, *syms)
-# puts "dir   = #{Dir.pwd}"
+    log!(enter: __method__, args: [file, *syms])
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
     lines.each do |line|
@@ -70,6 +92,7 @@ module RuneBlog::Helpers
   end
 
   def try_read_config(file, hash)
+    log!(enter: __method__, args: [file, hash])
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
 # STDERR.puts vals.inspect
@@ -77,6 +100,7 @@ module RuneBlog::Helpers
   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|
@@ -88,6 +112,7 @@ def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
 end 
 
   def write_config(obj, file)
+    log!(enter: __method__, args: [obj, file])
     hash = obj.to_h
 # Dir.chdir(::Home)
 # puts "--- wc: pwd = #{Dir.pwd}"
@@ -99,6 +124,7 @@ end
   end
 
   def get_views   # read from filesystem
+    log!(enter: __method__)
 #   Dir.chdir(::Home) do
       verify(@root => "#@root is nil",
              Dir.exist?(@root) => "#@root doesn't exist",
@@ -109,6 +135,7 @@ end
   end
 
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
+    log!(enter: __method__, args: [root, current_view, editor])
 #   raise BlogAlreadyExists if Dir.exist?(".blogs")
 #   Dir.mkdir(".blogs")
     root = Dir.pwd + "/" + root
@@ -118,12 +145,14 @@ end
   end
 
   def new_sequence
+    log!(enter: __method__)
     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])
     verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
@@ -131,6 +160,7 @@ end
   end
 
   def find_draft_slugs
+    log!(enter: __method__)
     verify(@root => "#@root is nil",
            Dir.exist?(@root) => "#@root doesn't exist",
            Dir.exist?("#@root/drafts") => "#@root/drafts doesn't exist")
@@ -145,6 +175,7 @@ end
   end
 
   def create_dirs(*dirs)
+    log!(enter: __method__, args: [*dirs])
     dirs.each do |dir|
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
@@ -154,24 +185,28 @@ end
     end
   end
 
-  def interpolate(str, binding)
+  def interpolate(str, bind)
+    log!(enter: __method__, args: [str, bind])
     wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap, binding
+    eval wrap, bind
   end
 
   def error(err)  # Hmm, this is duplicated
+    log!(str: "duplicated method", enter: __method__, args: [err])
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
 
   def dump(obj, name)
+    log!(enter: __method__, args: [obj, name])
     File.write(name, obj)
   end
 
 end
 
 def dump(obj, name)      # FIXME scope
+  log!(str: "scope problem", enter: __method__, args: [obj, name])
   File.write(name, obj)
 end
 

data/lib/liveblog.rb

@@ -5,7 +5,7 @@ require 'date'
 require 'livetext'
 require 'runeblog'
 
-errfile = File.new("liveblog.out", "w")
+errfile = File.new("/tmp/liveblog.out", "w")
 STDERR.reopen(errfile)
 
 def init_liveblog    # FIXME - a lot of this logic sucks
@@ -22,18 +22,31 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @theme = @vdir + "/themes/standard/"
 end
 
+# FIXME - stale? and livetext are duplicated from helpers-blog
+
+  def stale?(src, dst)
+    return true unless File.exist?(dst)
+    return true if File.mtime(src) > File.mtime(dst)
+    return false
+  end
+
+  def livetext(src, dst=nil)
+    src += ".lt3" unless src.end_with?(".lt3")
+    if dst
+      dst += ".html" unless dst.end_with?(".html")
+    else
+      dst = src.sub(/.lt3$/, "")
+    end
+    return unless stale?(src, dst)
+    system("livetext #{src} >#{dst}")
+  end
+
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
   _out "  <!-- Post number #{@meta.num} -->\n "
 end
 
-def _view_from_cwd
-  md = Dir.pwd.match(%r[.*/views/(.*?)/])
-  return md[1] if md
-  nil
-end
-
 def quote
   _passthru "<blockquote>"
   _passthru _body
@@ -60,11 +73,70 @@ def h6; _passthru "#{@_data}"; end
 
 def hr; _passthru "<hr>"; end
 
-def emit   # send to STDOUT?
-  @emit = true
-  case _args.first
-    when "off";  @emit = false
-    when "on";   @emit = true
+def list
+  _out "<ul>"
+  _body {|line| _out "<li>#{line}</li>" }
+  _out "</ul>"
+  _optional_blank_line
+end
+
+def list!
+  _out "<ul>"
+  lines = _body.each 
+  loop do 
+    line = lines.next
+    line = _format(line)
+    if line[0] == " "
+      _out line
+    else
+      _out "<li>#{line}</li>"
+    end
+  end
+  _out "</ul>"
+  _optional_blank_line
+end
+
+def html_body(file)
+  file.puts "<html>\n  <body>"
+  yield
+  file.puts "  </body>\n</html>"
+end
+
+def make_news_links
+  # FIXME remember strings may not be safe
+  line = _data.chomp
+  input, cardfile, mainfile, card_title = *line.split(" ", 4)
+  pairs = File.readlines(input).map {|line| line.chomp.split(",", 2) }
+  # HTML for main area (iframe)
+  File.open("#{mainfile}.html", "w") do |f|
+    html_body(f) do
+      f.puts "<h1>#{card_title}</h1>"
+      pairs.each do |file, title| 
+        f.puts %[<a style="text-decoration: none; font-size: 24px" href="#{file}">#{title}</a> <br>]
+      end
+    end
+  end
+  # HTML for sidebar card
+  File.open("#{cardfile}.html", "w") do |f|
+    f.puts <<-EOS
+      <div class="card mb-3">
+        <div class="card-body">
+          <h5 class="card-title">
+            <a href="javascript: void(0)" 
+               onclick="javascript:open_main('widgets/news/#{mainfile}.html')" 
+               style="text-decoration: none; color: black">#{card_title}</a>
+          </h5>
+    EOS
+    pairs.each do |file, title| 
+      f.puts <<-EOS
+        <li class="list-group-item"> <a href="javascript: void(0)" 
+        onclick="javascript:open_main('#{file}')">#{title}</a> </li>
+      EOS
+    end
+    f.puts <<-EOS
+        </div>
+      </div>
+    EOS
   end
 end
 
@@ -164,29 +236,6 @@ def pin
   _optional_blank_line
 end
 
-def list
-  _out "<ul>"
-  _body {|line| _out "<li>#{line}</li>" }
-  _out "</ul>"
-  _optional_blank_line
-end
-
-def list!
-  _out "<ul>"
-  lines = _body.each 
-  loop do 
-    line = lines.next
-    line = _format(line)
-    if line[0] == " "
-      _out line
-    else
-      _out "<li>#{line}</li>"
-    end
-  end
-  _out "</ul>"
-  _optional_blank_line
-end
-
 def write_post
   raise "'post' was not called" unless @meta
   save = Dir.pwd
@@ -277,6 +326,8 @@ class Livetext::Functions
   end
 end
 
+###
+
 def _var(name)  # FIXME scope issue!
   ::Livetext::Vars[name] || "[:#{name} is undefined]"
 end
@@ -359,33 +410,23 @@ def meta
 end
 
 def recent_posts    # side-effect
-  _out %[<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">]
-  all_teasers
-  _out %[</div>]
+  _out <<-HTML
+    <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
+      <iframe id="main" style="width: 100vw; height: 100vh; position: relative;" 
+       src='recent.html' width=100% frameborder="0" allowfullscreen>
+      </iframe>
+    </div>
+  HTML
 end
 
 def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
-  _body do |line|
-    tag = line.chomp.strip
-    source = "sidebar/#{tag.downcase}.lt3"
-    unless File.exist?(source)
-      source = "widgets/#{tag.downcase}.lt3"
+  _args do |token|
+    tag = token.chomp.strip.downcase
+    Dir.chdir("widgets/#{tag}") do
+      livetext tag, "card-#{tag}.html"
+      _include_file "card-#{tag}.html"
     end
-    _include_file source
-  end
-  _out %[</div>]
-end
-
-def sidebar!
-  _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
-  _args do |line|
-    tag = line.chomp.strip
-    source = "sidebar/#{tag.downcase}.lt3"
-    unless File.exist?(source)
-      source = "widgets/#{tag.downcase}/main.lt3"
-    end
-    _include_file source
   end
   _out %[</div>]
 end
@@ -457,7 +498,7 @@ def all_teasers
   end
   text << "</body></html>"
   File.write("recent.html", text)
-  _out %[<iframe id="main" style="width: 100vw;height: 100vh;position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
+  _out %[<iframe id="main" style="width: 100vw; height: 100vh; position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
 end
 
 def _post_lookup(postid)    # side-effect
@@ -547,7 +588,9 @@ def card1
 end
 
 def card2
-  card_title = _data
+  str = _data
+  file, card_title = str.chomp.split(" ", 2) 
+  card_title = %[<a #{_main(file)} style="text-decoration: none; color: black">#{card_title}</a>]
 
 # FIXME is this wrong??
 
@@ -555,7 +598,6 @@ def card2
     <div class="card mb-3">
       <div class="card-body">
         <h5 class="card-title">#{card_title}</h5>
-      </div>
       <ul class="list-group list-group-flush">
   HTML
   _out open
@@ -564,7 +606,7 @@ def card2
     main = _main(url)
     _out %[<li class="list-group-item"><a #{main}}">#{cdata}</a> </li>]
   end
-  close = %[       </ul>\n    </div>]
+  close = %[       </ul>\n    </div>\n  </div>]
   _out close
 end
 
@@ -583,6 +625,8 @@ def tag_cloud
     main = _main(url)
     _out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
+  close = %[       </div>\n  </div>]
+  _out close
 end
 
 def navbar