review 1.6.0 → 1.7.0

data/test/test_book_part.rb

@@ -33,7 +33,7 @@ class PartTest < Test::Unit::TestCase
     assert_equal 0, part.volume.lines
 
     chs = []
-    tfs = []  ## prevent from removing Tempfile
+    tfs = [] ## prevent from removing Tempfile
     Tempfile.open('part_test') do |o|
       o.print "12345"
       chs << Book::Chapter.new(book, nil, nil, o.path)

data/test/test_builder.rb

@@ -52,47 +52,6 @@ class BuidlerTest < Test::Unit::TestCase
     assert_raises(NoMethodError) do # XXX: OK?
       b.puts ""
     end
-
-    if "".respond_to?(:encode)
-      utf8_str = "あいうえお"
-      eucjp_str = "あいうえお".encode("EUC-JP")
-      sjis_str = "あいうえお".encode("Shift_JIS")
-      jis_str = "あいうえお".encode("ISO-2022-JP")
-    else
-      utf8_str = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a" # "あいうえお"
-      eucjp_str = "\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa"
-      sjis_str = "\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8"
-      jis_str = "\x1b\x24\x42\x24\x22\x24\x24\x24\x26\x24\x28\x24\x2a\x1b\x28\x42"
-    end
-
-    [
-      ['EUC', eucjp_str],
-      ['SJIS', sjis_str],
-#      ['JIS', jis_str],
-#      ['jis', jis_str],
-#      ['jIs', jis_str],
-      ['XYZ', utf8_str],
-    ].each do |enc, expect|
-      params = {"outencoding" => enc}
-
-      [
-        [:print, utf8_str, expect],
-        [:puts,  utf8_str, "#{expect}\n"],
-        [:print, "#{utf8_str}\n", "#{expect}\n"],
-        [:puts,  "#{utf8_str}\n", "#{expect}\n"],
-      ].each do |m, instr, expstr|
-        b = Builder.new
-        chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, nil, '-', nil)
-        b.bind(nil, chapter, nil)
-        chapter.book.config = params
-        b.__send__(m, instr)
-        if "".respond_to?(:encode)
-          assert_equal expstr.encode("UTF-8"), b.result
-        else
-          assert_equal expstr, b.result
-        end
-      end
-    end
   end
 
   def test_not_implemented_methods
@@ -131,14 +90,6 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal [:text, text], @b.compile_inline(text)
   end
 
-  def test_convert_outencoding
-    book = ReVIEW::Book::Base.new(nil)
-    book.config = {'outencoding' => "EUC"}
-    b = Builder.new
-    ret = b.convert_outencoding("a", book.config["outencoding"])
-    assert_equal "a", ret
-  end
-
   class XBuilder < Builder
     def list_header(id, caption)
     end

data/test/test_configure.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/epubmaker'
+
+class ConfigureTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @maker = ReVIEW::EPUBMaker.new
+    @config = ReVIEW::Configure.values
+    @config.merge!({
+                     "bookname" => "sample",
+                     "title" => "Sample Book",
+                     "version" => 2,
+                     "urnid" => "http://example.jp/",
+                     "date" => "2011-01-01",
+                     "language" => "ja",
+                     "epubmaker" => {"flattocindent" => true},
+                   })
+    @output = StringIO.new
+    I18n.setup(@config["language"])
+  end
+
+  def test_configure_class
+    assert_equal ReVIEW::Configure, @config.class
+  end
+
+  def test_configure_get
+    bookname = @config["bookname"]
+    assert_equal "sample", bookname
+  end
+
+  def test_configure_get2
+    assert_equal true, @config["epubmaker"]["flattocindent"]
+  end
+
+  def test_configure_with_maker
+    @config.maker = "epubmaker"
+    assert_equal true, @config["flattocindent"]
+    assert_equal true, @config["epubmaker"]["flattocindent"]
+  end
+
+  def test_configure_with_invalidmaker
+    @config.maker = "pdfmaker"
+    assert_equal nil, @config["flattocindent"]
+    assert_equal true, @config["epubmaker"]["flattocindent"]
+  end
+
+end

data/test/test_htmlbuilder.rb

@@ -14,10 +14,9 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @builder = HTMLBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!({
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
+      "htmlext" => "html",
     })
     @book = Book::Base.new(".")
     @book.config = @config
@@ -521,6 +520,35 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal "<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class=\"list\">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n</pre>\n</div>\n", actual
   end
 
+  def test_listnum
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+
+    @book.config["highlight"] = false
+    actual = compile_block(<<-EOS)
+//listnum[samplelist][this is @<b>{test}<&>_][ruby]{
+def foo(a1, a2=:test)
+  (1..3).times{|i| a.include?(:foo)}
+  return true
+end
+//}
+EOS
+
+    expected =<<-EOS
+<div class="code">
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+<pre class="list"> 1: def foo(a1, a2=:test)
+ 2:   (1..3).times{|i| a.include?(:foo)}
+ 3:   return true
+ 4: end
+</pre>
+</div>
+EOS
+
+    assert_equal expected, actual
+  end
+
   def test_listnum_pygments_lang
     def @chapter.list(id)
       Book::ListIndex::Item.new("samplelist",1)
