RubyGems - runeblog - Versions diffs - 0.2.60 → 0.2.65 - Mend

runeblog 0.2.60 → 0.2.65

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

data/empty_view/remote/widgets/ad/GIT_IS_DUMB ADDED

	@@ -0,0 +1,2 @@
1	+
2	+

data/empty_view/remote/widgets/links/GIT_IS_DUMB ADDED

	@@ -0,0 +1,2 @@
1	+
2	+

data/empty_view/remote/widgets/news/GIT_IS_DUMB ADDED

	@@ -0,0 +1,2 @@
1	+
2	+

data/empty_view/remote/widgets/pages/GIT_IS_DUMB ADDED

	@@ -0,0 +1,2 @@
1	+
2	+

data/empty_view/remote/widgets/pinned/GIT_IS_DUMB ADDED

	@@ -0,0 +1,2 @@
1	+
2	+

data/empty_view/themes/standard/blog/generate.lt3 CHANGED

@@ -14,7 +14,7 @@
 .include blog/head.lt3
   <body>
-    $.banner text: top.html image: austin-pano.jpg // navbar
+    $.banner bgcolor: 101035 text: top.html image: austin-pano.jpg // navbar
     <div class="content container-fluid mt-4">
       <div class="row">
         $.include blog/index.lt3

data/empty_view/themes/standard/widgets/pinned/pinned.rb CHANGED

@@ -7,10 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      # f = File.new("/tmp/mehhh", "w")
       @lines = File.exist?(@datafile) ? File.readlines(@datafile) : []
-      # f.puts #{@lines.inspect} in #{Dir.pwd}"
-      File.open("/tmp/mehhh", "w") {|f| f.puts "#{@lines.inspect} in #{Dir.pwd}" }
     end
     def _html_body(file, css = nil)    # FIXME
@@ -50,7 +47,7 @@ class ::RuneBlog::Widget
       mainfile = "#{tag}-main"
       File.open("#{mainfile}.html", "w") do |f|
         _html_body(f, css) do
-f.puts "<!-- #{@lines.inspect} in #{Dir.pwd} -->"
+          f.puts "<!-- #{@lines.inspect} in #{Dir.pwd} -->"
           f.puts "<h1>#{card_title}</h1><br><hr>"
           @links.each do |title, file|
             title = title.gsub(/\\/, "")  # kludge

data/lib/liveblog.rb CHANGED

@@ -7,8 +7,6 @@ require 'runeblog'
 require 'pathmagic'
 require 'xlate'
-# errfile = File.new("/tmp/liveblog.out", "w")
-# STDERR.reopen(errfile)
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
@@ -28,8 +26,6 @@ end
 # "dot" commands
 ##################
 def dropcap
   # Bad form: adds another HEAD
   text = _data
@@ -72,11 +68,8 @@ def faq
   ques = _data.chomp
   ans  = _body_text
   id = "faq#@faq_count"
-# _out %[&nbsp;<a class="btn btn-default btn-xs" data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample">+</a>]
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
-# _out "<font size=-2><br></font>" if @faq_count == 1
-# _out "<br>" unless @faq_count == 1
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
   _out "<br>" unless @faq_count == 1
   _optional_blank_line
@@ -93,11 +86,21 @@ def _read_navbar_data
 end
 def banner  # still experimental
-  _out "<table width=100% bgcolor=#101035>"
-  _out "  <tr>"
   enum = _args.each
   count = 0
   span = 1
+  first = enum.peek
+  if first.start_with?("bgcolor:")
+    enum.next
+    bg = enum.next
+  else
+    bg = nil # bg = white - do nothing
+  end
+  str =  "<table width=100%"
+  str << (bg ? " bgcolor=##{bg}>" : ">")
+  _out str
+  _out "  <tr>"
   loop do
     count += 1
     arg = enum.next
@@ -119,17 +122,14 @@ def banner  # still experimental
         _out "<td colspan=#{span}>" + File.read(file) + "</td>" +
              " <!-- #{arg} -->"
       when "navbar"
