review 2.3.0 → 2.4.0

data/test/test_pdfmaker_cmd.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'tmpdir'
 require 'fileutils'
@@ -24,7 +22,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
       config = prepare_samplebook(@tmpdir1)
-      builddir = @tmpdir1 + "/" + config['bookname'] + '-pdf'
+      builddir = @tmpdir1 + '/' + config['bookname'] + '-pdf'
       assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])

data/test/test_review_ext.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'book_test_helper'
 require 'review/compiler'
@@ -22,11 +20,11 @@ end
 
     ReVIEW::Book::Base.clear_rubyenv ## to load review-ext.rb
     mktmpbookdir('CHAPS' => "ch01.re\n",
-                 "ch01.re" => "= test\n\ntest.\n",
-                 "review-ext.rb" => review_ext) do |dir, book, files|
+                 'ch01.re' => "= test\n\ntest.\n",
+                 'review-ext.rb' => review_ext) do |_dir, _book, _files|
       builder = ReVIEW::HTMLBuilder.new(false)
       ReVIEW::Compiler.new(builder)
-      assert_equal "test", builder.builder_init_test
+      assert_equal 'test', builder.builder_init_test
     end
   end
 end

data/test/test_rstbuilder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
@@ -10,12 +8,10 @@ class RSTBuidlerTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
-    @builder = RSTBuilder.new()
+    @builder = RSTBuilder.new
     @config = ReVIEW::Configure.values
-    @config.merge!({
-                     "secnolevel" => 2,
-                     "language" => "ja",
-                   })
+    @config['secnolevel'] = 2
+    @config['language'] = 'ja'
     @book = Book::Base.new(nil)
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -29,182 +25,182 @@ class RSTBuidlerTest < Test::Unit::TestCase
         puts msg
       end
     end
-    I18n.setup(@config["language"])
+    I18n.setup(@config['language'])
   end
 
   def test_headline_level1
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|.. _test:\n\n==========================\nthis is test.\n==========================\n\n|, actual
+    assert_equal %Q(.. _test:\n\n==========================\nthis is test.\n==========================\n\n), actual
   end
 
   def test_headline_level1_without_secno
-    @config["secnolevel"] = 0
+    @config['secnolevel'] = 0
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|.. _test:\n\n==========================\nthis is test.\n==========================\n\n|, actual
+    assert_equal %Q(.. _test:\n\n==========================\nthis is test.\n==========================\n\n), actual
   end
 
   def test_headline_level2
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|.. _test:\n\nthis is test.\n==========================\n\n|, actual
+    assert_equal %Q(.. _test:\n\nthis is test.\n==========================\n\n), actual
   end
 
   def test_headline_level3
     actual = compile_block("==={test} this is test.\n")
-    assert_equal %Q|.. _test:\n\nthis is test.\n--------------------------\n\n|, actual
+    assert_equal %Q(.. _test:\n\nthis is test.\n--------------------------\n\n), actual
   end
 
   def test_headline_level3_with_secno
-    @config["secnolevel"] = 3
+    @config['secnolevel'] = 3
     actual = compile_block("==={test} this is test.\n")
-    assert_equal %Q|.. _test:\n\nthis is test.\n--------------------------\n\n|, actual
+    assert_equal %Q(.. _test:\n\nthis is test.\n--------------------------\n\n), actual
   end
 
   def test_href
-    actual = compile_inline("@<href>{http://github.com, GitHub}")
-    assert_equal %Q| `GitHub <http://github.com>`_ |, actual
+    actual = compile_inline('@<href>{http://github.com, GitHub}')
+    assert_equal %Q( `GitHub <http://github.com>`_ ), actual
   end
 
   def test_href_without_label
-    actual = compile_inline("@<href>{http://github.com}")
-    assert_equal %Q| `http://github.com <http://github.com>`_ |, actual
+    actual = compile_inline('@<href>{http://github.com}')
+    assert_equal ' `http://github.com <http://github.com>`_ ', actual
   end
 
   def test_inline_raw
-    actual = compile_inline("@<raw>{@<tt>{inline\}}")
-    assert_equal %Q|@<tt>{inline}|, actual
+    actual = compile_inline('@<raw>{@<tt>{inline\}}')
+    assert_equal '@<tt>{inline}', actual
   end
 
   def test_inline_ruby