@@ -583,6 +611,19 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">        lineA\n                lineB\n        lineC\n</pre>\n</div>\n|, actual
   end
 
+  def test_emlistnum
+    @book.config["highlight"] = false
+    actual = compile_block("//emlistnum{\nlineA\nlineB\n//}\n")
+    expected =<<-EOS
+<div class="emlistnum-code">
+<pre class="emlist"> 1: lineA
+ 2: lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_emlist_with_4tab
     @config["tabwidth"] = 4
     actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
@@ -626,6 +667,15 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<a href="bib.html#bib-id_sample_3Dbib">[1]</a>|, compile_inline("@<bib>{sample=bib}")
   end
 
+  def test_bib_htmlext
+    def @chapter.bibpaper(id)
+      Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")
+    end
+
+    @config["htmlext"] = "xhtml"
+    assert_equal %Q|<a href="bib.xhtml#bib-samplebib">[1]</a>|, compile_inline("@<bib>{samplebib}")
+  end
+
   def test_bibpaper
     def @chapter.bibpaper(id)
       Book::BibpaperIndex::Item.new("samplebib",1,"sample bib")

data/test/test_htmltoc.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'review/htmltoc'
+
+class HTMLTocTest < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_tocfilename
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal "/var/tmp/toc-html.txt", toc.tocfilename
+  end
+
+  def test_encode_args
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal "chaptype=pre", toc.encode_args({:chaptype => "pre"})
+    assert_equal "force_include=true,chaptype=body,properties=foo", toc.encode_args({:force_include => true, :chaptype => "body", "properties"=>"foo"})
+  end
+
+  def test_decode_args
+    toc = HTMLToc.new("/var/tmp")
+    assert_equal({:chaptype => "pre"}, toc.decode_args("chaptype=pre"))
+    assert_equal({:force_include => "true", :chaptype => "body",:properties=>"foo"}, toc.decode_args("force_include=true,chaptype=body,properties=foo"))
+  end
+
+end
+

data/test/test_i18n.rb

@@ -10,7 +10,7 @@ require 'tmpdir'
 class I18nTest < Test::Unit::TestCase
   include ReVIEW
 
-  if RUBY_VERSION !~ /^1.8/  ## to avoid Travis error :-(
+  if RUBY_VERSION !~ /^1.8/ ## to avoid Travis error :-(
     def test_load_locale_yml
       Dir.mktmpdir do |dir|
         Dir.chdir(dir) do
@@ -137,10 +137,8 @@ class I18nTest < Test::Unit::TestCase
     I18n.setup "en"
     @builder = HTMLBuilder.new()
     @config = {
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
       "ext" => ".re"
     }
     @book = Book::Base.new(".")

data/test/test_idgxmlbuilder.rb

@@ -14,8 +14,6 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config = ReVIEW::Configure.values
     @config.merge!({
       "secnolevel" => 2,
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
       "nolf" => true,
       "tableopt" => "10"
     })

data/test/test_inaobuilder.rb

@@ -9,10 +9,8 @@ class INAOBuidlerTest < Test::Unit::TestCase
 
   def setup
     @param = {
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
     }
   end
 

data/test/test_latexbuilder.rb

@@ -12,11 +12,9 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @builder = LATEXBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!( {
-      "secnolevel" => 2,    # for IDGXMLBuilder, EPUBBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, EPUBBuilder
       "toclevel" => 2,
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for EPUBBuilder
+      "stylesheet" => nil, # for EPUBBuilder
     })
     @book = Book::Base.new(nil)
     @book.config = @config

data/test/test_lineinput.rb

@@ -73,24 +73,6 @@ class LineInputTest < Test::Unit::TestCase
     assert li.next?
   end
 
-  def test_skip_blank_lines
-    if "".respond_to?(:encode)
-      euc_jp_spc = "　".encode("EUC-JP")
-    else
-      euc_jp_spc = "\xa1\xa1" # EUC-JP 全角空白
-    end
-    [
-      ["", 0, nil],
-      ["\n \n  \nabc", 3, 'abc'],
-      ["\t", 1, nil],
-      [euc_jp_spc, 0, euc_jp_spc],
-    ].each do |text, n, rest|
-      li = LineInput.new(StringIO.new(text))
-      assert_equal n, li.skip_blank_lines
-      assert_equal rest, li.gets
-    end
-  end
-
   def test_gets_if
     io = StringIO.new
     li = LineInput.new(io)

data/test/test_markdownbuilder.rb

