juli 2.2.4 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/juli/command/tag.rb +2 -2
  3. data/lib/juli/template/simple.html +8 -9
  4. data/lib/juli/template/sitemap.html +20 -20
  5. data/lib/juli/template/sitemap_order_by_mtime_DESC.html +20 -20
  6. data/lib/juli/util.rb +2 -2
  7. data/lib/juli/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 55bfc613ec94fa35bfee06e77ef37796555cc3ebe47b136a9dac89ad73c224cf
4
- data.tar.gz: 26b05c4eb398165f13266ec1eaac595c864b3a847e020bc6ef6bf063359fd29d
3
+ metadata.gz: e7f0c46151ffcb47e793aee92afbaeb315bd41bea967b13523f7bfd5fca3152c
4
+ data.tar.gz: 9f6d4fa05dcfcfae54089427dccbb1465c11ac569e7a0260f9fa22370a5d70b2
5
5
  SHA512:
6
- metadata.gz: b1d3f7e0bc600e14282db98173bc15cbd130a3be776f8e9f9fbace8d87927aaeae0772dc81acf505c6efaf94d4173957947f747d916e1a05cbc3196bc94f128d
7
- data.tar.gz: 18a861a8d0debd86113fa1d31eb0a2ac317f1cc47cb4e4ae3acf7f88e4dbe430ce18012689fb495516cc023afc33fd98d6d4c4ae0a6f803cc414a3166ad17cab
6
+ metadata.gz: d17945280100fae109dde0d62c3968c40a15dcb99cb00652dc50ed89def02187e08a25f775c908de65c653eff6b46717245c57435c256ac9d4c1b33e9263b96b
7
+ data.tar.gz: b873158e462ca9f5d443b908652f6fc03ee05d765da6316b2ddd06b3e95dfd2e1baa5fcb46075d5d52dc3a132f146a78d7d5fa7466cf6894e020d8cad7c5c800
data/lib/juli/command/tag.rb CHANGED
@@ -20,7 +20,7 @@ module Juli::Command
20
20
  body += gen_tag_list(
21
21
  Juli::Macro::Tag::NO_TAG,
22
22
  I18n.t(Juli::Macro::Tag::NO_TAG))
23
- body += "\n\n" + '<br/>'*50
23
+ body += "\n\n" + '<br/>'*100
24
24
 
25
25
  # tag detail
26
26
  for tag in @tag_macro.tag_db.keys do
@@ -51,7 +51,7 @@ module Juli::Command
51
51
  def gen_tag_detail(tag, tag_label=tag)
52
52
  content_tag(:a, '', :name=>tag).force_encoding('UTF-8') +
53
53
  content_tag(:h2, tag_label).force_encoding('UTF-8') +
54
- '<table>' +
54
+ '<table class="sitemap table table-hover">' +
55
55
  begin
56
56
  s = ''
57
57
  for page in @tag_macro.pages(@tag_macro.to_utf8(tag)) do
data/lib/juli/template/simple.html CHANGED
@@ -26,20 +26,19 @@ contents:: draw contents of page
26
26
  %>
27
27
  <head>
28
28
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
29
+ <meta name="viewport" content="width=device-width, initial-scale=1">
29
30
  <title><%= title %></title>
30
31
  <script src="<%= prototype %>" type="text/javascript"></script>
31
32
  <script src="<%= javascript %>" type="text/javascript"></script>
33
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
32
34
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
33
35
  </head>
34
36
  <body>
35
- <h1>
36
- <%= title %>
37
- </h1>
38
- <br/><br/>
39
-
40
- <%= contents %>
41
- <br/><br/>
42
-
43
- <%= body %>
37
+ <div class=container>
38
+ <h1><%= title %></h1>
39
+ <%= contents %>
40
+ <br/><br/>
41
+ <%= body %>
42
+ </div>
44
43
  </body>
45
44
  </html>
data/lib/juli/template/sitemap.html CHANGED
@@ -31,9 +31,11 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
31
31
  %>
32
32
  <head>
33
33
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
34
+ <meta name="viewport" content="width=device-width, initial-scale=1">
34
35
  <title><%= title %></title>
35
36
  <script src="<%= prototype %>" type="text/javascript"></script>
36
37
  <script src="<%= javascript %>" type="text/javascript"></script>
38
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
37
39
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
38
40
  <style>
39
41
  table.sitemap {
@@ -42,9 +44,9 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
42
44
  border: 1px solid #000;
43
45
  }
44
46
  table.sitemap tr th, table.sitemap tr td {
45
- margin: 1px;
46
- border: 1px ridge #888;
47
- padding: 2px 5px 2px 5px;
47
+ margin: 1px;
48
+ border: 1px ridge #888;
49
+ padding: 2px 5px 2px 5px;
48
50
  }
