juli 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c3d5e53c5e520378e5c5f1d30cb9c2e02508577f40af54f40700166bb2028d8
-  data.tar.gz: 0f2fd9bdffe2b91fcb90e4f88f4947ed9af067ddf5e10ce0dd0a30ceaaf9e505
+  metadata.gz: 6d53b60bb5ef9774cf842e9be7fd48afdb13d9d27f58229db598725f1ffc4c7f
+  data.tar.gz: a1372eec2a37a1806083afb8e1c28b8244c20a38e153951f7092025b0050af92
 SHA512:
-  metadata.gz: e78a9580e814d1589a435061d40bf434bb70f4a90c4ed4a3a2127b3c4290104b48b824730ebc797e28454329e20425cfda026e04cd7ae30420b2a3d026e4fbe0
-  data.tar.gz: 40de4fc3e096c055538ec801e2039a825cab80141cc7b1e674f0a1f90ee1eefb6b27c0823cd557be1632228dd683e4d83cc6f233714bf7f022eefd1a160a0fc7
+  metadata.gz: 866ddcda9824a9a9067a48d222e98deadd319ad8cd18d24ef28296a29b7e0182c1a72e18eaa549694657b298f42abde45de2f81bb6dc323557ebf66d0eaa643a
+  data.tar.gz: f5e4486d6d9c3751e14e6412d2ab8ed6735176c227b8d201720739a68d1fb65096b08711d5e74698687486762a98a25d654b7c18e251b04286e0fc6f6a5c94a3

data/README.rdoc

@@ -16,6 +16,13 @@ Or install it yourself as:
 
   $ gem install juli
 
+NOTE:
+
+* MX-Linux21 requires the followings before installing:
+
+  $ sudo apt install imagemagick-dev
+
+
 === Usage
 
   $ cd [YOUR-WIKI-ROOT]
@@ -41,15 +48,19 @@ Or install it yourself as:
 
 === Development
 