@@ -12,10 +12,8 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
   def setup
     @builder = MARKDOWNBuilder.new()
     @config = {
-      "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
-      "inencoding" => "UTF-8",
-      "outencoding" => "UTF-8",
-      "stylesheet" => nil,  # for HTMLBuilder
+      "secnolevel" => 2, # for IDGXMLBuilder, HTMLBuilder
+      "stylesheet" => nil, # for HTMLBuilder
     }
     @book = Book::Base.new(nil)
     @book.config = @config
@@ -74,6 +72,7 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
+
 ```
 AAA
 BBB
@@ -91,6 +90,7 @@ BBB
 
     assert_equal <<-EOS, actual
 リスト1.1 caption
+
 ```ruby
 AAA
 BBB
@@ -109,6 +109,7 @@ BBB
     assert_equal <<-EOS, actual
 
 caption
+
 ```ruby
 AAA
 BBB

data/test/test_pdfmaker.rb

@@ -17,6 +17,7 @@ class PDFMakerTest < Test::Unit::TestCase
                      "date" => "2011-01-01",
                      "language" => "ja",
                    })
+    @maker.config = @config
     @output = StringIO.new
     I18n.setup(@config["language"])
   end
@@ -26,7 +27,8 @@ class PDFMakerTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         pdf_file = File.join(dir, "sample.pdf")
         FileUtils.touch(pdf_file)
-        @maker.check_book(@config)
+        @maker.basedir = Dir.pwd
+        @maker.remove_old_file
         assert !File.exist?(pdf_file)
       end
     end
@@ -35,13 +37,13 @@ class PDFMakerTest < Test::Unit::TestCase
   def test_check_book_none
     Dir.mktmpdir do |dir|
       assert_nothing_raised do
-        @maker.check_book(@config)
+        @maker.remove_old_file
       end
     end
   end
 
   def test_buildpath
-    assert_equal(@maker.build_path(@config), "./sample-pdf")
+    assert_equal(@maker.build_path, "./sample-pdf")
   end
 
   def test_parse_opts_help
@@ -78,7 +80,7 @@ class PDFMakerTest < Test::Unit::TestCase
             "csl"=>["監修三郎"],
             "trl"=>["翻訳四郎","翻訳五郎",]})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors(@config)
+      authors = @maker.make_authors
       assert_equal("テスト太郎、テスト次郎　著 \\\\\n監修三郎　監修 \\\\\n翻訳四郎、翻訳五郎　訳",
                    authors)
     end
@@ -87,7 +89,7 @@ class PDFMakerTest < Test::Unit::TestCase
   def test_make_authors_only_aut
     @config.merge!({"aut"=>"テスト太郎"})
     Dir.mktmpdir do |dir|
-      authors = @maker.make_authors(@config)
+      authors = @maker.make_authors
       assert_equal("テスト太郎　著", authors)
     end
   end
@@ -104,7 +106,7 @@ class PDFMakerTest < Test::Unit::TestCase
       "prt"=>"テスト出版",
     })
     Dir.mktmpdir do |dir|
-      okuduke = @maker.make_colophon(@config)
+      okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\n翻　訳 & 翻訳四郎、翻訳五郎 \\\\\nデザイン & デザイン六郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n表　紙 & 表紙九郎 \\\\\n編　集 & 編集十郎 \\\\\n発行所 & テスト出版 \\\\\n",
                    okuduke)
     end
@@ -122,7 +124,7 @@ class PDFMakerTest < Test::Unit::TestCase
     })
     Dir.mktmpdir do |dir|
       I18n.update({"prt" => "印刷所"},"ja")
-      okuduke = @maker.make_colophon(@config)
+      okuduke = @maker.make_colophon
       assert_equal("著　者 & テスト太郎、テスト次郎 \\\\\n監　修 & 監修三郎 \\\\\nイラスト & イラスト七郎、イラスト八郎 \\\\\n発行所 & テスト出版 \\\\\n連絡先 & tarou@example.jp \\\\\n印刷所 & テスト印刷 \\\\\n",
                    okuduke)
     end
@@ -130,7 +132,7 @@ class PDFMakerTest < Test::Unit::TestCase
 
   def test_gettemplate
     Dir.mktmpdir do |dir|
-      tmpl = @maker.get_template(@config)
+      tmpl = @maker.get_template
       expect = File.read(File.join(assets_dir,"test_template.tex"))
       assert_equal(expect, tmpl)
     end
@@ -157,8 +159,7 @@ class PDFMakerTest < Test::Unit::TestCase
 
         expect = File.read(File.join(assets_dir,"test_template_backmatter.tex"))
 
-        maker = ReVIEW::PDFMaker.new
-        tmpl = maker.get_template(@config)
+        tmpl = @maker.get_template
         tmpl.gsub!(/\A.*%% backmatter begins\n/m,"")
         assert_equal(expect, tmpl)
       end