RubyGems - runeblog - Versions diffs - 0.1.91 → 0.1.92 - Mend

runeblog 0.1.91 → 0.1.92

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

checksums.yaml +4 -4
data/lib/liveblog.rb +6 -15
data/lib/runeblog.rb +1 -1
data/lib/runeblog_version.rb +1 -1
data/themes/standard/README +33 -0
data/themes/standard/blog/head.lt3 +4 -23
data/themes/standard/{assets → etc}/blog.css +0 -0
data/themes/standard/etc/externals.lt3 +19 -0
data/themes/standard/{assets → etc}/favicon.ico +0 -0
metadata +4 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ecc0207a215d6ecb745fc93ef707d330990f287637f0e6838ea996ef8a3922
-  data.tar.gz: f00e1ab6255ae818b30d345408e44a3735dc907b9d16cf9ab51fc473bd6bedeb
+  metadata.gz: 28db91c5c187f46387a81fae94e52e61498c5d85bcfbb9f1e6291acc330e94a7
+  data.tar.gz: 526ffa1a59ce7abb2fd014b23ca92fb7d03b2830541f1e0fbd361c71de101f6a
 SHA512:
-  metadata.gz: 9e13e2828c71f69a5fd40dc4da1c1cf604e2222ad8d1c919e4402a662e7224aa488512f6c2107d48336a96049cf61d830fe93d4247e278c7ac755e511ef7b03b
-  data.tar.gz: 26aac596e6e68e5b37bd36c1aacb193f22da135a5e299a68437f46b34d52e74f343e5e22960b6d879a132d772febb66049876dd5f4a1ba969dccdfd9f942d7f7
+  metadata.gz: 17711b8b724d0d7d75bb75da955187c4973070f82d18fa4dba4dbe0f1a55d6ae09b14bb0b31f33b36326803aab43ed14869dacde224b5109c6ba9c31024bd9ca
+  data.tar.gz: 8a7d737cc8eba180ba4293c161fbdb5458fa201770e707795e2811d3e5f6df135421a1c98794cf848ddaec79c809ce496019dfa3f4e0be08986eb02d309bc388

data/lib/liveblog.rb CHANGED Viewed

@@ -46,7 +46,7 @@ end
 def style
   fname = _args[0]
-  _passthru %[<link rel="stylesheet" href="???/assets/#{fname}')">]
+  _passthru %[<link rel="stylesheet" href="???/etc/#{fname}')">]
 end
 # Move elsewhere later!
@@ -280,8 +280,7 @@ def _var(name)  # FIXME scope issue!
   ::Livetext::Vars[name] || "[:#{name} is undefined]"
 end
-def head
-  _out "<head>"
+def head  # Does NOT output <head> tags
   args = _args
   args.each do |inc|
     self.data = inc
@@ -300,9 +299,9 @@ def head
                "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(:title)}">],
-               "style"          => %[<link rel="stylesheet" href="assets/blog.css">],
+               "style"          => %[<link rel="stylesheet" href="etc/blog.css">],
                "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:title)}">],
-               "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="../assets/favicon.ico">\n <link rel="apple-touch-icon" href="../assets/favicon.ico">]
+               "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="../etc/favicon.ico">\n <link rel="apple-touch-icon" href="../etc/favicon.ico">]
              }
   result = {}
   lines = _body
@@ -317,7 +316,7 @@ def head
         text = File.read(file)
         result["script"] = Livetext.new.transform(text)
       when "style"
-        result["style"] = %[<link rel="stylesheet" href="('/assets/#{remain}')">]
+        result["style"] = %[<link rel="stylesheet" href="('/etc/#{remain}')">]
       # Later: allow other overrides
       when ""; break
       else
@@ -327,7 +326,6 @@ def head
   hash = defaults.dup.update(result)  # FIXME collisions?
 #  _out "<html lang=en_US>"
   hash.each_value {|x| _out "  " + x }