-    actual = compile_inline("@<ruby>{coffin,bed}")
-    assert_equal %Q| :ruby:`coffin`<bed>`_ |, actual
+    actual = compile_inline('@<ruby>{coffin,bed}')
+    assert_equal ' :ruby:`coffin`<bed>`_ ', actual
   end
 
   def test_inline_kw
-    actual = compile_inline("@<kw>{ISO, International Organization for Standardization } @<kw>{Ruby<>}")
-    assert_equal %Q| **ISO（International Organization for Standardization）**   **Ruby<>** |, actual
+    actual = compile_inline('@<kw>{ISO, International Organization for Standardization } @<kw>{Ruby<>}')
+    assert_equal ' **ISO（International Organization for Standardization）**   **Ruby<>** ', actual
   end
 
   def test_inline_maru
-    actual = compile_inline("@<maru>{1}@<maru>{20}@<maru>{A}@<maru>{z}")
-    assert_equal %Q| :maru:`1`  :maru:`20`  :maru:`A`  :maru:`z` |, actual
+    actual = compile_inline('@<maru>{1}@<maru>{20}@<maru>{A}@<maru>{z}')
+    assert_equal ' :maru:`1`  :maru:`20`  :maru:`A`  :maru:`z` ', actual
   end
 
   def test_inline_br
-    actual = compile_inline("@<br>{}")
-    assert_equal %Q|\n|, actual
+    actual = compile_inline('@<br>{}')
+    assert_equal "\n", actual
   end
 
   def test_inline_i
-    actual = compile_inline("test @<i>{inline test} test2")
-    assert_equal %Q|test  *inline test*  test2|, actual
+    actual = compile_inline('test @<i>{inline test} test2')
+    assert_equal 'test  *inline test*  test2', actual
   end
 
   def test_inline_i_and_escape
-    actual = compile_inline("test @<i>{inline<&;\\ test} test2")
-    assert_equal %Q|test  *inline<&;\\ test*  test2|, actual
+    actual = compile_inline('test @<i>{inline<&;\\ test} test2')
+    assert_equal 'test  *inline<&;\\ test*  test2', actual
   end
 
   def test_inline_b
-    actual = compile_inline("test @<b>{inline test} test2")
-    assert_equal %Q|test  **inline test**  test2|, actual
+    actual = compile_inline('test @<b>{inline test} test2')
+    assert_equal 'test  **inline test**  test2', actual
   end
 
   def test_inline_b_and_escape
-    actual = compile_inline("test @<b>{inline<&;\\ test} test2")
-    assert_equal %Q|test  **inline<&;\\ test**  test2|, actual
+    actual = compile_inline('test @<b>{inline<&;\\ test} test2')
+    assert_equal 'test  **inline<&;\\ test**  test2', actual
   end
 
   def test_inline_tt
-    actual = compile_inline("test @<tt>{inline test} test2@<tt>{\\}}")
-    assert_equal %Q|test  ``inline test``  test2 ``}`` |, actual
+    actual = compile_inline('test @<tt>{inline test} test2@<tt>{\\}}')
+    assert_equal 'test  ``inline test``  test2 ``}`` ', actual
   end
 
   def test_inline_tti
-    actual = compile_inline("test @<tti>{inline test} test2")
-    assert_equal %Q|test  ``inline test``  test2|, actual
+    actual = compile_inline('test @<tti>{inline test} test2')
+    assert_equal 'test  ``inline test``  test2', actual
   end
 
   def test_inline_ttb
-    actual = compile_inline("test @<ttb>{inline test} test2")
-    assert_equal %Q|test  ``inline test``  test2|, actual
+    actual = compile_inline('test @<ttb>{inline test} test2')
+    assert_equal 'test  ``inline test``  test2', actual
   end
 
   def test_inline_uchar
-    actual = compile_inline("test @<uchar>{2460} test2")
-    assert_equal %Q|test ① test2|, actual
+    actual = compile_inline('test @<uchar>{2460} test2')
+    assert_equal 'test ① test2', actual
   end
 
   def test_inline_comment
-    actual = compile_inline("test @<comment>{コメント} test2")
-    assert_equal %Q|test  test2|, actual
+    actual = compile_inline('test @<comment>{コメント} test2')
+    assert_equal 'test  test2', actual
   end
 
   def test_inline_comment_for_draft
