review 2.3.0 → 2.4.0

data/test/test_book_chapter.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'book_test_helper'
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
@@ -8,7 +7,7 @@ class ChapterTest < Test::Unit::TestCase
     assert_equal :book, ch.book
     assert_equal :number, ch.number
     assert_equal '/foo/bar', ch.path
-    assert_equal "#<ReVIEW::Book::Chapter number /foo/bar>", ch.inspect
+    assert_equal '#<ReVIEW::Book::Chapter number /foo/bar>', ch.inspect
   end
 
   def test_dirname_and_basename
@@ -39,7 +38,7 @@ class ChapterTest < Test::Unit::TestCase
   def test_open
     ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
     assert_equal :io, ch.open
-    assert_equal [:io], (ch.open {|io| [io] })
+    assert_equal [:io], (ch.open { |io| [io] })
   end
 
   def test_size
@@ -64,22 +63,22 @@ class ChapterTest < Test::Unit::TestCase
   end
 
   def test_lines
-    lines = ["1\n", "2\n", "3"]
+    lines = ["1\n", "2\n", '3']
     tf = Tempfile.new('chapter_test')
-    tf.print lines.join('')
+    tf.print lines.join
     tf.close
 
     book = Book::Base.new(nil)
     ch = Book::Chapter.new(book, nil, nil, tf.path)
     assert_equal lines, ch.lines
 
-    lines = ["1\n", "2\n", "3"]
+    lines = ["1\n", "2\n", '3']
     tf1 = Tempfile.new('chapter_test1')
-    tf1.print lines.join('')
+    tf1.print lines.join
     tf1.close
     tf2 = Tempfile.new('chapter_test2')
-    tf2.puts lines.join('')
-    tf2.puts lines.join('')
+    tf2.puts lines.join
+    tf2.puts lines.join
     tf2.close
 
     ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2.path)
@@ -107,14 +106,14 @@ class ChapterTest < Test::Unit::TestCase
     assert_equal content.gsub(/\s/, '').size, ch.volume.bytes # XXX: OK?
   end
 
-  def test_on_CHAPS?
+  def test_on_chaps?
     mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2.re",
                  'chapter1.re' => '12345', 'preface.re' => 'abcde' do |dir, book, files|
       ch1 = Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re'])
       pre = Book::Chapter.new(book, nil, 'preface', files['preface.re'])
 
-      assert ch1.on_CHAPS?
-      assert !pre.on_CHAPS?
+      assert ch1.on_chaps?
+      assert !pre.on_chaps?
 
       ch2_path = File.join(dir, 'chapter2.er')
       File.open(ch2_path, 'w') {}
@@ -124,8 +123,8 @@ class ChapterTest < Test::Unit::TestCase
       File.open(ch3_path, 'w') {}
       ch3 = Book::Chapter.new(book, 3, 'chapter3', ch3_path)
 
-      assert ch2.on_CHAPS?
-      assert !ch3.on_CHAPS?
+      assert ch2.on_chaps?
+      assert !ch3.on_chaps?
     end
   end
 
@@ -166,7 +165,7 @@ E
   end
 
   def test_bibpaper
-    do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, :filename => 'bib.re')
+    do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib.re')
 //bibpaper
 //bibpaper [abc][text...]
 //bibpaper [def][text...]
@@ -175,12 +174,12 @@ E
 //list [others]
 E
     assert_raises FileNotFound do
-      do_test_index('', Book::BibpaperIndex, :bibpaper_index, :bibpaper, :filename => 'bib')
+      do_test_index('', Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib')
     end
   end
 
   def test_headline_index
-    do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, :propagate => false)
+    do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, propagate: false)
 ==
 == abc
 == def
@@ -190,7 +189,7 @@ E
   end
 
   def test_headline_index_nullsection
-    do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, :propagate => false)
+    do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, propagate: false)
 == abc
 ==== dummy
 == def
@@ -198,7 +197,7 @@ E
   end
 
   def test_column_index
