review 1.0.0 → 1.1.0

data/test/test_book_part.rb

@@ -0,0 +1,53 @@
+require 'book_test_helper'
+class PartTest < Test::Unit::TestCase
+  include BookTestHelper
+
+  def test_initialize
+    part = Book::Part.new(nil, nil, nil)
+    assert_equal nil, part.number
+    assert_equal nil, part.chapters
+    assert_equal '', part.name
+
+    part = Book::Part.new(nil, 123, [], 'name')
+    assert_equal 123, part.number
+    assert_equal [], part.chapters
+    assert_equal 'name', part.name
+  end
+
+  def test_each_chapter
+    part = Book::Part.new(nil, nil, [1, 2, 3])
+
+    tmp = []
+    part.each_chapter do |ch|
+      tmp << ch
+    end
+    assert_equal [1, 2, 3], tmp
+  end
+
+  def test_volume
+    part = Book::Part.new(nil, nil, [])
+    assert part.volume
+    assert_equal 0, part.volume.bytes
+    assert_equal 0, part.volume.chars
+    assert_equal 0, part.volume.lines
+
+    chs = []
+    tfs = []  ## prevent from removing Tempfile
+    Tempfile.open('part_test') do |o|
+      o.print "12345"
+      chs << Book::Chapter.new(nil, nil, nil, o.path)
+      tfs << o
+    end
+    Tempfile.open('part_test') do |o|
+      o.print "67890"
+      chs << Book::Chapter.new(nil, nil, nil, o.path)
+      tfs << o
+    end
+
+    part = Book::Part.new(nil, nil, chs)
+    assert part.volume
+    assert part.volume.bytes > 0
+    assert part.volume.chars > 0
+    assert part.volume.lines > 0
+  end
+end

data/test/test_builder.rb

@@ -98,7 +98,6 @@ class BuidlerTest < Test::Unit::TestCase
       :source_header, :source_body,
       :image_image, :image_dummy,
       :table_header, :table_begin, :tr, :th, :table_end,
-      :nofunc_text,
       :compile_ruby, :compile_kw, :compile_href,
       :bibpaper_header, :bibpaper_bibpaper,
       :inline_hd_chap,
@@ -113,18 +112,26 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal [:text, text], @b.compile_inline(text)
   end
 
-  def test_convert_outencoding_1arg
-    ReVIEW.book.param = {'outencoding' => "UTF-8"}
-    b = Builder.new
-    ret = b.convert_outencoding("a")
-    assert_equal "a", ret
+  def test_inline_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"]
   end
 
-  def test_convert_outencoding_2arg
-    ReVIEW.book.param = {'outencoding' => "UTF-8"}
+  def test_compile_inline_backslash
+    text = "abc\\d\\#a"
+    assert_equal [:text, text], @b.compile_inline(text)
+  end
+
+  def test_convert_outencoding
+    ReVIEW.book.param = {'outencoding' => "EUC"}
     b = Builder.new
-    ret = b.convert_outencoding("a","b")
-    assert_equal(["a","b"], ret)
+    ret = b.convert_outencoding("a", ReVIEW.book.param["outencoding"])
+    assert_equal "a", ret
   end
 
   class XBuilder < Builder

data/test/test_compiler.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/compiler'
+require 'review/book'
+require 'review/latexbuilder'
+
+class CompilerTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @builder = LATEXBuilder.new()
+    @c = Compiler.new(@builder)
+  end
+
+  def test_parse_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
+  end
+
+  def test_parse_args_with_brace2
+    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
+  end
+
+  def test_parse_args_with_backslash2
+    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
+  end
+end
+

data/test/test_epubmaker.rb

@@ -35,7 +35,7 @@ class EPUBMakerTest < Test::Unit::TestCase
 
   def test_mimetype
     @producer.mimetype(@output)
-    assert_equal %Q[application/epub+zip\n], @output.string
+    assert_equal %Q[application/epub+zip], @output.string
   end
 
   def test_container