-  _out "</head>"
   _out "<body>"
 end
@@ -355,13 +353,6 @@ end
 def recent_posts    # side-effect
   _out %[<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">]
   all_teasers
-  ## which = _args[0]
-  ## case which
-  ##   when "recent_posts"
-  ##     all_teasers
-  ##   when "post"   # No longer needed??
-  ##     _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
-  ## end
   _out %[</div>]
 end
@@ -439,7 +430,7 @@ def all_teasers
   text = <<-HTML
     <html>
-    <head><link rel="stylesheet" href="assets/blog.css"></head>
+    <head><link rel="stylesheet" href="etc/blog.css"></head>
     <body>
   HTML
   posts = _find_recent_posts

data/lib/runeblog.rb CHANGED Viewed

@@ -263,7 +263,7 @@ class RuneBlog
     posts = posts[0..19]  # return 20 at most
     text = <<-HTML
       <html>
-      <head><link rel="stylesheet" href="assets/blog.css"></head>
+      <head><link rel="stylesheet" href="etc/blog.css"></head>
       <body>
     HTML
     # posts = _find_recent_posts

data/lib/runeblog_version.rb CHANGED Viewed

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

data/themes/standard/README CHANGED Viewed

@@ -1,3 +1,36 @@
+New structire:
+.
+├── README
+├── assets
+├── banner
+├── blog
+│   ├── generate.lt3
+│   ├── head.lt3
+│   ├── index.lt3
+│   └── post_entry.lt3
+├── etc
+│   ├── blog.css
+│   ├── externals.lt3
+│   └── favicon.ico
+├── global.lt3
+├── head.lt3
+├── liveblog.out
+├── meta.lt3
+├── navbar
+│   ├── about.html
+│   └── navbar.lt3
+├── pages
+├── post
+│   ├── generate.lt3
+│   ├── head.lt3
+│   └── index.lt3
+└── sidebar
+    ├── ad.lt3
+    ├── calendar.lt3
+    ├── news.lt3
+    └── tag-cloud.lt3
 templates                     The first "default theme" - more later
 ├── README                    This file

data/themes/standard/blog/head.lt3 CHANGED Viewed

@@ -1,29 +1,10 @@
-<head>  <!-- fix this later -->
 .include meta.lt3
-.stylesheet
-https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
-sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T
-.end
-.script
-https://code.jquery.com/jquery-3.3.1.slim.min.js
-sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo
-.end
-.script
-https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js
-sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1
-.end
-.script
-https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
-sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM
-.end
-</head>
+<head>
+.include etc/externals.lt3
 .head
 . # fix/remove later
 .end
+</head>

data/themes/standard/{assets → etc}/blog.css RENAMED Viewed

File without changes

data/themes/standard/etc/externals.lt3 ADDED Viewed

@@ -0,0 +1,19 @@
+.stylesheet
+https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
+sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T
+.end
+.script
+https://code.jquery.com/jquery-3.3.1.slim.min.js
+sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo
+.end
+.script
+https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js
+sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1
+.end
+.script
+https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
+sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM
+.end

data/themes/standard/{assets → etc}/favicon.ico RENAMED Viewed

File without changes

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.91
+  version: 0.1.92
 platform: ruby
 authors:
 - Hal Fulton
@@ -78,12 +78,13 @@ files:
 - test/make_blog.rb
 - test/test
 - themes/standard/README
-- themes/standard/assets/blog.css
-- themes/standard/assets/favicon.ico
 - themes/standard/blog/generate.lt3
 - themes/standard/blog/head.lt3
 - themes/standard/blog/index.lt3
 - themes/standard/blog/post_entry.lt3
+- themes/standard/etc/blog.css
+- themes/standard/etc/externals.lt3
+- themes/standard/etc/favicon.ico
 - themes/standard/global.lt3
 - themes/standard/head.lt3
 - themes/standard/liveblog.out