review 2.0.0.beta1 → 2.0.0

data/test/test_tocparser.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'review/tocparser'
+
+class TOCParserTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def test_tocparser_parse_null
+    dummy_book = ReVIEW::Book::Base.load
+    chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
+    ret = TOCParser.parse(chap)
+    assert_equal [], ret
+  end
+
+  def test_tocparser_parse
+    dummy_book = ReVIEW::Book::Base.load
+    io = StringIO.new("= test\n\naaa\n//image[foo][bar]{\n//}\n\n== test2\n\n=== test3\n\n==test21\n\n=test11\n")
+    chap = ReVIEW::Book::Chapter.new(dummy_book, 1, 'foo', "bar/foo.re", io)
+    ret = TOCParser.parse(chap)
+    assert_equal 2, ret.size ## XXX how to count chapters including multiple L1 headlines ??
+    chap_node = ret[0]
+    assert_equal ReVIEW::TOCParser::Chapter, chap_node.class
+    assert_equal "foo", chap_node.chapter_id
+    assert_equal 1, chap_node.number
+  end
+end

data/test/test_topbuilder.rb

@@ -14,8 +14,6 @@ class TOPBuidlerTest < Test::Unit::TestCase
     @config = ReVIEW::Configure.values
     @config.merge!({
       "secnolevel" => 2,
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
       "language" => "ja",
     })
     @book = Book::Base.new(nil)
@@ -182,6 +180,40 @@ class TOPBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|◆→開始:インラインリスト←◆\n■this is ★test☆<&>_\n 1: foo\n 2: bar\n◆→終了:インラインリスト←◆\n\n|, actual
   end
 
