review 4.2.0 → 5.0.0

data/test/test_review_ext.rb

@@ -11,7 +11,8 @@ class ReviewExtTest < Test::Unit::TestCase
 module ReVIEW
   class HTMLBuilder
     attr_reader :builder_init_test
-    def builder_init
+    def initialize(strict = false)
+      super
       @builder_init_test = "test"
     end
   end

data/test/test_rstbuilder.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'review/compiler'
 require 'review/book'
-require 'review/topbuilder'
+require 'review/rstbuilder'
 require 'review/i18n'
 
 class RSTBuidlerTest < Test::Unit::TestCase
@@ -327,13 +327,16 @@ EOS
 .. note::
 
    A
+
 B
 
+
 .. note::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -342,13 +345,16 @@ EOS
 .. memo::
 
    A
+
 B
 
+
 .. memo::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -357,13 +363,16 @@ EOS
 .. info::
 
    A
+
 B
 
+
 .. info::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -372,13 +381,16 @@ EOS
 .. important::
 
    A
+
 B
 
+
 .. important::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -387,13 +399,16 @@ EOS
 .. caution::
 
    A
+
 B
 
+
 .. caution::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -402,13 +417,16 @@ EOS
 .. notice::
 
    A
+
 B
 
+
 .. notice::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -417,13 +435,16 @@ EOS
 .. warning::
 
    A
+
 B
 
+
 .. warning::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
 
@@ -432,13 +453,16 @@ EOS
 .. tip::
 
    A
+
 B
 
+
 .. tip::
 
    caption
    A
 
+
 EOS
     assert_equal expected, actual
   end

data/test/test_sec_counter.rb

@@ -0,0 +1,156 @@
+require 'test_helper'
+require 'book_test_helper'
+require 'review/sec_counter'
+
+class SecCounterTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @book = Book::Base.new
+    @io = StringIO.new("= sample\n\n")
+    @chapter = Book::Chapter.new(@book, 1, 'foo', '-', @io)
+    @part = Book::Part.new(@book, 1, [], 'name')
+    I18n.setup
+  end
+
+  def test_initialize
+    @sec_counter = SecCounter.new(5, @chapter)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-0', @sec_counter.anchor(3))
+  end
+
+  def test_anchor1
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-1', @sec_counter.anchor(3))
+  end
+
+  def test_anchor2
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-2', @sec_counter.anchor(3))
+    assert_equal('1-1-2-1', @sec_counter.anchor(4))
+  end
+
+  def test_anchor3
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-3', @sec_counter.anchor(3))
+    assert_equal('1-1-3-0', @sec_counter.anchor(4))
+  end
+
+  def test_anchor4
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(2)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-3', @sec_counter.anchor(2))
+    assert_equal('1-3-2', @sec_counter.anchor(3))
+    assert_equal('1-3-2-0', @sec_counter.anchor(4))
+  end
+
+  def test_anchor_part1
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-1', @sec_counter.anchor(3))
+  end
+
+  def test_anchor_part3
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-3', @sec_counter.anchor(3))
+    assert_equal('1-1-3-0', @sec_counter.anchor(4))
+  end
+
+  def test_prefix1
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    assert_equal('1.1　', @sec_counter.prefix(2, 3))
+    assert_equal('1.1.0　', @sec_counter.prefix(3, 3))
+    assert_equal('1.1.0　', @sec_counter.prefix(3, 5))
+  end
+
+  def test_prefix2
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('1.1.2　', @sec_counter.prefix(3, 5))
+    assert_equal('1.1.2　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+  end
+
+  def test_prefix3
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('1.1.3　', @sec_counter.prefix(3, 5))
+    assert_equal('1.1.3　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+    assert_equal('1.1.3.0　', @sec_counter.prefix(4, 5))
+  end
+
+  def test_prefix_part1
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    assert_equal('I.1　', @sec_counter.prefix(2, 3))
+    assert_equal('I.1.0　', @sec_counter.prefix(3, 3))
+    assert_equal('I.1.0　', @sec_counter.prefix(3, 5))
+  end
+
+  def test_prefix_part2
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('I.1　', @sec_counter.prefix(2, 5))
+    assert_equal('I.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('I.1.2　', @sec_counter.prefix(3, 5))
+    assert_equal('I.1.2　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+  end
+end

data/test/test_textmaker_cmd.rb

@@ -29,7 +29,7 @@ class TEXTMakerCmdTest < Test::Unit::TestCase
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
       Dir.chdir(@tmpdir1) do
         _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_TEXTMAKER} #{option} #{configfile}")
-        STDERR.puts e unless e.empty?
+        assert_equal '', e
         assert s.success?
       end
       assert File.exist?(File.join(@tmpdir1, targetfile))

data/test/test_topbuilder.rb

@@ -175,11 +175,11 @@ EOS
   end
 
   def test_dt_inline
-    fn = Book::FootnoteIndex.parse(['//footnote[bar][bar]'])
-    @chapter.instance_eval { @footnote_index = fn }
-    actual = compile_block(" : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+    actual = compile_block("//footnote[bar][bar]\n\n : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
 
     expected = <<-EOS
+【注1】bar
+
 ★foo【注1】[]<>&◆→TeX式ここから←◆\\alpha[]◆→TeX式ここまで←◆☆
 	
 
@@ -533,10 +533,10 @@ EOS
   end
 
   def test_empty_table
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n//}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
     assert_equal ':2: error: no rows in the table', e.message
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n------------\n//}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
     assert_equal ':3: error: no rows in the table', e.message
   end
 
@@ -735,6 +735,183 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    titles = {
+      'note' => 'ノート',
+      'memo' => 'メモ',
+      'important' => '重要',
+      'info' => '情報',
+      'notice' => '注意',
+      'caution' => '警告',
+      'warning' => '危険',
+      'tip' => 'TIP'
+    }
+
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}1
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}3
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}4
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}5
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}6
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+
+●	A
+
+1	B
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND1
+
+◆→開始:インラインリスト←◆
+LIST
+◆→終了:インラインリスト←◆
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//note{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
   def test_image
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1)
@@ -816,18 +993,18 @@ EOB
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<img>{n}\n" }
+    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" }
+    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" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
     assert_equal ':1: error: unknown headline: n', e.message
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ":1: error: unknown #{name}: n", e.message
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
       assert_equal ':1: error: key not found: "n"', e.message
     end
   end