review 2.0.0.beta1 → 2.0.0

data/test/test_lineinput.rb

@@ -54,10 +54,9 @@ class LineInputTest < Test::Unit::TestCase
     li.ungets('xyz')
     assert_equal 0, li.lineno
     li.ungets('xyz')
-    assert_equal -1, li.lineno # XXX: OK?
+    assert_equal(-1, li.lineno) # XXX: OK?
   end
 
-=begin
   def test_peek
     li = LineInput.new(StringIO.new)
     assert_equal nil, li.peek
@@ -74,25 +73,6 @@ 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)
@@ -119,7 +99,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)
@@ -138,7 +118,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)
@@ -148,7 +128,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)
@@ -157,7 +137,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)
@@ -196,6 +176,5 @@ class LineInputTest < Test::Unit::TestCase
     assert_equal ["abc\n", "def\n"], data
     assert_equal 3, li.lineno
   end
-=end
 end
 

data/test/test_makerhelper.rb

@@ -38,13 +38,15 @@ class MakerHelperTest < Test::Unit::TestCase
   end
 
   def test_copy_images_to_dir_convert
-    touch_file("#{@tmpdir1}/foo.eps")
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      touch_file("#{@tmpdir1}/foo.eps")
 
-    image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
+      image_files = MakerHelper.copy_images_to_dir(@tmpdir1, @tmpdir2,
                                                  :convert => {:eps => :png})
 
-    assert File.exist?("#{@tmpdir2}/foo.eps.png"), "EPS to PNG conversion failed"
-    assert image_files.include?("#{@tmpdir1}/foo.eps.png")
+      assert File.exist?("#{@tmpdir2}/foo.eps.png"), "EPS to PNG conversion failed"
+      assert image_files.include?("#{@tmpdir1}/foo.eps.png")
+    end
   end
 
   def test_copy_images_to_dir_with_exts

data/test/test_markdownbuilder.rb

@@ -12,12 +12,10 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
   def setup
     @builder = MARKDOWNBuilder.new()
     @config = {
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
     }