data/test/test_epubmaker_cmd.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+
+REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', File.dirname(__FILE__))
+
+class EPUBMakerCmdTest < Test::Unit::TestCase
+  def setup
+    @tmpdir1 = Dir.mktmpdir
+    @tmpdir2 = Dir.mktmpdir
+
+    @old_rubylib = ENV['RUBYLIB']
+    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+  end
+
+  def teardown
+    FileUtils.rm_rf @tmpdir1
+    FileUtils.rm_rf @tmpdir2
+    ENV['RUBYLIB'] = @old_rubylib
+  end
+
+  def test_epubmaker_cmd
+    config = prepare_samplebook(@tmpdir1)
+    builddir = @tmpdir1 + "/" + config['bookname'] + '-epub'
+    assert ! File.exists?(builddir)
+
+    Dir.chdir(@tmpdir1) do
+      system("#{REVIEW_EPUBMAKER} config.yml 1>/dev/null 2>/dev/null")
+    end
+
+    assert File.exists?(builddir)
+  end
+end

data/test/test_helper.rb

@@ -8,3 +8,20 @@ def ul_helper(src, expect)
   assert_equal expect, @builder.raw_result
 end
 
+def builder_helper(src, expect, method_sym)
+  io = StringIO.new(src)
+  li = LineInput.new(io)
+  @compiler.__send__(method_sym, li)
+  assert_equal expect, @builder.raw_result
+end
+
+def touch_file(path)
+  File.open(path, "w").close
+  path
+end
+
+def prepare_samplebook(srcdir)
+  samplebook_dir = File.expand_path("sample-book/src/", File.dirname(__FILE__))
+  FileUtils.cp_r(Dir.glob(samplebook_dir + "/*"), srcdir)
+  YAML.load(File.open(srcdir + "/config.yml"))
+end

data/test/test_htmlbuilder.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 require 'review/compiler'
 require 'review/book'
 require 'review/htmlbuilder'
+require 'review/i18n'
 
 class HTMLBuidlerTest < Test::Unit::TestCase
   include ReVIEW
@@ -19,46 +20,46 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     }
     ReVIEW.book.param = @param
     @compiler = ReVIEW::Compiler.new(@builder)
