RubyGems - juli - Versions diffs - 2.1.0 → 2.2.0 - Mend

juli 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

checksums.yaml +5 -5
data/.gitignore +0 -1
data/README.rdoc +1 -1
data/Rakefile +1 -1
data/doc/.juli/config +1 -1
data/doc/.juli/{sourceforge.html → github.html} +4 -6
data/doc/.juli/slidy.html +3 -5
data/doc/.juli/takahashi_method.html +3 -5
data/doc/index.txt +4 -25
data/doc/juli(1).txt +1 -1
data/doc/juli_tb.rb(1).txt +1 -1
data/doc/photo(macro)/architecture.odg +0 -0
data/doc/photo(macro)/architecture_1.png +0 -0
data/doc/photo(macro).txt +46 -18
data/doc/template.txt +2 -2
data/juli.gemspec +5 -2
data/lib/juli/macro/photo.rb +120 -24
data/lib/juli/template/default.html +1 -1
data/lib/juli/template/facebook.html +1 -1
data/lib/juli/template/juli.css +59 -2
data/lib/juli/template/sitemap.html +4 -6
data/lib/juli/template/sitemap_order_by_mtime_DESC.html +4 -6
data/lib/juli/template/slidy.html +3 -5
data/lib/juli/template/sourceforge.html +4 -6
data/lib/juli/template/takahashi_method.html +3 -5
data/lib/juli/version.rb +1 -1
metadata +49 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0332b51197f16c985e33f0b14f17de94e1e5c7c8
-  data.tar.gz: d44577a0524a445c3d8edea6d1319f2517222ff8
+SHA256:
+  metadata.gz: 23d7f4a628fca794dbc15c32e627de9887c5d95df32de6047985c1fdf69783a8
+  data.tar.gz: 1655dbe0f42221c7ca44afa3c1e1503032d38bd2e01bddd7f453da23fcfa0fe8
 SHA512:
-  metadata.gz: 04676c102da50e2181a0f9351c06c38a2d0c0e4fc1d1b266a1f8e86f176d58927e2dd07d5b252df5a5505567f8f3eb29b4bbb9ae515bd0642350f061c5e8acf3
-  data.tar.gz: ad4a0fa85b3a0d56eae90d6cb92e511fcf3c9efdff0b452a18a1f58c3146d7fa6a5faae11c11be4ebf6e713dbabc53e658426d58fabe9610571a0487026ab61c
+  metadata.gz: 4b3e6179071d46103f5dfedf5a8fd5b9be480faca6863fe835b388d8d8f647f6111f17ed7024bd5c2435aa59810133cfca3633179100526fa917d3bd7adb5952
+  data.tar.gz: ff2588d8e3321ab95df3f0e3f813f7011efcc22a4c3285ef09d5a5582f9399f58ab693d288f298ec83702c75b5d762e0b0fdaf79a3a831079293fd392b2aef2d

data/.gitignore CHANGED Viewed

@@ -20,7 +20,6 @@
 /Gemfile.lock
 /_yardoc/
 /coverage/
-/doc/
 /pkg/
 /spec/reports/
 /tmp/

data/README.rdoc CHANGED Viewed

@@ -37,7 +37,7 @@ Or install it yourself as:
 === Juli Version
 1.*:: obsoleted
-2.*:: for ruby2.2
+2.*:: >= ruby2.2
 === Development

data/Rakefile CHANGED Viewed

@@ -84,7 +84,7 @@ namespace :doc do
 end
 desc 'clean working files'
