review 3.2.0 → 4.0.0

data/test/test_i18n.rb

@@ -9,7 +9,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(locale: ja\nfoo: "bar"\n) }
         I18n.setup
         assert_equal 'bar', I18n.t('foo')
       end
@@ -20,7 +20,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yaml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(locale: ja\nfoo: "bar"\n) }
         assert_raise ReVIEW::ConfigError do
           I18n.setup
         end
@@ -32,7 +32,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(locale: ja\nfoo: "bar"\n) }
         I18n.setup('ja', 'foo.yml')
         assert_equal 'bar', I18n.t('foo')
       end
@@ -43,7 +43,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(locale: ja\nfoo: "bar"\n) }
         i18n = ReVIEW::I18n.new('ja')
         i18n.update_localefile(File.join(Dir.pwd, 'foo.yml'))
         assert_equal 'bar', i18n.t('foo')
@@ -55,7 +55,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(locale: ja\nfoo: "bar"\n) }
         I18n.setup('ja', 'foo.yml')
         assert_equal 'bar', I18n.t('foo')
       end
@@ -66,7 +66,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(ja:\n  foo: "bar"\nen:\n  foo: "buz"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(ja:\n  foo: "bar"\nen:\n  foo: "buz"\n) }
         I18n.setup
         assert_equal 'bar', I18n.t('foo')
         assert_equal '図', I18n.t('image')
@@ -81,7 +81,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(local: ja\nfoo: "bar"\n)) }
+        File.open(file, 'w') { |f| f.write %Q(local: ja\nfoo: "bar"\n) }
         assert_raises(ReVIEW::KeyError) do
           I18n.setup
         end
@@ -93,59 +93,59 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pa章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pa章" }
         I18n.setup('ja')
         assert_equal '第a章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pA章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pA章" }
         I18n.setup('ja')
         assert_equal '第B章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pAW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pAW章" }
         I18n.setup('ja')
         assert_equal '第Ｂ章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%paW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%paW章" }
         I18n.setup('ja')
         assert_equal '第ｂ章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pR章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pR章" }
         I18n.setup('ja')
         assert_equal '第I章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pr章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pr章" }
         I18n.setup('ja')
         assert_equal '第ii章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pRW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pRW章" }
         I18n.setup('ja')
         assert_equal '第Ⅻ章', I18n.t('chapter', 12)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pJ章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pJ章" }
         I18n.setup('ja')
         assert_equal '第二十七章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pdW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pdW章" }
         I18n.setup('ja')
         assert_equal '第１章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pdW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pdW章" }
         I18n.setup('ja')
         assert_equal '第27章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pDW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pDW章" }
         I18n.setup('ja')
         assert_equal '第１章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pDW章") }
+        File.open(file, 'w') { |f| f.write "locale: ja\nchapter: 第%pDW章" }
         I18n.setup('ja')
         assert_equal '第２７章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\npart: Part %pRW") }
+        File.open(file, 'w') { |f| f.write "locale: ja\npart: Part %pRW" }
         I18n.setup('ja')
         assert_equal 'Part ０', I18n.t('part', 0)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\npart: 第%pJ部") }
+        File.open(file, 'w') { |f| f.write "locale: ja\npart: 第%pJ部" }
         I18n.setup('ja')
         assert_equal '第一部', I18n.t('part', 1)
       end
@@ -215,7 +215,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_en
-    I18n.setup 'en'
+    I18n.setup('en')
     assert_equal 'Figure ', I18n.t('image')
     assert_equal 'Table ', I18n.t('table')
     assert_equal 'Chapter 1', I18n.t('chapter', 1)
@@ -223,7 +223,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_nil
-    I18n.setup 'nil'
+    I18n.setup('nil')
     assert_equal 'image', I18n.t('image')
     assert_equal 'table', I18n.t('table')
     assert_equal 'etc', I18n.t('etc')
