review 1.2.0 → 1.3.0

data/lib/review/tocparser.rb

@@ -119,14 +119,14 @@ module ReVIEW
       def add_child(c)
         @children.push c
       end
-      
+
       def each_node(&block)
         @children.each do |c|
           yield c
           c.each(&block)
         end
       end
-      
+
       def each_child(&block)
         @children.each(&block)
       end

data/lib/review/tocprinter.rb

@@ -25,7 +25,7 @@ module ReVIEW
 
     def initialize(print_upper, param)
       @print_upper = print_upper
-      @param = param
+      @config = param
     end
 
     def print?(level)
@@ -35,22 +35,22 @@ module ReVIEW
     def nkffilter(line)
       inc = ""
       outc = "-w"
-      if @param["inencoding"] =~ /^EUC$/
+      if @config["inencoding"] =~ /^EUC$/
         inc = "-E"
-      elsif @param["inencoding"] =~ /^SJIS$/
+      elsif @config["inencoding"] =~ /^SJIS$/
         inc = "-S"
-      elsif @param["inencoding"]  =~ /^JIS$/
+      elsif @config["inencoding"]  =~ /^JIS$/
         inc = "-J"
       end
-      
-      if @param["outencoding"] =~ /^EUC$/
+
+      if @config["outencoding"] =~ /^EUC$/
         outc = "-e"
-      elsif @param["outencoding"] =~ /^SJIS$/
+      elsif @config["outencoding"] =~ /^SJIS$/
         outc = "-s"
-      elsif @param["outencoding"]  =~ /^JIS$/
+      elsif @config["outencoding"]  =~ /^JIS$/
         outc = "-j"
       end
-      
+
       NKF.nkf("#{inc} #{outc}", line)
     end
   end
@@ -126,9 +126,9 @@ module ReVIEW
           end
         end
       end
-      puts HTMLLayout.new({ :body => html,
-                            :title => "目次",
-                            :template => File.join(book.basedir, "layouts", "layout.erb")}).result
+      puts HTMLLayout.new(
+        {'body' => html, 'title' => "目次"},
+        File.join(book.basedir, "layouts", "layout.erb")).result
     end
 
     private

data/lib/review/topbuilder.rb

@@ -171,7 +171,7 @@ module ReVIEW
       else
         raise "caption level too deep or unsupported: #{level}"
       end
-      prefix = "" if (level.to_i > ReVIEW.book.param["secnolevel"])
+      prefix = "" if (level.to_i > @book.config["secnolevel"])
       puts "■H#{level}■#{prefix}#{compile_inline(caption)}"
     end
 
@@ -230,7 +230,7 @@ module ReVIEW
       blank
     end
 
-    alias :lead read
+    alias_method :lead, :read
 
     def inline_list(id)
       chapter, id = extract_chapter_id(id)
@@ -381,7 +381,7 @@ module ReVIEW
     def td(str)
       str
     end
-    
+
     def table_end
       puts "◆→終了:#{@titles["table"]}←◆"
       blank
@@ -461,7 +461,7 @@ module ReVIEW
       "★#{str}☆"
     end
 
-    alias :inline_strong inline_b
+    alias_method :inline_strong, :inline_b
 
     def inline_tt(str)
       "△#{str}☆"
@@ -471,7 +471,7 @@ module ReVIEW
       "★#{str}☆◆→等幅フォント太字←◆"
     end
 
-    alias :inline_ttbold inline_ttb
+    alias_method :inline_ttbold, :inline_ttb
 
     def inline_tti(str)
       "▲#{str}☆◆→等幅フォントイタ←◆"
@@ -523,12 +523,12 @@ module ReVIEW
 
     def common_column_begin(type, caption)
       blank
