runeblog 0.1.91 → 0.1.92

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/liveblog.rb +6 -15
  3. data/lib/runeblog.rb +1 -1
  4. data/lib/runeblog_version.rb +1 -1
  5. data/themes/standard/README +33 -0
  6. data/themes/standard/blog/head.lt3 +4 -23
  7. data/themes/standard/{assets → etc}/blog.css +0 -0
  8. data/themes/standard/etc/externals.lt3 +19 -0
  9. data/themes/standard/{assets → etc}/favicon.ico +0 -0
  10. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d0ecc0207a215d6ecb745fc93ef707d330990f287637f0e6838ea996ef8a3922
4
- data.tar.gz: f00e1ab6255ae818b30d345408e44a3735dc907b9d16cf9ab51fc473bd6bedeb
3
+ metadata.gz: 28db91c5c187f46387a81fae94e52e61498c5d85bcfbb9f1e6291acc330e94a7
4
+ data.tar.gz: 526ffa1a59ce7abb2fd014b23ca92fb7d03b2830541f1e0fbd361c71de101f6a
5
5
  SHA512:
6
- metadata.gz: 9e13e2828c71f69a5fd40dc4da1c1cf604e2222ad8d1c919e4402a662e7224aa488512f6c2107d48336a96049cf61d830fe93d4247e278c7ac755e511ef7b03b
7
- data.tar.gz: 26aac596e6e68e5b37bd36c1aacb193f22da135a5e299a68437f46b34d52e74f343e5e22960b6d879a132d772febb66049876dd5f4a1ba969dccdfd9f942d7f7
6
+ metadata.gz: 17711b8b724d0d7d75bb75da955187c4973070f82d18fa4dba4dbe0f1a55d6ae09b14bb0b31f33b36326803aab43ed14869dacde224b5109c6ba9c31024bd9ca
7
+ data.tar.gz: 8a7d737cc8eba180ba4293c161fbdb5458fa201770e707795e2811d3e5f6df135421a1c98794cf848ddaec79c809ce496019dfa3f4e0be08986eb02d309bc388
data/lib/liveblog.rb CHANGED
@@ -46,7 +46,7 @@ end
46
46
 
47
47
  def style
48
48
  fname = _args[0]
49
- _passthru %[<link rel="stylesheet" href="???/assets/#{fname}')">]
49
+ _passthru %[<link rel="stylesheet" href="???/etc/#{fname}')">]
50
50
  end
51
51
 
52
52
  # Move elsewhere later!
@@ -280,8 +280,7 @@ def _var(name) # FIXME scope issue!
280
280
  ::Livetext::Vars[name] || "[:#{name} is undefined]"
281
281
  end
282
282
 
283
- def head
284
- _out "<head>"
283
+ def head # Does NOT output <head> tags
285
284
  args = _args
286
285
  args.each do |inc|
287
286
  self.data = inc
@@ -300,9 +299,9 @@ def head
300
299
  "linkc" => %[<link rel="canonical" href="#{_var(:host)}">],
301
300
  "og:url" => %[<meta property="og:url" content="#{_var(:host)}">],
302
301
  "og:site_name" => %[<meta property="og:site_name" content="#{_var(:title)}">],
303
- "style" => %[<link rel="stylesheet" href="assets/blog.css">],
302
+ "style" => %[<link rel="stylesheet" href="etc/blog.css">],
304
303
  "feed" => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:title)}">],
305
- "favicon" => %[<link rel="shortcut icon" type="image/x-icon" href="../assets/favicon.ico">\n <link rel="apple-touch-icon" href="../assets/favicon.ico">]
304
+ "favicon" => %[<link rel="shortcut icon" type="image/x-icon" href="../etc/favicon.ico">\n <link rel="apple-touch-icon" href="../etc/favicon.ico">]
306
305
  }
307
306
  result = {}
308
307
  lines = _body
@@ -317,7 +316,7 @@ def head
317
316
  text = File.read(file)
318
317
  result["script"] = Livetext.new.transform(text)
319
318
  when "style"
320
- result["style"] = %[<link rel="stylesheet" href="('/assets/#{remain}')">]
319
+ result["style"] = %[<link rel="stylesheet" href="('/etc/#{remain}')">]
321
320
  # Later: allow other overrides
322
321
  when ""; break
323
322
  else
@@ -327,7 +326,6 @@ def head
327
326
  hash = defaults.dup.update(result) # FIXME collisions?
328
327
  # _out "<html lang=en_US>"
329
328
  hash.each_value {|x| _out " " + x }
330
- _out "</head>"
331
329
  _out "<body>"
332
330
  end
333
331
 
@@ -355,13 +353,6 @@ end
355
353
  def recent_posts # side-effect
