review 5.1.1 → 5.4.0

data/test/test_plaintextbuilder.rb

@@ -14,6 +14,8 @@ class PLAINTEXTBuidlerTest < Test::Unit::TestCase
     @config['language'] = 'ja'
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -469,10 +471,10 @@ EOS
 
   def test_empty_table
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
-    assert_equal ':2: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
 
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
-    assert_equal ':3: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -691,8 +693,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -708,8 +710,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -724,8 +726,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -760,20 +762,42 @@ EOS
     assert_equal %Q(\\sin\n1^{2}\n\n), actual
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+(1)
+(1) bar
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ':1: error: key not found: "n"', e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -891,7 +915,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //endchild is shown, but any opened //beginchild doesn't exist", e.message
+    assert_equal ":1: //endchild is shown, but any opened //beginchild doesn't exist", e.message
   end
 
   def test_nest_error_close1
@@ -899,7 +923,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -917,7 +941,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -937,7 +961,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_preprocessor.rb

@@ -1,9 +1,196 @@
 require 'test_helper'
 require 'review/preprocessor'
 require 'stringio'
+require 'book_test_helper'
 
 class PreprocessorTest < Test::Unit::TestCase
   include ReVIEW
+  include BookTestHelper
 
-  ## TODO: add tests
+  def test_mapfile
+    preproc = ReVIEW::Preprocessor.new({})
+
+    ch01_re = <<-'REFILE'
+= test1
+
+//list[hello.rb.1][hello.re]{
+#@mapfile(hello.rb)
+#@end
+//}
+REFILE
+
+    hello_rb = <<-'RBFILE'
+#!/usr/bin/env ruby
+
+class Hello
+  def hello(name)
+    print "hello, #{name}!\n"
+  end
+end
+
+if __FILE__ == $0
+  Hello.new.hello("world")
+end
+RBFILE
+
+    expected = <<-'EXPECTED'
+= test1
+
+//list[hello.rb.1][hello.re]{
+#@mapfile(hello.rb)
+#!/usr/bin/env ruby
+
+class Hello
+  def hello(name)
+    print "hello, #{name}!\n"
+  end
+end
+
+if __FILE__ == $0
+  Hello.new.hello("world")
+end
+#@end
+//}
+EXPECTED
+    converted = mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                             'ch01.re' => ch01_re,
+                             'hello.rb' => hello_rb) do |_dir, _book, _files|
+      preproc.process('ch01.re')
+    end
+    assert_equal expected, converted
+  end
+
+  def test_mapfile_tabwidth_is_4
+    param = { 'tabwidth' => 4 }
+    preproc = ReVIEW::Preprocessor.new(param)
+
+    ch01 = <<-'REFILE'
+//emlist[test1][inc.txt]{
+#@mapfile(inc.txt)
+#@end
+//}
+REFILE
+
+    inc_txt = <<-'INC_TXT'
+test.
+	test2.
+
+	test3.
+
+	  test4.
+
+			test5.
+INC_TXT
+
+    expected = <<-'EXPECTED'
+//emlist[test1][inc.txt]{
+#@mapfile(inc.txt)
+test.
+    test2.
+
+    test3.
+
+      test4.
+
+            test5.
+#@end
+//}
+EXPECTED
+    converted = nil
+    mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                 'inc.txt' => inc_txt,
+                 'ch01.re' => ch01) do |_dir, _book, _files|
+      converted = preproc.process('ch01.re')
+    end
+    assert_equal expected, converted
+  end
+
+  def test_maprange
+    preproc = ReVIEW::Preprocessor.new({})
+
+    ch01_re = <<-'REFILE'
+//list[range.rb][range.rb(抜粋)]{
+#@maprange(range.rb,sample)
+#@end
+//}
+REFILE
+
+    range_rb = <<-'RBFILE'
+#!/usr/bin/env ruby
+
+class Hello
+#@range_begin(sample)
+  def hello(name)
+    print "hello, #{name}!\n"
+  end
+#@range_end(sample)
+end
+
+if __FILE__ == $0
+  Hello.new.hello("world")
+end
+RBFILE
+
+    expected = <<-'EXPECTED'
+//list[range.rb][range.rb(抜粋)]{
+#@maprange(range.rb,sample)
+  def hello(name)
+    print "hello, #{name}!\n"
+  end
+#@end
+//}
+EXPECTED
+    converted = mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                             'ch01.re' => ch01_re,
+                             'range.rb' => range_rb) do |_dir, _book, _files|
+      preproc.process('ch01.re')
+    end
+    assert_equal expected, converted
+  end
+
+  def test_at_at_maprange
+    preproc = ReVIEW::Preprocessor.new({})
+
+    ch01_re = <<-'REFILE'
+//list[range.c][range.c(抜粋)]{
+#@maprange(range.c,sample)
+#@end
+//}
+REFILE
+
+    range_c = <<-'CFILE'
+#include <stdio.h>
+
+/* #@@range_begin(sample)  */
+void
+put_hello(char *name)
+{
+  printf("hello, %s!\n", name);
+}
+/* #@@range_end(sample) */
+
+int main()
+{
+  put_hello("world");
+}
+CFILE
+
+    expected = <<-'EXPECTED'
+//list[range.c][range.c(抜粋)]{
+#@maprange(range.c,sample)
+void
+put_hello(char *name)
+{
+  printf("hello, %s!\n", name);
+}
+#@end
+//}
+EXPECTED
+    converted = mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
+                             'ch01.re' => ch01_re,
+                             'range.c' => range_c) do |_dir, _book, _files|
+      preproc.process('ch01.re')
+    end
+    assert_equal expected, converted
+  end
 end

data/test/test_rstbuilder.rb

@@ -513,6 +513,19 @@ EOS
 
    \\sin   1^{2}
 
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+ [(1)]_ 
+
+.. [(1)] bar
 EOS
     assert_equal expected, actual
   end

data/test/test_textmaker_cmd.rb

@@ -21,7 +21,7 @@ class TEXTMakerCmdTest < Test::Unit::TestCase
   end
 
   def common_buildtext(bookdir, configfile, targetfile, option)
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+    unless /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
       config = prepare_samplebook(@tmpdir1, bookdir, nil, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-text')
       assert !File.exist?(builddir)