-After checking out the repo, run `bin/setup` to install dependencies.
-Then, run `bin/console` for an interactive prompt that will allow you to
-experiment.
+After checking out the repo,
+
+1. run `bundle install` to install dependencies.
+2. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`,
-and then run `bundle exec rake release` to create a git tag for the version,
-push git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+
+To release a new version of gem,
+
+1. update the version number in `lib/juli/version.rb`
+1. run `bundle exec rake release` to create a git tag for the version
+1. push git commits and tags, and
+1. push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 === Contributing
 

data/Rakefile

@@ -15,7 +15,7 @@ juli_line_parser_rb   = 'lib/juli/line_parser.tab.rb'
 parsers               = [juli_parser_rb, juli_line_parser_rb]
 test_conf_outout_top  = 'test/html'
 
-task default: parsers
+task build: parsers
 
 file juli_parser_rb => 'lib/juli/parser.y' do |t|
   sh "racc -v -g #{t.prerequisites[0]}"

data/juli.gemspec

@@ -25,12 +25,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'aws-sdk-s3'
   spec.add_runtime_dependency 'i18n'
   spec.add_runtime_dependency 'rmagick'
+  spec.add_runtime_dependency 'sdbm'
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'racc'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'test-unit'
 end

data/lib/juli/command/tag.rb

@@ -20,7 +20,7 @@ module Juli::Command
       body += gen_tag_list(
                   Juli::Macro::Tag::NO_TAG,
                   I18n.t(Juli::Macro::Tag::NO_TAG))
-      body += "\n\n" + '<br/>'*50
+      body += "\n\n" + '<br/>'*100
 
       # tag detail
       for tag in @tag_macro.tag_db.keys do
@@ -51,7 +51,7 @@ module Juli::Command
     def gen_tag_detail(tag, tag_label=tag)
       content_tag(:a, '', :name=>tag).force_encoding('UTF-8') +
       content_tag(:h2, tag_label).force_encoding('UTF-8') +
-      '<table>' +
+      '<table class="sitemap table table-hover">' +
       begin
         s = ''
         for page in @tag_macro.pages(@tag_macro.to_utf8(tag)) do

data/lib/juli/line_parser.tab.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -294,49 +294,49 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'line_parser.y', 6)
   def _reduce_1(val, _values)
-     @root = val[0] 
+     @root = val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 9)
   def _reduce_2(val, _values)
-     LineAbsyn::ArrayNode.new 
+     LineAbsyn::ArrayNode.new
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 10)
   def _reduce_3(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 13)
   def _reduce_4(val, _values)
-     LineAbsyn::StringNode.new(val[0]) 
+     LineAbsyn::StringNode.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 14)
   def _reduce_5(val, _values)
-     LineAbsyn::WikiName.new(val[0]) 
+     LineAbsyn::WikiName.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 15)
   def _reduce_6(val, _values)
-     LineAbsyn::StringNode.new(val[0]) 
+     LineAbsyn::StringNode.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 16)
   def _reduce_7(val, _values)
-     LineAbsyn::Url.new(val[0]) 
+     LineAbsyn::Url.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'line_parser.y', 17)
   def _reduce_8(val, _values)
-     LineAbsyn::Macro.new(val[0][0], val[0][1]) 
+     LineAbsyn::Macro.new(val[0][0], val[0][1])
   end
 .,.,
 
@@ -345,6 +345,6 @@ def _reduce_none(val, _values)
 end
 
   end   # class LineParser
-  end   # module Juli
+end   # module Juli
 
 

data/lib/juli/parser.tab.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -457,49 +457,49 @@ Racc_debug_parser = true
 
 module_eval(<<'.,.,', 'parser.y', 7)
   def _reduce_1(val, _values)
-     @root = val[0] 
+     @root = val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 10)
   def _reduce_2(val, _values)
-     Absyn::ArrayNode.new 
+     Absyn::ArrayNode.new
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 11)
   def _reduce_3(val, _values)
-     val[0].add(val[1]) if val[1]; val[0] 
+     val[0].add(val[1]) if val[1]; val[0]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 14)
   def _reduce_4(val, _values)
-     Absyn::StrNode.new(val[0]) 
+     Absyn::StrNode.new(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 15)
   def _reduce_5(val, _values)
-     Absyn::Verbatim.new(val[1]) 
+     Absyn::Verbatim.new(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 16)
   def _reduce_6(val, _values)
-     val[1] 
+     val[1]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 17)
   def _reduce_7(val, _values)
-     val[1] 
+     val[1]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 18)
   def _reduce_8(val, _values)
-     val[1] 
+     val[1]
   end
 .,.,
 
@@ -509,7 +509,7 @@ module_eval(<<'.,.,', 'parser.y', 18)
 
 module_eval(<<'.,.,', 'parser.y', 21)
   def _reduce_11(val, _values)
-     nil 
+     nil
   end
 .,.,
 
@@ -517,61 +517,61 @@ module_eval(<<'.,.,', 'parser.y', 21)
 
 module_eval(<<'.,.,', 'parser.y', 25)
   def _reduce_13(val, _values)
-     val[0] + val[1] 
+     val[0] + val[1]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 37)
   def _reduce_14(val, _values)
-     h = Absyn::ArrayNode.new; h.add(val[0]) 
+     h = Absyn::ArrayNode.new; h.add(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 38)
   def _reduce_15(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 40)
   def _reduce_16(val, _values)
-     Absyn::Chapter.new(val[0], val[1], val[2]) 
+     Absyn::Chapter.new(val[0], val[1], val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 44)
   def _reduce_17(val, _values)
-     l = Absyn::UnorderedList.new; l.add(val[0]) 
+     l = Absyn::UnorderedList.new; l.add(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 45)
   def _reduce_18(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 47)
   def _reduce_19(val, _values)
-     val[1] 
+     val[1]
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 51)
   def _reduce_20(val, _values)
-     l = Absyn::OrderedList.new; l.add(val[0]) 
+     l = Absyn::OrderedList.new; l.add(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 52)
   def _reduce_21(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_22(val, _values)
-     val[1] 
+     val[1]
   end
 .,.,
 
@@ -583,7 +583,7 @@ module_eval(<<'.,.,', 'parser.y', 58)
 
 module_eval(<<'.,.,', 'parser.y', 59)
   def _reduce_24(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
@@ -595,19 +595,19 @@ module_eval(<<'.,.,', 'parser.y', 61)
 
 module_eval(<<'.,.,', 'parser.y', 65)
   def _reduce_26(val, _values)
-     l = Absyn::DictionaryList.new; l.add(val[0]) 
+     l = Absyn::DictionaryList.new; l.add(val[0])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 66)
   def _reduce_27(val, _values)
-     val[0].add(val[1]) 
+     val[0].add(val[1])
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 68)
   def _reduce_28(val, _values)
-     Absyn::DictionaryListItem.new(val[0], val[2]) 
+     Absyn::DictionaryListItem.new(val[0], val[2])
   end
 .,.,
 
@@ -616,6 +616,6 @@ def _reduce_none(val, _values)
 end
 
   end   # class Parser
-  end   # module Juli
+end   # module Juli
 
 

data/lib/juli/template/simple.html

@@ -29,17 +29,15 @@ contents::    draw contents of page
   <title><%= title %></title>
   <script src="<%= prototype %>"  type="text/javascript"></script>
   <script src="<%= javascript %>" type="text/javascript"></script>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
   <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<h1>
-  <%= title %>
-</h1>
-<br/><br/>
-
-<%= contents %>
-<br/><br/>
-
-<%= body %>
+  <div class=container>
+    <h1><%= title %></h1>
+      <%= contents %>
+    <br/><br/>
+    <%= body %>
+  </div>
 </body>
 </html>

data/lib/juli/template/sitemap.html

@@ -34,6 +34,7 @@ sitemap_order_by_mtime_DESC.html::  sitemap template (mtime decendant order)
   <title><%= title %></title>
   <script src="<%= prototype %>"  type="text/javascript"></script>
   <script src="<%= javascript %>" type="text/javascript"></script>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
   <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
   <style>
     table.sitemap {
@@ -42,9 +43,9 @@ sitemap_order_by_mtime_DESC.html::  sitemap template (mtime decendant order)
       border:           1px solid #000;
     }
     table.sitemap tr th, table.sitemap tr td {
-      margin: 1px;
-      border: 1px ridge #888;
-      padding:          2px 5px 2px 5px;
+      margin:   1px;
+      border:   1px ridge #888;
+      padding:  2px 5px 2px 5px;
     }
     table.sitemap tr th {
       background-color: #cfc;
@@ -55,22 +56,20 @@ sitemap_order_by_mtime_DESC.html::  sitemap template (mtime decendant order)
   </style>
 </head>
 <body>
-<h1>
-  <%= title %>
-</h1>
-<br/><br/>
-
-<table class=sitemap>
-  <tr>
-    <th><%= I18n.t('num') %></th>
-    <th><%= I18n.t('name') %> ▲</th>
-    <th><a href='sitemap_order_by_mtime_DESC.shtml'><%= I18n.t('last_modified_at') %></a></th>
-  </tr>
-  <%= body %>
-</table>
-<hr/>
-<a href="https://github.com/fuminori-ido/juli"
-  ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
-    /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
+  <div class=container>
+    <h1><%= title %></h1>
+    <table class='sitemap table table-hover'>
+      <tr>
+        <th class=num><%= I18n.t('num') %></th>
+        <th class=name><%= I18n.t('name') %> ▲</th>
+        <th class=link><a href='sitemap_order_by_mtime_DESC.shtml'><%= I18n.t('last_modified_at') %></a></th>
+      </tr>
+      <%= body %>
+      </table>
+      <hr/>
+      <a href="https://github.com/fuminori-ido/juli"
+        ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
+        /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
+  </div>
 </body>
 </html>

data/lib/juli/template/sitemap_order_by_mtime_DESC.html

@@ -34,6 +34,7 @@ sitemap.html::  sitemap template (alphabetical order)
   <title><%= title %></title>
   <script src="<%= prototype %>"  type="text/javascript"></script>
   <script src="<%= javascript %>" type="text/javascript"></script>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
   <link href="<%= stylesheet %>" rel="stylesheet" type="text/css" />
   <style>
     table.sitemap {
@@ -42,9 +43,9 @@ sitemap.html::  sitemap template (alphabetical order)
       border:           1px solid #000;
     }
     table.sitemap tr th, table.sitemap tr td {
-      margin: 1px;
-      border: 1px ridge #888;
-      padding:          2px 5px 2px 5px;
+      margin:   1px;
+      border:   1px ridge #888;
+      padding:  2px 5px 2px 5px;
     }
     table.sitemap tr th {
       background-color: #cfc;
@@ -55,22 +56,20 @@ sitemap.html::  sitemap template (alphabetical order)
   </style>
 </head>
 <body>
-<h1>
-  <%= title %>
-</h1>
-<br/><br/>
-
-<table class=sitemap>
-  <tr>
-    <th><%= I18n.t('num') %></th>
-    <th><a href='sitemap.shtml'><%= I18n.t('name') %></a></th>
-    <th><%= I18n.t('last_modified_at') %> ▼</a></th>
-  </tr>
-  <%= body %>
-</table>
-<hr/>
-<a href="https://github.com/fuminori-ido/juli"
-  ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
-    /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
+  <div class=container>
+    <h1><%= title %></h1>
+    <table class=sitemap>
+      <tr>
+        <th><%= I18n.t('num') %></th>
+        <th><a href='sitemap.shtml'><%= I18n.t('name') %></a></th>
+        <th><%= I18n.t('last_modified_at') %> ▼</a></th>
+      </tr>
+      <%= body %>
+    </table>
+    <hr/>
+    <a href="https://github.com/fuminori-ido/juli"
+      ><img height="32" width="32" src="https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/github.svg"
+        /></a> Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
+  </div>
 </body>
 </html>

data/lib/juli/util.rb

@@ -146,8 +146,8 @@ EOM
             YAML::load(ERB.new(File.read(path)).result) :
             {}
 
-        # YAML::load('') returns false so that set empty hash
-        hash = {} if hash == false
+        hash = {} if hash == false      # YAML::load('') returns false so that set empty hash
+        hash = {} if hash.nil?
         @conf = DEFAULT.dup.merge(hash)
       end
     end

data/lib/juli/version.rb

@@ -1,3 +1,3 @@
 module Juli
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - ido
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sdbm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +126,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +274,7 @@ homepage: https://github.com/fuminori-ido/juli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -275,9 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Offline wiki, and outline processor
 test_files: []