49
51
  table.sitemap tr th {
50
52
  background-color: #cfc;
@@ -55,22 +57,20 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
55
57
  </style>
56
58
  </head>
57
59
  <body>
58
- <h1>
59
- <%= title %>
60
- </h1>
61
- <br/><br/>
62
-
63
- <table class=sitemap>
64
- <tr>
65
- <th><%= I18n.t('num') %></th>
66
- <th><%= I18n.t('name') %> ▲</th>
67
- <th><a href='sitemap_order_by_mtime_DESC.shtml'><%= I18n.t('last_modified_at') %></a></th>
68
- </tr>
69
- <%= body %>
70
- </table>
71
- <hr/>
72
- <a href="https://github.com/fuminori-ido/juli"
73
- ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
74
- /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
60
+ <div class=container>
61
+ <h1><%= title %></h1>
62
+ <table class='sitemap table table-hover'>
63
+ <tr>
64
+ <th class=num><%= I18n.t('num') %></th>
65
+ <th class=name><%= I18n.t('name') %> ▲</th>
66
+ <th class=link><a href='sitemap_order_by_mtime_DESC.shtml'><%= I18n.t('last_modified_at') %></a></th>
67
+ </tr>
68
+ <%= body %>
69
+ </table>
70
+ <hr/>
71
+ <a href="https://github.com/fuminori-ido/juli"
72
+ ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
73
+ /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
74
+ </div>
75
75
  </body>
76
76
  </html>
data/lib/juli/template/sitemap_order_by_mtime_DESC.html CHANGED
@@ -31,9 +31,11 @@ sitemap.html:: sitemap template (alphabetical order)
31
31
  %>
32
32
  <head>
33
33
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
34
+ <meta name="viewport" content="width=device-width, initial-scale=1">
34
35
  <title><%= title %></title>
35
36
  <script src="<%= prototype %>" type="text/javascript"></script>
36
37
  <script src="<%= javascript %>" type="text/javascript"></script>
38
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
37
39
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
38
40
  <style>
39
41
  table.sitemap {
@@ -42,9 +44,9 @@ sitemap.html:: sitemap template (alphabetical order)
42
44
  border: 1px solid #000;
43
45
  }
44
46
  table.sitemap tr th, table.sitemap tr td {
45
- margin: 1px;
46
- border: 1px ridge #888;
47
- padding: 2px 5px 2px 5px;
47
+ margin: 1px;
48
+ border: 1px ridge #888;
49
+ padding: 2px 5px 2px 5px;
48
50
  }
49
51
  table.sitemap tr th {
50
52
  background-color: #cfc;
@@ -55,22 +57,20 @@ sitemap.html:: sitemap template (alphabetical order)
55
57
  </style>
56
58
  </head>
57
59
  <body>
58
- <h1>
59
- <%= title %>
60
- </h1>
61
- <br/><br/>
62
-
63
- <table class=sitemap>
64
- <tr>
65
- <th><%= I18n.t('num') %></th>
66
- <th><a href='sitemap.shtml'><%= I18n.t('name') %></a></th>
67
- <th><%= I18n.t('last_modified_at') %> ▼</a></th>
68
- </tr>
69
- <%= body %>
70
- </table>
71
- <hr/>
72
- <a href="https://github.com/fuminori-ido/juli"
73
- ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
74
- /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
60
+ <div class=container>
61
+ <h1><%= title %></h1>
62
+ <table class=sitemap>
63
+ <tr>
64
+ <th><%= I18n.t('num') %></th>
65
+ <th><a href='sitemap.shtml'><%= I18n.t('name') %></a></th>
66
+ <th><%= I18n.t('last_modified_at') %> ▼</a></th>
67
+ </tr>
68
+ <%= body %>
69
+ </table>
70
+ <hr/>
71
+ <a href="https://github.com/fuminori-ido/juli"
72
+ ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
73
+ /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
74
+ </div>
75
75
  </body>
76
76
  </html>
data/lib/juli/util.rb CHANGED
@@ -146,8 +146,8 @@ EOM
146
146
  YAML::load(ERB.new(File.read(path)).result) :
147
147
  {}
148
148
 
149
- # YAML::load('') returns false so that set empty hash
150
- hash = {} if hash == false
149
+ hash = {} if hash == false # YAML::load('') returns false so that set empty hash
150
+ hash = {} if hash.nil?
151
151
  @conf = DEFAULT.dup.merge(hash)
152
152
  end
153
153
  end
data/lib/juli/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Juli
2
- VERSION = "2.2.4"
2
+ VERSION = "2.3.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: juli
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - ido
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-02-27 00:00:00.000000000 Z
11
+ date: 2022-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-s3