-    do_test_index(<<E, Book::ColumnIndex, :column_index, :column, :propagate => false)
+    do_test_index(<<E, Book::ColumnIndex, :column_index, :column, propagate: false)
 = dummy1
 ===[column]{abc} aaaa
 = dummy2
@@ -216,7 +215,7 @@ E
 //list [others]
 E
 
-    do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, :propagate => false)
+    do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
 //numberlessimage
 //numberlessimage [abc]
 //numberlessimage [def]
@@ -232,7 +231,7 @@ E
 //list [others]
 E
 
-    do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, :propagate => false)
+    do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
 //image
 //numberlessimage [abc]
 //image [def]
@@ -241,7 +240,7 @@ E
 E
   end
 
-  def do_test_index(content, klass, list_method, ref_method, opts = {})
+  def do_test_index(content, _klass, _list_method, ref_method, opts = {})
     Dir.mktmpdir do |dir|
       path = File.join(dir, opts[:filename] || 'chapter.re')
 

data/test/test_book_part.rb

@@ -18,9 +18,7 @@ class PartTest < Test::Unit::TestCase
     part = Book::Part.new(nil, nil, [1, 2, 3])
 
     tmp = []
-    part.each_chapter do |ch|
-      tmp << ch
-    end
+    part.each_chapter { |ch| tmp << ch }
     assert_equal [1, 2, 3], tmp
   end
 
@@ -35,12 +33,12 @@ class PartTest < Test::Unit::TestCase
     chs = []
     tfs = [] ## prevent from removing Tempfile
     Tempfile.open('part_test') do |o|
-      o.print "12345"
+      o.print '12345'
       chs << Book::Chapter.new(book, nil, nil, o.path)
       tfs << o
     end
     Tempfile.open('part_test') do |o|
-      o.print "67890"
+      o.print '67890'
       chs << Book::Chapter.new(book, nil, nil, o.path)
       tfs << o
     end

data/test/test_builder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/builder'
 
@@ -47,46 +45,38 @@ class BuidlerTest < Test::Unit::TestCase
   def test_print_and_puts
     b = Builder.new
     assert_raises(NoMethodError) do # XXX: OK?
-      b.print ""
+      b.print ''
     end
     assert_raises(NoMethodError) do # XXX: OK?
-      b.puts ""
+      b.puts ''
     end
   end
 
   def test_not_implemented_methods
     ex = NoMethodError # XXX: OK?
-    [
-      :list_header, :list_body, :listnum_body,
-      :source_header, :source_body,
-      :image_image, :image_dummy,
-      :table_header, :table_begin, :tr, :th, :table_end,
-      :compile_ruby, :compile_kw, :compile_href,
-      :bibpaper_header, :bibpaper_bibpaper,
-      :inline_hd_chap,
-    ].each do |m|
+    %i[list_header list_body listnum_body source_header source_body image_image image_dummy table_header table_begin tr th table_end compile_ruby compile_kw compile_href bibpaper_header bibpaper_bibpaper inline_hd_chap].each do |m|
       b = Builder.new
       assert_raises(ex) { b.__send__(m) }
     end
   end
 
   def test_compile_inline
-    text = "abc"
+    text = 'abc'
     assert_equal [:text, text], @b.compile_inline(text)
   end
 
   def test_inline_ruby
-    def @b.compile_ruby(base,ruby)
-      [base,ruby]
+    def @b.compile_ruby(base, ruby)
+      [base, ruby]
     end
-    str = @b.inline_ruby("foo,bar")
-    assert_equal str, ["foo","bar"]
-    str = @b.inline_ruby("foo\\,\\,,\\,bar,buz")
-    assert_equal str, ["foo,,",",bar,buz"]
+    str = @b.inline_ruby('foo,bar')
+    assert_equal str, ['foo', 'bar']
+    str = @b.inline_ruby('foo\\,\\,,\\,bar,buz')
+    assert_equal str, ['foo,,', ',bar,buz']
   end
 
   def test_compile_inline_backslash
