runeblog 0.2.83 → 0.2.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc20c73da7ee238b37adbc948c5e883f1e5f0b9b8c7f7add232c31dfbc2e3bd3
-  data.tar.gz: 294b35d978b4ff2859f1073d460a3f61947284b659a041037f43f319cb38c4c8
+  metadata.gz: f0a0162c325b884d416802f6502ca34273cc388d7af3e58347e886c1b1e4c4d1
+  data.tar.gz: 450abb053bea34e25e392e6421fbd38cd6ded80d9bc93379b3a0f288f9dd60e3
 SHA512:
-  metadata.gz: 2b8b9925f49e63203942d6c325960c7774c0ad96671e065e279b880cee8d80ff60c215488e9e403c3657ec9b4e2d89efc8f4e5052d0bffe9ff887dcd67556bd3
-  data.tar.gz: 5b44950c664496a2032010c1e50da51a6091cf1d689ed1f49536ecb54c1586f4046de94bc9a5d1ae12fca675c3ba0969208f6c42cc93cd0dc0750c5687bdc205
+  metadata.gz: 886ae461d1898a79c2b674b728418975b3d28bd48a43c7d1cd2706133495c4497fbda6d1af3d365015929e7e53d6fab76047f4b7b17697cfed88f4dbacda153d
+  data.tar.gz: 100ef7fd298aff83c714070fc7beda5cedf03d063bf1b8dc5a9a150a16e56bada728842e23acbcb61b827eacea22404e5f743a74de905daf614629265b8e1f10

data/bin/blog

@@ -26,7 +26,7 @@ end
 
 def get_started
   if yesno("Do you want to qo a quick setup?")
-    puts "\n      First choose your editor."
+    puts "      First choose your editor."
     @blog.editor = pick_editor
     File.write("#{@blog.root}/data/EDITOR", @blog.editor)
 
@@ -37,19 +37,15 @@ def get_started
     end
     # Now create a custom global.lt3
     @blog._generate_global
-    sleep 1
     noview = true
     puts fx("\n  Quick setup complete!", :bold)
     if yesno("Create your first view now?")
       cmd_new_view(nil)
       noview = false
-      sleep 1
       puts "\n  View #{@blog.view} created!\n "
     end
-    system("cp #@root/data/global.lt3 #@root/views/#{@blog.view}/themes/standard/")
   end
 
-  sleep 0.5
 
   puts
   print fx("  For help", :bold)

data/empty_view/themes/standard/banner/top.lt3

