review 2.3.0 → 2.4.0

data/lib/review/catalog.rb

@@ -12,45 +12,41 @@ module ReVIEW
     end
 
     def predef
-      return "" unless @yaml["PREDEF"]
-      @yaml["PREDEF"].join("\n")
+      return '' unless @yaml['PREDEF']
+      @yaml['PREDEF'].join("\n")
     end
 
     def chaps
-      return "" unless @yaml["CHAPS"]
+      return '' unless @yaml['CHAPS']
 
-      @yaml["CHAPS"].map {|entry|
-        if entry.is_a? String
+      @yaml['CHAPS'].map do |entry|
+        if entry.is_a?(String)
           entry
-        elsif entry.is_a? Hash
+        elsif entry.is_a?(Hash)
           entry.values # chaps in a part
         end
-      }.flatten.join("\n")
+      end.flatten.join("\n")
     end
 
     def parts
-      return "" unless @yaml["CHAPS"]
+      return '' unless @yaml['CHAPS']
 
-      @yaml["CHAPS"].map {|entry|
-        if entry.is_a? Hash
-          entry.keys
-        end
-      }.flatten.compact.join("\n")
+      @yaml['CHAPS'].map { |entry| entry.keys if entry.is_a?(Hash) }.flatten.compact.join("\n")
     end
 
     def parts_with_chaps
-      return "" unless @yaml["CHAPS"]
-      @yaml["CHAPS"].flatten.compact
+      return '' unless @yaml['CHAPS']
+      @yaml['CHAPS'].flatten.compact
     end
 
     def appendix
-      return "" unless @yaml["APPENDIX"]
-      @yaml["APPENDIX"].join("\n")
+      return '' unless @yaml['APPENDIX']
+      @yaml['APPENDIX'].join("\n")
     end
 
     def postdef
-      return "" unless @yaml["POSTDEF"]
-      @yaml["POSTDEF"].join("\n")
+      return '' unless @yaml['POSTDEF']
+      @yaml['POSTDEF'].join("\n")
     end
   end
 end

data/lib/review/compiler.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
-# Copyright (c) 2002-2007 Minero Aoki
 # Copyright (c) 2009-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2002-2007 Minero Aoki
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -14,7 +12,6 @@ require 'review/exception'
 require 'strscan'
 
 module ReVIEW
-
   class Location
     def initialize(filename, f)
       @filename = filename
@@ -38,9 +35,7 @@ module ReVIEW
     alias_method :to_s, :string
   end
 
-
   class Compiler
-
     def initialize(strategy)
       @strategy = strategy
     end
@@ -64,9 +59,7 @@ module ReVIEW
       attr_reader :name
 
       def check_args(args)
-        unless @argc_spec === args.size
-          raise CompileError, "wrong # of parameters (block command //#{@name}, expect #{@argc_spec} but #{args.size})"
-        end
+        raise CompileError, "wrong # of parameters (block command //#{@name}, expect #{@argc_spec} but #{args.size})" unless @argc_spec === args.size
         @checker.call(*args) if @checker
       end
 
@@ -75,7 +68,7 @@ module ReVIEW
         when Range then @argc_spec.begin
         when Integer then @argc_spec
         else
-          raise TypeError, "argc_spec is not Range/Integer: #{inspect()}"
+          raise TypeError, "argc_spec is not Range/Integer: #{inspect}"
         end
       end
 
@@ -90,18 +83,22 @@ module ReVIEW
 
     SYNTAX = {}
 
-    def Compiler.defblock(name, argc, optional = false, &block)
+    def self.defblock(name, argc, optional = false, &block)
       defsyntax name, (optional ? :optional : :block), argc, &block
     end
 
-    def Compiler.defsingle(name, argc, &block)
+    def self.defsingle(name, argc, &block)
       defsyntax name, :line, argc, &block
     end
 
-    def Compiler.defsyntax(name, type, argc, &block)
+    def self.defsyntax(name, type, argc, &block)
       SYNTAX[name] = SyntaxElement.new(name, type, argc, &block)
     end
 
+    def self.definline(name)
+      INLINE[name] = InlineSyntaxElement.new(name)
+    end
+
     def syntax_defined?(name)
       SYNTAX.key?(name.to_sym)
     end
@@ -120,10 +117,6 @@ module ReVIEW
 
     INLINE = {}
 
