review 1.7.2 → 2.0.0.beta1

data/test/test_i18n.rb

@@ -10,7 +10,7 @@ require 'tmpdir'
 class I18nTest < Test::Unit::TestCase
   include ReVIEW
 
-  if RUBY_VERSION !~ /^1.8/ ## to avoid Travis error :-(
+  if RUBY_VERSION !~ /^1.8/  ## to avoid Travis error :-(
     def test_load_locale_yml
       Dir.mktmpdir do |dir|
         Dir.chdir(dir) do
@@ -137,8 +137,10 @@ class I18nTest < Test::Unit::TestCase
     I18n.setup "en"
     @builder = HTMLBuilder.new()
     @config = {
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for HTMLBuilder
       "ext" => ".re"
     }
     @book = Book::Base.new(".")

data/test/test_idgxmlbuilder.rb

@@ -14,6 +14,8 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config = ReVIEW::Configure.values
     @config.merge!({
       "secnolevel" => 2,
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
       "nolf" => true,
       "tableopt" => "10"
     })
@@ -175,11 +177,13 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<quote>foo\n\nbuz</quote>|, actual
   end
 
+  ## XXX block content should be escaped.
   def test_note
     actual = compile_block("//note[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q|<note><title aid:pstyle='note-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></note>|, actual
   end
 
+  ## XXX block content should be escaped.
   def test_memo
     actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q|<memo><title aid:pstyle='memo-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></memo>|, actual
@@ -194,7 +198,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @book.config["deprecated-blocklines"] = true
     actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     @book.config["deprecated-blocklines"] = nil
-    assert_equal %Q|<term>test1\ntest1.5\n\ntest<i>2</i></term>|, actual
+    assert_equal %Q|<term>test1test1.5\n\ntest<i>2</i></term>|, actual
   end
 
   def test_notice
@@ -603,5 +607,4 @@ EOS
     expected = %Q(|idgxml <>!\"\n& )
     assert_equal expected.chomp, actual
   end
-
 end

data/test/test_inaobuilder.rb

@@ -9,8 +9,10 @@ class INAOBuidlerTest < Test::Unit::TestCase
 
   def setup
     @param = {
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for HTMLBuilder
     }
   end
 

data/test/test_latexbuilder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'test_helper'
-require 'review/compiler'
 require 'review/book'
+require 'review/compiler'
 require 'review/latexbuilder'
 require 'review/i18n'
 
@@ -12,9 +12,11 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @builder = LATEXBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!( {
-      "secnolevel" => 2, # for IDGXMLBuilder, EPUBBuilder
+      "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
       "toclevel" => 2,
-      "stylesheet" => nil, # for EPUBBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for EPUBBuilder
     })
     @book = Book::Base.new(nil)
     @book.config = @config
@@ -277,34 +279,9 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, actual
   end
 
-  def test_emlistnum_caption
-    actual = compile_block("//emlistnum[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\n 1: foo\n 2: bar\n 3: \n 4: buz\n\\end{reviewemlist}\n|, actual
-  end
-
-  def test_list
-    actual = compile_block("//list[id1][cap1]{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q|\\reviewlistcaption{リスト1.1: cap1}\n\\begin{reviewlist}\nfoo\nbar\n\nbuz\n\\end{reviewlist}\n|, actual
-  end
-
-  def test_list_lst
-    @book.config["highlight"] = {}
-    @book.config["highlight"]["latex"] = "listings"
-    actual = compile_block("//list[id1][cap1][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
-    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
-  end
-
-  def test_list_lst_with_lang
-    @book.config["highlight"] = {}
-    @book.config["highlight"]["latex"] = "listings"
-    @book.config["highlight"]["lang"] = "sql"
-    actual = compile_block("//list[id1][cap1]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
-    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
-  end
-
   def test_listnum
     actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
-    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
+    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\reviewlistcaption{ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
   end
 
   def test_listnum_lst
@@ -336,7 +313,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
 
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
-    assert_equal %Q|\\noindent\nfoo\nbar\n\nfoo2\nbar2\n|, actual
+    assert_equal %Q|\\noindent\nfoobar\n\nfoo2bar2\n|, actual
   end
 
   def test_image
@@ -383,6 +360,17 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
   end
 
+  def test_indepimage_esc
+    def @chapter.image(id)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    actual = compile_block("//indepimage[sean_2_10][sample photo][]\n")
+    assert_equal %Q|\\begin{reviewimage}\n\\includegraphics[width=\\maxwidth]{./images/chap1-sampleimg.png}\n\\reviewindepimagecaption{図: sample photo}\n\\end{reviewimage}\n|, actual
+  end
+
   def test_indepimage_without_caption
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
@@ -479,7 +467,6 @@ EOS
 \\addcontentsline{toc}{subsection}{prev column}
 
 inside prev column
-
 \\end{reviewcolumn}
 
 \\begin{reviewcolumn}
@@ -488,7 +475,6 @@ inside prev column
 \\addcontentsline{toc}{subsection}{test}
 
 inside column
-
 \\end{reviewcolumn}
 EOS
     @config["toclevel"] = 3
@@ -510,9 +496,7 @@ EOS
 \\reviewcolumnhead{}{test}
 
 inside column
-
 \\end{reviewcolumn}
-
 \\subsection*{next level}
 \\label{sec:1-0-1}
 EOS
@@ -598,7 +582,6 @@ EOS
 \\begin{itemize}
 \\item AA
 \\end{itemize}
-
 \\end{itemize}
 EOS
     actual = compile_block(src)
@@ -621,13 +604,11 @@ EOS
 \\begin{itemize}
 \\item AA
 \\end{itemize}
-
 \\item BBB
 
 \\begin{itemize}
 \\item BB
 \\end{itemize}
-
 \\end{itemize}
 EOS
     actual = compile_block(src)

data/test/test_lineinput.rb

@@ -57,6 +57,7 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal -1, li.lineno # XXX: OK?
   end
 
+=begin
   def test_peek
     li = LineInput.new(StringIO.new)
     assert_equal nil, li.peek
@@ -73,6 +74,25 @@ class LineInputTest < Test::Unit::TestCase
     assert li.next?
   end
 
+  def test_skip_blank_lines
+    if "".respond_to?(:encode)
+      euc_jp_spc = "　".encode("EUC-JP")
+    else
+      euc_jp_spc = "\xa1\xa1" # EUC-JP 全角空白
+    end
+    [
+      ["", 0, nil],
+      ["\n \n  \nabc", 3, 'abc'],
+      ["\t", 1, nil],
+      [euc_jp_spc, 0, euc_jp_spc],
+    ].each do |text, n, rest|
+      li = LineInput.new(StringIO.new(text))
+      assert_equal n, li.skip_blank_lines
+      assert_equal rest, li.gets
+    end
+  end
+
+
   def test_gets_if
     io = StringIO.new
     li = LineInput.new(io)
@@ -99,7 +119,7 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal "abc\n", li.gets_unless(/^X/)
     assert_equal nil, li.gets_unless(/^d/)
   end
-
+=end
   def test_each
     content = "abc\ndef\nghi"
     io = StringIO.new(content)
@@ -118,7 +138,7 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal 2, li.lineno
     assert_equal "ghi", li.gets
   end
-
+=begin
   def test_getlines_while
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
@@ -128,7 +148,7 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal 2, li.lineno
     assert_equal "ghi", li.gets
   end
-
+=end
   def test_until_match
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
@@ -137,7 +157,7 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal 1, li.lineno
     assert_equal "def\n", li.gets
   end
-
+=begin
   def test_getlines_until
     io = StringIO.new("abc\ndef\nghi")
     li = LineInput.new(io)
@@ -176,5 +196,6 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal ["abc\n", "def\n"], data
     assert_equal 3, li.lineno
   end
+=end
 end
 

data/test/test_markdownbuilder.rb

@@ -12,8 +12,10 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
   def setup
     @builder = MARKDOWNBuilder.new()
     @config = {
-      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
-      "stylesheet" => nil, # for HTMLBuilder
+      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
+      "inencoding" => "UTF-8",
+      "outencoding" => "UTF-8",
+      "stylesheet" => nil,  # for HTMLBuilder
     }
     @book = Book::Base.new(nil)
     @book.config = @config
@@ -62,23 +64,6 @@ EOS
     assert_equal "```shell-session\nlineA\nlineB\n```\n", actual
   end
 
-
-  def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
-    assert_equal %Q|<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
-  end
-
-  def test_dlist_with_bracket
-    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
-    assert_equal %Q|<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
-  end
-
-  def test_dlist_with_comment
-    source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
-    actual = compile_block(source)
-    assert_equal %Q|<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n|, actual
-  end
-
   def test_list
     actual = compile_block(<<-EOS)
 //list[name][caption]{
@@ -89,7 +74,6 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
-
 ```
 AAA
 BBB
@@ -107,7 +91,6 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
-
 ```ruby
 AAA
 BBB
@@ -126,7 +109,6 @@ BBB
     assert_equal <<-EOS, actual
 
 caption
-
 ```ruby
 AAA
 BBB

data/test/test_pdfmaker.rb

@@ -17,7 +17,6 @@ class PDFMakerTest < Test::Unit::TestCase
                      "date" => "2011-01-01",
                      "language" => "ja",
                    })
-    @maker.config = @config
     @output = StringIO.new
     I18n.setup(@config["language"])
   end
@@ -27,23 +26,24 @@ class PDFMakerTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         pdf_file = File.join(dir, "sample.pdf")
         FileUtils.touch(pdf_file)
-        @maker.basedir = Dir.pwd
-        @maker.remove_old_file
+        @maker.check_book(@config)
         assert !File.exist?(pdf_file)
       end
     end
+  ensure
+    $stderr = STDERR
   end
 
   def test_check_book_none
     Dir.mktmpdir do |dir|
       assert_nothing_raised do
-        @maker.remove_old_file
+        @maker.check_book(@config)
       end
     end
   end
 
   def test_buildpath
-    assert_equal(@maker.build_path, "./sample-pdf")
+    assert_equal(@maker.build_path(@config), "./sample-pdf")
   end
 
   def test_parse_opts_help
@@ -80,7 +80,7 @@ class PDFMakerTest < Test::Unit::TestCase
             "csl"=>["監修三郎"],
             "trl"=>["翻訳四郎","翻訳五郎",]})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors
+      authors = @maker.make_authors(@config)
       assert_equal("テスト太郎、テスト次郎　著 \\\\\n監修三郎　監修 \\\\\n翻訳四郎、翻訳五郎　訳",
                    authors)
     end
@@ -89,7 +89,7 @@ class PDFMakerTest < Test::Unit::TestCase
   def test_make_authors_only_aut
     @config.merge!({"aut"=>"テスト太郎"})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors
+      authors = @maker.make_authors(@config)
       assert_equal("テスト太郎　著", authors)
     end
   end
@@ -106,7 +106,7 @@ class PDFMakerTest < Test::Unit::TestCase
       "prt"=>"テスト出版",
     })
     Dir.mktmpdir do |dir|
-      okuduke = @maker.make_colophon
+      okuduke = @maker.make_colophon(@config)
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n",
                    okuduke)
     end
@@ -124,7 +124,7 @@ class PDFMakerTest < Test::Unit::TestCase
     })
     Dir.mktmpdir do |dir|
       I18n.update({"prt" => "印刷所"},"ja")
-      okuduke = @maker.make_colophon
+      okuduke = @maker.make_colophon(@config)
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n発行所 & テスト出版 \\\\\n連絡先 & tarou@example.jp \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
     end
@@ -132,7 +132,7 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_gettemplate
     Dir.mktmpdir do |dir|
-      tmpl = @maker.get_template
+      tmpl = @maker.get_template(@config)
       expect = File.read(File.join(assets_dir,"test_template.tex"))
       assert_equal(expect, tmpl)
     end
@@ -159,7 +159,8 @@ class PDFMakerTest < Test::Unit::TestCase
 
         expect = File.read(File.join(assets_dir,"test_template_backmatter.tex"))
 
-        tmpl = @maker.get_template
+        maker = ReVIEW::PDFMaker.new
+        tmpl = maker.get_template(@config)
         tmpl.gsub!(/\A.*%% backmatter begins\n/m,"")
         assert_equal(expect, tmpl)
       end

data/test/test_textutils.rb

@@ -29,40 +29,4 @@ class TextUtilsTest < Test::Unit::TestCase
     detabed = detab("\tabc\tdef", 4)
     assert_equal "    abc def", detabed
   end
-
-  def test_split_paragraph_empty_nil
-    ret = @tu_nil.split_paragraph([])
-    assert_equal ret, [""]
-  end
-
-  def test_split_paragraph_empty_p
-    ret = @tu_p.split_paragraph([])
-    assert_equal ret, ["<p></p>"]
-  end
-
-  def test_split_paragraph_p
-    ret = @tu_p.split_paragraph(["abc"])
-    assert_equal ["<p>abc</p>"], ret
-    ret = @tu_p.split_paragraph(["abc","def"])
-    assert_equal ["<p>abcdef</p>"], ret
-    ret = @tu_p.split_paragraph(["abc","","def"])
-    assert_equal ["<p>abc</p>","<p>def</p>"], ret
-    ret = @tu_p.split_paragraph(["abc","","","def"])
-    assert_equal ["<p>abc</p>","<p>def</p>"], ret
-    ret = @tu_p.split_paragraph(["abc","","","def","ghi"])
-    assert_equal ["<p>abc</p>","<p>defghi</p>"], ret
-  end
-
-  def test_split_paragraph_nil
-    ret = @tu_nil.split_paragraph(["abc"])
-    assert_equal ["abc"], ret
-    ret = @tu_nil.split_paragraph(["abc","def"])
-    assert_equal ["abcdef"], ret
-    ret = @tu_nil.split_paragraph(["abc","","def"])
-    assert_equal ["abc","def"], ret
-    ret = @tu_nil.split_paragraph(["abc","","","def"])
-    assert_equal ["abc","def"], ret
-    ret = @tu_nil.split_paragraph(["abc","","","def","ghi"])
-    assert_equal ["abc","defghi"], ret
-  end
 end