-task clean: ['doc:clobber_app', :'test:coverage:clobber_juli'] do
+task clean: ['doc:clobber_app'] do
   sh "find . -name '*~' -exec rm {} \\;"
   sh 'rm', '-rf', *[parsers, test_conf_outout_top,
       'InstalledFiles', '.config',    # setup.rb generated

data/doc/.juli/config CHANGED Viewed

@@ -1,5 +1,5 @@
 output_top: ../doc_html/
-template:   sourceforge.html
+template:   github.html
 ext:        .shtml
 #amazon:     '<iframe src="http://rcm-jp.amazon.co.jp/e/cm?t=wells00-22&o=9&p=8&l=as1&asins=%{asins}&ref=tf_til&fc1=000000&IS2=1&lt1=_blank&m=amazon&lc1=0000FF&bc1=000000&bg1=FFFFFF&f=ifr" style="float:right; width:120px;height:240px;margin:3px" scrolling="no" marginwidth="0" marginheight="0" frameborder="0"></iframe>'
 amazon:     '<iframe src="http://rcm-jp.amazon.co.jp/e/cm?t=wells00-22&o=9&p=8&l=as1&asins=%{asins}&ref=tf_til&fc1=000000&IS2=1&lt1=_blank&m=amazon&lc1=0000FF&bc1=000000&bg1=FFFFFF&f=ifr" style="float:right; width:120px;height:240px;margin:30px" scrolling="no" marginwidth="0" marginheight="0" frameborder="0"></iframe>'

data/doc/.juli/{sourceforge.html → github.html} RENAMED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <%#
-This template is only for juli project's sourceforge document.
+This template is only for juli project's document.
                     DO NOT MODIFY THIS FILE DIRECTORY!
@@ -71,10 +71,8 @@ contents::    draw contents of page
 <br/><br/>
 <%= body %>
 <hr/>
-<a href="http://sourceforge.net/projects/jjjuli"
-  ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-      width="80" height="15"
-      alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-    /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+<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>
 </body>
 </html>

data/doc/.juli/slidy.html CHANGED Viewed

@@ -182,11 +182,9 @@ so that please do not delete them.
   <table width='100%'>
   <tr>
     <td>
-      <a href="http://sourceforge.net/projects/jjjuli"
-        ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-            width="80" height="15"
-            alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-            /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+      <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>
     </td>
     <td align=right>
       slide <span id=curr_page></span>/<span id=total_page></span>

data/doc/.juli/takahashi_method.html CHANGED Viewed

@@ -93,11 +93,9 @@ so that please do not delete them.
   <table width='100%'>
   <tr>
     <td>
-      <a href="http://sourceforge.net/projects/jjjuli"
-        ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-            width="80" height="15"
-            alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-            /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+      <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>
     </td>
     <td align=right>
       slide <span id=curr_page></span>/<span id=total_page></span>

data/doc/index.txt CHANGED Viewed

@@ -173,21 +173,6 @@ text file revision control is handled by je(1).
   $ gem install juli
-== from package
-Prerequisites:
-* rsync
-* ruby-1.9
-* RMagick (for photo(macro))
-* sdbm (for tag(macro))
-* i18n
-1. download package from http://sourceforge.net/projects/jjjuli/files/
-1. run setup.rb as follows:
-  $ tar zxvf juli-#.##.##.tgz
-  $ cd juli-#.##.##
-  $ ruby setup.rb                       # you may need 'sudo'
 == from repository
 Prerequisites:
@@ -199,16 +184,12 @@ Prerequisites:
 * rake
 * git
-racc tool is required when you download from Sourceforge repository
-and install it.
-  $ git clone git://jjjuli.git.sourceforge.net/gitroot/jjjuli/jjjuli
-  $ cd jjjuli
+  $ git clone git@github.com:fuminori-ido/juli.git
+  $ cd juli
   $ rake                                # generate ruby source from *.y files
   $ ruby setup.rb                       # you may need 'sudo'
-* prototype.js is used (included in this package).
 = See Also
 == Sub topics
@@ -248,12 +229,10 @@ I found the following competitors also after the comparison research:
 Any feedback is welcome.  Please check the followings:
-* <a href='http://sourceforge.net/projects/jjjuli/reviews/'>Love/Hate</a>
-* <a href='http://sourceforge.net/projects/jjjuli/forums'>Help</a>
-* <a href='http://sourceforge.net/tracker/?group_id=390715'>Bug Report, Feature Requests</a>
+* <a href='https://github.com/fuminori-ido/juli/issues'>Bug Report, Feature Requests</a>
 == Author
-Fuminori Ido, https://sourceforge.net/users/ido00
+Fuminori Ido, https://github.com/fuminori-ido
 == License

data/doc/juli(1).txt CHANGED Viewed

@@ -160,7 +160,7 @@ index::     juli top document
 = MISC
 == Author
-Fuminori Ido, https://sourceforge.net/users/ido00
+Fuminori Ido, https://github.com/fuminori-ido/juli
 == License

data/doc/juli_tb.rb(1).txt CHANGED Viewed

@@ -16,7 +16,7 @@ is 0 then it means successful.
 = MISC
 == Author
-Fuminori Ido, https://sourceforge.net/users/ido00
+Fuminori Ido, https://github.com/fuminori-ido
 == License

data/doc/photo(macro)/architecture.odg CHANGED Viewed

Binary file

data/doc/photo(macro)/architecture_1.png CHANGED Viewed

Binary file

data/doc/photo(macro).txt CHANGED Viewed

@@ -32,17 +32,23 @@ Example:
 will be:
+<hr/>
 \{photo 2012-04-22/DCIM/101_PANA/P1010441.JPG}
 When I visited the ruins of Hachioji-Castle in Japan,
 I saw many beautiful statue of Buddha.
 Here is one of them.
+<hr/>
+<br clear='all' />
 In general, in Juli wiki text, write as follows:
   \{photo a/b/c.jpg}
-Where, a/b/c.jpg is a relative-path of the photo file from 'mount'
+Where, a/b/c.jpg is a relative-path of the photo file from 'storage'
 directory (see 'setup' section below).
 As you see this example, by clicking this small photo,
@@ -64,23 +70,29 @@ Where,
 * 'output_top' above is the juli configuration parameter specified in .juli/config
   for HTML generated document top directory.
   See juli(1) and/or tutorial.
-* 'photo.mount' above is new configuration parameter introduced in this macro
+* 'photo.storages' above is configuration parameter in this macro
   for all of your photo master file directory which may include
   some private photos.  Of course, only photos you specify in
   \\{photo ...} macro are copied to public_photo as above figure shows.
   See 'Setup' section below.
+* 'photo.mount' is deprecated since v2.2.0
 == Setup
-1. Decide one location of directory of all of your photos
-   on the same file system.
-   We call it 'mount' directory in this macro.
-   Maintenace of the mount directory is up to you.
-   If you have several directories, create one directory, and
-   move the directories under it or symlink to each.
+1. For images in juli, use local photo directory and/or AWS S3.
+   We call it 'photo.storages' in this macro.
+   Maintenace of the 'photo.storages' is up to you.
 1. In .juli/config, setup photo related entries like the followings:
     photo:
-      mount:        /home/wells/photo
+      storages:
+      - kind:       local
+        dir:        /home/wells/photo
+      - kind:       aws
+        params:
+          region:   ap-northeast-1
+          profile:  juli
+        bucket:     juli
+        prefix:     photo
       small:
         width:      512
         style:      '...'
@@ -89,8 +101,10 @@ Where,
 Where, each key means as follows:
-mount::
-  Top directory of photos.
+storages[].kind::
+  either 'local' or 'aws'
+storages[].dir::
+  Top directory of photos when kind == 'local'.
   It is usually photo master file directory, photo uploade directory, or
   SD-card back-up directory on your PC.
   It SHOULD be NON-PUBLIC directory to protect annonymous
@@ -100,6 +114,12 @@ mount::
   Relative path can be used, which is relative from JULI_REPO, not
   from .juli/config.
   Example: /home/wells/photo
+storages[].params::
+  S3 access information when kind == 'aws'.
+storages[].bucket::
+  S3 bucket name when kind == 'aws'.
+storages[].prefix::
+  (not used now)
 small::
   small photo related configurations.  See below for the detail.
 small.width::
@@ -108,7 +128,7 @@ small.width::
 small.style::
   Small photo's style sheet.
   'img.juli_photo_small' entry in the
-  doc/.juli/sourceforge.html file (in this package) is one of the example.
+  doc/.juli/github.html file (in this package) is one of the example.
 large::
   large photo related configurations.  See below for the detail.
 large.width::
@@ -124,13 +144,13 @@ This setup is one-shot task.
 == Maintenance
-When you add photo, just sync (by e.g. rsync) your photo SD card and
-'mount' directory.
+When you add photo in you 'storage', just execute 'juli(1)', then
+photo in the storage is copied to public site.
 == Security
-1. When you set 'mount', it SHOULD be out-of-url so that any photo
-   under the 'mount' cannot be accessed via internet.
+1. When you set 'storages[].dir', it SHOULD be out-of-url so that any photo
+   under the 'dir' cannot be accessed via internet.
 1. Only photo referring by this macro can be accessed via internet.
 == File permission
@@ -140,7 +160,7 @@ The following permission is required on juli(1):
 * write permission on output_top/public_photo/ directory.
   Where, output_top is the directory for generated HTML
   specified at .juli/config.
-* read  permission under 'mount' directory.
+* read  permission under 'storage'.
 == Example
@@ -149,7 +169,15 @@ The following permission is required on juli(1):
 <a href='#'>This document</a>'s \\{photo} macro setup is as follows:
   photo:
-    mount:    ../sample/protected_photo/
+    storages:
+    - kind:   local
+      dir:    '/home/wells/photo'
+    - kind:       aws
+      params:
+        region:   ap-northeast-1
+        profile:  juli
+      bucket:     juli
+      prefix:     ''
     small:
       width:  200
       style:  'float: right'

data/doc/template.txt CHANGED Viewed

@@ -206,8 +206,8 @@ but the purpose is different.
 Helper is used for \{!template} and macro is used in juli wiki page.
 Currently, there is no plan to integrate them.
-If you need, please request me it with the detailed reason via sourceforge page
-http://sourceforge.net/projects/jjjuli/
+If you need, please request me it with the detailed reason via github page
+https://github.com/fuminori-ido/juli
 -&gt; Tracker
 -&gt; Feature Request, thank you!

data/juli.gemspec CHANGED Viewed

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = "juli"
   spec.version       = Juli::VERSION
   spec.authors       = ["ido"]
-  spec.email         = ["fuminori_ido@yahoo.co.jp"]
+  spec.email         = ["ido-gh@wtech.jp"]
   spec.summary       = %q{Offline wiki, and outline processor}
   spec.description   = %q{Offline wiki, and outline processor}
@@ -22,12 +22,15 @@ Gem::Specification.new do |spec|
   spec.executables   = 'juli'
   spec.require_paths = ["lib"]
+  spec.add_runtime_dependency 'aws-sdk-s3'
   spec.add_runtime_dependency 'i18n'
   spec.add_runtime_dependency 'rmagick'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'racc'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'test-unit'
 end

data/lib/juli/macro/photo.rb CHANGED Viewed

@@ -1,7 +1,9 @@
+require 'aws-sdk-s3'
 require 'fileutils'
 require 'digest/sha1'
 require 'rmagick'
 require 'pp'
+require 'tmpdir'
 module Juli
   module Macro
@@ -14,7 +16,12 @@ module Juli
       PUBLIC_PHOTO_DIR_DEFAULT  = 'public_photo'
       SEED_DEFAULT              = '-- Juli seed default!! --'
       CONF_DEFAULT = {
-        'mount'     => '/home/YOUR_NAME/Photos',
+        'storages'  => [
+          {
+            'kind'    => 'local',
+            'dir'     => '/home/YOUR_NAME/Photos',
+          },
+        ],
         'small'     => {
           'width'   => 512,           # default small width in pixel
           'style'   => 'float: right'
@@ -32,15 +39,35 @@ module Juli
 # Photo macro setup sample is as follows.
 #
 #photo:
-# mount:    '#{CONF_DEFAULT['mount']}'
+# mount:        '#{CONF_DEFAULT['mount']}'    # DEPERECATED, use storages[].kind = 'local'
+# storages:
+# - kind:       local
+#   dir:        '#{CONF_DEFAULT['mount']}'
+# - kind:       aws
+#   params:
+#     region:   ap-northeast-1
+#     profile:  juli
+#   bucket:     juli
+#   prefix:     photo
 # small:
-#   width:  #{CONF_DEFAULT['small']['width']}
-#   style:  '#{CONF_DEFAULT['small']['style']}'
+#   width:      #{CONF_DEFAULT['small']['width']}
+#   style:      '#{CONF_DEFAULT['small']['style']}'
 # large:
-#   width:  #{CONF_DEFAULT['large']['width']}
+#   width:      #{CONF_DEFAULT['large']['width']}
 EOM
       end
+      def initialize
+        super
+        for storage in conf_photo && conf_photo['storages'] || {}
+          if storage['kind'] == 'aws'
+            _h = {}
+            storage['params'].each{|k,v| _h[k.to_sym] = v}  # to sym
+            @aws = ::Aws::S3::Client.new(_h)
+          end
+        end
+      end
       def set_conf_default(conf)
         set_conf_default_sub(conf, 'photo', CONF_DEFAULT)
       end
@@ -64,8 +91,8 @@ EOM
       # public photo directory is used to:
       #
       # * store converted photo from original one
-      # * protect private photo in 'mount' directory from public web access
-      #   by copying (with conversion) to it on demand.
+      # * protect private photo in 'mount' directory and storage
+      #   from public web access by copying (with conversion) to it on demand.
       #
       # === INPUTS
       # url::   when true, return url, else, return physical file-system path
@@ -106,29 +133,23 @@ EOM
       #
       # and return the path.
       #
+      # source photo is looked up under the following order:
+      # 1. local directory designated by 'mount' config, if defined
+      # 1. remote storage designated by 'storage' config, if defined
+      #
       # === INPUTS
       # path::  photo-macro path argument
       # size::  :small, or :large
       # url::   when true, return url, else, return physical file-system path
       def intern(path, size = :small, url = true)
-        protected_path    = File.join(conf_photo['mount'], path)
-        if !File.exist?(protected_path)
-          warn("WARN: no source photo path(#{protected_path})")
-          return ''
+        if conf_photo['mount']
+          STDERR.printf "DEPERECATED WARNING: 'mount' is deprecated; use 'storages'\n"
+          result = intern_local_mount(conf_photo['mount'], path, size, url)
+          return result if result != ''
         end
-        public_phys_path  = photo_path(path, size, false)
-        if !File.exist?(public_phys_path) ||
-            File::Stat.new(public_phys_path).mtime < File::Stat.new(protected_path).mtime
-          img     = Magick::ImageList.new(protected_path)
-          width   = (s = conf_photo[size.to_s]) && s['width']
-          img.resize_to_fit!(width, img.rows * width / img.columns)
-          self.rotate(img).
-              strip!.
-              write(public_phys_path).destroy!
-        end
-        photo_path(path, size, url)
+        result = intern_storages(path, size, url)
+        return result if result != ''
       end
       # return <img...> HTML tag for the photo with this macro features.
@@ -149,7 +170,8 @@ EOM
         @conf_photo ||= conf['photo']
       end
-    private
+      private
       def set_conf_default_sub(hash, key, val)
         case val
         when Hash
@@ -161,6 +183,80 @@ EOM
           hash[key] = val if !hash[key]
         end
       end
+      # @return '' if not found
+      def intern_local_mount(mount_dir, path, size, url)
+        protected_path    = File.join(mount_dir, path)
+        if !File.exist?(protected_path)
+         #debug("DEBUG: no source photo path(#{protected_path})")
+          return ''
+        end
+        public_phys_path  = photo_path(path, size, false)
+        if !File.exist?(public_phys_path) ||
+            File::Stat.new(public_phys_path).mtime < File::Stat.new(protected_path).mtime
+          img     = Magick::ImageList.new(protected_path)
+          width   = (s = conf_photo[size.to_s]) && s['width']
+          img.resize_to_fit!(width, img.rows * width / img.columns)
+          self.rotate(img).
+              strip!.
+              write(public_phys_path).destroy!
+        end
+        photo_path(path, size, url)
+      end
+      def intern_storages(path, size, url)
+        result = ''
+        for storage in conf_photo && conf_photo['storages'] || {}
+          result = case storage['kind']
+                   when 'local'
+                    intern_local_mount(storage['dir'], path, size, url)
+                   when 'aws'
+                    intern_aws(storage, path, size, url)
+                   else
+                    raise "unsupported kind of storage(#{storage['kind']})"
+                   end
+          return result if result != ''
+        end
+      end
+      # FIXME: I gave up to use 'fog' gem so that I'm using AWS S3 here now.
+      # I welcome somebody implements fog version!
+      def intern_aws(storage, path, size, url)
+        return '' if storage.nil? || storage.empty?
+        resp = nil
+        begin
+          resp = @aws.head_object(bucket: storage['bucket'], key: path)
+        rescue ::Aws::S3::Errors::NotFound
+          warn("WARN: no source photo path(#{path}) in storage")
+          return ''
+        end
+        public_phys_path  = photo_path(path, size, false)
+        if !File.exist?(public_phys_path) ||
+            File::Stat.new(public_phys_path).mtime < resp.last_modified
+          work_path = tmpname('juli_photo')
+          resp      = @aws.get_object(bucket:           storage['bucket'],
+                                      key:              path,
+                                      response_target:  work_path)
+          img       = Magick::ImageList.new(work_path)
+          width     = (s = conf_photo[size.to_s]) && s['width']
+          img.resize_to_fit!(width, img.rows * width / img.columns)
+          self.rotate(img).
+              strip!.
+              write(public_phys_path).destroy!
+         #FileUtils.rm_f(work_path)
+        end
+        photo_path(path, size, url)
+      end
+      def tmpname(base_name)
+        t = Time.now.strftime("%Y%m%d")
+        "/tmp/#{base_name}-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      end
     end
   end
 end

data/lib/juli/template/default.html CHANGED Viewed

@@ -59,6 +59,6 @@ contents::    draw contents of page
 <br/><br/>
 <%= body %>
 <hr/>
-Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
 </body>
 </html>

data/lib/juli/template/facebook.html CHANGED Viewed

@@ -77,6 +77,6 @@ Facebook developer site application registration page fo
 <%= fb_like %>
 <%= fb_comments %>
 <hr/>
-Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+Generated by <a href='https://github.com/fuminori-ido/juli'>juli <%= Juli::VERSION %></a>
 </body>
 </html>

data/lib/juli/template/juli.css CHANGED Viewed

@@ -1,3 +1,7 @@
+body {
+  line-height:      1.2em;
+}
 p.default {
   padding-left:     10px;
 }
@@ -106,7 +110,13 @@ ol, ul {
 /* Dictionary list */
 table.juli_compact_dictionary {
-  padding-left:     10px;
+  border:           1px solid #aaa;
+  margin-top:       0.5em;
+  margin-bottom:    0.5em;
+  margin-left:      1em;
+}
+table.juli_compact_dictionary td:nth-child(1) {
+  padding-right:    1em;
 }
 dl.juli_dictionary dt {
   margin-top:       0.5em;
@@ -144,6 +154,54 @@ div.sitemap {
   text-align:       left;
 }
+/*----------------------------------------------------------------
+Additional
+----------------------------------------------------------------*/
+div#header {
+  background:       #62a5dc;
+  border-radius:    10px;
+  text-align:       center;
+  color:            white;
+  height:           8em;
+}
+div#header div.site_title {
+  padding-top:      30px;
+  padding-bottom:    5px;
+  font-size:        3em;
+  line-height:      1.2em;
+}
+div#header div.site_title a {
+  text-decoration:  none;
+  color:            white;
+}
+div#header div.description {
+  font-size:        90%;
+  padding-bottom:   30px;
+}
+img.juli_photo_small {
+  margin:         10px;
+  border-top:     2px solid #888;
+  border-left:    2px solid #888;
+  border-right:   2px solid black;
+  border-bottom:  2px solid black;
+  padding:        0px;
+}
+table.default {
+  border-collapse:  collapse;
+  border:           1px solid #a84;
+}
+table.default th, table.default td {
+  border:           1px solid #888;
+}
+table.default th.digit, table.default td.digit {
+  text-align:       right;
+}
+table.default th {
+  background-color: #8db;
+}
 /*----------------------------------------------------------------
 Tag list
 ----------------------------------------------------------------*/
@@ -159,7 +217,6 @@ a.juli_tag_08 { font-size: 195%;  }
 a.juli_tag_09 { font-size: 210%;  }
 a.juli_tag_10 { font-size: 225%;  }
 /*----------------------------------------------------------------
 Photo
 ----------------------------------------------------------------*/

data/lib/juli/template/sitemap.html CHANGED Viewed

@@ -1,6 +1,6 @@
 <html>
 <%#
-This template is only for juli project's sourceforge document.
+This template is only for juli project's document.
 %>
 <!--
@@ -69,10 +69,8 @@ sitemap_order_by_mtime_DESC.html::  sitemap template (mtime decendant order)
   <%= body %>
 </table>
 <hr/>
-<a href="http://sourceforge.net/projects/jjjuli"
-  ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-      width="80" height="15"
-      alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-    /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+<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>
 </body>
 </html>

data/lib/juli/template/sitemap_order_by_mtime_DESC.html CHANGED Viewed

@@ -1,6 +1,6 @@
 <html>
 <%#
-This template is only for juli project's sourceforge document.
+This template is only for juli project's document.
 %>
 <!--
@@ -69,10 +69,8 @@ sitemap.html::  sitemap template (alphabetical order)
   <%= body %>
 </table>
 <hr/>
-<a href="http://sourceforge.net/projects/jjjuli"
-  ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-      width="80" height="15"
-      alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-    /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+<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>
 </body>
 </html>

data/lib/juli/template/slidy.html CHANGED Viewed

@@ -103,11 +103,9 @@ so that please do not delete them.
   <table width='100%'>
   <tr>
     <td>
-      <a href="http://sourceforge.net/projects/jjjuli"
-        ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-            width="80" height="15"
-            alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-            /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+      <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>
     </td>
     <td align=right>
       slide <span id=curr_page></span>/<span id=total_page></span>

data/lib/juli/template/sourceforge.html CHANGED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <%#
-This template is only for juli project's sourceforge document.
+This template is only for juli project's document.
 %>
 <!--
@@ -62,10 +62,8 @@ contents::    draw contents of page
 <br/><br/>
 <%= body %>
 <hr/>
-<a href="http://sourceforge.net/projects/jjjuli"
-  ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-      width="80" height="15"
-      alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-    /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+<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>
 </body>
 </html>

data/lib/juli/template/takahashi_method.html CHANGED Viewed

@@ -93,11 +93,9 @@ so that please do not delete them.
   <table width='100%'>
   <tr>
     <td>
-      <a href="http://sourceforge.net/projects/jjjuli"
-        ><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=390715&amp;type=8"
-            width="80" height="15"
-            alt="Get jj_juli at SourceForge.net. Fast, secure and Free Open Source software downloads"
-            /></a> | Generated by <a href='http://jjjuli.sourceforge.net/'>juli <%= Juli::VERSION %></a>
+      <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>
     </td>
     <td align=right>
       slide <span id=curr_page></span>/<span id=total_page></span>

data/lib/juli/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Juli
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata CHANGED Viewed

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: juli
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - ido
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  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: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,9 +136,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Offline wiki, and outline processor
 email:
-- fuminori_ido@yahoo.co.jp
+- ido-gh@wtech.jp
 executables:
 - juli
 extensions: []
@@ -128,8 +170,8 @@ files:
 - bin/juli_tb.rb
 - bin/setup
 - doc/.juli/config
+- doc/.juli/github.html
 - doc/.juli/slidy.html
-- doc/.juli/sourceforge.html
 - doc/.juli/takahashi_method.html
 - doc/README_FOR_API
 - doc/compare.ods
@@ -235,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5.5
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: Offline wiki, and outline processor