-    text = "abc\\d\\#a"
+    text = 'abc\\d\\#a'
     assert_equal [:text, text], @b.compile_inline(text)
   end
 
@@ -107,4 +97,3 @@ class BuidlerTest < Test::Unit::TestCase
     end
   end
 end
-

data/test/test_catalog.rb

@@ -6,7 +6,7 @@ class CatalogTest < Test::Unit::TestCase
 
   def test_predef
     sut = Catalog.new(yaml)
-    exp =<<-EOS
+    exp = <<-EOS
 pre01.re
 pre02.re
     EOS
@@ -15,7 +15,7 @@ pre02.re
 
   def test_chaps
     sut = Catalog.new(yaml)
-    exp =<<-EOS
+    exp = <<-EOS
 ch01.re
 ch02.re
     EOS
@@ -25,12 +25,12 @@ ch02.re
   def test_chaps_empty
     yaml = StringIO.new
     sut = Catalog.new(yaml)
-    assert_equal("", sut.chaps)
+    assert_equal('', sut.chaps)
   end
 
   def test_appendix
     sut = Catalog.new(yaml)
-    exp =<<-EOS
+    exp = <<-EOS
 post01.re
 post02.re
     EOS
@@ -39,7 +39,7 @@ post02.re
 
   def test_chaps_with_parts
     sut = Catalog.new(yaml_with_parts)
-    exp =<<-EOS
+    exp = <<-EOS
 ch01.re
 ch02.re
 ch03.re
@@ -51,7 +51,7 @@ ch05.re
 
   def test_parts
     sut = Catalog.new(yaml_with_parts)
-    exp =<<-EOS
+    exp = <<-EOS
 part1.re
 part2.re
     EOS
@@ -60,21 +60,21 @@ part2.re
 
   def test_parts_with_empty
     sut = Catalog.new(yaml)
-    assert_equal("", sut.parts)
+    assert_equal('', sut.parts)
   end
 
   def test_parts2
     sut = Catalog.new(yaml_with_parts)