-    @config["draft"] = true
-    actual = compile_inline("test @<comment>{コメント} test2")
-    assert_equal %Q|test コメント test2|, actual
+    @config['draft'] = true
+    actual = compile_inline('test @<comment>{コメント} test2')
+    assert_equal 'test コメント test2', actual
   end
 
   def test_inline_in_table
     actual = compile_block("//table{\n★1☆\t▲2☆\n------------\n★3☆\t▲4☆<>&\n//}\n")
-    assert_equal %Q|   * - ★1☆\n     - ▲2☆\n   * - ★3☆\n     - ▲4☆<>&\n\n|, actual
+    assert_equal %Q(   * - ★1☆\n     - ▲2☆\n   * - ★3☆\n     - ▲4☆<>&\n\n), actual
   end
 
   def test_emtable
     actual = compile_block("//emtable[foo]{\nA\n//}\n//emtable{\nA\n//}")
-    assert_equal %Q|.. list-table:: foo\n   :header-rows: 1\n\n   * - A\n\n   * - A\n\n|, actual
+    assert_equal %Q(.. list-table:: foo\n   :header-rows: 1\n\n   * - A\n\n   * - A\n\n), actual
   end
 
   def test_paragraph
     actual = compile_block("foo\nbar\n")
-    assert_equal %Q|foobar\n\n|, actual
+    assert_equal %Q(foobar\n\n), actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
-    assert_equal %Q|\tfoobar\n\n|, actual
+    assert_equal %Q(\tfoobar\n\n), actual
   end
 
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q|.. flushright::\n\n   foobar\nbuz\n\n|, actual
+    assert_equal %Q(.. flushright::\n\n   foobar\nbuz\n\n), actual
   end
 
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
-    assert_equal %Q|foobar\n\nfoo2bar2\n\n|, actual
+    assert_equal %Q(foobar\n\nfoo2bar2\n\n), actual
   end
 
   def test_comment
-    actual = compile_block("//comment[コメント]")
-    assert_equal %Q|\n|, actual
+    actual = compile_block('//comment[コメント]')
+    assert_equal "\n", actual
   end
 
   def test_comment_for_draft
-    @config["draft"] = true
-    actual = compile_block("//comment[コメント]")
-    assert_equal %Q|\n|, actual
+    @config['draft'] = true
+    actual = compile_block('//comment[コメント]')
+    assert_equal "\n", actual
   end
 
   def test_list