-    @chapter = Chapter.new(nil, 1, '-', nil, StringIO.new)
+    @chapter = Book::Chapter.new(Book::Base.new(nil), 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
   end
 
   def test_headline_level1
     @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1" />第1章　this is test.</h1>\n|, @builder.raw_result
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this is test.</h1>\n|, @builder.raw_result
   end
 
   def test_headline_level1_without_secno
     @param["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
-    assert_equal %Q|<h1 id="test"><a id="h1" />this is test.</h1>\n|, @builder.raw_result
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>this is test.</h1>\n|, @builder.raw_result
   end
 
   def test_headline_level1_with_inlinetag
     @builder.headline(1,"test","this @<b>{is} test.<&\">")
-    assert_equal %Q|<h1 id="test"><a id="h1" />第1章　this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, @builder.raw_result
+    assert_equal %Q|<h1 id="test"><a id="h1"></a>第1章　this <b>is</b> test.&lt;&amp;&quot;&gt;</h1>\n|, @builder.raw_result
   end
 
   def test_headline_level2
     @builder.headline(2,"test","this is test.")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1" />1.1　this is test.</h2>\n|, @builder.raw_result
+    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>1.1　this is test.</h2>\n|, @builder.raw_result
   end
 
   def test_headline_level3
     @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1" />this is test.</h3>\n|, @builder.raw_result
+    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>this is test.</h3>\n|, @builder.raw_result
   end
 
   def test_headline_level3_with_secno
     @param["secnolevel"] = 3
     @builder.headline(3,"test","this is test.")
-    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1" />1.0.1　this is test.</h3>\n|, @builder.raw_result
+    assert_equal %Q|\n<h3 id="test"><a id="h1-0-1"></a>1.0.1　this is test.</h3>\n|, @builder.raw_result
   end
 
   def test_label
     @builder.label("label_test")
-    assert_equal %Q|<a id="label_test" />\n|, @builder.raw_result
+    assert_equal %Q|<a id="label_test"></a>\n|, @builder.raw_result
   end
 
   def test_href
@@ -131,6 +132,21 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test <tt><b>inline test</b></tt> test2|, ret
   end
 
+  def test_inline_hd_chap
+    def @chapter.headline_index
+      items = [Book::HeadlineIndex::Item.new("chap1|test", [1, 1], "te_st")]
+      Book::HeadlineIndex.new(items, self)
+    end
+
+    @param["secnolevel"] = 2
+    ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「te_st」 test2|, ret
+
+    @param["secnolevel"] = 3
+    ret = @builder.compile_inline("test @<hd>{chap1|test} test2")
+    assert_equal %Q|test 「1.1.1 te_st」 test2|, ret
+  end
+
   def test_inline_uchar
     ret = @builder.compile_inline("test @<uchar>{2460} test2")
     assert_equal %Q|test &#x2460; test2|, ret
@@ -138,7 +154,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_inline_ruby
     ret = @builder.compile_inline("@<ruby>{粗雑,クルード}と思われているなら@<ruby>{繊細,テクニカル}にやり、繊細と思われているなら粗雑にやる。")
-    assert_equal "<ruby><rb>粗雑</rb><rp>(</rp><rt>クルード</rt><rp>)</rp></ruby>と思われているなら<ruby><rb>繊細</rb><rp>(</rp><rt>テクニカル</rt><rp>)</rp></ruby>にやり、繊細と思われているなら粗雑にやる。", ret
+    assert_equal "<ruby><rb>粗雑</rb><rp>（</rp><rt>クルード</rt><rp>）</rp></ruby>と思われているなら<ruby><rb>繊細</rb><rp>（</rp><rt>テクニカル</rt><rp>）</rp></ruby>にやり、繊細と思われているなら粗雑にやる。", ret
+  end
+
+  def test_inline_ruby_comma
+    ret = @builder.compile_inline("@<ruby>{foo\\, bar\\, buz,フー・バー・バズ}")
+    assert_equal "<ruby><rb>foo, bar, buz</rb><rp>（</rp><rt>フー・バー・バズ</rt><rp>）</rp></ruby>", ret
+  end
+
+  def test_inline_ref
+    ret = @builder.compile_inline("@<ref>{外部参照<>&}")
+    assert_equal %Q|<a target='外部参照&lt;&gt;&amp;'>「●●　外部参照&lt;&gt;&amp;」</a>|, ret
   end
 
   def test_quote
@@ -164,9 +190,14 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<p class="flushright">foobar</p>\n<p class="flushright">buz</p>\n|, @builder.raw_result
   end
 
+  def test_centering
+    @builder.centering(["foo", "bar", "", "buz"])
+    assert_equal %Q|<p class="center">foobar</p>\n<p class="center">buz</p>\n|, @builder.raw_result
+  end
+
   def test_image
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -177,7 +208,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_image_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -188,7 +219,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_image_with_metric2
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -198,7 +229,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -209,7 +240,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage_without_caption
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -220,7 +251,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -231,7 +262,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage_with_metric2
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -242,7 +273,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(id)
-      item = ImageIndex::Item.new("sampleimg",1)
+      item = Book::ImageIndex::Item.new("sampleimg",1)
       item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
       item
     end
@@ -251,6 +282,20 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<div class="image">\n<img src="images/chap1-sampleimg.png" alt="" width="120%" />\n</div>\n|, @builder.raw_result
   end
 
+  def test_list
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    @builder.list(["test1", "test1.5", "", "test<i>2</i>"], "samplelist", "this is @<b>{test}<&>_")
+
+    begin # FIXME: Use params instead of exception handling
+      require 'pygments'
+      assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #666666">&lt;</span>i<span style="color: #666666">&gt;2&lt;/</span>i<span style="color: #666666">&gt;</span>\n</pre>\n</div>\n|, @builder.raw_result
+    rescue LoadError
+      assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n|, @builder.raw_result
+    end
+  end
+
   def test_emlist
     @builder.emlist(["lineA","lineB"])
     assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
@@ -261,6 +306,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<div class="emlist-code">\n<p class="caption">cap1</p>\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
   end
 
+  def test_emlist_with_tab
+    @builder.emlist(["\tlineA","\t\tlineB","\tlineC"])
+    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">        lineA\n                lineB\n        lineC\n</pre>\n</div>\n|, @builder.raw_result
+  end
+
+  def test_emlist_with_4tab
+    @builder.instance_eval{@tabwidth=4}
+    @builder.emlist(["\tlineA","\t\tlineB","\tlineC"])
+    assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">    lineA\n        lineB\n    lineC\n</pre>\n</div>\n|, @builder.raw_result
+  end
+
   def test_cmd
     @builder.cmd(["lineA","lineB"])
     assert_equal %Q|<div class="cmd-code">\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, @builder.raw_result
@@ -273,7 +329,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_bib
     def @chapter.bibpaper(id)
-      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
     assert_equal %Q|<a href="./bib.html#bib-samplebib">[1]</a>|, @builder.inline_bib("samplebib")
@@ -281,11 +337,20 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_bibpaper
     def @chapter.bibpaper(id)
-      BibpaperIndex::Item.new("samplebib",1,"sample bib")
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
     end
 
     @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<b>{bold}")
-    assert_equal %Q|<div>\n<a id=\"bib-samplebib\">\n[1] sample bib <b>bold</b>\n</a>\n<p>\na\nb\n</p>\n</div>\n|, @builder.raw_result
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n|, @builder.raw_result
+  end
+
+  def test_bibpaper_with_anchor
+    def @chapter.bibpaper(id)
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
+    end
+
+    @builder.bibpaper(["a", "b"], "samplebib", "sample bib @<href>{http://example.jp}")
+    assert_equal %Q|<div class=\"bibpaper\">\n<a id=\"bib-samplebib\">[1]</a> sample bib <a href=\"http://example.jp\" class=\"link\">http://example.jp</a>\n<p>ab</p></div>\n|, @builder.raw_result
   end
 
   def column_helper(review)
@@ -309,12 +374,12 @@ EOS
     expect =<<-EOS
 <div class="column">
 
-<h3><a id="h1-0-1" />prev column</h3>
+<h3><a id="column-1"></a>prev column</h3>
 <p>inside prev column</p>
 </div>
 <div class="column">
 
-<h3><a id="h1-0-2" />test</h3>
+<h3><a id="column-2"></a>test</h3>
 <p>inside column</p>
 </div>
 EOS
@@ -332,11 +397,11 @@ EOS
     expect =<<-EOS
 <div class="column">
 
-<h3><a id="h1-0-1" />test</h3>
+<h3><a id="column-1"></a>test</h3>
 <p>inside column</p>
 </div>
 
-<h3><a id="h1-0-2" />next level</h3>
+<h3><a id="h1-0-1"></a>next level</h3>
 EOS
 
     assert_equal expect, column_helper(review)
@@ -439,6 +504,63 @@ EOS
     ul_helper(src, expect)
   end
 
+  def test_ul_nest4
+    src =<<-EOS
+  * A
+  ** AA
+  *** AAA
+  * B
+  ** BB
+EOS
+
+    expect =<<-EOS
+<ul>
+<li>A<ul>
+<li>AA<ul>
+<li>AAA</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>B<ul>
+<li>BB</li>
+</ul>
+</li>
+</ul>
+EOS
+    ul_helper(src, expect)
+  end
+
+  def test_ul_nest5
+    src =<<-EOS
+  * A
+  ** AA
+  **** AAAA
+  * B
+  ** BB
+EOS
+
+    expect =<<-EOS
+<ul>
+<li>A<ul>
+<li>AA<ul>
+<li><ul>
+<li>AAAA</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>B<ul>
+<li>BB</li>
+</ul>
+</li>
+</ul>
+EOS
+    ul_helper(src, expect)
+  end
+
   def test_inline_raw0
     assert_equal "normal", @builder.inline_raw("normal")
   end
@@ -505,4 +627,14 @@ EOS
 EOS
     assert_equal expect.chomp, @builder.raw_result
   end
+
+  def test_inline_fn
+    fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
+    @chapter.instance_eval{@footnote_index=fn}
+    @builder.footnote("foo",'bar\\a\\$buz')
+    expect =<<-'EOS'
+<div class="footnote"><p class="footnote">[<a id="fn-foo">*1</a>] bar\a\$buz</p></div>
+EOS
+    assert_equal expect, @builder.raw_result
+  end
 end