+  def test_major_blocks
+    actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
+    expected = %Q(◆→開始:ノート←◆\nA\nB\n◆→終了:ノート←◆\n\n◆→開始:ノート←◆\n■caption\nA\n◆→終了:ノート←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
+    expected = %Q(◆→開始:メモ←◆\nA\nB\n◆→終了:メモ←◆\n\n◆→開始:メモ←◆\n■caption\nA\n◆→終了:メモ←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
+    expected = %Q(◆→開始:情報←◆\nA\nB\n◆→終了:情報←◆\n\n◆→開始:情報←◆\n■caption\nA\n◆→終了:情報←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
+    expected = %Q(◆→開始:重要←◆\nA\nB\n◆→終了:重要←◆\n\n◆→開始:重要←◆\n■caption\nA\n◆→終了:重要←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
+    expected = %Q(◆→開始:警告←◆\nA\nB\n◆→終了:警告←◆\n\n◆→開始:警告←◆\n■caption\nA\n◆→終了:警告←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
+    expected = %Q(◆→開始:注意←◆\nA\nB\n◆→終了:注意←◆\n\n◆→開始:注意←◆\n■caption\nA\n◆→終了:注意←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
+    expected = %Q(◆→開始:危険←◆\nA\nB\n◆→終了:危険←◆\n\n◆→開始:危険←◆\n■caption\nA\n◆→終了:危険←◆\n\n)
+    assert_equal expected, actual
+
+    actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
+    expected = %Q(◆→開始:TIP←◆\nA\nB\n◆→終了:TIP←◆\n\n◆→開始:TIP←◆\n■caption\nA\n◆→終了:TIP←◆\n\n)
+    assert_equal expected, actual
+  end
+
   def test_image
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)

data/test/test_yamlloader.rb

@@ -0,0 +1,188 @@
+require 'test_helper'
+require 'review/yamlloader'
+require 'review/extentions'
+require 'tmpdir'
+
+class YAMLLoaderTest < Test::Unit::TestCase
+  def setup
+    @loader = ReVIEW::YAMLLoader.new
+  end
+
+  def teardown
+  end
+
+  def test_load_file
+    Dir.mktmpdir do |dir|
+      yaml_file = File.join(dir, "test.yml")
+      File.open(yaml_file, "w") do |f|
+        f.write <<EOB
+foo:
+  bar: "test"
+EOB
+      end
+      yaml = @loader.load_file(yaml_file)
+      assert_equal yaml, {"foo" => {"bar"=>"test"}}
+    end
+  end
+
+  def test_load_file_inherit
+    Dir.mktmpdir do |dir|
+      yaml_file = File.join(dir, "test.yml")
+      yaml_file2 = File.join(dir, "test2.yml")
+      File.open(yaml_file, "w") do |f|
+        f.write <<EOB
+k0: 2
+k1:
+  name: "test"
+  array: [{name: "N", val: "V"}]
+inherit: ["test2.yml"]
+EOB
+      end
+      File.open(yaml_file2, "w") do |f|
+        f.write <<EOB
+k1:
+  name: "test2"
+  name2: "value2"
+  array: [{name: "shoudoverridden_name", val: "shouldoverridden_val"}]
+k2: "3"
+EOB
+      end
+      yaml = @loader.load_file(yaml_file)
+      assert_equal({"k0" => 2,
+                    "k1" => {"name"=>"test", "name2"=>"value2",
+                             "array" => [{"name" => "N", "val" => "V"}]},
+                    "k2" => "3"},
+                   yaml)
+    end
+  end
+
+  def test_load_file_inherit2
+    Dir.mktmpdir do |dir|
+      yaml_file = File.join(dir, "test.yml")
+      yaml_file2 = File.join(dir, "test2.yml")
+      yaml_file3 = File.join(dir, "test3.yml")
+      File.open(yaml_file, "w") do |f|
+        f.write <<EOB
+k0: 2
+k1:
+  name1: "value1-1"
+inherit: ["test3.yml", "test2.yml"]
+EOB
+      end
+      File.open(yaml_file2, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "value1-2"
+  name2: "value2-2"
+k2: "B"
+EOB
+      end
+      File.open(yaml_file3, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "value1-3"
+  name2: "value2-3"
+  name3: "value3-3"
+k3: "C"
+EOB
+      end
+      yaml = @loader.load_file(yaml_file)
+      assert_equal({"k0" => 2,
+                    "k1" => {"name1"=>"value1-1", "name2"=>"value2-2", "name3"=>"value3-3"},
+                    "k2" => "B",
+                    "k3" => "C",
+                   },
+                   yaml)
+    end
+  end
+
+  def test_load_file_inherit3
+    Dir.mktmpdir do |dir|
+      yaml_file1 = File.join(dir, "test1.yml")
+      yaml_file2 = File.join(dir, "test2.yml")
+      yaml_file3 = File.join(dir, "test3.yml")
+      yaml_file4 = File.join(dir, "test4.yml")
+      yaml_file5 = File.join(dir, "test5.yml")
+      yaml_file6 = File.join(dir, "test6.yml")
+      yaml_file7 = File.join(dir, "test7.yml")
+      File.open(yaml_file7, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N7"
+inherit: ["test3.yml", "test6.yml"]
+EOB
+      end
+      File.open(yaml_file6, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N6"
+  name2: "N6"
+inherit: ["test4.yml", "test5.yml"]
+EOB
+      end
+      File.open(yaml_file5, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N5"
+  name2: "N5"
+  name3: "N5"
+EOB
+      end
+      File.open(yaml_file4, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N4"
+  name2: "N4"
+  name3: "N4"
+  name4: "N4"
+EOB
+      end
+      File.open(yaml_file3, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N3"
+  name2: "N3"
+  name3: "N3"
+  name4: "N3"
+  name5: "N3"
+inherit: ["test1.yml", "test2.yml"]
+EOB
+      end
+      File.open(yaml_file2, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N2"
+  name2: "N2"
+  name3: "N2"
+  name4: "N2"
+  name5: "N2"
+  name6: "N2"
+EOB
+      end
+      File.open(yaml_file1, "w") do |f|
+        f.write <<EOB
+k1:
+  name1: "N1"
+  name2: "N1"
+  name3: "N1"
+  name4: "N1"
+  name5: "N1"
+  name6: "N1"
+  name7: "N1"
+EOB
+      end
+
+      yaml = @loader.load_file(yaml_file7)
+      assert_equal({"k1" => {"name1"=>"N7",
+                             "name2"=>"N6",
+                             "name3"=>"N5",
+                             "name4"=>"N4",
+                             "name5"=>"N3",
+                             "name6"=>"N2",
+                             "name7"=>"N1",
+                            },
+                   },
+                   yaml)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0
 platform: ruby
 authors:
 - kmuto
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kpeg
+  name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,43 +85,47 @@ description: Re:VIEW is a digital publishing system for books and ebooks. It sup
   InDesign, EPUB and LaTeX.
 email: kmuto@debian.org
 executables:
+- review
 - review-catalog-converter
 - review-check
 - review-checkdep
 - review-compile
 - review-epubmaker
-- review-epubmaker-legacy
 - review-index
 - review-init
 - review-pdfmaker
 - review-preproc
 - review-validate
 - review-vol
+- review-webmaker
 extensions: []
 extra_rdoc_files:
 - ChangeLog
-- README.rdoc
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - COPYING
 - ChangeLog
+- Dockerfile
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
+- appveyor.yml
+- bin/review
 - bin/review-catalog-converter
 - bin/review-check
 - bin/review-checkdep
 - bin/review-compile
 - bin/review-epubmaker
-- bin/review-epubmaker-legacy
 - bin/review-index
 - bin/review-init
 - bin/review-pdfmaker
 - bin/review-preproc
 - bin/review-validate
 - bin/review-vol
+- bin/review-webmaker
 - debian/README.Debian
 - debian/README.source
 - debian/changelog
@@ -122,17 +140,22 @@ files:
 - debian/review.links
 - debian/rules
 - debian/source/format
+- doc/NEWS.ja.md
+- doc/NEWS.md
 - doc/catalog.ja.md
 - doc/catalog.md
+- doc/config.yml.sample
+- doc/customize_epub.ja.md
 - doc/format.ja.md
 - doc/format.md
 - doc/format_idg.ja.md
+- doc/pdfmaker.ja.md
+- doc/pdfmaker.md
 - doc/quickstart.ja.md
 - doc/quickstart.md
-- doc/ruby-uuid/README
-- doc/ruby-uuid/README.ja
 - doc/sample.css
-- doc/sample.yml
+- doc/writing_vertical.ja.md
+- doc/writing_vertical.md
 - lib/epubmaker.rb
 - lib/epubmaker/content.rb
 - lib/epubmaker/epubcommon.rb
@@ -153,39 +176,32 @@ files:
 - lib/review/builder.rb
 - lib/review/catalog.rb
 - lib/review/compiler.rb
-- lib/review/compiler/literals_1_8.kpeg
-- lib/review/compiler/literals_1_8.rb
-- lib/review/compiler/literals_1_9.kpeg
-- lib/review/compiler/literals_1_9.rb
 - lib/review/configure.rb
+- lib/review/converter.rb
 - lib/review/epubbuilder.rb
 - lib/review/epubmaker.rb
 - lib/review/ewbbuilder.rb
 - lib/review/exception.rb
 - lib/review/extentions.rb
-- lib/review/extentions/array.rb
+- lib/review/extentions/hash.rb
 - lib/review/extentions/object.rb
 - lib/review/extentions/string.rb
 - lib/review/htmlbuilder.rb
-- lib/review/htmllayout.rb
+- lib/review/htmltoc.rb
 - lib/review/htmlutils.rb
 - lib/review/i18n.rb
 - lib/review/i18n.yml
 - lib/review/idgxmlbuilder.rb
-- lib/review/inaobuilder.rb
 - lib/review/latexbuilder.rb
 - lib/review/latexindex.rb
 - lib/review/latexutils.rb
-- lib/review/layout.tex.erb
 - lib/review/lineinput.rb
-- lib/review/location.rb
 - lib/review/makerhelper.rb
 - lib/review/markdownbuilder.rb
-- lib/review/node.rb
 - lib/review/pdfmaker.rb
 - lib/review/preprocessor.rb
-- lib/review/review.kpeg
 - lib/review/sec_counter.rb
+- lib/review/template.rb
 - lib/review/textbuilder.rb
 - lib/review/textutils.rb
 - lib/review/tocparser.rb
@@ -193,10 +209,21 @@ files:
 - lib/review/topbuilder.rb
 - lib/review/unfold.rb
 - lib/review/version.rb
-- lib/uuid.rb
+- lib/review/webmaker.rb
+- lib/review/webtocprinter.rb
+- lib/review/yamlloader.rb
 - review.gemspec
-- rubocop-todo.yml
+- templates/html/layout-html5.html.erb
+- templates/html/layout-xhtml1.html.erb
+- templates/latex/layout.tex.erb
+- templates/ncx/epubv2.ncx.erb
+- templates/opf/epubv2.opf.erb
+- templates/opf/epubv3.opf.erb
+- templates/web/html/layout-html5.html.erb
+- templates/web/html/layout-xhtml1.html.erb
+- templates/xml/container.xml.erb
 - test/CHAPS
+- test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
 - test/bib.re
@@ -207,12 +234,14 @@ files:
 - test/sample-book/src/catalog.yml
 - test/sample-book/src/ch01.re
 - test/sample-book/src/ch02.re
+- test/sample-book/src/config-epub2.yml
 - test/sample-book/src/config.yml
 - test/sample-book/src/images/ch01-imgsample.jpg
 - test/sample-book/src/images/cover.jpg
 - test/sample-book/src/preface.re
 - test/sample-book/src/sty/jumoline.sty
 - test/sample-book/src/sty/reviewmacro.sty
+- test/sample-book/src/style-web.css
 - test/sample-book/src/style.css
 - test/sample-book/src/vendor/jumoline/README
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
@@ -225,16 +254,19 @@ files:
 - test/test_catalog.rb
 - test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
+- test/test_configure.rb
+- test/test_converter.rb
 - test/test_epub3maker.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
+- test/test_extentions_hash.rb
 - test/test_helper.rb
 - test/test_htmlbuilder.rb
+- test/test_htmltoc.rb
 - test/test_htmlutils.rb
 - test/test_i18n.rb
 - test/test_idgxmlbuilder.rb
 - test/test_image_finder.rb
-- test/test_inaobuilder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
 - test/test_lineinput.rb
@@ -244,9 +276,11 @@ files:
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
 - test/test_review_ext.rb
+- test/test_template.rb
 - test/test_textutils.rb
+- test/test_tocparser.rb
 - test/test_topbuilder.rb
-- test/test_uuid.rb
+- test/test_yamlloader.rb
 homepage: http://github.com/kmuto/review
 licenses:
 - LGPL
@@ -267,12 +301,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'
 test_files:
 - test/CHAPS
+- test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
 - test/bib.re
@@ -283,12 +318,14 @@ test_files:
 - test/sample-book/src/catalog.yml
 - test/sample-book/src/ch01.re
 - test/sample-book/src/ch02.re
+- test/sample-book/src/config-epub2.yml
 - test/sample-book/src/config.yml
 - test/sample-book/src/images/ch01-imgsample.jpg
 - test/sample-book/src/images/cover.jpg
 - test/sample-book/src/preface.re
 - test/sample-book/src/sty/jumoline.sty
 - test/sample-book/src/sty/reviewmacro.sty
+- test/sample-book/src/style-web.css
 - test/sample-book/src/style.css
 - test/sample-book/src/vendor/jumoline/README
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
@@ -301,16 +338,19 @@ test_files:
 - test/test_catalog.rb
 - test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
+- test/test_configure.rb
+- test/test_converter.rb
 - test/test_epub3maker.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
+- test/test_extentions_hash.rb
 - test/test_helper.rb
 - test/test_htmlbuilder.rb
+- test/test_htmltoc.rb
 - test/test_htmlutils.rb
 - test/test_i18n.rb
 - test/test_idgxmlbuilder.rb
 - test/test_image_finder.rb
-- test/test_inaobuilder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
 - test/test_lineinput.rb
@@ -320,6 +360,8 @@ test_files:
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
 - test/test_review_ext.rb
+- test/test_template.rb
 - test/test_textutils.rb
+- test/test_tocparser.rb
 - test/test_topbuilder.rb
-- test/test_uuid.rb
+- test/test_yamlloader.rb