-    @book = Book::Base.new(nil)
+    @book = Book::Base.new(".")
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
@@ -64,6 +62,23 @@ 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]{
@@ -74,6 +89,7 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
+
 ```
 AAA
 BBB
@@ -91,6 +107,7 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
+
 ```ruby
 AAA
 BBB
@@ -109,6 +126,7 @@ BBB
     assert_equal <<-EOS, actual
 
 caption
+
 ```ruby
 AAA
 BBB

data/test/test_pdfmaker.rb

@@ -16,7 +16,9 @@ class PDFMakerTest < Test::Unit::TestCase
                      "urnid" => "http://example.jp/",
                      "date" => "2011-01-01",
                      "language" => "ja",
+                     "texcommand" => "uplatex",
                    })
+    @maker.config = @config
     @output = StringIO.new
     I18n.setup(@config["language"])
   end
@@ -26,24 +28,30 @@ class PDFMakerTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         pdf_file = File.join(dir, "sample.pdf")
         FileUtils.touch(pdf_file)
-        @maker.check_book(@config)
+        @maker.basedir = Dir.pwd
+        @maker.remove_old_file
         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.check_book(@config)
+        @maker.basedir = Dir.pwd
+        @maker.remove_old_file
       end
     end
   end
 
-  def test_buildpath
-    assert_equal(@maker.build_path(@config), "./sample-pdf")
+  def test_buildpath_debug
+    @maker.config["debug"] = true
+    path = @maker.build_path
+    begin
+      assert_equal(path, "sample-pdf")
+    ensure
+      FileUtils.remove_entry_secure path
+    end
   end
 
   def test_parse_opts_help
@@ -59,7 +67,6 @@ class PDFMakerTest < Test::Unit::TestCase
   end
 
   def test_parse_opts_ignore_errors
-    io = StringIO.new
     conf, yml = @maker.parse_opts(["--ignore-errors", "hoge.yml"])
     assert_equal conf["ignore-errors"], true
     assert_equal yml, "hoge.yml"
@@ -80,7 +87,7 @@ class PDFMakerTest < Test::Unit::TestCase
             "csl"=>["監修三郎"],
             "trl"=>["翻訳四郎","翻訳五郎",]})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors(@config)
+      authors = @maker.make_authors
       assert_equal("テスト太郎、テスト次郎　著 \\\\\n監修三郎　監修 \\\\\n翻訳四郎、翻訳五郎　訳",
                    authors)
     end
@@ -89,7 +96,7 @@ class PDFMakerTest < Test::Unit::TestCase
   def test_make_authors_only_aut
     @config.merge!({"aut"=>"テスト太郎"})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors(@config)
+      authors = @maker.make_authors
       assert_equal("テスト太郎　著", authors)
     end
   end
@@ -103,11 +110,12 @@ class PDFMakerTest < Test::Unit::TestCase
       "ill"=>["イラスト七郎","イラスト八郎"],
       "cov"=>["表紙九郎"],
       "edt"=>["編集十郎"],
-      "prt"=>"テスト出版",
+      "pbl"=>"テスト出版",
+      "prt"=>"テスト印刷",
     })
     Dir.mktmpdir do |dir|
-      okuduke = @maker.make_colophon(@config)
-      assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n",
+      okuduke = @maker.make_colophon
+      assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
     end
   end
@@ -124,7 +132,7 @@ class PDFMakerTest < Test::Unit::TestCase
     })
     Dir.mktmpdir do |dir|
       I18n.update({"prt" => "印刷所"},"ja")
-      okuduke = @maker.make_colophon(@config)
+      okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n発行所 & テスト出版 \\\\\n連絡先 & tarou@example.jp \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
     end
@@ -132,17 +140,14 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_gettemplate
     Dir.mktmpdir do |dir|
-      tmpl = @maker.get_template(@config)
+      @maker.basedir = Dir.pwd
+      tmpl = @maker.get_template
       expect = File.read(File.join(assets_dir,"test_template.tex"))
       assert_equal(expect, tmpl)
     end
   end
 
   def test_gettemplate_with_backmatter
-    if RUBY_VERSION =~ /^1.8/
-      $stderr.puts "skip test_gettemplate_with_backmatter (for travis error)"
-      return
-    end
     @config.merge!({
       "backcover"=>"backcover.html",
       "profile"=>"profile.html",
@@ -159,12 +164,73 @@ class PDFMakerTest < Test::Unit::TestCase
 
         expect = File.read(File.join(assets_dir,"test_template_backmatter.tex"))
 
-        maker = ReVIEW::PDFMaker.new
-        tmpl = maker.get_template(@config)
+        @maker.basedir = Dir.pwd
+        tmpl = @maker.get_template
         tmpl.gsub!(/\A.*%% backmatter begins\n/m,"")
         assert_equal(expect, tmpl)
       end
     end
   end
 
+  def test_colophon_history
+    @config["aut"] = ["Mr.Smith"]
+    @config["pbl"] = ["BLUEPRINT"]
+    @config["pht"] = ["Mrs.Smith"]
+    @config.merge!({"language" => "ja"})
+    history = @maker.make_history_list
+    expect = ["2011年1月1日　発行"]
+    assert_equal expect, history
+  end
+
+  def test_colophon_history_2
+    @config["aut"] = ["Mr.Smith"]
+    @config["pbl"] = ["BLUEPRINT"]
+    @config["pht"] = ["Mrs.Smith"]
+    @config.merge!({"language" => "ja",
+                    "history" => [[
+                                    "2011-08-03 v1.0.0版発行",
+                                    "2012-02-15 v1.1.0版発行",
+                                  ]] })
+    history = @maker.make_history_list
+    expect = ["2011年8月3日　v1.0.0版発行",
+              "2012年2月15日　v1.1.0版発行"]
+    assert_equal expect, history
+  end
+
+  def test_colophon_history_date
+    @config["aut"] = ["Mr.Smith"]
+    @config["pbl"] = ["BLUEPRINT"]
+    @config["pht"] = ["Mrs.Smith"]
+    @config.merge!({"language" => "ja",
+                    "history" => [[
+                                    "2011-08-03",
+                                    "2012-02-15",
+                                  ]] })
+    history = @maker.make_history_list
+    expect = ["2011年8月3日　初版第1刷　発行",
+              "2012年2月15日　初版第2刷　発行"]
+    assert_equal expect, history
+  end
+
+  def test_colophon_history_date2
+    @config["aut"] = ["Mr.Smith"]
+    @config["pbl"] = ["BLUEPRINT"]
+    @config["pht"] = ["Mrs.Smith"]
+    @config.merge!({"language" => "ja",
+                    "history" => [[
+                                    "2011-08-03",
+                                    "2012-02-15",
+                                  ],[
+                                    "2012-10-01",
+                                  ],[
+                                    "2013-03-01",
+                                  ]] })
+    history = @maker.make_history_list
+    expect = ["2011年8月3日　初版第1刷　発行",
+              "2012年2月15日　初版第2刷　発行",
+              "2012年10月1日　第2版第1刷　発行",
+              "2013年3月1日　第3版第1刷　発行"]
+    assert_equal expect, history
+  end
+
 end

data/test/test_pdfmaker_cmd.rb

@@ -11,7 +11,6 @@ REVIEW_PDFMAKER = File.expand_path('../bin/review-pdfmaker', File.dirname(__FILE
 class PDFMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
-    @tmpdir2 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
     ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
@@ -19,12 +18,11 @@ class PDFMakerCmdTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf @tmpdir1
-    FileUtils.rm_rf @tmpdir2
     ENV['RUBYLIB'] = @old_rubylib
   end
 
   def test_pdfmaker_cmd
-    if RUBY_VERSION !~ /^1.8/
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
       config = prepare_samplebook(@tmpdir1)
       builddir = @tmpdir1 + "/" + config['bookname'] + '-pdf'
       assert ! File.exist?(builddir)

data/test/test_review_ext.rb

@@ -24,7 +24,7 @@ end
                  "ch01.re" => "= test\n\ntest.\n",
                  "review-ext.rb" => review_ext) do |dir, book, files|
       builder = ReVIEW::HTMLBuilder.new(false)
-      c = ReVIEW::Compiler.new(builder)
+      ReVIEW::Compiler.new(builder)
       assert_equal "test", builder.instance_eval{@builder_init_test}
     end
   end

data/test/test_template.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/template'
+
+class TemplateTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @name = nil
+  end
+
+  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))
+  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))
+  end
+end
+
+

data/test/test_textutils.rb

@@ -29,4 +29,40 @@ 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