review 1.4.0 → 1.5.0

data/test/test_index.rb

@@ -42,10 +42,118 @@ class IndexTest < Test::Unit::TestCase
 == sec1-3
 ==== sec1-3-0-1
     EOB
-    chap = Book::Chapter.new(nil, 1, '-', nil) # dummy
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
     index = Book::HeadlineIndex.parse(src, chap)
     assert_equal [2,2], index['sec1-2|sec1-2-2'].number
     assert_equal "1.2.2", index.number('sec1-2|sec1-2-2')
   end
+
+  def test_HeadelineIndex2
+    src = <<-EOB
+= chap1
+== sec1-1
+== sec1-2
+=== sec1-2-1
+===[column] column1
+== sec1-3
+=== sec1-3-1
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [3,1], index['sec1-3|sec1-3-1'].number
+    assert_equal "1.3.1", index.number('sec1-3|sec1-3-1')
+  end
+
+  def test_HeadelineIndex3
+    src = <<-EOB
+= chap1
+== sec1-1
+== sec1-2
+=== sec1-2-1
+===[column] column1
+=== sec1-2-2
+== sec1-3
+=== sec1-3-1
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [2,2], index['sec1-2|sec1-2-2'].number
+    assert_equal "1.2.2", index.number('sec1-2|sec1-2-2')
+
+    assert_equal [3,1], index['sec1-3|sec1-3-1'].number
+    assert_equal "1.3.1", index.number('sec1-3|sec1-3-1')
+  end
+
+  def test_HeadelineIndex4
+    src = <<-EOB
+= chap1
+====[column] c1
+== sec1-1
+== sec1-2
+=== sec1-2-1
+=== sec1-2-2
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [2,2], index['sec1-2|sec1-2-2'].number
+    assert_equal "1.2.2", index.number('sec1-2|sec1-2-2')
+  end
+
+  def test_HeadelineIndex5
+    src = <<-EOB
+= chap1
+====[column] c1
+== sec1-1
+== sec1-2
+=== sec1-2-1
+=== sec1-2-2
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [2,2], index['sec1-2-2'].number
+    assert_equal "1.2.2", index.number('sec1-2-2')
+  end
+
+  def test_HeadelineIndex6
+    src = <<-EOB
+= chap1
+== sec1
+=== target
+== sec2
+
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+    assert_equal [1,1], index['target'].number
+    assert_equal "1.1.1", index.number('target')
+  end
+
+
+  def test_HeadelineIndex7
+    src = <<-EOB
+= chap1
+== sec1
+=== target
+       ^-- dummy target
+== sec2
+=== target
+       ^-- real target but it cannot be detected, because there is another one.
+
+    EOB
+    book = Book::Base.load
+    chap = Book::Chapter.new(book, 1, '-', nil) # dummy
+    index = Book::HeadlineIndex.parse(src, chap)
+
+    assert_raise ReVIEW::KeyError do
+      assert_equal [1,1], index['target'].number
+    end
+  end
+
 end
 

data/test/test_latexbuilder.rb