@@ -236,7 +236,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def _setup_htmlbuilder
-    I18n.setup 'en'
+    I18n.setup('en')
     @builder = HTMLBuilder.new
     @config = ReVIEW::Configure[
       'secnolevel' => 2, # for IDGXMLBuilder, HTMLBuilder
@@ -295,6 +295,6 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def teardown
-    I18n.setup 'ja'
+    I18n.setup('ja')
   end
 end

data/test/test_idgxmlbuilder.rb

@@ -199,16 +199,28 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal '<p>foobar</p>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal '<p>foo bar</p>', actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(<p inlist="1">foobar</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(<p inlist="1">foo bar</p>), actual
   end
 
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal '<quote><p>foobar</p><p>buz</p></quote>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal '<quote><p>foo bar</p><p>buz</p></quote>', actual
   end
 
   def test_major_blocks
@@ -249,16 +261,28 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   def test_term
     actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal '<term><p>test1test1.5</p><p>test<i>2</i></p></term>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal '<term><p>test1 test1.5</p><p>test<i>2</i></p></term>', actual
   end
 
   def test_point
     actual = compile_block("//point[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q(<point-t><title aid:pstyle='point-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></point-t>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//point[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q(<point-t><title aid:pstyle='point-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1 test1.5</p><p>test<i>2</i></p></point-t>), actual
   end
 
   def test_point_without_caption
     actual = compile_block("//point{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal '<point><p>test1test1.5</p><p>test<i>2</i></p></point>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//point{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal '<point><p>test1 test1.5</p><p>test<i>2</i></p></point>', actual
   end
 
   def test_emlist
@@ -311,7 +335,7 @@ EOS
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS.chomp
@@ -326,7 +350,7 @@ EOS
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS.chomp
@@ -341,7 +365,7 @@ EOS
 
   def test_listnum_linenum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     actual = compile_block("//firstlinenum[100]\n//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS.chomp
@@ -356,7 +380,7 @@ EOS
 
   def test_list_listinfo
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @config['listinfo'] = true
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
@@ -454,11 +478,19 @@ EOS
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q(<p align='right'>foobar</p><p align='right'>buz</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q(<p align='right'>foo bar</p><p align='right'>buz</p>), actual
   end
 
   def test_centering
     actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q(<p align='center'>foobar</p><p align='center'>buz</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q(<p align='center'>foo bar</p><p align='center'>buz</p>), actual
   end
 
   def test_blankline
@@ -469,11 +501,15 @@ EOS
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
     assert_equal %Q(<p aid:pstyle="noindent" noindent='1'>foobar</p><p>foo2bar2</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    assert_equal %Q(<p aid:pstyle="noindent" noindent='1'>foo bar</p><p>foo2 bar2</p>), actual
   end
 
   def test_image
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -484,7 +520,7 @@ EOS
 
   def test_image_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -495,7 +531,7 @@ EOS
 
   def test_image_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -506,7 +542,7 @@ EOS
 
   def test_indepimage
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -517,7 +553,7 @@ EOS
 
   def test_indepimage_without_caption
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -528,7 +564,7 @@ EOS
 
   def test_indepimage_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -539,7 +575,7 @@ EOS
 
   def test_indepimage_with_metric2
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -550,7 +586,7 @@ EOS
 
   def test_indepimage_without_caption_but_with_metric
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
@@ -628,7 +664,7 @@ EOS
 
   def test_column_in_aother_chapter_ref
     def @chapter.column_index
-      items = [Book::ColumnIndex::Item.new('chap1|column', 1, 'column_cap')]
+      items = [Book::Index::Item.new('chap1|column', 1, 'column_cap')]
       Book::ColumnIndex.new(items)
     end
 
@@ -657,9 +693,15 @@ EOS
   * BBB
     -BB
 EOS
-
     expected = <<-EOS.chomp
 <ul><li aid:pstyle="ul-item">AAA-AA</li><li aid:pstyle="ul-item">BBB-BB</li></ul>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    expected = <<-EOS.chomp
+<ul><li aid:pstyle="ul-item">AAA -AA</li><li aid:pstyle="ul-item">BBB -BB</li></ul>
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
@@ -777,24 +819,24 @@ EOS
 
   def test_inline_imgref
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample photo')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span type='image'>図1.1「sample photo」</span></p>)
     assert_equal expected, actual
   end
 
   def test_inline_imgref2
     def @chapter.image(_id)
-      item = Book::NumberlessImageIndex::Item.new('sampleimg', 1)
+      item = Book::Index::Item.new('sampleimg', 1)
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span type='image'>図1.1</span></p>)
     assert_equal expected, actual
   end

data/test/test_image_finder.rb

@@ -19,7 +19,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 
@@ -33,7 +33,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 
@@ -47,7 +47,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 
@@ -61,7 +61,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 
@@ -75,7 +75,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 
@@ -93,7 +93,7 @@ class ImageFinderTest < Test::Unit::TestCase
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path_dstimg, finder.find_path('foo'))
     ensure
-      FileUtils.remove_entry_secure dir
+      FileUtils.remove_entry_secure(dir)
     end
   end
 end