356
354
  _out %[<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">]
357
355
  all_teasers
358
- ## which = _args[0]
359
- ## case which
360
- ## when "recent_posts"
361
- ## all_teasers
362
- ## when "post" # No longer needed??
363
- ## _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
364
- ## end
365
356
  _out %[</div>]
366
357
  end
367
358
 
@@ -439,7 +430,7 @@ def all_teasers
439
430
 
440
431
  text = <<-HTML
441
432
  <html>
442
- <head><link rel="stylesheet" href="assets/blog.css"></head>
433
+ <head><link rel="stylesheet" href="etc/blog.css"></head>
443
434
  <body>
444
435
  HTML
445
436
  posts = _find_recent_posts
data/lib/runeblog.rb CHANGED
@@ -263,7 +263,7 @@ class RuneBlog
263
263
  posts = posts[0..19] # return 20 at most
264
264
  text = <<-HTML
265
265
  <html>
266
- <head><link rel="stylesheet" href="assets/blog.css"></head>
266
+ <head><link rel="stylesheet" href="etc/blog.css"></head>
267
267
  <body>
268
268
  HTML
269
269
  # posts = _find_recent_posts
data/lib/runeblog_version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
3
3
 
4
4
  class RuneBlog
5
- VERSION = "0.1.91"
5
+ VERSION = "0.1.92"
6
6
 
7
7
  path = Gem.find_files("runeblog").grep(/runeblog-/).first
8
8
  Path = File.dirname(path)
data/themes/standard/README CHANGED
@@ -1,3 +1,36 @@
1
+ New structire:
2
+
3
+ .
4
+ ├── README
5
+ ├── assets
6
+ ├── banner
7
+ ├── blog
8
+ │   ├── generate.lt3
9
+ │   ├── head.lt3
10
+ │   ├── index.lt3
11
+ │   └── post_entry.lt3
12
+ ├── etc
13
+ │   ├── blog.css
14
+ │   ├── externals.lt3
15
+ │   └── favicon.ico
16
+ ├── global.lt3
17
+ ├── head.lt3
18
+ ├── liveblog.out
19
+ ├── meta.lt3
20
+ ├── navbar
21
+ │   ├── about.html
22
+ │   └── navbar.lt3
23
+ ├── pages
24
+ ├── post
25
+ │   ├── generate.lt3
26
+ │   ├── head.lt3
27
+ │   └── index.lt3
28
+ └── sidebar
29
+ ├── ad.lt3
30
+ ├── calendar.lt3
31
+ ├── news.lt3
32
+ └── tag-cloud.lt3
33
+
1
34
 
2
35
  templates The first "default theme" - more later
3
36
  ├── README This file
data/themes/standard/blog/head.lt3 CHANGED
@@ -1,29 +1,10 @@
1
- <head> <!-- fix this later -->
2
-
3
1
  .include meta.lt3
4
2
 
5
- .stylesheet
6
- https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
7
- sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T
8
- .end
9
-
10
- .script
11
- https://code.jquery.com/jquery-3.3.1.slim.min.js
12
- sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo
13
- .end
14
-
15
- .script
16
- https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js
17
- sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1
18
- .end
19
-
20
- .script
21
- https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
22
- sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM
23
- .end
24
-
25
- </head>
3
+ <head>
4
+ .include etc/externals.lt3
26
5
 
27
6
  .head
28
7
  . # fix/remove later
29
8
  .end
9
+
10
+ </head>
data/themes/standard/{assets → etc}/blog.css RENAMED
File without changes
data/themes/standard/etc/externals.lt3 ADDED
@@ -0,0 +1,19 @@
1
+ .stylesheet
2
+ https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
3
+ sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T
4
+ .end
5
+
6
+ .script
7
+ https://code.jquery.com/jquery-3.3.1.slim.min.js
8
+ sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo
9
+ .end
10
+
11
+ .script
12
+ https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js
13
+ sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1
14
+ .end
15
+
16
+ .script
17
+ https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
18
+ sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM
19
+ .end
data/themes/standard/{assets → etc}/favicon.ico RENAMED
File without changes
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: runeblog
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.91
4
+ version: 0.1.92
5
5
  platform: ruby
6
6
  authors:
7
7
  - Hal Fulton
@@ -78,12 +78,13 @@ files:
78
78
  - test/make_blog.rb
79
79
  - test/test
80
80
  - themes/standard/README
81
- - themes/standard/assets/blog.css
82
- - themes/standard/assets/favicon.ico
83
81
  - themes/standard/blog/generate.lt3
84
82
  - themes/standard/blog/head.lt3
85
83
  - themes/standard/blog/index.lt3
86
84
  - themes/standard/blog/post_entry.lt3
85
+ - themes/standard/etc/blog.css
86
+ - themes/standard/etc/externals.lt3
87
+ - themes/standard/etc/favicon.ico
87
88
  - themes/standard/global.lt3
88
89
  - themes/standard/head.lt3
89
90
  - themes/standard/liveblog.out