-    def @chapter.list(id)
-      Book::ListIndex::Item.new("test",1)
+    def @chapter.list(_id)
+      Book::ListIndex::Item.new('test', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q|.. _samplelist:\n\n-foo\n-bar\n|, actual
+    assert_equal %Q(.. _samplelist:\n\n-foo\n-bar\n), actual
   end
 
   def test_listnum
-    def @chapter.list(id)
-      Book::ListIndex::Item.new("test",1)
+    def @chapter.list(_id)
+      Book::ListIndex::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q|.. _test:\n\n1\n2\n\n|, actual
+    assert_equal %Q(.. _test:\n\n1\n2\n\n), actual
   end
 
   def test_emlistnum
     actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q|this is @<b>{test}<&>_\n\n.. code-block:: none\n   :linenos:\n\n   foo\n   bar\n\n|, actual
+    assert_equal %Q(this is @<b>{test}<&>_\n\n.. code-block:: none\n   :linenos:\n\n   foo\n   bar\n\n), actual
   end
 
   def test_major_blocks
@@ -242,25 +238,25 @@ class RSTBuidlerTest < Test::Unit::TestCase
   end
 
   def test_image
-    def @chapter.image(id)
-      item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+    def @chapter.image(_id)
+      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
     actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
-    assert_equal %Q|.. _sampleimg:\n\n.. figure:: images/-/sampleimg.png\n\n   sample photo\n\n|, actual
+    assert_equal %Q(.. _sampleimg:\n\n.. figure:: images/-/sampleimg.png\n\n   sample photo\n\n), actual
   end
 
   def test_image_with_metric
-    def @chapter.image(id)
-      item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+    def @chapter.image(_id)
+      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\nfoo\n//}\n")
-    assert_equal %Q|.. _sampleimg:\n\n.. figure:: images/-/sampleimg.png\n   :scale:120.0%\n\n   sample photo\n\n|, actual
+    assert_equal %Q(.. _sampleimg:\n\n.. figure:: images/-/sampleimg.png\n   :scale:120.0%\n\n   sample photo\n\n), actual
   end
 
   def test_texequation
@@ -275,57 +271,57 @@ EOS
   end
 
   def test_inline_raw0
-    assert_equal "normal", compile_inline("@<raw>{normal}")
+    assert_equal 'normal', compile_inline('@<raw>{normal}')
   end
 
   def test_inline_raw1
-    assert_equal "body", compile_inline("@<raw>{|top|body}")
+    assert_equal 'body', compile_inline('@<raw>{|top|body}')
   end
 
   def test_inline_raw2
-    assert_equal "body", compile_inline("@<raw>{|top, latex|body}")
+    assert_equal 'body', compile_inline('@<raw>{|top, latex|body}')
   end
 
   def test_inline_raw3
-    assert_equal "body", compile_inline("@<raw>{|idgxml, html|body}")
+    assert_equal 'body', compile_inline('@<raw>{|idgxml, html|body}')
   end
 
   def test_inline_raw4
-    assert_equal "|top body", compile_inline("@<raw>{|top body}")
+    assert_equal '|top body', compile_inline('@<raw>{|top body}')
   end
 
   def test_inline_raw5
-    assert_equal "nor\nmal", compile_inline("@<raw>{|top|nor\\nmal}")
+    assert_equal "nor\nmal", compile_inline('@<raw>{|top|nor\\nmal}')
   end
 
   def test_block_raw0
-    actual = compile_block("//raw[<>!\"\\n& ]\n")
-    expected = %Q(<>!\"\n& )
-    assert_equal expected.chomp, actual
+    actual = compile_block(%Q(//raw[<>!"\\n& ]\n))
+    expected = %Q(<>!"\n& )
+    assert_equal expected, actual
   end
 
   def test_block_raw1
-    actual = compile_block("//raw[|top|<>!\"\\n& ]\n")
+    actual = compile_block(%Q(//raw[|top|<>!"\\n& ]\n))
     expected = ''
-    assert_equal expected.chomp, actual
+    assert_equal expected, actual
   end
 
   def test_block_raw2
-    actual = compile_block("//raw[|top, latex|<>!\"\\n& ]\n")
+    actual = compile_block(%Q(//raw[|top, latex|<>!"\\n& ]\n))
     expected = ''
-    assert_equal expected.chomp, actual
+    assert_equal expected, actual
   end
 
   def test_block_raw3
-    actual = compile_block("//raw[|latex, idgxml|<>!\"\\n& ]\n")
+    actual = compile_block(%Q(//raw[|latex, idgxml|<>!"\\n& ]\n))
     expected = ''
-    assert_equal expected.chomp, actual
+    assert_equal expected, actual
   end
 
   def test_block_raw4
-    actual = compile_block("//raw[|top <>!\"\\n& ]\n")
-    expected = %Q(|top <>!\"\n& )
-    assert_equal expected.chomp, actual
+    actual = compile_block(%Q(//raw[|top <>!"\\n& ]\n))
+    expected = %Q(|top <>!"\n& )
+    assert_equal expected, actual
   end
 
   def column_helper(review)
@@ -333,7 +329,7 @@ EOS
   end
 
   def test_column_ref
-    review =<<-EOS
+    review = <<-EOS
 ===[column]{foo} test
 
 inside column
@@ -342,7 +338,7 @@ inside column
 
 this is @<column>{foo}.
 EOS
-    expected =<<-EOS
+    expected = <<-EOS
 .. column:: test
 
    inside column
@@ -357,5 +353,4 @@ EOS
 
     assert_equal expected, column_helper(review)
   end
-
 end

data/test/test_template.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'review/template'
 
@@ -13,15 +11,13 @@ class TemplateTest < Test::Unit::TestCase
   def test_load
     tmplfile = File.expand_path('./assets/test.xml.erb', File.dirname(__FILE__))
     tmpl = ReVIEW::Template.load(tmplfile)
-    assert_equal("<test>\n<name></name>\n</test>\n",tmpl.result(binding))
+    assert_equal("<test>\n<name></name>\n</test>\n", tmpl.result(binding))
   end
 
   def test_open_with_value
     tmplfile = File.expand_path('./assets/test.xml.erb', File.dirname(__FILE__))
     tmpl = ReVIEW::Template.load(tmplfile)
-    @name = "test"
-    assert_equal("<test>\n<name>test</name>\n</test>\n",tmpl.result(binding))
+    @name = 'test'
+    assert_equal("<test>\n<name>test</name>\n</test>\n", tmpl.result(binding))
   end
 end
-
-