@@ -24,6 +24,7 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @chapter = Book::Chapter.new(@book, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
+    I18n.setup("ja")
   end
 
   def test_headline_level1
@@ -234,11 +235,25 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\reviewcmdcaption{cap1}\n\\begin{reviewcmd}\nfoo\nbar\n\nbuz\n\\end{reviewcmd}\n|, actual
   end
 
+  def test_cmd_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//cmd{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\\vspace{-1.5em}\\begin{reviewcmdlst}[title={\\relax},language={}]\nfoo\nbar\n\nbuz\n\\end{reviewcmdlst}\n|, actual
+  end
+
   def test_emlist
     actual = compile_block("//emlist{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, actual
   end
 
+  def test_emlist_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//emlist[][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\n\\vspace{-1.5em}\\begin{reviewemlistlst}[title={\\relax},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewemlistlst}\n|, actual
+  end
+
   def test_emlist_caption
     actual = compile_block("//emlist[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\nfoo\nbar\n\nbuz\n\\end{reviewemlist}\n|, actual
@@ -255,6 +270,18 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, actual
   end
 
+  def test_listnum
+    actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
+    assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\reviewlistcaption{ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual
+  end
+
+  def test_listnum_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
+    assert_equal %Q|\\begin{reviewlistnumlst}[caption={ruby},language={}]\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n\\end{reviewlistnumlst}\n|, actual
+  end
+
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|\n\\begin{quote}\nfoobar\n\nbuz\n\\end{quote}\n|, actual
@@ -637,6 +664,30 @@ EOS
     assert_equal "{-} {-}{-} {-}{-}{-} {-}{-}{-}{-}", actual
   end
 
+  def test_inline_imgref
+    def @chapter.image(id)
+      item = Book::ImageIndex::Item.new("sampleimg", 1, 'sample photo')
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    actual = compile_block "@<imgref>{sampleimg}\n"
+    expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}「sample photo」\n"
+    assert_equal expected, actual
+  end
+
+  def test_inline_imgref2
+    def @chapter.image(id)
+      item = Book::NumberlessImageIndex::Item.new("sampleimg", 1)
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    actual = compile_block "@<imgref>{sampleimg}\n"
+    expected = "\n\\reviewimageref{1.1}{image:chap1:sampleimg}\n"
+    assert_equal expected, actual
+  end
+
   def test_block_raw0
     actual = compile_block("//raw[<>!\"\\n& ]\n")
     expected = %Q(<>!\"\n& )

data/test/test_markdownbuilder.rb

@@ -61,7 +61,60 @@ EOS
 
   def test_cmd
     actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
-    assert_equal "```\nlineA\nlineB\n```\n", actual
+    assert_equal "```shell-session\nlineA\nlineB\n```\n", actual
+  end
+
+  def test_list
+    actual = compile_block(<<-EOS)
+//list[name][caption]{
+AAA
+BBB
+//}
+    EOS
+
+    assert_equal <<-EOS, actual
+リスト1.1 caption
+```
+AAA
+BBB
+```
+    EOS
+  end
+
+  def test_list_lang
+    actual = compile_block(<<-EOS)
+//list[name][caption][ruby]{
+AAA
+BBB
+//}
+    EOS
+
+    assert_equal <<-EOS, actual
+リスト1.1 caption
+```ruby
+AAA
+BBB
+```
+    EOS
+  end
+
+  def test_emlist_lang
+    actual = compile_block(<<-EOS)
+//emlist[caption][ruby]{
+AAA
+BBB
+//}
+    EOS
+
+    assert_equal <<-EOS, actual
+
+caption
+```ruby
+AAA
+BBB
+```
+
+    EOS
   end
 
   def test_table

data/test/test_pdfmaker.rb

@@ -15,18 +15,19 @@ class PDFMakerTest < Test::Unit::TestCase
                      "version" => 2,
                      "urnid" => "http://example.jp/",
                      "date" => "2011-01-01",
-                     "language" => "en",
+                     "language" => "ja",
                    })
     @output = StringIO.new
+    I18n.setup(@config["language"])
   end
 
   def test_check_book_existed
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        FileUtils.touch(File.join(dir, "sample.pdf"))
-        assert_raises SystemExit do
-          @maker.check_book(@config)
-        end
+        pdf_file = File.join(dir, "sample.pdf")
+        FileUtils.touch(pdf_file)
+        @maker.check_book(@config)
+        assert !File.exist?(pdf_file)
       end
     end
   end
@@ -120,7 +121,7 @@ class PDFMakerTest < Test::Unit::TestCase
       "contact"=>"tarou@example.jp",
     })
     Dir.mktmpdir do |dir|
-      I18n.i18n("ja", {"prt" => "印刷所"})
+      I18n.update({"prt" => "印刷所"},"ja")
       okuduke = @maker.make_colophon(@config)
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n発行所 & テスト出版 \\\\\n連絡先 & tarou@example.jp \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)

