runeblog 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf71088966e7393574d792a3508bb35f8a581e774a250dbe88b61fee08cd7588
-  data.tar.gz: 991d387f3649a4defbdee3500d2a275ab2b5b6b2956ad46188c50a8c3c393513
+  metadata.gz: 2f937d26af0033b5370fb7057e148cf2a0c9574f1fd2a3575f19ba11a9fb412f
+  data.tar.gz: 54ee56282b161b3b114d968f31d818f35eb9d9116bebda68f2de380d8aa5d290
 SHA512:
-  metadata.gz: 57eaf8b41cb76dd92e2a4f5ba45c3461248761e433e2f1fefc4ab6373ac414fcfbe2c4c04016465438b7a68b3ef7d666ad848634afa37f1cbac36c01e7be5385
-  data.tar.gz: 3bd8ed4c9776f71b2787cdb484c981b314b53993b3d31bb125176e576d91f752830813eba24f1cacf84b1cf455a7f4743fc0bc866009217c3afe09a44b67d8c2
+  metadata.gz: b820edb205e03e5a4ba420daa50b8e163e2dc74fdc3dcebb96deecc963e0ef0e64d1a9c592bd0825e2589fca6998323990b6b76c1c015483038693bf7af500dc
+  data.tar.gz: 07e9915006923ba7de0e33963ce4ecf9a63d4fbe20368f8962f13d0ed131951905219ccaafdff636f6100bd230546877ab6122e4cc48151e06dcdbeb7469cdc6

data/lib/liveblog.rb

@@ -117,13 +117,25 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
           </h5>
     EOS
     log!(str: "Writing data pairs to #{cardfile}.html", pwd: true)
-    top = ""
-    top = :widgets/tag + "/" unless tag == "news"   # FIXME !!
     pairs.each do |file, title| 