-    assert_equal(["ch01.re",
-                  {"part1.re" => ["ch02.re"]},
-                  "ch03.re",
-                  {"part2.re" => ["ch04.re", "ch05.re"]}],
+    assert_equal(['ch01.re',
+                  { 'part1.re' => ['ch02.re'] },
+                  'ch03.re',
+                  { 'part2.re' => ['ch04.re', 'ch05.re'] }],
                  sut.parts_with_chaps)
   end
 
   def test_postdef
     sut = Catalog.new(yaml)
-    exp =<<-EOS
+    exp = <<-EOS
 back01.re
 back02.re
     EOS
@@ -83,14 +83,13 @@ back02.re
 
   def test_from_object
     sut = Catalog.new(yaml_hash)
-    exp =<<-EOS
+    exp = <<-EOS
 ch01.re
 ch02.re
     EOS
     assert_equal(exp.chomp, sut.chaps)
   end
 
-
   private
 
   def yaml
@@ -115,10 +114,10 @@ POSTDEF:
   end
 
   def yaml_hash
-    {"PREDEF" => %w(pre01.re pre02.re),
-     "CHAPS" => %w(ch01.re ch02.re),
-     "APPENDIX" => %w(post01.re post02.re),
-     "POSTDEF" => %w(back01.re back02.re)}
+    { 'PREDEF' => %w[pre01.re pre02.re],
+      'CHAPS' => %w[ch01.re ch02.re],
+      'APPENDIX' => %w[post01.re post02.re],
+      'POSTDEF' => %w[back01.re back02.re] }
   end
 
   def yaml_with_parts

data/test/test_catalog_converter_cmd.rb

@@ -25,7 +25,7 @@ CHAPS:
   end
 
   def test_parse_chaps_empty
-    assert_equal "CHAPS:\n\n", parse_chaps("")
+    assert_equal "CHAPS:\n\n", parse_chaps('')
     assert_equal "CHAPS:\n\n", parse_chaps(nil)
   end
 
@@ -61,13 +61,13 @@ CHAPS:
   end
 
   def test_parse_parts_chaps_empty
-    assert_equal "CHAPS:\n\n", parse_parts("", "")
+    assert_equal "CHAPS:\n\n", parse_parts('', '')
     assert_equal "CHAPS:\n\n", parse_parts(nil, nil)
   end
 
   def test_parse_postdef
-    assert_equal "APPENDIX:\n\n", parse_postdef("", true)
-    assert_equal "POSTDEF:\n\n", parse_postdef("")
-    assert_equal "POSTDEF:\n\n", parse_postdef("", false)
+    assert_equal "APPENDIX:\n\n", parse_postdef('', true)
+    assert_equal "POSTDEF:\n\n", parse_postdef('')
+    assert_equal "POSTDEF:\n\n", parse_postdef('', false)
   end
 end

data/test/test_compiler.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
@@ -9,38 +7,42 @@ class CompilerTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
-    @builder = LATEXBuilder.new()
+    @builder = LATEXBuilder.new
     @c = Compiler.new(@builder)
   end
 
   def test_parse_args
-    args = @c.__send__(:parse_args, "[foo][bar]")
-    assert_equal ["foo","bar"], args
+    args = @c.__send__(:parse_args, '[foo][bar]')
+    assert_equal ['foo', 'bar'], args
   end
 
   def test_parse_args_with_brace1
-    args = @c.__send__(:parse_args, "[fo[\\][\\]o][bar]")
-    assert_equal ["fo[][]o","bar"], args
+    args = @c.__send__(:parse_args, '[fo[\\][\\]o][bar]')
+    assert_equal ['fo[][]o', 'bar'], args
   end
 
   def test_parse_args_with_brace2
-    args = @c.__send__(:parse_args, "[f\\]o\\]o][bar]")
-    assert_equal ["f]o]o","bar"], args
+    args = @c.__send__(:parse_args, '[f\\]o\\]o][bar]')
+    assert_equal ['f]o]o', 'bar'], args
   end
 
   def test_parse_args_with_backslash
-    args = @c.__send__(:parse_args, "[foo][bar\\buz]")
-    assert_equal ["foo","bar\\buz"], args
+    args = @c.__send__(:parse_args, '[foo][bar\\buz]')
+    assert_equal ['foo', 'bar\\buz'], args
   end
 
   def test_parse_args_with_backslash2
-    args = @c.__send__(:parse_args, "[foo][bar\\#\\[\\!]")
-    assert_equal ["foo","bar\\#\\[\\!"], args
+    args = @c.__send__(:parse_args, '[foo][bar\\#\\[\\!]')
+    assert_equal ['foo', 'bar\\#\\[\\!'], args
   end
 
   def test_parse_args_with_backslash3
-    args = @c.__send__(:parse_args, "[foo][bar\\\\buz]")
-    assert_equal ["foo","bar\\buz"], args
+    args = @c.__send__(:parse_args, '[foo][bar\\\\buz]')
+    assert_equal ['foo', 'bar\\buz'], args
   end
-end
 
+  def test_replace_fence
+    actual = @c.__send__(:replace_fence, '@<m>${}\\}|$, @<m>|{}\\}\\$|, @<m>|\\{\\a\\}|, @<tt>|}|, @<tt>|\\|, @<tt>|\\\\|, @<tt>|\\\\\\|')
+    assert_equal '@<m>{{\\}\\\\\\}|}, @<m>{{\\}\\\\\\}\\$}, @<m>{\\{\\a\\\\\\}}, @<tt>{\\}}, @<tt>{\\\\}, @<tt>{\\\\\\\\}, @<tt>{\\\\\\\\\\\\}', actual
+  end
+end

data/test/test_configure.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/epubmaker'
 
@@ -9,18 +7,18 @@ class ConfigureTest < Test::Unit::TestCase
   def setup
     @maker = ReVIEW::EPUBMaker.new
     @config = ReVIEW::Configure.values
-    @config.merge!({
-                     "bookname" => "sample",
-                     "title" => "Sample Book",
-                     "version" => 2,
-                     "urnid" => "http://example.jp/",
-                     "date" => "2011-01-01",
-                     "language" => "ja",
-                     "epubmaker" => {"flattocindent" => true,
-                                     "title" => "Sample Book(EPUB)"},
-                   })
+    @config.merge!(
+      'bookname' => 'sample',
+      'title' => 'Sample Book',
+      'version' => 2,
+      'urnid' => 'http://example.jp/',
+      'date' => '2011-01-01',
+      'language' => 'ja',
+      'epubmaker' => { 'flattocindent' => true,
+                       'title' => 'Sample Book(EPUB)' }
+    )
     @output = StringIO.new
-    I18n.setup(@config["language"])
+    I18n.setup(@config['language'])
   end
 
   def test_configure_class
@@ -28,67 +26,66 @@ class ConfigureTest < Test::Unit::TestCase
   end
 
   def test_configure_get
-    bookname = @config["bookname"]
-    assert_equal "sample", bookname
+    bookname = @config['bookname']
+    assert_equal 'sample', bookname
   end
 
   def test_configure_get2
-    assert_equal true, @config["epubmaker"]["flattocindent"]
+    assert_equal true, @config['epubmaker']['flattocindent']
   end
 
   def test_configure_with_maker
-    @config.maker = "epubmaker"
-    assert_equal true, @config["flattocindent"]
-    assert_equal true, @config["epubmaker"]["flattocindent"]
+    @config.maker = 'epubmaker'
+    assert_equal true, @config['flattocindent']
+    assert_equal true, @config['epubmaker']['flattocindent']
   end
 
   def test_configure_with_maker_override
-    @config.maker = "epubmaker"
-    assert_equal "Sample Book(EPUB)", @config["title"]
-    @config.maker = "pdfmaker"
-    assert_equal "Sample Book", @config["title"]
+    @config.maker = 'epubmaker'
+    assert_equal 'Sample Book(EPUB)', @config['title']
+    @config.maker = 'pdfmaker'
+    assert_equal 'Sample Book', @config['title']
   end
 
   def test_configure_with_invalidmaker
-    @config.maker = "pdfmaker"
-    assert_equal nil, @config["flattocindent"]
-    assert_equal true, @config["epubmaker"]["flattocindent"]
+    @config.maker = 'pdfmaker'
+    assert_equal nil, @config['flattocindent']
+    assert_equal true, @config['epubmaker']['flattocindent']
   end
 
   def test_check_version_nosetting
-    @config.delete("review_version")
+    @config.delete('review_version')
     assert_raise ReVIEW::ConfigError do
-      @config.check_version("2.0.0")
+      @config.check_version('2.0.0')
     end
   end
 
   def test_check_version_noversion
-    @config["review_version"] = nil
+    @config['review_version'] = nil
     assert_nothing_raised ReVIEW::ConfigError do
-      @config.check_version("2.0.0")
+      @config.check_version('2.0.0')
     end
   end
 
   def test_check_version
-    @config["review_version"] = "2.1"
+    @config['review_version'] = '2.1'
     assert_nothing_raised do
-      @config.check_version("2.1.0")
+      @config.check_version('2.1.0')
     end
     assert_nothing_raised do
-      @config.check_version("2.2.0")
+      @config.check_version('2.2.0')
     end
     assert_nothing_raised do
-      @config.check_version("2.2.5")
+      @config.check_version('2.2.5')
     end
     assert_raise ReVIEW::ConfigError do
-      @config.check_version("2.0.0")
+      @config.check_version('2.0.0')
     end
     assert_raise ReVIEW::ConfigError do
-      @config.check_version("3.0.0")
+      @config.check_version('3.0.0')
     end
     assert_raise ReVIEW::ConfigError do
-      @config.check_version("1.8.0")
+      @config.check_version('1.8.0')
     end
   end
-
 end