-# STDERR.puts "-- navbar: pwd = #{Dir.pwd}:  #{`ls`}"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
         _make_navbar  # horiz is default
-        # xlate cwd: dir, src: "navbar.lt3", dst: "navbar.html"   # , debug: true
         stuff = File.read("banner/navbar.html")
         _out "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" +
              " <!-- #{arg} -->"
       when "vnavbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
         _make_navbar(:vert)
-        # xlate cwd: dir, src: "vnavbar.lt3", dst: "vnavbar.html"   # , debug: true
         file = "banner/vnavbar.html"
         _out "<td colspan=#{span}>" + File.read(file) + "</td>" +
              "<!-- #{arg} -->"
@@ -197,21 +197,6 @@ def list!
   _optional_blank_line
 end
-def make_main_links
-  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, 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, level: 3)
-end
 ### inset
 def inset
@@ -232,7 +217,6 @@ def inset
     else  # Only into body
       output << line
     end
-#   _passthru(line)
   end
   lr = _args.first
   wide = _args[1] || "25"
@@ -241,10 +225,6 @@ def inset
   _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
@@ -256,7 +236,6 @@ def title
   @meta.title = title
   setvar :title, title
   # FIXME refactor -- just output variables for a template
-# _out %[<h1 class="post-title">#{title}</h1><br>]
   _optional_blank_line
 end
@@ -346,15 +325,8 @@ def teaser
 end
 def finalize
-  # FIXME simplify this!
-  unless @meta
-STDERR.puts "META is nil: file = #{Livetext::Vars[:File]}"
-#   puts @live.body
-    return
-  end
-  if @blog.nil?
-    return @meta
-  end
+  return unless @meta
+  return @meta if @blog.nil?
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
@@ -480,7 +452,18 @@ def pinned_rebuild
         widget = code.new(@blog)
         widget.build
       end
-      _include_file wtag/"pinned-card.html"
+      # _include_file wtag/"pinned-card.html"
+    end
+  end
+end
+def _handle_standard_widget(tag)
+  wtag = :widgets/tag
+  code = _load_local(tag)
+  if code
+    Dir.chdir(wtag) do
+      widget = code.new(@blog)
+      widget.build
     end
   end
 end
@@ -494,7 +477,7 @@ def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
-  standard = %w[pinned pages links]
+  standard = %w[pinned pages links news]
   _body do |token|
     tag = token.chomp.strip.downcase
@@ -502,34 +485,23 @@ def sidebar
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-    code = _load_local(tag)
-    if code
-      if ["news", "pages", "links", "pinned"].include? tag
-        Dir.chdir(wtag) do
-          widget = code.new(@blog)
-          widget.build
+    case
+      when standard.include?(tag)
+        _handle_standard_widget(tag)
+      when 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
-      _include_file wtag/tcard
-      next
-    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
-      xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
+        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
     end
     _include_file wtag/tcard
 #   depend = %w[card.css main.css custom.rb local.rb]
 #   depend += ["#{wtag}.lt3", "#{wtag}.rb"]
-#   depend += %w[pieces/card-head.lt3 pieces/card-tail.lt3]
-#   depend += %w[pieces/main-head.lt3 pieces/main-tail.lt3]
 #   depend.map! {|x| @blog.view.dir/"themes/standard/widgets"/wtag/x }
 # _debug "--- call xlate #{tag} src = #{tag}  dst = #{tcard}\r"
   end
@@ -556,21 +528,6 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
-def card_iframe
-  title, lines = _data, _body
-  lines.map!(&:chomp)
-  url = lines[0].chomp
-  stuff = lines[1..-1].join(" ")  # FIXME later
-  middle = <<-HTML
-    <iframe src="#{url}" #{stuff}
-            style="border: 0" #{stuff}
-            frameborder="0" scrolling="no">
-    </iframe>
-  HTML
-  _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
-end
 $Dot = self   # Clunky! for dot commands called from Functions class
 # Find a better way to do this?