-      puts "◆→開始:#{@titles["type"]}←◆"
+      puts "◆→開始:#{@titles[type]}←◆"
       puts %Q[■#{compile_inline(caption)}]
     end
 
     def common_column_end(type)
-      puts %Q[◆→終了:#{@titles["type"]}←◆]
+      puts %Q[◆→終了:#{@titles[type]}←◆]
       blank
     end
 
@@ -676,7 +676,7 @@ module ReVIEW
       base_block "insn", lines, caption
     end
 
-    alias :box insn
+    alias_method :box, :insn
 
     def indepimage(id, caption=nil, metric=nil)
       blank
@@ -690,7 +690,7 @@ module ReVIEW
       blank
     end
 
-    alias :numberlessimage indepimage
+    alias_method :numberlessimage, :indepimage
 
     def label(id)
       # FIXME
@@ -727,11 +727,11 @@ module ReVIEW
     def inline_br(str)
       %Q(\n)
     end
-    
+
     def text(str)
       str
     end
-    
+
     def inline_chap(id)
       #"「第#{super}章　#{inline_title(id)}」"
       # "第#{super}章"
@@ -740,9 +740,9 @@ module ReVIEW
 
     def inline_chapref(id)
       chs = ["", "「", "」"]
-      unless ReVIEW.book.param["chapref"].nil?
-        _chs = convert_inencoding(ReVIEW.book.param["chapref"],
-                                  ReVIEW.book.param["inencoding"]).split(",")
+      unless @book.config["chapref"].nil?
+        _chs = convert_inencoding(@book.config["chapref"],
+                                  @book.config["inencoding"]).split(",")
         if _chs.size != 3
           error "--chapsplitter must have exactly 3 parameters with comma."
         else
@@ -768,7 +768,7 @@ module ReVIEW
       %Q(「◆→#{idref}←◆」) # 節、項を参照
     end
 
-    alias inline_ref inline_labelref
+    alias_method :inline_ref, :inline_labelref
 
     def inline_pageref(idref)
       %Q(●ページ◆→#{idref}←◆) # ページ番号を参照

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/uuid.rb

@@ -245,8 +245,8 @@ class UUID
 		m = unpack[5].unpack 'C*'
 		'%02x%02x%02x%02x%02x%02x' % m
 	end
-	alias mac_address node
-	alias ieee802 node
+	alias_method :mac_address, :node
+	alias_method :ieee802, :node
 
 	# Generate the string representation (a.k.a GUID) of this UUID
 	def to_s
@@ -254,21 +254,21 @@ class UUID
 		a[-1] = mac_address
 		"%08x-%04x-%04x-%02x%02x-%s" % a
 	end
-	alias guid to_s
+	alias_method :guid, :to_s
 
 	# Convert into a RFC4122-comforming URN representation
 	def to_uri
 		"urn:uuid:" + self.to_s
 	end
-	alias urn to_uri
-	alias inspect to_uri
+	alias_method :urn, :to_uri
+	alias_method :inspect, :to_uri
 
 	# Convert into 128-bit unsigned integer
 	# Typically a Bignum instance, but can be a Fixnum.
 	def to_int
 		@num
 	end
-	alias to_i to_int
+	alias_method :to_i, :to_int
 
 	# Two  UUIDs  are  said  to  be  equal if  and  only  if  their  (byte-order
 	# canonicalized) integer representations are equivallent.  Refer RFC4122 for
@@ -276,7 +276,7 @@ class UUID
 	def == other
 		to_i == other.to_i
 	end
-	alias eql? ==
+	alias_method :eql?, :==
 
 	# Two identical UUIDs should have same hash
 	def hash

data/review.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary     = "Re:VIEW: a easy-to-use digital publishing system"
   gem.description = "Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX."
   gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2014-04-02"
+  gem.date = "2014-06-29"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   ]
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("rake", ["0.8.7"])
+  gem.add_development_dependency("rake")
 end
 

data/rubocop-todo.yml

@@ -0,0 +1,443 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-03-27 13:46:06 +0900 using RuboCop version 0.19.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+AccessModifierIndentation:
+  Enabled: false
+
+# Offense count: 1
+AccessorMethodName:
+  Enabled: false
+
+# Offense count: 29
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+AlignParameters:
+  Enabled: false
+
+# Offense count: 2
+AmbiguousOperator:
+  Enabled: false
+
+# Offense count: 30
+# Cop supports --auto-correct.
+AndOr:
+  Enabled: false
+
+# Offense count: 22
+AsciiComments:
+  Enabled: false
+
+# Offense count: 34
+# Configuration parameters: AllowSafeAssignment.
+AssignmentInCondition:
+  Enabled: false
+
+# Offense count: 1
+BlockAlignment:
+  Enabled: false
+
+# Offense count: 1
+BlockComments:
+  Enabled: false
+
+# Offense count: 10
+BlockNesting:
+  Max: 4
+
+# Offense count: 114
+# Cop supports --auto-correct.
+Blocks:
+  Enabled: false
+
+# Offense count: 31
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 4
+CaseEquality:
+  Enabled: false
+
+# Offense count: 1
+ClassAndModuleCamelCase:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 28
+# Configuration parameters: CountComments.
+ClassLength:
+  Max: 1003
+
+# Offense count: 35
+ClassMethods:
+  Enabled: false
+
+# Offense count: 2
+ClassVars:
+  Enabled: false
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredMethods.
+CollectionMethods:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+ColonMethodCall:
+  Enabled: false
+
+# Offense count: 11
+# Configuration parameters: Keywords.
+CommentAnnotation:
+  Enabled: false
+
+# Offense count: 1
+ConstantName:
+  Enabled: false
+
+# Offense count: 52
+CyclomaticComplexity:
+  Max: 64
+
+# Offense count: 98
+Documentation:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAdjacentOneLineDefs.
+EmptyLineBetweenDefs:
+  Enabled: false
+
+# Offense count: 32
+# Cop supports --auto-correct.
+EmptyLines:
+  Enabled: false
+
+# Offense count: 3
+EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+# Offense count: 101
+# Cop supports --auto-correct.
+EmptyLinesAroundBody:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+EmptyLiteral:
+  Enabled: false
+
+# Offense count: 1
+Eval:
+  Enabled: false
+
+# Offense count: 4
+FavorUnlessOverNegatedIf:
+  Enabled: false
+
+# Offense count: 11
+# Configuration parameters: Exclude.
+FileName:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+For:
+  Enabled: false
+
+# Offense count: 22
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+FormatString:
+  Enabled: false
+
+# Offense count: 13
+# Configuration parameters: AllowedVariables.
+GlobalVars:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+HashMethods:
+  Enabled: false
+
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# Offense count: 34
+# Configuration parameters: MaxLineLength.
+IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+IndentArray:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+IndentHash:
+  Enabled: false
+
+# Offense count: 36
+# Cop supports --auto-correct.
+IndentationConsistency:
+  Enabled: false
+
+# Offense count: 59
+# Cop supports --auto-correct.
+IndentationWidth:
+  Enabled: false
+
+# Offense count: 19
+# Cop supports --auto-correct.
+LeadingCommentSpace:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+LineEndConcatenation:
+  Enabled: false
+
+# Offense count: 696
+LineLength:
+  Max: 739
+
+# Offense count: 109
+# Cop supports --auto-correct.
+MethodCallParentheses:
+  Enabled: false
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+MethodDefParentheses:
+  Enabled: false
+
+# Offense count: 226
+# Configuration parameters: CountComments.
+MethodLength:
+  Max: 426
+
+# Offense count: 17
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+MethodName:
+  Enabled: false
+
+# Offense count: 1
+MultilineIfThen:
+  Enabled: false
+
+# Offense count: 6
+Not:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+NumericLiterals:
+  MinDigits: 7
+
+# Offense count: 1
+OpMethod:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+ParameterLists:
+  Max: 6
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowSafeAssignment.
+ParenthesesAroundCondition:
+  Enabled: false
+
+# Offense count: 2
+ParenthesesAsGroupedExpression:
+  Enabled: false
+
+# Offense count: 473
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 36
+# Cop supports --auto-correct.
+PerlBackrefs:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: NamePrefixBlacklist.
+PredicateName:
+  Enabled: false
+
+# Offense count: 4
+RedundantBegin:
+  Enabled: false
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+RedundantReturn:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+RedundantSelf:
+  Enabled: false
+
+# Offense count: 18
+# Configuration parameters: MaxSlashes.
+RegexpLiteral:
+  Enabled: false
+
+# Offense count: 8
+SelfAssignment:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Semicolon:
+  Enabled: false
+
+# Offense count: 2
+ShadowingOuterLocalVariable:
+  Enabled: false
+
+# Offense count: 40
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+SignalException:
+  Enabled: false
+
+# Offense count: 5
+# Configuration parameters: Methods.
+SingleLineBlockParams:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowIfMethodIsEmpty.
+SingleLineMethods:
+  Enabled: false
+
+# Offense count: 230
+# Cop supports --auto-correct.
+SpaceAfterComma:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+SpaceAfterNot:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+SpaceAfterSemicolon:
+  Enabled: false
+
+# Offense count: 36
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+# Offense count: 152
+# Cop supports --auto-correct.
+SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 55
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 232
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 75
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+SpaceInsideParens:
+  Enabled: false
+
+# Offense count: 13
+# Cop supports --auto-correct.
+SpecialGlobalVars:
+  Enabled: false
+
+# Offense count: 2407
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+StringLiterals:
+  Enabled: false
+
+# Offense count: 348
+Tab:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+TrailingBlankLines:
+  Enabled: false
+
+# Offense count: 34
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+TrailingComma:
+  Enabled: false
+
+# Offense count: 8
+# Configuration parameters: ExactNameMatch, AllowPredicates, Whitelist.
+TrivialAccessors:
+  Enabled: false
+
+# Offense count: 3
+UnlessElse:
+  Enabled: false
+
+# Offense count: 18
+UselessAssignment:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+VariableName:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: MaxLineLength.
+WhileUntilModifier:
+  Enabled: false
+
+# Offense count: 31
+# Cop supports --auto-correct.
+WordArray:
+  MinSize: 7