juli 2.2.3 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +7 -0
  3. data/Rakefile +1 -1
  4. data/juli.gemspec +1 -0
  5. data/lib/juli/command/tag.rb +2 -2
  6. data/lib/juli/line_parser.tab.rb +1 -1
  7. data/lib/juli/parser.tab.rb +1 -1
  8. data/lib/juli/template/simple.html +8 -9
  9. data/lib/juli/template/sitemap.html +20 -20
  10. data/lib/juli/template/sitemap_order_by_mtime_DESC.html +19 -20
  11. data/lib/juli/util.rb +2 -2
  12. data/lib/juli/version.rb +1 -1
  13. metadata +20 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 27c05aff07389e1b72d32965590a5d23a4c87bb45f79b5fae4773200a8a5454e
4
- data.tar.gz: 607df4376f0c16db172e864ae86745761f32e0f3e3befb0464120d06943e073b
3
+ metadata.gz: 7e84d1f7d0d52e02c42ffbf4fbd951c2ffe1f2101e8f09ce2a34dffb533fbe0e
4
+ data.tar.gz: 67e24e1090d4f0c7d18dedebf463e1c7d3bd483894ab77faeca8ab703b2818f4
5
5
  SHA512:
6
- metadata.gz: 85fafa88b17ea8b1f47fa6e5f0545e10ef436e3616c3d10a427538b78aeec10ab65c0eea117a6184e0cc6cfe4cda764bc02ba2d49dbe57643b824234146821a0
7
- data.tar.gz: 72153702650d6d6d9ef560e7c718ebe85eb3989c25cc9054517bb5c16dc6da3c4545ea744ae77bfa8a5a5544b3473d30f8aa0f721e9545da21368969ca21adac
6
+ metadata.gz: 79ff0a4838fc6000b96a75a2770c81e7d4a7b6a133a499df4e3eecb3ecf10ef74649847a478af096f4c9da8e81c94aea3fc63b7ec639d98d82b3f4fbd6f317aa
7
+ data.tar.gz: bb1133c769fefa5ed08befadf89d468c084616708f6e8c5cfa67e8a66899e125467b083c1915192c0de41c94aafc4caa3791aed23e1fab93a7706f6bbccc1c66
data/README.rdoc CHANGED
@@ -16,6 +16,13 @@ Or install it yourself as:
16
16
 
17
17
  $ gem install juli
18
18
 
19
+ NOTE:
20
+
21
+ * MX-Linux21 requires the followings before installing:
22
+
23
+ $ sudo apt install imagemagick-dev
24
+
25
+
19
26
  === Usage
20
27
 
21
28
  $ cd [YOUR-WIKI-ROOT]
data/Rakefile CHANGED
@@ -15,7 +15,7 @@ juli_line_parser_rb = 'lib/juli/line_parser.tab.rb'
15
15
  parsers = [juli_parser_rb, juli_line_parser_rb]
16
16
  test_conf_outout_top = 'test/html'
17
17
 
18
- task default: parsers
18
+ task build: parsers
19
19
 
20
20
  file juli_parser_rb => 'lib/juli/parser.y' do |t|
21
21
  sh "racc -v -g #{t.prerequisites[0]}"
data/juli.gemspec CHANGED
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.add_runtime_dependency 'aws-sdk-s3'
26
26
  spec.add_runtime_dependency 'i18n'
27
27
  spec.add_runtime_dependency 'rmagick'
28
+ spec.add_runtime_dependency 'sdbm'
28
29
 
29
30
  spec.add_development_dependency 'byebug'
30
31
  spec.add_development_dependency 'racc'
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/line_parser.tab.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # DO NOT MODIFY!!!!
3
- # This file is automatically generated by Racc 1.4.16
3
+ # This file is automatically generated by Racc 1.6.0
4
4
  # from Racc grammar file "".
5
5
  #
6
6
 
data/lib/juli/parser.tab.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # DO NOT MODIFY!!!!
3
- # This file is automatically generated by Racc 1.4.16
3
+ # This file is automatically generated by Racc 1.6.0
4
4
  # from Racc grammar file "".
5
5
  #
6
6
 
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
@@ -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.3"
2
+ VERSION = "2.3.1"
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.3
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - ido
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-14 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
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: sdbm
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ">="
67
+ - !ruby/object:Gem::Version
68
+ version: '0'
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: byebug
57
71
  requirement: !ruby/object:Gem::Requirement
@@ -260,7 +274,7 @@ homepage: https://github.com/fuminori-ido/juli
260
274
  licenses:
261
275
  - MIT
262
276
  metadata: {}
263
- post_install_message:
277
+ post_install_message:
264
278
  rdoc_options: []
265
279
  require_paths:
266
280
  - lib
@@ -275,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
275
289
  - !ruby/object:Gem::Version
276
290
  version: '0'
277
291
  requirements: []
278
- rubygems_version: 3.1.2
279
- signing_key:
292
+ rubygems_version: 3.3.3
293
+ signing_key:
280
294
  specification_version: 4
281
295
  summary: Offline wiki, and outline processor
282
296
  test_files: []