data/test/test_review_ext.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'book_test_helper'
+require 'review/compiler'
+require 'review/book'
+require 'review/htmlbuilder'
+
+class ReviewExtTest < Test::Unit::TestCase
+  include BookTestHelper
+
+  def test_builder_init_on_review_ext
+    review_ext = <<-EOB
+module ReVIEW
+  class HTMLBuilder
+    def builder_init
+      @builder_init_test = "test"
+    end
+  end
+end
+    EOB
+
+    mktmpbookdir('CHAPS' => "ch01.re\n",
+                 "ch01.re" => "= test\n\ntest.\n",
+                 "review-ext.rb" => review_ext) do |dir, book, files|
+      builder = ReVIEW::HTMLBuilder.new(false)
+      c = ReVIEW::Compiler.new(builder)
+      assert_equal "test", builder.instance_eval{@builder_init_test}
+    end
+  end
+end

data/test/test_topbuilder.rb

@@ -15,7 +15,8 @@ class TOPBuidlerTest < Test::Unit::TestCase
     @config.merge!({
       "secnolevel" => 2,
       "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8"
+      "outencoding" => "UTF-8",
+      "language" => "ja",
     })
     @book = Book::Base.new(nil)
     @book.config = @config
@@ -30,6 +31,7 @@ class TOPBuidlerTest < Test::Unit::TestCase
         puts msg
       end
     end
+    I18n.setup(@config["language"])
   end
 
   def test_headline_level1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,6 +25,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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'
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  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
@@ -80,21 +108,23 @@ files:
 - debian/review.links
 - debian/rules
 - debian/source/format
-- doc/catalog.rdoc
-- doc/format.rdoc
-- doc/format_idg.rdoc
-- doc/libepubmaker/config.yml
-- doc/quickstart.rdoc
+- doc/catalog.ja.md
+- doc/catalog.md
+- doc/format.ja.md
+- doc/format.md
+- doc/format_idg.ja.md
+- doc/quickstart.ja.md
+- doc/quickstart.md
 - doc/ruby-uuid/README
 - doc/ruby-uuid/README.ja
 - doc/sample.css
 - doc/sample.yml
 - lib/epubmaker.rb
 - lib/epubmaker/content.rb
+- lib/epubmaker/epubcommon.rb
 - lib/epubmaker/epubv2.rb
 - lib/epubmaker/epubv3.rb
 - lib/epubmaker/producer.rb
-- lib/epubmaker/resource.rb
 - lib/lineinput.rb
 - lib/review.rb
 - lib/review/book.rb
@@ -147,10 +177,9 @@ files:
 - test/bib.re
 - test/book_test_helper.rb
 - test/sample-book/README.md
-- test/sample-book/src/CHAPS
-- test/sample-book/src/PREDEF
 - test/sample-book/src/Rakefile
 - test/sample-book/src/_cover.html
+- test/sample-book/src/catalog.yml
 - test/sample-book/src/ch01.re
 - test/sample-book/src/ch02.re
 - test/sample-book/src/config.yml
@@ -171,6 +200,7 @@ files:
 - test/test_catalog.rb
 - test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
+- test/test_epub3maker.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
 - test/test_helper.rb
@@ -188,6 +218,7 @@ files:
 - test/test_pdfmaker.rb
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
+- test/test_review_ext.rb
 - test/test_textutils.rb
 - test/test_topbuilder.rb
 - test/test_uuid.rb
@@ -211,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'
@@ -220,10 +251,9 @@ test_files:
 - test/bib.re
 - test/book_test_helper.rb
 - test/sample-book/README.md
-- test/sample-book/src/CHAPS
-- test/sample-book/src/PREDEF
 - test/sample-book/src/Rakefile
 - test/sample-book/src/_cover.html
+- test/sample-book/src/catalog.yml
 - test/sample-book/src/ch01.re
 - test/sample-book/src/ch02.re
 - test/sample-book/src/config.yml
@@ -244,6 +274,7 @@ test_files:
 - test/test_catalog.rb
 - test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
+- test/test_epub3maker.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
 - test/test_helper.rb
@@ -261,6 +292,8 @@ test_files:
 - test/test_pdfmaker.rb
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
+- test/test_review_ext.rb
 - test/test_textutils.rb
 - test/test_topbuilder.rb
 - test/test_uuid.rb
+has_rdoc: