review 3.2.0 → 4.0.0

data/test/test_topbuilder.rb

@@ -177,11 +177,19 @@ EOS
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal %Q(foobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal %Q(foo bar\n), actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(\tfoobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(\tfoo bar\n), actual
   end
 
   def test_flushright
@@ -192,6 +200,17 @@ foobar
 buz
 ◆→終了:右寄せ←◆
 
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:右寄せ←◆
+foo bar
+buz
+◆→終了:右寄せ←◆
+
 EOS
     assert_equal expected, actual
   end
@@ -207,6 +226,15 @@ EOS
 ◆→DTP連絡:次の1行インデントなし←◆
 foobar
 foo2bar2
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+◆→DTP連絡:次の1行インデントなし←◆
+foo bar
+foo2 bar2
 EOS
     assert_equal expected, actual
   end
@@ -226,7 +254,7 @@ EOS
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -243,7 +271,7 @@ EOS
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
     expected = <<-EOS
@@ -373,7 +401,7 @@ EOS
 
   def test_bib
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     assert_equal '[1]', compile_inline('@<bib>{samplebib}')
@@ -413,7 +441,7 @@ EOS
 
   def test_inline_table
     def @chapter.table(_id)
-      Book::TableIndex::Item.new('sampletable', 1)
+      Book::Index::Item.new('sampletable', 1)
     end
     actual = compile_block("@<table>{sampletest}\n")
     assert_equal "表1.1\n", actual
@@ -562,7 +590,7 @@ EOS
 
   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
@@ -581,7 +609,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
@@ -624,7 +652,7 @@ EOB
       @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(foo bar"\\<>_@<b>{BAZ} ★bar"\\<>_@<b>{BAZ}☆ [missing word: N]\n), actual
-      assert_match(/WARN -- : :1: word not bound: N/, io.string)
+      assert_match(/WARN --: :1: word not bound: N/, io.string)
     end
   end
 

data/test/test_update.rb

@@ -14,7 +14,7 @@ class UpdateTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir
+    FileUtils.rm_rf(@tmpdir)
   end
 
   def test_broken_yml
@@ -96,19 +96,28 @@ EOT
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
-    assert_match(/Update 'review_version' to '3.0'/, io.string)
-    assert_equal 'review_version: 3.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+    assert_match(/Update 'review_version' to '4.0'/, io.string)
+    assert_equal 'review_version: 4.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+
+    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 3.0\n")
+
+    io = StringIO.new
+    @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+    @u.parse_ymls(@tmpdir)
+    @u.update_version
+    assert_match(/Update 'review_version' to '4.0'/, io.string)
+    assert_equal 'review_version: 4.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_version_current
-    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 3.0\n")
+    File.write(File.join(@tmpdir, 'config.yml'), "review_version: 4.0\n")
 
     io = StringIO.new
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
     assert_equal '', io.string
-    assert_equal 'review_version: 3.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
+    assert_equal 'review_version: 4.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
   def test_update_version_newer
@@ -118,7 +127,7 @@ EOT
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
     @u.parse_ymls(@tmpdir)
     @u.update_version
-    assert_match(/Update 'review_version' to '3.0'/, io.string)
+    assert_match(/Update 'review_version' to '4.0'/, io.string)
     assert_equal 'review_version: 99.0', File.read(File.join(@tmpdir, 'config.yml')).match(/review_version:.*$/).to_s
   end
 
@@ -143,7 +152,7 @@ EOT
 
   def test_update_rakefile_different
     File.write(File.join(@tmpdir, 'Rakefile'), '')
-    FileUtils.mkdir_p File.join(@tmpdir, 'lib/tasks')
+    FileUtils.mkdir_p(File.join(@tmpdir, 'lib/tasks'))
     File.write(File.join(@tmpdir, 'lib/tasks/review.rake'), '')
     io = StringIO.new
     @u.instance_eval{ @logger = ReVIEW::Logger.new(io) }
@@ -389,7 +398,7 @@ EOT
     assert_match(/has options/, io.string)
     cont = <<EOT
 texcommand: "/Program Files/up-latex"
-texoptions: "-interaction=nonstopmode -file-line-error --shell-escape -v"
+texoptions: "-interaction=nonstopmode -file-line-error -halt-on-error --shell-escape -v"
 EOT
     assert_equal cont, File.read(File.join(@tmpdir, 'config.yml'))
   end

data/test/test_yamlloader.rb

@@ -184,4 +184,17 @@ EOB
                    yaml)
     end
   end
+
+  def test_empty_file
+    Dir.mktmpdir do |dir|
+      yaml_file = File.join(dir, 'test.yml')
+      File.open(yaml_file, 'w') do |f|
+        f.write <<EOB
+#
+EOB
+      end
+      e = assert_raise(RuntimeError) { @loader.load_file(yaml_file) }
+      assert_match('test.yml is malformed.', e.message)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -137,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-eaw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Re:VIEW is a digital publishing system for books and ebooks. It supports
   InDesign, EPUB and LaTeX.
 email: kmuto@debian.org
@@ -148,6 +162,7 @@ executables:
 - review-compile
 - review-epub2html
 - review-epubmaker
+- review-idgxmlmaker
 - review-index
 - review-init
 - review-pdfmaker
@@ -179,6 +194,7 @@ files:
 - bin/review-compile
 - bin/review-epub2html
 - bin/review-epubmaker
+- bin/review-idgxmlmaker
 - bin/review-index
 - bin/review-init
 - bin/review-pdfmaker
@@ -240,6 +256,7 @@ files:
 - lib/review/book/compilable.rb
 - lib/review/book/image_finder.rb
 - lib/review/book/index.rb
+- lib/review/book/index/item.rb
 - lib/review/book/page_metric.rb
 - lib/review/book/part.rb
 - lib/review/book/volume.rb
@@ -263,6 +280,10 @@ files:
 - lib/review/i18n.rb
 - lib/review/i18n.yml
 - lib/review/idgxmlbuilder.rb
+- lib/review/idgxmlmaker.rb
+- lib/review/init-web/finish.html
+- lib/review/init-web/index.html
+- lib/review/init-web/review-layout-design.js
 - lib/review/init.rb
 - lib/review/latexbuilder.rb
 - lib/review/latexindex.rb
@@ -293,12 +314,14 @@ files:
 - review.gemspec
 - samples/LICENSE
 - samples/sample-book/README.md
+- samples/sample-book/src/.gitignore
 - samples/sample-book/src/Rakefile
 - samples/sample-book/src/_cover.html
 - samples/sample-book/src/catalog.yml
 - samples/sample-book/src/ch01.re
 - samples/sample-book/src/ch02.re
 - samples/sample-book/src/config-epub2.yml
+- samples/sample-book/src/config-jlreq.yml
 - samples/sample-book/src/config.yml
 - samples/sample-book/src/images/ch01-imgsample.jpg
 - samples/sample-book/src/images/cover-a5.ai
@@ -319,6 +342,7 @@ files:
 - samples/syntax-book/ch01.re
 - samples/syntax-book/ch02.re
 - samples/syntax-book/ch03.re
+- samples/syntax-book/config-jlreq.yml
 - samples/syntax-book/config.yml
 - samples/syntax-book/images/ball.png
 - samples/syntax-book/images/cover-b5.ai