@@ -607,59 +564,10 @@ class Livetext::Functions
   def _var(name)
     ::Livetext::Vars[name] || "[:#{name} is undefined]"
   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
 ###
-def card1
-  title, lines = _data, _body
-  lines.map!(&:chomp)
-  card_text = lines[0]
-  url, classname, cdata = lines[1].split(",", 4)
-  main = _main(url)
-  middle = <<-HTML
-    <p class="card-text">#{card_text}</p>
-    <a #{main} class="#{classname}">#{cdata}</a>
-  HTML
-  _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
-end
-def card2
-  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??
-  open = <<-HTML
-    <div class="card mb-3">
-      <div class="card-body">
-        <h5 class="card-title">#{card_title}</h5>
-      <ul class="list-group list-group-flush">
-  HTML
-  _out open
-  _body do |line|
-    url, cdata = line.chomp.split(",", 3)
-    main = _main(url)
-    _out %[<li class="list-group-item"><a #{main}}">#{cdata}</a> </li>]
-  end
-  close = %[       </ul>\n    </div>\n  </div>]
-  _out close
-end
 def tag_cloud
   title = _data
@@ -686,17 +594,14 @@ end
 def vnavbar
   str = _make_navbar(:vert)
-# _out str
 end
 def hnavbar
   str = _make_navbar  # horiz is default
-# _out str
 end
 def navbar
   str = _make_navbar  # horiz is default
-# _out str
 end
 def _make_navbar(orient = :horiz)
@@ -757,123 +662,6 @@ def _html_body(file, css = nil)
   file.puts "  </body>\n</html>"
 end
-def _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{cardfile}.html", pwd: true, level: 2)
-  url = mainfile
-  url = :widgets/tag/mainfile + ".html"
-  File.open("#{cardfile}.html", "w") do |f|
-    f.puts <<-EOS
-      <div class="card mb-3">
-        <div class="card-body">
-          <h5 class="card-title">
-            <button type="button" class="btn btn-primary" data-toggle="collapse" data-target="##{tag}">+</button>
-            <a href="javascript: void(0)"
-               onclick="javascript:open_main('#{url}')"
-               style="text-decoration: none; color: black"> #{card_title}</a>
-          </h5>
-          <div class="collapse" id="#{tag}">
-    EOS
-    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true, level: 2)
-    local = _local_tag?(tag)
-    pairs.each do |file, title|
-      url = file
-      type, title = page_type(tag, title)
-      case type
-        when :local;   url_ref = _widget_card(file, tag)  # local always frameable
-        when :frame;   url_ref = _main(file)              # remote, frameable
-        when :noframe; url_ref = _blank(file)             # remote, not frameable
-      end
-      anchor = %[<a #{url_ref}>#{title}</a>]
-      wrapper = %[<li class="list-group-item">#{anchor}</li>]
-      f.puts wrapper
-    end
-     _include_file cardfile+".html"
-    f.puts <<-EOS
-          </div>
-        </div>
-      </div>
-    EOS
-  end
-end
-def _local_tag?(tag)
-  case tag.to_sym
-    when :pages
-      true
-    when :news, :links
-      false
-  else
-    true  # Hmmm...
-  end
-end
-def page_type(tag, title)
-  yesno = "yes"
-  yesno, title = title.split(/, */) if title =~ /^[yes|no]/
-  local = _local_tag?(tag)
-  frameable = (yesno == "yes")
-  if local
-    return [:local, title]
-  elsif frameable
-    return [:frame, title]
-  else
-    return [:noframe, 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, level: 2)
-  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, 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
-        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
-    end
-  end
-end
 def _errout(*args)
   ::STDERR.puts *args
 end
@@ -948,12 +736,3 @@ def _blank(url)
   %[href='#{url}' target='blank']
 end
-def _widget_main(url, tag)
-  %[href="#{url}"]
-end
-def _widget_card(url, tag)
-  url2 = :widgets/tag/url
-  %[href="javascript: void(0)" onclick="javascript:open_main('#{url2}')"]
-end