-    def Compiler.definline(name)
-      INLINE[name] = InlineSyntaxElement.new(name)
-    end
-
     def inline_defined?(name)
       INLINE.key?(name.to_sym)
     end
@@ -146,6 +139,8 @@ module ReVIEW
     defblock :talk, 0
     defblock :texequation, 0
     defblock :graph, 1..3
+    defblock :indepimage, 1..3, true
+    defblock :numberlessimage, 1..3, true
 
     defblock :address, 0
     defblock :blockquote, 0
@@ -168,8 +163,6 @@ module ReVIEW
     defsingle :noindent, 0
     defsingle :linebreak, 0
     defsingle :pagebreak, 0
-    defsingle :indepimage, 1..3
-    defsingle :numberlessimage, 1..3
     defsingle :hr, 0
     defsingle :parasep, 0
     defsingle :label, 1
@@ -233,6 +226,7 @@ module ReVIEW
     definline :include
     definline :tcy
     definline :embed
+    definline :pageref
 
     private
 
@@ -246,16 +240,16 @@ module ReVIEW
           f.gets # Nothing to do
         when /\A=+[\[\s\{]/
           compile_headline f.gets
-        when %r<\A\s+\*>
+        when /\A\s+\*/
           compile_ulist f
-        when %r<\A\s+\d+\.>
+        when /\A\s+\d+\./
           compile_olist f
-        when %r<\A\s*:\s>
+        when /\A\s*:\s/
           compile_dlist f
-        when %r<\A//\}>
+        when %r{\A//\}}
           f.gets
           error 'block end seen but not opened'
-        when %r<\A//[a-z]+>
+        when %r{\A//[a-z]+}
           name, args, lines = read_command(f)
           syntax = syntax_descriptor(name)
           unless syntax
@@ -264,11 +258,11 @@ module ReVIEW
             next
           end
           compile_command syntax, args, lines
-        when %r<\A//>
+        when %r{\A//}
           line = f.gets
           warn "`//' seen but is not valid command: #{line.strip.inspect}"
           if block_open?(line)
-            warn "skipping block..."
+            warn 'skipping block...'
             read_block(f, false)
           end
         else
@@ -291,21 +285,19 @@ module ReVIEW
       caption = m[4].strip
       index = level - 1
       if tag
-        if tag !~ /\A\//
+        if tag !~ %r{\A/}
+          warn 'headline is empty.' if caption.empty?
           close_current_tagged_section(level)
           open_tagged_section(tag, level, label, caption)
         else
           open_tag = tag[1..-1]
           prev_tag_info = @tagged_section.pop
-          unless prev_tag_info.first == open_tag
-            raise CompileError, "#{open_tag} is not opened."
-          end
+          error "#{open_tag} is not opened." if prev_tag_info.nil? || prev_tag_info.first != open_tag
           close_tagged_section(*prev_tag_info)
         end
       else
-        if @headline_indexs.size > (index + 1)
-          @headline_indexs = @headline_indexs[0..index]
-        end
+        warn 'headline is empty.' if caption.empty?
+        @headline_indexs = @headline_indexs[0..index] if @headline_indexs.size > (index + 1)
         @headline_indexs[index] = 0 if @headline_indexs[index].nil?
         @headline_indexs[index] += 1
         close_current_tagged_section(level)
@@ -348,9 +340,7 @@ module ReVIEW
     end
 
     def close_all_tagged_section
-      until @tagged_section.empty?
-        close_tagged_section(* @tagged_section.pop)
-      end
+      close_tagged_section(* @tagged_section.pop) until @tagged_section.empty?
     end
 
     def compile_ulist(f)
@@ -359,9 +349,7 @@ module ReVIEW
         next if line =~ /\A\#@/
 
         buf = [text(line.sub(/\*+/, '').strip)]
-        f.while_match(/\A\s+(?!\*)\S/) do |cont|
-          buf.push text(cont.strip)
-        end
+        f.while_match(/\A\s+(?!\*)\S/) { |cont| buf.push text(cont.strip) }
 
         line =~ /\A\s+(\*+)/
         current_level = $1.size
@@ -373,17 +361,17 @@ module ReVIEW
           level_diff = current_level - level
           level = current_level
           (1..(level_diff - 1)).to_a.reverse_each do |i|
-            @strategy.ul_begin {i}
+            @strategy.ul_begin { i }
             @strategy.ul_item_begin []
           end
-          @strategy.ul_begin {level}
+          @strategy.ul_begin { level }
           @strategy.ul_item_begin buf
         elsif level > current_level # up
           level_diff = level - current_level
           level = current_level
           (1..level_diff).to_a.reverse_each do |i|
             @strategy.ul_item_end
-            @strategy.ul_end {level + i}
+            @strategy.ul_end { level + i }
           end
           @strategy.ul_item_end
           # body
@@ -393,7 +381,7 @@ module ReVIEW
 
       (1..level).to_a.reverse_each do |i|
         @strategy.ul_item_end
-        @strategy.ul_end {i}
+        @strategy.ul_end { i }
       end
     end
 
@@ -404,9 +392,7 @@ module ReVIEW
 
         num = line.match(/(\d+)\./)[1]
         buf = [text(line.sub(/\d+\./, '').strip)]
-        f.while_match(/\A\s+(?!\d+\.)\S/) do |cont|
-          buf.push text(cont.strip)
-        end
+        f.while_match(/\A\s+(?!\d+\.)\S/) { |cont| buf.push text(cont.strip) }
         @strategy.ol_item buf, num
       end
       @strategy.ol_end
@@ -416,7 +402,7 @@ module ReVIEW
       @strategy.dl_begin
       while /\A\s*:/ =~ f.peek
         @strategy.dt text(f.gets.sub(/\A\s*:/, '').strip)
-        @strategy.dd(f.break(/\A(\S|\s*:|\s+\d+\.\s|\s+\*\s)/).map {|line| text(line.strip) })
+        @strategy.dd(f.break(/\A(\S|\s*:|\s+\d+\.\s|\s+\*\s)/).map { |line| text(line.strip) })
         f.skip_blank_lines
         f.skip_comment_lines
       end
@@ -425,9 +411,9 @@ module ReVIEW
 
     def compile_paragraph(f)
       buf = []
-      f.until_match(%r<\A//|\A\#@>) do |line|
+      f.until_match(%r{\A//|\A\#@}) do |line|
         break if line.strip.empty?
-        buf.push text(line.sub(/^(\t+)\s*/) {|m| "<!ESCAPETAB!>" * m.size}.strip.gsub(/<!ESCAPETAB!>/, "\t"))
+        buf.push text(line.sub(/^(\t+)\s*/) { |m| '<!ESCAPETAB!>' * m.size }.strip.gsub('<!ESCAPETAB!>', "\t"))
       end
       @strategy.paragraph buf
     end
@@ -436,28 +422,27 @@ module ReVIEW
       line = f.gets
       name = line.slice(/[a-z]+/).to_sym
       ignore_inline = (name == :embed)
-      args = parse_args(line.sub(%r<\A//[a-z]+>, '').rstrip.chomp('{'), name)
+      args = parse_args(line.sub(%r{\A//[a-z]+}, '').rstrip.chomp('{'), name)
       lines = block_open?(line) ? read_block(f, ignore_inline) : nil
-      return name, args, lines
+
+      [name, args, lines]
     end
 
     def block_open?(line)
-      line.rstrip[-1,1] == '{'
+      line.rstrip[-1, 1] == '{'
     end
 
     def read_block(f, ignore_inline)
       head = f.lineno
       buf = []
-      f.until_match(%r<\A//\}>) do |line|
+      f.until_match(%r{\A//\}}) do |line|
         if ignore_inline
           buf.push line
-        else
-          unless line =~ /\A\#@/
-            buf.push text(line.rstrip)
-          end
+        elsif line !~ /\A\#@/
+          buf.push text(line.rstrip)
         end
       end
-      unless %r<\A//\}> =~ f.peek
+      unless %r{\A//\}} =~ f.peek
         error "unexpected EOF (block begins at: #{head})"
         return buf
       end
@@ -465,22 +450,22 @@ module ReVIEW
       buf
     end
 
-    def parse_args(str, name=nil)
+    def parse_args(str, _name = nil)
       return [] if str.empty?
       scanner = StringScanner.new(str)
       words = []
       while word = scanner.scan(/(\[\]|\[.*?[^\\]\])/)
-        w2 = word[1..-2].gsub(/\\(.)/){
+        w2 = word[1..-2].gsub(/\\(.)/) do
           ch = $1
-          (ch == "]" or ch == "\\") ? ch : "\\" + ch
-        }
+          (ch == ']' or ch == '\\') ? ch : '\\' + ch
+        end
         words << w2
       end
-      if !scanner.eos?
+      unless scanner.eos?
         error "argument syntax error: #{scanner.rest} in #{str.inspect}"
         return []
       end
-      return words
+      words
     end
 
     def compile_command(syntax, args, lines)
@@ -498,9 +483,7 @@ module ReVIEW
       if syntax.block_allowed?
         compile_block syntax, args, lines
       else
-        if lines
-          error "block is not allowed for command //#{syntax.name}; ignore"
-        end
+        error "block is not allowed for command //#{syntax.name}; ignore" if lines
         compile_single syntax, args
       end
     end
@@ -514,9 +497,7 @@ module ReVIEW
     end
 
     def default_block(syntax)
-      if syntax.block_required?
-        error "block is required for //#{syntax.name}; use empty block"
-      end
+      error "block is required for //#{syntax.name}; use empty block" if syntax.block_required?
       []
     end
 
@@ -524,18 +505,24 @@ module ReVIEW
       @strategy.__send__(syntax.name, *args)
     end
 
+    def replace_fence(str)
+      str.gsub(/@<(\w+)>([$|])(.+?)(\2)/) do
+        op = $1
+        arg = $3.gsub('@', "\x01").gsub('\\}') { '\\\\}' }.gsub('}') { '\}' }.sub(/(?:\\)+$/) { |m| '\\\\' * m.size }
+        "@<#{op}>{#{arg}}"
+      end
+    end
+
     def text(str)
       return '' if str.empty?
-      words = str.split(/(@<\w+>\{(?:[^\}\\]|\\.)*?\})/, -1)
-      words.each do |w|
-        error "`@<xxx>' seen but is not valid inline op: #{w}" if w.scan(/@<\w+>/).size > 1 && !/\A@<raw>/.match(w)
-      end
+      words = replace_fence(str).split(/(@<\w+>\{(?:[^\}\\]|\\.)*?\})/, -1)
+      words.each { |w| error "`@<xxx>' seen but is not valid inline op: #{w}" if w.scan(/@<\w+>/).size > 1 && !/\A@<raw>/.match(w) }
       result = @strategy.nofunc_text(words.shift)
       until words.empty?
         result << compile_inline(words.shift.gsub(/\\\}/, '}').gsub(/\\\\/, '\\'))
         result << @strategy.nofunc_text(words.shift)
       end
-      result
+      result.gsub("\x01", '@')
     rescue => err
       error err.message
     end
@@ -543,12 +530,8 @@ module ReVIEW
 
     def compile_inline(str)
       op, arg = /\A@<(\w+)>\{(.*?)\}\z/.match(str).captures
-      unless inline_defined?(op)
-        raise CompileError, "no such inline op: #{op}"
-      end
-      unless @strategy.respond_to?("inline_#{op}")
-        raise "strategy does not support inline op: @<#{op}>"
-      end
+      raise CompileError, "no such inline op: #{op}" unless inline_defined?(op)
+      raise "strategy does not support inline op: @<#{op}>" unless @strategy.respond_to?("inline_#{op}")
       @strategy.__send__("inline_#{op}", arg)
     rescue => err
       error err.message
@@ -562,7 +545,5 @@ module ReVIEW
     def error(msg)
       @strategy.error msg
     end
-
   end
-
 end # module ReVIEW

data/lib/review/configure.rb

@@ -1,86 +1,84 @@
-# -*- coding: utf-8 -*-
 require 'securerandom'
 
 module ReVIEW
   class Configure < Hash
-
     attr_accessor :maker
 
     def self.values
       conf = Configure[
         # These parameters can be overridden by YAML file.
-        "bookname"=> "example", # it defines epub file name also
-        "booktitle" => "Re:VIEW Sample Book",
-        "title" => nil,
-        "aut" => nil, # author
-        "prt" => nil, # printer(publisher)
-        "asn" => nil, # associated name
-        "ant" => nil, # bibliographic antecedent
-        "clb" => nil, # Collaborator
-        "edt" => nil, # Editor
-        "dsr" => nil, # Designer
-        "ill" => nil, # Illustrator
-        "pht" => nil, # Photographer
-        "trl" => nil, # Translator
-        "date" => nil, # publishing date
-        "rights" => nil, # Copyright messages
-        "description" => nil, # Description
-        "urnid" => "urn:uid:#{SecureRandom.uuid}", # Identifier
-        "stylesheet" => "stylesheet.css", # stylesheet file
-        "coverfile" => nil, # content file of body of cover page
-        "mytoc" => nil, # whether make own table of contents or not
-        "params" => "", # specify review2html parameters
-        "toclevel" => 3, # level of toc
-        "secnolevel" => 2, # level of section #
-        "epubversion" => 3,
-        "titlepage" => true, # Use title page
-        "toc" => nil, # Use table of contents in body
-        "colophon" => nil, # Use colophon
-        "debug" => nil, # debug flag
-        "catalogfile" => 'catalog.yml',
-        "language" => 'ja', # XXX default language should be JA??
-        "mathml" => nil, # for HTML
-        "htmlext" => "html",
-        "htmlversion" => 5,
-        "imagedir" => "images",
-        "image_ext" => %w(png gif jpg jpeg svg ttf woff otf),
-        "fontdir" => "fonts",
-
-        "chapter_file" => 'CHAPS',
-        "part_file" => 'PART',
-        "reject_file" => 'REJECT',
-        "predef_file" => 'PREDEF',
-        "postdef_file" => 'POSTDEF',
-        "page_metric" => ReVIEW::Book::PageMetric::A5,
-        "ext" => '.re',
-        "image_dir" => 'images',
-        "image_types" => %w(.ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg),
-        "image_scale2width" => true, # for LaTeX
-        "bib_file" => "bib.re",
-        "colophon_order" => %w(aut csl trl dsr ill cov edt pbl contact prt),
-        "externallink" => true,
-        "tableopt" => nil,      # for IDGXML
-        "listinfo" => nil,      # for IDGXML
-        "nolf" => true,         # for IDGXML
-        "chapref" => nil,       # for IDGXML
-        "structuredxml" => nil, # for IDGXML
-        "pt_to_mm_unit" => 0.3528, # for IDGXML (DTP: 1pt = 0.3528mm, JIS: 1pt = 0.3514mm)
+        'bookname' => 'example', # it defines epub file name also
+        'booktitle' => 'Re:VIEW Sample Book',
+        'title' => nil,
+        'aut' => nil, # author
+        'prt' => nil, # printer(publisher)
+        'asn' => nil, # associated name
+        'ant' => nil, # bibliographic antecedent
+        'clb' => nil, # Collaborator
+        'edt' => nil, # Editor
+        'dsr' => nil, # Designer
+        'ill' => nil, # Illustrator
+        'pht' => nil, # Photographer
+        'trl' => nil, # Translator
+        'date' => Time.now.strftime('%Y-%m-%d'), # publishing date
+        'rights' => nil, # Copyright messages
+        'description' => nil, # Description
+        'urnid' => "urn:uid:#{SecureRandom.uuid}", # Identifier
+        'stylesheet' => 'stylesheet.css', # stylesheet file
+        'coverfile' => nil, # content file of body of cover page
+        'mytoc' => nil, # whether make own table of contents or not
+        'params' => '', # specify review2html parameters
+        'toclevel' => 3, # level of toc
+        'secnolevel' => 2, # level of section #
+        'epubversion' => 3,
+        'titlepage' => true, # Use title page
+        'toc' => nil, # Use table of contents in body
+        'colophon' => nil, # Use colophon
+        'debug' => nil, # debug flag
+        'catalogfile' => 'catalog.yml',
+        'language' => 'ja', # XXX default language should be JA??
+        'mathml' => nil, # for HTML
+        'imgmath' => nil, # for HTML
+        'htmlext' => 'html',
+        'htmlversion' => 5,
+        'imagedir' => 'images',
+        'image_ext' => %w[png gif jpg jpeg svg ttf woff otf],
+        'fontdir' => 'fonts',
+        'chapter_file' => 'CHAPS',
+        'part_file' => 'PART',
+        'reject_file' => 'REJECT',
+        'predef_file' => 'PREDEF',
+        'postdef_file' => 'POSTDEF',
+        'page_metric' => ReVIEW::Book::PageMetric::A5,
+        'ext' => '.re',
+        'image_dir' => 'images',
+        'image_types' => %w[.ai .psd .eps .pdf .tif .tiff .png .bmp .jpg .jpeg .gif .svg],
+        'image_scale2width' => true, # for LaTeX
+        'bib_file' => 'bib.re',
+        'colophon_order' => %w[aut csl trl dsr ill cov edt pbl contact prt],
+        'externallink' => true,
+        'tableopt' => nil,      # for IDGXML
+        'listinfo' => nil,      # for IDGXML
+        'nolf' => true,         # for IDGXML
+        'chapref' => nil,       # for IDGXML
+        'structuredxml' => nil, # for IDGXML
+        'pt_to_mm_unit' => 0.3528, # for IDGXML (DTP: 1pt = 0.3528mm, JIS: 1pt = 0.3514mm)
 
-        "footnotetext" => nil, # for LaTeX
-        "texcommand" => "uplatex", # for LaTeX
-        "texdocumentclass" => ["jsbook", "uplatex,oneside"], # for LaTeX
-        "dvicommand" => "dvipdfmx", # for LaTeX
-        "dvioptions" => "-d 5", # for LaTeX
+        'footnotetext' => nil, # for LaTeX
+        'texcommand' => 'uplatex', # for LaTeX
+        'texdocumentclass' => ['jsbook', 'uplatex,oneside'], # for LaTeX
+        'dvicommand' => 'dvipdfmx', # for LaTeX
+        'dvioptions' => '-d 5', # for LaTeX
 
-        "pdfmaker" => {
-          "makeindex" => nil, # Make index page
-          "makeindex_command" => "mendex", # works only when makeindex is true
-          "makeindex_options" => "-f -r -I utf8",
-          "makeindex_sty" => nil,
-          "makeindex_dic" => nil,
-          "makeindex_mecab" => true,
-          "makeindex_mecab_opts" => "-Oyomi",
-        },
+        'pdfmaker' => {
+          'makeindex' => nil, # Make index page
+          'makeindex_command' => 'mendex', # works only when makeindex is true
+          'makeindex_options' => '-f -r -I utf8',
+          'makeindex_sty' => nil,
+          'makeindex_dic' => nil,
+          'makeindex_mecab' => true,
+          'makeindex_mecab_opts' => '-Oyomi'
+        }
       ]
       conf.maker = nil
       conf
@@ -88,49 +86,41 @@ module ReVIEW
 
     def [](key)
       maker = self.maker
-      if maker && self.key?(maker) && self.fetch(maker) && self.fetch(maker).key?(key)
-        return self.fetch(maker).fetch(key, nil)
-      end
-      if self.key?(key)
-        return self.fetch(key)
-      end
+      return self.fetch(maker).fetch(key, nil) if maker && self.key?(maker) && self.fetch(maker) && self.fetch(maker).key?(key)
+      return self.fetch(key) if self.key?(key)
+      nil
     end
 
     def check_version(version)
-      unless self.key?("review_version")
-        raise ReVIEW::ConfigError, "configuration file has no review_version property."
-      end
+      raise ReVIEW::ConfigError, 'configuration file has no review_version property.' unless self.key?('review_version')
 
-      if self["review_version"].blank?
-        # do nothing
-      elsif self["review_version"].to_i != version.to_i ## major version
-        raise ReVIEW::ConfigError, "major version of configuration file is different."
-      elsif self["review_version"].to_f > version.to_f ## minor version
-        raise ReVIEW::ConfigError, "Re:VIEW version '#{version}' is older than configuration file's version '#{self["review_version"]}'."
-      end
+      return true if self['review_version'].blank?
+
+      raise ReVIEW::ConfigError, 'major version of configuration file is different.' if self['review_version'].to_i != version.to_i ## major version
+      raise ReVIEW::ConfigError, "Re:VIEW version '#{version}' is older than configuration file's version '#{self['review_version']}'." if self['review_version'].to_f > version.to_f ## minor version
     end
 
     def name_of(key)
-      if self[key].kind_of?(Array)
-        self[key].join(",") # i18n?
-      elsif self[key].kind_of?(Hash)
-        self[key]["name"]
+      if self[key].is_a?(Array)
+        self[key].join(',') # i18n?
+      elsif self[key].is_a?(Hash)
+        self[key]['name']
       else
         self[key]
       end
     end
 
     def names_of(key)
-      if self[key].kind_of?(Array)
+      if self[key].is_a?(Array)
         self[key].map do |a|
-          if a.kind_of?(Hash)
-            a["name"]
+          if a.is_a?(Hash)
+            a['name']
           else
             a
           end
         end
-      elsif self[key].kind_of?(Hash)
-        [self[key]["name"]]
+      elsif self[key].is_a?(Hash)
+        [self[key]['name']]
       else
         [self[key]]
       end