-      f.puts <<-EOS
-        <li class="list-group-item"> <a href="javascript: void(0)" 
-        onclick="javascript:open_main('#{top}#{file}')">#{title}</a> </li>
-      EOS
+      url = file
+      if ["news", "links"].include? tag
+        frameable, title = title.split(/, */, 2)
+        frameable = (frameable.downcase == "yes")
+        if frameable
+          anchor = %[<a href="javascript: void(0)" onclick="javascript:open_main('#{url}')">#{title}</a>]
+        else
+          anchor = %[<a href='#{url}' target='_blank'>#{title}</a>]
+        end
+      else
+        url = :widgets/tag/file
+        anchor = %[<a href="javascript: void(0)" onclick="javascript:open_main('#{url}')">#{title}</a>]
+      end
+STDERR.puts [file, title].inspect
+STDERR.puts [tag, frameable, anchor].inspect
+STDERR.puts 
+      wrapper = %[<li class="list-group-item">#{anchor}</li>]
+      f.puts wrapper
     end
     f.puts <<-EOS
         </div>
@@ -138,7 +150,7 @@ def _write_main(mainfile, pairs, card_title)
     _html_body(f) do
       f.puts "<h1>#{card_title}</h1>"
       pairs.each do |file, title| 
-        main = _main(file)
+        main = (file.start_with?("http") ? _main(file) : file)
         f.puts %[<a style="text-decoration: none; font-size: 24px" #{main}>#{title}</a> <br>]
       end
     end
@@ -153,7 +165,7 @@ def make_main_links
   cardfile, mainfile = "#{tag}-card", "#{tag}-main"
   input = "list.data"
   log!(str: "Reading #{input}", pwd: true)
-  pairs = File.readlines(input).map {|line| line.chomp.split(",", 2) }
+  pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
   _write_main(mainfile, pairs, card_title)
   widget_relative = false  # (tag != "news")  # FIXME kludge!!!
   _write_card(cardfile, mainfile, pairs, card_title, tag, relative: widget_relative)
@@ -440,26 +452,25 @@ STDERR.puts "---- SIDEBAR pwd = #{Dir.pwd}"
     wtag = :widgets/tag
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-#   livetext tag, tcard, wtag
-    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    xlate cwd: wtag, src: tag, dst: tcard
     _include_file wtag/tcard
   end
   _out %[</div>]
 end
 
 def sidebar!
-# if _args.include? "off"
-#   _body { }  # iterate, do nothing
-#   return 
-# end
+  if _args.include? "off"
+    _body { }  # iterate, do nothing
+    return 
+  end
+
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |token|
     tag = token.chomp.strip.downcase
     wtag = :widgets/tag
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-#   livetext tag, tcard, wtag
-    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    xlate cwd: wtag, src: tag, dst: tcard
     _include_file wtag/tcard
   end
   _out %[</div>]

data/lib/runeblog.rb

@@ -385,7 +385,9 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
-    xlate cwd: vdir/: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"
   end
 

data/lib/runeblog_version.rb

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

data/lib/xlate.rb

@@ -15,17 +15,23 @@ LEXT = ".lt3"
             copy: nil, debug: false, force: false)
     src += LEXT unless src.end_with?(LEXT)
     dst += ".html" unless dst.end_with?(".html") || strip
-    STDERR.puts "-- xlate: pwd = #{cwd}"
+    indent = " "*12
     Dir.chdir(cwd) do
-      return unless stale?(src, dst, force)
       if debug
-        STDERR.puts "-- xlate #{src} >#{dst}"
-        STDERR.puts "     in:   #{Dir.pwd}"
-        STDERR.puts "     from: #{caller[0]}"
-        STDERR.puts "     copy: #{copy}" if copy
+        STDERR.puts "#{indent} -- xlate #{src} >#{dst}"
+        STDERR.puts "#{indent}      in:   #{Dir.pwd}"
+        STDERR.puts "#{indent}      from: #{caller[0]}"
+        STDERR.puts "#{indent}      copy: #{copy}" if copy
+      end
+      if stale?(src, dst, force)
+        # do nothing
+      else
+        STDERR.puts "#{indent} -- ^ Already up to date!" if debug
+        return
       end
       rc = system("livetext #{src} >#{dst}")
       STDERR.puts "...completed (shell returned #{rc})" if debug
+      system("cp #{dst} #{copy}") if copy
     end
   end
 

data/test/make_blog.rb

@@ -14,8 +14,8 @@ def getch
 # sleep 5
 end
 
-def debug(str)
-  STDERR.puts ">>> #{str} #{Time.now}"
+def debug(str = "")
+  STDERR.puts "#{Time.now.strftime("%H:%M:%S")} #{str}"
 end
 
 def make_post(x, title, teaser, body, views=[])
@@ -23,10 +23,10 @@ def make_post(x, title, teaser, body, views=[])
 # print "."
   x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
   views.each do |view| 
-    debug "      generate_index #{view}"
+    debug
+    debug "** generate_index #{view}"
     x.generate_index(view) 
   end  # recent.html
-  STDERR.puts
 end
 
 def show_lines(text)
@@ -44,7 +44,7 @@ system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo(".blogs")
 x = RuneBlog.new(".blogs")
 
-debug("create_view 'around_austin'")
+debug("create_view: around_austin")
 x.create_view("around_austin")   # FIXME remember view title!
 
 # Hack:
@@ -52,12 +52,13 @@ if File.exist?("publish")
   system("cp publish .blogs/views/around_austin/publish")
 end
 
-debug("create_view 'computing'")
+debug("create_view: computing")
 x.create_view("computing")
 
-debug("create_view 'music'")
+debug("create_view: music")
 x.create_view("music")
 
+debug("-- change_view: around_austin")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY, ["music"])
@@ -72,6 +73,7 @@ EXCERPT
 Now, depending on what you consider "major," blah blah blah...
 BODY
 
+debug("-- change_view: computing")
 x.change_view("computing")     # 3 5 6
 
 make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
@@ -81,6 +83,7 @@ I mean, unless the previous one was the last one ever, which I don't expect to
 happen for a couple of decades.
 BODY
 
+debug("-- change_view: music")
 x.change_view("music")    # 4 10
 
 make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
@@ -89,6 +92,7 @@ EXCERPT
 And more about indie music.
 BODY
 
+debug("-- change_view: computing")
 x.change_view("computing")
 
 make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
@@ -103,6 +107,7 @@ EXCERPT
 But that day hasn't come yet.
 BODY
 
+debug("-- change_view: around_austin")
 x.change_view("around_austin")
 
 make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
@@ -124,6 +129,7 @@ EXCERPT
 This is about Sabine St, blah blah lorem ipsum dolor...
 BODY
 
+debug("-- change_view: music")
 x.change_view("music")
 
 make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY, ["around_austin"])
@@ -133,11 +139,8 @@ But I first heard of them
 in 2005.
 BODY
 
-debug("GENERATE_view 'around_austin'")
+debug
+debug("** generate_view: around_austin")
 x.generate_view("around_austin")
 
-x.change_view("around_austin")
-
-puts
-puts Time.now
-puts
+debug

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -77,7 +77,6 @@ files:
 - lib/runeblog_version.rb
 - lib/view.rb
 - lib/xlate.rb
-- test/config
 - test/fakeimage.jpg
 - test/general_test.rb
 - test/make_blog.rb

data/test/config

@@ -1,3 +0,0 @@
-root: /Users/Hal/Dropbox/files/runeblog/test/.blogs
-current_view: around_austin
-editor: /usr/local/bin/vim