review 2.5.0 → 3.0.0.preview1

data/test/test_book_chapter.rb

@@ -35,12 +35,6 @@ class ChapterTest < Test::Unit::TestCase
     # assert_raises(TypeError) { ch.name } # XXX: OK?
   end
 
-  def test_open
-    ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
-    assert_equal :io, ch.open
-    assert_equal [:io], (ch.open { |io| [io] })
-  end
-
   def test_size
     ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
     assert_equal File.size(__FILE__), ch.size
@@ -53,7 +47,7 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_title
     io = StringIO.new
-    book = Book::Base.new(nil)
+    book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, nil, io)
     assert_equal '', ch.title
 
@@ -68,7 +62,7 @@ class ChapterTest < Test::Unit::TestCase
     tf.print lines.join
     tf.close
 
-    book = Book::Base.new(nil)
+    book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, tf.path)
     assert_equal lines, ch.lines
 
@@ -95,12 +89,12 @@ class ChapterTest < Test::Unit::TestCase
     tf2.print content
     tf2.close
 
-    book = Book::Base.new(nil)
+    book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, tf1.path)
     assert ch.volume
     assert_equal content.gsub(/\s/, '').size, ch.volume.bytes
 
-    book = Book::Base.new(nil)
+    book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2)
     assert ch.volume
     assert_equal content.gsub(/\s/, '').size, ch.volume.bytes # XXX: OK?

data/test/test_book_part.rb

@@ -3,12 +3,13 @@ class PartTest < Test::Unit::TestCase
   include BookTestHelper
 
   def test_initialize
-    part = Book::Part.new(nil, nil, nil)
+    book = Book::Base.new
+    part = Book::Part.new(book, nil, nil)
     assert_equal nil, part.number
     assert_equal nil, part.chapters
     assert_equal '', part.name
 
-    part = Book::Part.new(nil, 123, [], 'name')
+    part = Book::Part.new(book, 123, [], 'name')
     assert_equal 123, part.number
     assert_equal [], part.chapters
     assert_equal 'name', part.name
@@ -23,7 +24,7 @@ class PartTest < Test::Unit::TestCase
   end
 
   def test_volume
-    book = Book::Base.new(nil)
+    book = Book::Base.new
     part = Book::Part.new(book, nil, [])
     assert part.volume
     assert_equal 0, part.volume.bytes

data/test/test_catalog.rb

@@ -97,7 +97,7 @@ ch02.re
         FileUtils.touch(file)
       end
       cat = Catalog.new(yaml_hash)
-      cat.validate!(dir)
+      cat.validate!({ 'contentdir' => '.' }, dir)
     end
   end
 
@@ -107,7 +107,7 @@ ch02.re
         FileUtils.touch(file)
       end
       cat = Catalog.new(yaml_with_parts)
-      cat.validate!(dir)
+      cat.validate!({ 'contentdir' => '.' }, dir)
     end
   end
 
@@ -118,7 +118,7 @@ ch02.re
           FileUtils.touch(file)
         end
         cat = Catalog.new(yaml_hash)
-        cat.validate!(dir)
+        cat.validate!({ 'contentdir' => '.' }, dir)
       end
     end
   end
@@ -130,11 +130,22 @@ ch02.re
           FileUtils.touch(file)
         end
         cat = Catalog.new(yaml_hash)
-        cat.validate!(dir)
+        cat.validate!({ 'contentdir' => '.' }, dir)
       end
     end
   end
 
+  def test_validate_contentdir
+    mktmpbookdir do |dir, _book, _files|
+      Dir.mkdir('content')
+      %w[content/pre01.re content/pre02.re content/ch01.re content/ch02.re content/post01.re content/post02.re content/back01.re content/back02.re].each do |file|
+        FileUtils.touch(file)
+      end
+      cat = Catalog.new(yaml_hash)
+      cat.validate!({ 'contentdir' => 'content' }, dir)
+    end
+  end
+
   private
 
   def yaml

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'test/unit'
+require 'fileutils'
 
 def touch_file(path)
-  File.open(path, 'w').close
-  path
+  FileUtils.touch(path)
 end
 
 def assets_dir

data/test/test_htmlbuilder.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
+require 'book_test_helper'
 require 'review'
 
 class HTMLBuidlerTest < Test::Unit::TestCase
   include ReVIEW
+  include BookTestHelper
 
   def setup
     ReVIEW::I18n.setup
@@ -297,6 +299,11 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal 'test &#x2460; test2', actual
   end
 
+  def test_inline_balloon
+    actual = compile_inline('test @<balloon>{①}')
+    assert_equal %Q(test <span class="balloon">①</span>), actual
+  end
+
   def test_inline_ruby
     actual = compile_inline('@<ruby>{粗雑,クルード}と思われているなら@<ruby>{繊細,テクニカル}にやり、繊細と思われているなら粗雑にやる。')
     assert_equal '<ruby>粗雑<rp>（</rp><rt>クルード</rt><rp>）</rp></ruby>と思われているなら<ruby>繊細<rp>（</rp><rt>テクニカル</rt><rp>）</rp></ruby>にやり、繊細と思われているなら粗雑にやる。', actual
