juli 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5972beb37ee40ceb1e62692c18a19cb61e4b2542
-  data.tar.gz: b7309448136bfa5be0682db98825f0e9f4dcf179
+  metadata.gz: 0332b51197f16c985e33f0b14f17de94e1e5c7c8
+  data.tar.gz: d44577a0524a445c3d8edea6d1319f2517222ff8
 SHA512:
-  metadata.gz: eb93aabe4d570290a3fd473dcae7152ea4a8c725af1801b306d2a6a64ea7301f395abf86107c45f5ec6b3bf6fa86de94b45237e15bd6721c33ab4731d4051e52
-  data.tar.gz: 2ea56626c3d8116a1413ff972f2b8bb25a5a61a8bad71718032e07983cd86742fd9555f4761b3b638b66e090ec4b8861f99f0926771a3567ec35bb34372dc472
+  metadata.gz: 04676c102da50e2181a0f9351c06c38a2d0c0e4fc1d1b266a1f8e86f176d58927e2dd07d5b252df5a5505567f8f3eb29b4bbb9ae515bd0642350f061c5e8acf3
+  data.tar.gz: ad4a0fa85b3a0d56eae90d6cb92e511fcf3c9efdff0b452a18a1f58c3146d7fa6a5faae11c11be4ebf6e713dbabc53e658426d58fabe9610571a0487026ab61c

data/Rakefile

@@ -5,7 +5,7 @@ $LOAD_PATH.insert(0, File.join(File.dirname(__FILE__), 'lib'))
 
 require 'rake'
 require 'rake/testtask'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc'
 require 'rdoc/task'
 require 'juli'
 require 'racc'

data/juli.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'rdoc'
 end

data/lib/juli/command.rb

@@ -50,6 +50,10 @@ OUTPUT_TOP_COMMENT = <<EOM
 #
 #show_indent_toggle_button: true
 
+# When set to '1st-only' (default), wikiname auto-link is applied at ONLY 1st
+# occurence in a text, otherwise is applied at every occurence:
+#
+#link_wikiname_on:          1st-only
 
 # Specify output top directory (default = ../html).
 

data/lib/juli/util.rb

@@ -133,6 +133,7 @@ EOM
         'output_top'                => '../html',
         'show_indent_toggle_button' => true,
         'template'                  => 'default.html',
+        'link_wikiname_on'          => '1st-only',
       }
 
       include Singleton

data/lib/juli/version.rb

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

data/lib/juli/visitor/html.rb

@@ -59,8 +59,8 @@ module Juli::Visitor
       include Juli::Util
       include TagHelper
 
-      def initialize(macros)
-        @_macros = macros
+      def initialize(html_visitor)
+        @_html_visitor  = html_visitor
       end
 
       def visit_array(n)
@@ -74,8 +74,13 @@ module Juli::Visitor
       end
   
       def visit_wikiname(n)
-        decoded = Juli::Wiki.decode(n.str)
-        content_tag(:a, decoded, :class=>'wiki', :href=>decoded + conf['ext'])
+        if conf['link_wikiname_on'] == '1st-only' && @_html_visitor.wikiname_visited[n.str]
+          n.str
+        else
+          @_html_visitor.wikiname_visited[n.str] = true
+          decoded = Juli::Wiki.decode(n.str)
+          content_tag(:a, decoded, :class=>'wiki', :href=>decoded + conf['ext'])
+        end
       end
   
       def visit_url(n)
@@ -83,7 +88,7 @@ module Juli::Visitor
       end
 
       def visit_macro(n)
-        if macro = @_macros[camelize(n.name).to_sym]
+        if macro = @_html_visitor.macros[camelize(n.name).to_sym]
           macro.run(*n.rest.split(' '))
         else
           s = "juli ERR: UNKNOWN macro name: '#{n.name}'"
@@ -93,6 +98,8 @@ module Juli::Visitor
       end
     end
 
+    attr_accessor :wikiname_visited, :macros
+
     # Html sepecific initialization does:
     #
     # 1. create output_top.
@@ -112,7 +119,7 @@ module Juli::Visitor
 
       register_helper
       register_macro
-      @html_line_visitor  = HtmlLine.new(@_macros)
+      @html_line_visitor  = HtmlLine.new(self)
 
       if !File.directory?(conf['output_top'])
         FileUtils.mkdir_p(conf['output_top'])
@@ -139,7 +146,7 @@ module Juli::Visitor
       for key, helper in @_helpers do
         helper.on_root(in_file, root, self)
       end
-      for macro_symbol, macro in @_macros do
+      for macro_symbol, macro in @macros do
         macro.on_root(in_file, root, self)
       end
 
@@ -150,9 +157,10 @@ module Juli::Visitor
       javascript  = relative_from(in_file, 'juli.js')
       stylesheet  = relative_from(in_file, 'juli.css')
       sitemap     = relative_from(in_file, 'sitemap' + conf['ext'])
+      @wikiname_visited = {}
       body        = root.accept(self)
 
-      for macro_symbol, macro in @_macros do
+      for macro_symbol, macro in @macros do
         macro.after_root(in_file, root)
       end
 
@@ -277,17 +285,17 @@ module Juli::Visitor
     end
 
 
-    # create Macro object and register it in @_macros hash.
+    # create Macro object and register it in @macros hash.
     #
     # call set_conf_default() to set conf[key] default value for each macro
     def register_macro
-      @_macros = {}
+      @macros = {}
       for macro_symbol in Juli::Macro.constants do
         next if macro_symbol == :Base
         macro_class = Juli::Macro.module_eval(macro_symbol.to_s)
         macro = macro_class.new
         macro.set_conf_default(conf)
-        @_macros[macro_symbol] = macro
+        @macros[macro_symbol] = macro
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juli
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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
@@ -221,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.5
 signing_key: 
 specification_version: 4
 summary: Offline wiki, and outline processor