juli 2.2.4 → 2.3.0

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 +7 -9
  4. data/lib/juli/template/sitemap.html +19 -20
  5. data/lib/juli/template/sitemap_order_by_mtime_DESC.html +19 -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: 6d53b60bb5ef9774cf842e9be7fd48afdb13d9d27f58229db598725f1ffc4c7f
4
+ data.tar.gz: a1372eec2a37a1806083afb8e1c28b8244c20a38e153951f7092025b0050af92
5
5
  SHA512:
6
- metadata.gz: b1d3f7e0bc600e14282db98173bc15cbd130a3be776f8e9f9fbace8d87927aaeae0772dc81acf505c6efaf94d4173957947f747d916e1a05cbc3196bc94f128d
7
- data.tar.gz: 18a861a8d0debd86113fa1d31eb0a2ac317f1cc47cb4e4ae3acf7f88e4dbe430ce18012689fb495516cc023afc33fd98d6d4c4ae0a6f803cc414a3166ad17cab
6
+ metadata.gz: 866ddcda9824a9a9067a48d222e98deadd319ad8cd18d24ef28296a29b7e0182c1a72e18eaa549694657b298f42abde45de2f81bb6dc323557ebf66d0eaa643a
7
+ data.tar.gz: f5e4486d6d9c3751e14e6412d2ab8ed6735176c227b8d201720739a68d1fb65096b08711d5e74698687486762a98a25d654b7c18e251b04286e0fc6f6a5c94a3
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
@@ -29,17 +29,15 @@ contents:: draw contents of page
29
29
  <title><%= title %></title>
30
30
  <script src="<%= prototype %>" type="text/javascript"></script>
31
31
  <script src="<%= javascript %>" type="text/javascript"></script>
32
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
32
33
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
33
34
  </head>
34
35
  <body>
35
- <h1>
36
- <%= title %>
37
- </h1>
38
- <br/><br/>
39
-
40
- <%= contents %>
41
- <br/><br/>
42
-
43
- <%= body %>
36
+ <div class=container>
37
+ <h1><%= title %></h1>
38
+ <%= contents %>
39
+ <br/><br/>
40
+ <%= body %>
41
+ </div>
44
42
  </body>
45
43
  </html>
data/lib/juli/template/sitemap.html CHANGED
@@ -34,6 +34,7 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
34
34
  <title><%= title %></title>
35
35
  <script src="<%= prototype %>" type="text/javascript"></script>
36
36
  <script src="<%= javascript %>" type="text/javascript"></script>
37
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
37
38
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
38
39
  <style>
39
40
  table.sitemap {
@@ -42,9 +43,9 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
42
43
  border: 1px solid #000;
43
44
  }
44
45
  table.sitemap tr th, table.sitemap tr td {
45
- margin: 1px;
46
- border: 1px ridge #888;
47
- padding: 2px 5px 2px 5px;
46
+ margin: 1px;
47
+ border: 1px ridge #888;
48
+ padding: 2px 5px 2px 5px;
48
49
  }
49
50
  table.sitemap tr th {
50
51
  background-color: #cfc;
@@ -55,22 +56,20 @@ sitemap_order_by_mtime_DESC.html:: sitemap template (mtime decendant order)
55
56
  </style>
56
57
  </head>
57
58
  <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>
59
+ <div class=container>
60
+ <h1><%= title %></h1>
61
+ <table class='sitemap table table-hover'>
62
+ <tr>
63
+ <th class=num><%= I18n.t('num') %></th>
64
+ <th class=name><%= I18n.t('name') %> ▲</th>
65
+ <th class=link><a href='sitemap_order_by_mtime_DESC.shtml'><%= I18n.t('last_modified_at') %></a></th>
66
+ </tr>
67
+ <%= body %>
68
+ </table>
69
+ <hr/>
70
+ <a href="https://github.com/fuminori-ido/juli"
71
+ ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
72
+ /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
73
+ </div>
75
74
  </body>
76
75
  </html>
data/lib/juli/template/sitemap_order_by_mtime_DESC.html CHANGED
@@ -34,6 +34,7 @@ sitemap.html:: sitemap template (alphabetical order)
34
34
  <title><%= title %></title>
35
35
  <script src="<%= prototype %>" type="text/javascript"></script>
36
36
  <script src="<%= javascript %>" type="text/javascript"></script>
37
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
37
38
  <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
38
39
  <style>
39
40
  table.sitemap {
@@ -42,9 +43,9 @@ sitemap.html:: sitemap template (alphabetical order)
42
43
  border: 1px solid #000;
43
44
  }
44
45
  table.sitemap tr th, table.sitemap tr td {
45
- margin: 1px;
46
- border: 1px ridge #888;
47
- padding: 2px 5px 2px 5px;
46
+ margin: 1px;
47
+ border: 1px ridge #888;
48
+ padding: 2px 5px 2px 5px;
48
49
  }
49
50
  table.sitemap tr th {
50
51
  background-color: #cfc;
@@ -55,22 +56,20 @@ sitemap.html:: sitemap template (alphabetical order)
55
56
  </style>
56
57
  </head>
57
58
  <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>
59
+ <div class=container>
60
+ <h1><%= title %></h1>
61
+ <table class=sitemap>
62
+ <tr>
63
+ <th><%= I18n.t('num') %></th>
64
+ <th><a href='sitemap.shtml'><%= I18n.t('name') %></a></th>
65
+ <th><%= I18n.t('last_modified_at') %> ▼</a></th>
66
+ </tr>
67
+ <%= body %>
68
+ </table>
69
+ <hr/>
70
+ <a href="https://github.com/fuminori-ido/juli"
71
+ ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
72
+ /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
73
+ </div>
75
74
  </body>
76
75
  </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.0"
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.0
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