@@ -0,0 +1,19 @@
+.nopara
+<svg width="98%" height="100"
+     viewBox="0 0 98% 100">
+  <defs>
+    <linearGradient id="grad1" x1="100%" y1="100%" x2="0%" y2="100%">
+      <stop offset="0%" style="stop-color:rgb(198,198,228);stop-opacity:1" />
+      <stop offset="100%" style="stop-color:rgb(30,30,50);stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <style>
+    .small { font: 20px sans-serif; fill: #98baff }
+    .heavy { font: bold 55px sans-serif; fill: #76a9ff }
+  </style>
+
+<rect x="20" y="20" rx="15" ry="15" width="98%" height="100" fill="url(#grad1)"/>
+
+<text x="25" y="60" class=heavy>$blog</text>
+<text x="25" y="90" class=small>$blog.desc</text>
+</svg>

data/empty_view/themes/standard/blog/banner.lt3

@@ -1,6 +1,4 @@
 .banner
-  height  100
-  bgcolor 101035
   text    top.html
   break
   navbar

data/lib/liveblog.rb

@@ -91,7 +91,7 @@ end
 def banner
   count = 0
   span = 1
-  @bg = "white"  # outside loop
+  bg = "white"  # outside loop
   wide = nil
   high = 250
   str2 = ""
@@ -103,12 +103,9 @@ def banner
     tag, *data = line.split
     data ||= []
     case tag
-      when "width"
-        wide = data[0]
-      when "height"
-        high = data[0]
-      when "bgcolor"
-        @bg = data[0] || "white"
+      when "width";   wide = data[0]
+      when "height";  high = data[0]
+      when "bgcolor"; bg = data[0] || "white"
       when "image"
         image = data[0] || "banner.jpg"
         image = "banner"/image
@@ -122,31 +119,39 @@ def banner
       when "text"
         data[0] ||= "top.html"
         file = "banner"/data[0]
+        if ! File.exist?(file) 
+          src = file.sub(/html$/, "lt3")
+          if File.exist?(src)
+            preprocess src: src, dst: file, vars: Livetext::Vars
+          else
+            raise "Neither #{file} nor #{src} found"
+          end
+        end
         str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
       when "navbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
         _make_navbar  # horiz is default
         file = "banner/navbar.html"
         navbar = File.read(file)
-        # str2 << "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" + "\n"
       when "vnavbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
         _make_navbar(:vert)
         file = "banner/vnavbar.html"
         navbar = File.read(file)
-        # str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
       when "break"
-         span = count - 1
+#        span = count - 1
          str2 << "  </tr>\n  <tr>"  + "\n"
     else
       str2 << "        '#{tag}' isn't known" + "\n"
     end
   end
-  _out "<table width=100% height=#{high} bgcolor=##{@bg}>"
-  _out "  <tr>"
-  _out str2
-  _out "  </tr>"
-  _out "</table>"
+  _out <<~HTML
+    <table width=100% bgcolor=#{bg}>
+      <tr>
+        #{str2}
+      </tr>
+    </table>
+  HTML
   _out navbar if navbar
 rescue => err
   STDERR.puts "err = #{err}"
@@ -177,9 +182,9 @@ def _get_arg(name, args)  # really belongs in livetext
 end
 
 def _svg_title(*args)
-  width    = 330
-  height   = 100
-  bgcolor  = "blue"
+  width    = "95%"
+  height   = 90
+  bgcolor  = "black"
   style    = nil
   size     = ""
   font     = "sans-serif"
@@ -194,103 +199,43 @@ def _svg_title(*args)
   align2   = "center"
 
   e = args.each
-  hash = {}
+  hash = {}  # TODO get rid of hash??
+
+  valid = %w[width height bgcolor style size font color xy 
+             align style2 size2 font2 color2 xy2 align2]
+  os = OpenStruct.new
   loop do
     arg = e.next
     arg = arg.chop
-    case arg   # can give runtime error if arg missing
-      when "width";    width    = e.next
-      when "height";   height   = e.next
-      when "bgcolor";  bgcolor  = e.next
-      when "style";    style    = e.next
-      when "size";     size     = e.next
-      when "font";     font     = e.next
-      when "color";    color    = e.next
-      when "xy";       xy       = e.next
-      when "align";    align    = e.next
-      when "style2";   style2   = e.next
-      when "size2";    size2    = e.next
-      when "font2";    font2    = e.next
-      when "color2";   color2   = e.next
-      when "xy2";      xy2      = e.next
-      when "align2";   align2   = e.next
-    end
+    raise "Don't know '#{arg}'" unless valid.include?(arg)
+    os.send(arg+"=", e.next)
   end
   x, y = xy.split(",")
   x2, y2 = xy2.split(",")
-  hash["x"]       = x
-  hash["y"]       = y
-  hash["x2"]      = x2
-  hash["y2"]      = y2
-  hash["width"]   = width
-  hash["height"]  = height
-  hash["bgcolor"] = bgcolor
-  hash["style"]   = style
-  hash["size"]    = size
-  hash["font"]    = font
-  hash["color"]   = color
-  hash["xy"]      = xy
-  hash["align"]   = align
-  hash["style2"]  = style2
-  hash["size2"]   = size2
-  hash["font2"]   = font2
-  hash["color2"]  = color2
-  hash["align2"]  = align2
+  names = %w[x y x2 y2] + valid
+  names.each {|name| hash[name] = os.send(name) }
   result = <<~HTML
     <svg width="#{width}" height="#{height}"
          viewBox="0 0 #{width} #{height}">
+      <defs>
+        <linearGradient id="grad1" x1="100%" y1="100%" x2="0%" y2="100%">
+          <stop offset="0%" style="stop-color:rgb(198,198,228);stop-opacity:1" />
+          <stop offset="100%" style="stop-color:rgb(30,30,50);stop-opacity:1" />
+        </linearGradient>
+      </defs>
       <style>
         .title    { font: #{style} #{size} #{font}; fill: #{color} }
         .subtitle { font: #{style2} #{size2} #{font2}; fill: #{color2} }
       </style>
-      <rect x="10" y="10" rx="10" ry="10" width="#{width-20}" height="#{height-20}" fill="#{bgcolor}"/>
+      <rect x="10" y="10" rx="10" ry="10" width="#{width}" height="#{height}" fill="url(#grad1)"/>
       <text text-anchor="#{align}"  x="#{x}" y="#{y}" class="title">#{Livetext::Vars[:blog]} </text>
       <text text-anchor="#{align2}" x="#{x2}" y="#{y2}" class="subtitle">#{Livetext::Vars["blog.desc"]} </text>
-    </svg>
+    </svg> 
+    <!-- ^ how does syntax highlighting get messed up? </svg> -->
   HTML
   [result, hash]
 end
 
-def svg_title_SOON
-  tstyle = tsize = tfont = tcolor = txy = talign = nil
-  t2style = t2size = t2font = t2color = t2xy = t2align = nil
-  wide, high, hue = 450, 150, "white"
-  _body do |line|
-    count += 1
-    tag, *data = line.split
-    data ||= []
-    title_params = {style: nil, size: "", font: "sans-serif", color: "white",
-                    xy: "5,5", align: "left"}
-    case tag
-      when "title";   
-        hash = _parse_colon_args(data, title_params)
-        tstyle, tsize, tfont, tcolor, txy, talign = 
-          hash.values_at(:tstyle, :tsize, :tfont, :tcolor, :txy, :talign)
-        tx, ty = txy.split(",")
-      when "title2";  
-        hash = _parse_colon_args(data, title_params)
-        t2style, t2size, t2font, t2color, t2xy, t2align =
-          hash.values_at(:t2style, :t2size, :t2font, :t2color, :t2xy, :t2align)
-        t2x, t2y = t2xy.split(",")
-      when "width";   wide = _get_arg(:width, data)
-      when "height";  high = _get_arg(:height, data)
-      when "bgcolor"; hue  = _get_arg(:bgcolor, data)
-    end
-  end
-  <<~HTML
-    <svg width="#{wide}" height="#{high}"
-         viewBox="0 0 #{wide} #{high}">
-      <style>
-        .title    { font: #{tstyle} #{tsize} #{tfont}; fill: #{tcolor} }
-        .subtitle { font: #{t2style} #{t2size} #{t2font}; fill: #{t2color} }
-      </style>
-      <rect x="0" y="0" rx="10" ry="10" width="#{wide}" height="#{height}" fill="#{bgcolor}"/>
-      <text text-anchor="#{talign}"  x="#{tx}" y="#{tx}" class="title">$blog </text>
-      <text text-anchor="#{t2align}" x="#{t2x}" y="#{t2y}" class="subtitle">$blog.desc </text>
-    </svg>
-  HTML
-end
-
 def quote
   _passthru "<blockquote>"
   _passthru _body.join(" ")
@@ -753,7 +698,6 @@ def _make_navbar(orient = :horiz)
     list1, list2 = '<l class="navbar-nav mr-auto">', "</ul>"
   end
   
-#      <!-- FIXME weird bug here!!! -->
   start = <<-HTML
    <table><tr><td>
    <nav class="navbar #{extra} navbar-light bg-light">

data/lib/processing.rb

@@ -22,7 +22,7 @@ end
 
 def preprocess(cwd: Dir.pwd, src:, 
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
-          deps: [], copy: nil, debug: false, force: false)
+          deps: [], copy: nil, debug: false, force: false, vars: nil)
   src += LEXT unless src.end_with?(LEXT)
   dst += ".html" unless (dst.end_with?(".html") || strip)
   sp = " "*12
@@ -38,7 +38,7 @@ def preprocess(cwd: Dir.pwd, src:,
     stale = stale?(src, dst, deps, force)
     if stale
       live = Livetext.new
-      out = live.xform_file(src)
+      out = live.xform_file(src, vars: vars)
       File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     end

data/lib/repl.rb

@@ -276,6 +276,9 @@ module RuneBlog::REPL
       puts
     end
     @blog.create_view(arg)
+    text = File.read("#{@blog.root}/data/global.lt3")
+    File.write("#{@blog.root}/views/#{@blog.view}/themes/standard/global.lt3", 
+               text.gsub(/VIEW_NAME/, @blog.view.to_s))
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
     @blog.change_view(arg)

data/lib/runeblog.rb

@@ -376,15 +376,28 @@ class RuneBlog
       <body>
     HTML
     posts = _sorted_posts
-    wanted = [8, posts.size].min  # estimate how many we want?
-    enum = posts.each
-    entries = []
-    wanted.times do
-      postid = File.basename(enum.next)
-      postid = postid.to_i
-      entry = index_entry(postid)
-      entries << entry
-      text << entry
+    if posts.size > 0
+      wanted = [8, posts.size].min  # estimate how many we want?
+      enum = posts.each
+      entries = []
+      wanted.times do
+        postid = File.basename(enum.next)
+        postid = postid.to_i
+        entry = index_entry(postid)
+        entries << entry
+        text << entry
+      end
+    else
+      text << <<-HTML
+        <svg width="95%" height="95%" viewBox="0 0 95% 95%">
+          <style> .huge { font:  italic 100px sans-serif; fill: white } </style>
+          <rect x="0" y="0" rx="50" ry="50" width="95%" height="95%" fill="lightblue"/>
+          <text x="250" y="120" class=huge>No</text>
+          <text x="250" y="230" class=huge>posts</text>
+          <text x="250" y="340" class=huge>here</text>
+          <text x="250" y="450" class=huge>yet</text>
+        </svg>
+      HTML
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)

data/lib/runeblog_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.83
+  version: 0.2.84
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -91,7 +91,6 @@ files:
 - empty_view/assets/sky2.jpg
 - empty_view/remote/assets/GIT_IS_DUMB
 - empty_view/remote/banner/austin-pano.jpg
-- empty_view/remote/banner/top.html
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/ad/GIT_IS_DUMB
@@ -104,7 +103,7 @@ files:
 - empty_view/themes/standard/banner/contact.lt3
 - empty_view/themes/standard/banner/faq.lt3
 - empty_view/themes/standard/banner/list.data
-- empty_view/themes/standard/banner/top.html
+- empty_view/themes/standard/banner/top.lt3
 - empty_view/themes/standard/blog/banner.lt3
 - empty_view/themes/standard/blog/generate.lt3
 - empty_view/themes/standard/blog/head.lt3

data/empty_view/remote/banner/top.html

@@ -1,4 +0,0 @@
-  <div style="text-align: center; color: white; background: #101035">
-    <h1>Around Austin</h1><br>
-    The view from downtown...
-  </div>

data/empty_view/themes/standard/banner/top.html

@@ -1,18 +0,0 @@
-<svg width="95%" height="55"
-     viewBox="0 0 95% 55">
-  <defs>
-    <linearGradient id="grad1" x1="100%" y1="100%" x2="0%" y2="100%">
-      <stop offset="0%" style="stop-color:rgb(198,198,228);stop-opacity:1" />
-      <stop offset="100%" style="stop-color:rgb(30,30,50);stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <style>
-    .small { font: 13px sans-serif; fill: #98baff }
-    .heavy { font: bold 35px sans-serif; fill: #76a9ff }
-  </style>
-
-<rect x="0" y="0" rx="3" ry="3" width="95%" height="55" fill="url(#grad1)"/>
-
-<text x="5" y="33" class=heavy>$blog</text>
-<text x="5" y="48" class=small>$blog.desc</text>
-</svg>