RubyGems - runeblog - Versions diffs - 0.1.96 → 0.2.2 - Mend

runeblog 0.1.96 → 0.2.2

Files changed (497) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e0f35e5c032653d07acda3b5cfcaf0ff06cb8fe53d77f32969e37447200c41
-  data.tar.gz: dd558ffa5a91dd1ef68cd4935517844cdf3c9deba18ff349d92b2f36e1fd790a
+  metadata.gz: a9d81e1698ec57e960eb96cedd07e976f0581243a20ef44a509ff31d683ef552
+  data.tar.gz: 9f18e15de10d2bff25b3596c6d9e498833ed203252729d3a9ae07fde93200d13
 SHA512:
-  metadata.gz: 19161f1b4000f4ede35cb7c8393c1f8fcee3d0f190a61abe231ef098adedcaf99fc15ce7ccd2a7f983db924b05f110e279cf8c79417b61ee40bbdf9201c297b0
-  data.tar.gz: d06e92c711e868357b8c67f8da49dcddd7d2d983bd457675ac7c61c070fb5e1cfae2244d592327af6c1660b9fcaff05993cc80c90343af6c5d4476f493b5b0f4
+  metadata.gz: 57c611667b8cedc12adbfd2a6e07059fff1a98ad0ab9200ded8b4514c16f3b899b71d954ab1b00f2b5f953fad01faa86382206020a464819547ea23e0794d86f
+  data.tar.gz: aa44c0773ee6cf9117581a78baffd07949c43a07e3487187560601cc6996bc2aa7581862de3d64dab8fca3bf9fd1c277e1b629dffb335833f38131c4500039ab

data/lib/helpers-blog.rb CHANGED

@@ -1,15 +1,24 @@
 require 'runeblog_version'
+require 'fileutils'
 # Home = Dir.pwd # unless Home
 module RuneBlog::Helpers
   def copy(src, dst)
-    system("cp #{src}  #{dst}")
+    if src =~ /\*/
+      system("cp #{src}  #{dst}")
+    else
+      FileUtils.cp(src, dst)
+    end
   end
   def copy!(src, dst)
-    system("cp -r #{src}  #{dst}")
+    if src =~ /\*/
+      system("cp -r #{src}  #{dst}")
+    else
+      FileUtils.cp_r(src, dst)
+    end
   end
   def stale?(src, dst)
@@ -18,9 +27,13 @@ module RuneBlog::Helpers
     return false
   end
-  def livetext(src, dst)
+  def livetext(src, dst=nil)
     src << ".lt3" unless src.end_with?(".lt3")
-    dst << ".html" unless dst.end_with?(".html")
+    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

data/lib/liveblog.rb CHANGED