@@ -436,8 +443,7 @@ EOS
   end
 
   def test_noindent
-    @builder.noindent
-    actual = compile_block("foo\nbar\n\nfoo2\nbar2\n")
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
     assert_equal %Q(<p class="noindent">foobar</p>\n<p>foo2bar2</p>\n), actual
   end
 
@@ -747,14 +753,6 @@ EOS
     assert_equal %Q(<div id="samplelist" class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list highlight">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n</pre>\n</div>\n), actual
   end
 
-  def test_list_ext
-    def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist.rb', 1)
-    end
-    actual = compile_block("//list[samplelist.rb][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q(<div id="samplelist.rb" class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list language-rb">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n), actual
-  end
-
   def test_listnum
     def @chapter.list(_id)
       Book::ListIndex::Item.new('samplelist', 1)
@@ -1068,6 +1066,59 @@ EOS
     assert_equal %Q(<div class="cmd-code">\n<p class="caption">cap1</p>\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n), actual
   end
 
+  def test_texequation
+    return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+    return true unless system('latex -version 1>/dev/null 2>/dev/null')
+    mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                 'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P} q\n//}\n") do |dir, book, _files|
+      @book = book
+      @book.config = @config
+      @config['imgmath'] = true
+      @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
+      location = Location.new(nil, nil)
+      @builder.bind(@compiler, @chapter, location)
+      FileUtils.mkdir_p(File.join(dir, 'images'))
+      expected = <<-EOB
+<div class=\"equation\">
+<img src=\"././images/_review_math/_gen_XXX.png\" />
+</div>
+      EOB
+      tmpio = $stderr
+      $stderr = StringIO.new
+      begin
+        result = compile_block("//texequation{\np \\land \\bm{P} q\n//}\n")
+      ensure
+        $stderr = tmpio
+      end
+      actual = result.gsub(/_gen_[0-9a-f]+\.png/, '_gen_XXX.png')
+      assert_equal expected, actual
+    end
+  end
+
+  def test_texequation_fail
+    return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+    return true unless system('latex -version 1>/dev/null 2>/dev/null')
+    mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                 'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P}} q\n//}\n") do |dir, book, _files|
+      @book = book
+      @book.config = @config
+      @config['imgmath'] = true
+      @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
+      location = Location.new(nil, nil)
+      @builder.bind(@compiler, @chapter, location)
+      FileUtils.mkdir_p(File.join(dir, 'images'))
+      tmpio = $stderr
+      $stderr = StringIO.new
+      begin
+        assert_raise(ReVIEW::ApplicationError) do
+          _result = compile_block("//texequation{\np \\land \\bm{P}} q\n//}\n")
+        end
+      ensure
+        $stderr = tmpio
+      end
+    end
+  end
+
   def test_bib
     def @chapter.bibpaper(_id)
       Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
@@ -1692,6 +1743,23 @@ EOS
     assert_equal 'test <code class="inline-code tt">@&lt;code&gt;{$サンプル$}</code>', actual
   end
 
+  def test_inline_w
+    Dir.mktmpdir do |dir|
+      File.open(File.join(dir, 'words.csv'), 'w') do |f|
+        f.write <<EOB
+"F","foo"
+"B","bar""\\<>_@<b>{BAZ}"
+EOB
+      end
+      @book.config['words_file'] = File.join(dir, 'words.csv')
+      io = StringIO.new
+      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
+      assert_equal %Q(<p>foo bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ} <b>bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ}</b> [missing word: N]</p>\n), actual
+      assert_match(/WARN -- : :1: word not bound: N/, io.string)
+    end
+  end
+
   def test_inline_unknown
     e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<img>{n}\n" }
     assert_equal ':1: error: unknown image: n', e.message

data/test/test_htmlutils.rb

@@ -5,9 +5,16 @@ class HTMLUtilsTest < Test::Unit::TestCase
   include ReVIEW::HTMLUtils
 
   def test_escape_html
-    assert_equal '&lt;', escape_html('<')
-    assert_equal '&lt;&lt;', escape_html('<<')
-    assert_equal '_&lt;_&lt;_', escape_html('_<_<_')
+    assert_equal '&lt;', escape('<')
+    assert_equal '&lt;&lt;', escape('<<')
+    assert_equal '_&lt;_&lt;_', escape('_<_<_')
+  end
+
+  def test_unescape_html
+    assert_equal '<', unescape('&lt;')
+    assert_equal '>', unescape('&gt;')
+    assert_equal '&', unescape('&amp;')
+    assert_equal '&amp;', unescape('&amp;amp;')
   end
 
   def test_escape_html_ex
@@ -15,9 +22,9 @@ class HTMLUtilsTest < Test::Unit::TestCase
     ESC['.'] = 'X'
     ESC.each_pair do |ch, ref|
       if keys.include?(ch)
-        assert_equal ref, escape_html(ch)
+        assert_equal ref, escape(ch)
       else
-        assert_equal ch, escape_html(ch)
+        assert_equal ch, escape(ch)
       end
     end
   end

data/test/test_idgxmlbuilder.rb

@@ -12,7 +12,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config = ReVIEW::Configure.values
     @config['secnolevel'] = 2
     @config['tableopt'] = '10'
-    @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)