@@ -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
@@ -291,12 +342,12 @@ def head  # Does NOT output  tags
   defaults = {}
   defaults = { "charset"        => %[<meta charset="utf-8">],
                "http-equiv"     => %[<meta http-equiv="X-UA-Compatible" content="IE=edge">],
-               "title"          => %[<title>\n  #{_var(:blog)} | #{_var(:blog_desc)}\n  </title>],
+               "title"          => %[<title>\n  #{_var(:blog)} | #{_var("blog.desc")}\n  </title>],
                "generator"      => %[<meta name="generator" content="Runeblog v #@version">],
                "og:title"       => %[<meta property="og:title" content="#{_var(:blog)}">],
                "og:locale"      => %[<meta property="og:locale" content="#{_var(:locale)}">],
-               "description"    => %[<meta name="description" content="#{_var(:blog_desc)}">],
-               "og:description" => %[<meta property="og:description" content="#{_var(:blog_desc)}">],
+               "description"    => %[<meta name="description" content="#{_var("blog.desc")}">],
+               "og:description" => %[<meta property="og:description" content="#{_var("blog.desc")}">],
                "linkc"          => %[<link rel="canonical" href="#{_var(:host)}">],
                "og:url"         => %[<meta property="og:url" content="#{_var(:host)}">],
                "og:site_name"   => %[<meta property="og:site_name" content="#{_var(:blog)}">],
@@ -366,20 +417,12 @@ 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
-    self.data = "sidebar/#{tag.downcase}.lt3"
-    _include
-  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
-    self.data = "sidebar/#{tag.downcase}.lt3"
-    _include
+  _args do |token|
+    tag = token.chomp.strip.downcase
+    Dir.chdir("widgets/#{tag}") do
+      livetext tag, "card-#{tag}.html"
+      _include_file "card-#{tag}.html"
+    end
   end
   _out %[</div>]
 end
@@ -451,7 +494,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
@@ -512,7 +555,7 @@ def card_iframe
   stuff = lines[1..-1].join(" ")  # FIXME later
   middle = <<-HTML
     <iframe src="#{url}" #{stuff}
-            style="border: 0" height="350"
+            style="border: 0" #{stuff}
             frameborder="0" scrolling="no">
     </iframe>
   HTML
@@ -520,23 +563,30 @@ def card_iframe
   _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
 end
+def _main(url)
+  %[href="javascript: void(0)" onclick="javascript:open_main('#{url}')"]
+end
 def card1
   title, lines = _data, _body
   lines.map!(&:chomp)
   card_text = lines[0]
-  url, target, classname, cdata = lines[1].split(",", 4)
+  url, classname, cdata = lines[1].split(",", 4)
+  main = _main(url)
   middle = <<-HTML
     <p class="card-text">#{card_text}</p>
-    <a href="#{url}" target="#{target}" class="#{classname}">#{cdata}</a>
+    <a #{main} class="#{classname}">#{cdata}</a>
   HTML
   _card_generic(card_title: title, middle: middle, extra: "bg-dark text-white")
 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??
@@ -544,18 +594,16 @@ 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
   _body do |line|
-    url, target, cdata = line.chomp.split(",", 3)
-    _out %[<li class="list-group-item"><a href="#{url}" target="#{target}">#{cdata}</a> </li>]
+    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>]
+  close = %[       </ul>\n    </div>\n  </div>]
   _out close
-rescue
-  puts @live.body
 end
 def tag_cloud
@@ -569,11 +617,12 @@ def tag_cloud
   _out open
   _body do |line|
     line.chomp!
-    url, target, classname, cdata = line.split(",", 4)
-    _out %[<a href="#{url}" target="#{target}" class="#{classname}">#{cdata}</a>]
+    url, classname, cdata = line.split(",", 4)
+    main = _main(url)
+    _out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
-rescue
-  puts @live.body
+  close = %[       </div>\n  </div>]
+  _out close
 end
 def navbar
@@ -605,14 +654,13 @@ def navbar
   _out open
   _body do |line|
     href, cdata = line.chomp.strip.split(" ", 2)
-# <!-- href="javascript:void(0);" onClick="urlChange('www.mypdf.com/test.pdf')" -->
+    main = _main(href)
     if first
       first = false
       _out %[<li class="nav-item active"> <a class="nav-link" href="#{href}">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
-      href = "navbar/#{href}"
-      href_click = %[href="javascript:void(0)" onclick="javascript:open_main('#{href}')"]
-      _out %[<li class="nav-item"> <a class="nav-link" #{href_click}>#{cdata}</a> </li>]
+      main = _main("navbar/#{href}")
+      _out %[<li class="nav-item"> <a class="nav-link" #{main}>#{cdata}</a> </li>]
     end
   end
   _out close

data/lib/runeblog.rb CHANGED

@@ -178,10 +178,12 @@ class RuneBlog
       copy!("#{Themes}", "themes")
       create_dirs(:assets, :posts)
       create_dirs(:staging, "remote/permalink", "remote/navbar")
-      livetext "themes/standard/etc/blog.css.lt3", "themes/standard/etc/blog.css"   # simplify this
+      livetext "themes/standard/etc/blog.css.lt3" # strip ext
       copy!("themes/standard/*", "staging/")
       copy!("themes/standard/etc", "remote/")
       copy!("themes/standard/assets", "remote/")
+      copy!("themes/standard/widgets", "remote/")
       pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
       dump(pub, "publish")
@@ -276,15 +278,13 @@ class RuneBlog
   end
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
-    save = Dir.pwd
-    Dir.chdir(self.view.dir)
-    # change to create_draft ?
-    post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
-    post.edit unless testing
-    post.build
-    meta = post.meta
-    Dir.chdir(save)
-    meta.num ||= 999   # ??
+    meta = nil
+    Dir.chdir(self.view.dir) do
+      post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
+      post.edit unless testing
+      post.build
+      meta = post.meta
+    end
     return meta.num
   rescue => err
     puts err
@@ -400,6 +400,7 @@ class RuneBlog
           collect_recent_posts("recent.html")
           copy("recent.html", "../remote")
           copy!("navbar/*html", "../remote/navbar/")
+          copy!("widgets", "../remote/")  # really copies too much...
           livetext "blog/generate",  "../remote/index"
         end
       end

data/lib/runeblog_version.rb CHANGED

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

data/runeblog.gemspec CHANGED

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.91'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.92'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
   # Files...

data/test/.blogs/VERSION ADDED

	@@ -0,0 +1,2 @@
1	+ 0.2.1
2	+ Blog created: 2019-09-20 13:12:25 -0500

data/test/.blogs/config ADDED

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

data/test/.blogs/drafts/0001-whats-at-stubbs.lt3 ADDED

@@ -0,0 +1,16 @@
+.mixin liveblog
+. ^ get rid of this later
+.post 1
+.title What's at Stubbs...
+.pubdate 2019-09-20
+.views around_austin music
+.tags
+.teaser
+Stubbs has been around for longer than civilization.
+.end
+That's a good thing. But their music isn't always the greatest.