review 1.4.0 → 1.5.0

data/test/test_epubmaker.rb

@@ -11,7 +11,7 @@ class EPUBMakerTest < Test::Unit::TestCase
     @producer.merge_params({
                             "bookname" => "sample",
                             "title" => "Sample Book",
-                            "version" => 2,
+                            "epubversion" => 2,
                             "urnid" => "http://example.jp/",
                             "date" => "2011-01-01",
                             "language" => "en",
@@ -420,7 +420,7 @@ EOT
   end
 
   def test_stage3_flat
-    @producer.merge_params({"flattoc" => true, "flattocindent" => false})
+    @producer.merge_params({"epubmaker" => {"flattoc" => true, "flattocindent" => false}})
     stage3
     @producer.mytoc(@output)
     expect = <<EOT
@@ -497,7 +497,7 @@ EOT
 
   def test_colophon_default
     @producer.params["aut"] = ["Mr.Smith"]
-    @producer.params["prt"] = ["BLUEPRINT"]
+    @producer.params["pbl"] = ["BLUEPRINT"]
     @producer.colophon(@output)
     expect = <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
@@ -513,7 +513,7 @@ EOT
   <div class="colophon">
     <p class="title">Sample Book</p>
     <div class="pubhistory">
-      <p>2011年1月1日　発行</p>
+      <p>published by Jan.  1, 2011</p>
     </div>
     <table class="colophon">
       <tr><th>Author</th><td>Mr.Smith</td></tr>
@@ -528,7 +528,7 @@ EOT
 
   def test_colophon_pht
     @producer.params["aut"] = ["Mr.Smith"]
-    @producer.params["prt"] = ["BLUEPRINT"]
+    @producer.params["pbl"] = ["BLUEPRINT"]
     @producer.params["pht"] = ["Mrs.Smith"]
     @producer.colophon(@output)
     expect = <<EOT
@@ -545,7 +545,7 @@ EOT
   <div class="colophon">
     <p class="title">Sample Book</p>
     <div class="pubhistory">
-      <p>2011年1月1日　発行</p>
+      <p>published by Jan.  1, 2011</p>
     </div>
     <table class="colophon">
       <tr><th>Author</th><td>Mr.Smith</td></tr>

data/test/test_htmlbuilder.rb

@@ -10,6 +10,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   include ReVIEW
 
   def setup
+    ReVIEW::I18n.setup
     @builder = HTMLBuilder.new()
     @config = ReVIEW::Configure.values
     @config.merge!({
@@ -24,6 +25,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
+    I18n.setup("ja")
   end
 
   def test_xmlns_ops_prefix_epub3
@@ -68,7 +70,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録I　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="hI"></a>付録I　this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_roman
@@ -79,7 +81,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>I.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="hI-1"></a>I.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_postdef_alpha
@@ -90,7 +92,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("={test} this is test.\n")
-    assert_equal %Q|<h1 id="test"><a id="h1"></a>付録A　this is test.</h1>\n|, actual
+    assert_equal %Q|<h1 id="test"><a id="hA"></a>付録A　this is test.</h1>\n|, actual
   end
 
   def test_headline_level2_postdef_alpha
@@ -101,7 +103,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
       end
     end
     actual = compile_block("=={test} this is test.\n")
-    assert_equal %Q|\n<h2 id="test"><a id="h1-1"></a>A.1　this is test.</h2>\n|, actual
+    assert_equal %Q|\n<h2 id="test"><a id="hA-1"></a>A.1　this is test.</h2>\n|, actual
   end
 
   def test_headline_level1_without_secno
@@ -226,6 +228,38 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|test 「1.1.1 te_st」 test2|, actual
   end
 
+  def test_inline_hd_chap_postdef_roman
+    @chapter.book.config["appendix_format"] = "roman"
+    @chapter.instance_eval do
+      def on_APPENDIX?
+        true
+      end
+    end
+    def @chapter.headline_index
+      items = [Book::HeadlineIndex::Item.new("test", [1], "te_st")]
+      Book::HeadlineIndex.new(items, self)
+    end
+
+    actual = compile_inline("test @<hd>{test} test2")
+    assert_equal %Q|test 「I.1 te_st」 test2|, actual
+  end
+
+  def test_inline_hd_chap_postdef_alpha
+    @chapter.book.config["appendix_format"] = "alpha"
+    @chapter.instance_eval do
+      def on_APPENDIX?
+        true
+      end
+    end
+    def @chapter.headline_index
+      items = [Book::HeadlineIndex::Item.new("test", [1], "te_st")]
+      Book::HeadlineIndex.new(items, self)
+    end
+
+    actual = compile_inline("test @<hd>{test} test2")
+    assert_equal %Q|test 「A.1 te_st」 test2|, actual
+  end
+
   def test_inline_uchar
     actual = compile_inline("test @<uchar>{2460} test2")
     assert_equal %Q|test &#x2460; test2|, actual
@@ -259,6 +293,31 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal "<span class=\"equation\"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>", 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 = "<p>図1.1「sample photo」</p>\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 = "<p>図1.1</p>\n"
+    assert_equal expected, actual
+  end
+
+
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q|<blockquote><p>foobar</p>\n<p>buz</p></blockquote>\n|, actual
@@ -409,12 +468,67 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     begin
       require 'pygments'
     rescue LoadError
+      $stderr.puts "skip test_list_pygments_lang (cannot find pygments.rb)"
       return true
     end
     @book.config["pygments"] = true
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
 
-    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<span style="color: #008000; font-weight: bold">&lt;i&gt;</span>2<span style="color: #008000; font-weight: bold">&lt;/i&gt;</span>\n</pre>\n</div>\n|, actual
+    assert_equal %Q|<div class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest&lt;i&gt;2&lt;/i&gt;\n</pre>\n</div>\n|, actual
+  end
+
+  def test_list_pygments_lang
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    begin
+      require 'pygments'
+    rescue LoadError
+      $stderr.puts "skip test_list_pygments_lang (cannot find pygments.rb)"
+      return true
+    end
+    @book.config["pygments"] = true
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_][ruby]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
+
+    assert_equal %Q|<div class=\"caption-code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n| +
+                 %Q|<pre class=\"list\"><span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n| +
+                 %Q|  (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">\|</span>i<span style=\"color: #666666\">\|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n| +
+                 %Q|  <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n| +
+                 %Q|<span style=\"color: #008000; font-weight: bold\">end</span>\n| +
+                 %Q|</pre>\n| +
+                 %Q|</div>\n|, actual
+  end
+
+  def test_list_pygments_nulllang
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    begin
+      require 'pygments'
+    rescue LoadError
+      $stderr.puts "skip test_list_pygments_nulllang (cannot find pygments.rb)"
+      return true
+    end
+    @book.config["pygments"] = true
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_][]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
+
+    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_pygments_lang
+    def @chapter.list(id)
+      Book::ListIndex::Item.new("samplelist",1)
+    end
+    begin
+      require 'pygments'
+    rescue LoadError
+      $stderr.puts "skip test_listnum_pygments_lang (cannot find pygments.rb)"
+      return true
+    end
+    @book.config["pygments"] = true
+    actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_][ruby]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
+
+    assert_equal "<div class=\"code\">\n<p class=\"caption\">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<div class=\"highlight\" style=\"background: #f8f8f8\"><pre style=\"line-height: 125%\"><span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">1</span> <span style=\"color: #008000; font-weight: bold\">def</span> <span style=\"color: #0000FF\">foo</span>(a1, a2<span style=\"color: #666666\">=</span><span style=\"color: #19177C\">:test</span>)\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">2</span>   (<span style=\"color: #666666\">1.</span>.<span style=\"color: #666666\">3</span>)<span style=\"color: #666666\">.</span>times{<span style=\"color: #666666\">|</span>i<span style=\"color: #666666\">|</span> a<span style=\"color: #666666\">.</span>include?(<span style=\"color: #19177C\">:foo</span>)}\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">3</span>   <span style=\"color: #008000; font-weight: bold\">return</span> <span style=\"color: #008000\">true</span>\n<span style=\"background-color: #f0f0f0; padding: 0 5px 0 5px\">4</span> <span style=\"color: #008000; font-weight: bold\">end</span>\n</pre></div>\n</div>\n", actual
   end
 
   def test_emlist
@@ -422,6 +536,18 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
+  def test_emlist_pygments_lang
+    begin
+      require 'pygments'
+    rescue LoadError
+      $stderr.puts "skip test_emlist_pygments_lang (cannot find pygments.rb)"
+      return true
+    end
+    @book.config["pygments"] = true
+    actual = compile_block("//emlist[][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal "<div class=\"emlist-code\">\n<pre class=\"emlist\"><span style=\"color: #008000; font-weight: bold\">SELECT</span> <span style=\"color: #008000; font-weight: bold\">COUNT</span>(<span style=\"color: #666666\">*</span>) <span style=\"color: #008000; font-weight: bold\">FROM</span> tests <span style=\"color: #008000; font-weight: bold\">WHERE</span> tests.<span style=\"color: #008000; font-weight: bold\">no</span> <span style=\"color: #666666\">&gt;</span> <span style=\"color: #666666\">10</span> <span style=\"color: #008000; font-weight: bold\">AND</span> test.name <span style=\"color: #008000; font-weight: bold\">LIKE</span> <span style=\"color: #BA2121\">&#39;ABC%&#39;</span>\n</pre>\n</div>\n", actual
+  end
+
   def test_emlist_caption
     actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
     assert_equal %Q|<div class="emlist-code">\n<p class="caption">cap1</p>\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n|, actual
@@ -443,6 +569,17 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|<div class="cmd-code">\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, actual
   end
 
+  def test_cmd_pygments
+    begin
+      require 'pygments'
+    rescue LoadError
+      return true
+    end
+    @book.config["pygments"] = true
+    actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
+    assert_equal "<div class=\"cmd-code\">\n<pre class=\"cmd\"><span style=\"color: #888888\">lineA</span>\n<span style=\"color: #888888\">lineB</span>\n</pre>\n</div>\n", actual
+  end
+
   def test_cmd_caption
     actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
     assert_equal %Q|<div class="cmd-code">\n<p class="caption">cap1</p>\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n|, actual
@@ -574,7 +711,7 @@ EOS
 </div>
 
 <h3><a id="h1-0-1"></a>next level</h3>
-<p>this is test.</p>
+<p>this is コラム「test」.</p>
 EOS
 
     assert_equal expected, column_helper(review)

data/test/test_i18n.rb

@@ -32,10 +32,69 @@ class I18nTest < Test::Unit::TestCase
         end
       end
     end
+
+    def test_load_foo_yaml
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          file = File.join(dir, "foo.yml")
+          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+          I18n.setup("ja","foo.yml")
+          assert_equal "bar", I18n.t("foo")
+        end
+      end
+    end
+
+    def test_update_foo_yaml
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          file = File.join(dir, "foo.yml")
+          File.open(file, "w"){|f| f.write("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")
+        end
+      end
+    end
+
+    def test_update_foo_yaml_i18nclass
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          file = File.join(dir, "foo.yml")
+          File.open(file, "w"){|f| f.write("locale: ja\nfoo: \"bar\"\n")}
+          I18n.setup("ja", "foo.yml")
+          assert_equal "bar", I18n.t("foo")
+        end
+      end
+    end
+
+    def test_load_locale_yml_i18n
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          file = File.join(dir, "locale.yml")
+          File.open(file, "w"){|f| f.write("ja:\n  foo: \"bar\"\nen:\n  foo: \"buz\"\n")}
+          I18n.setup
+          assert_equal "bar", I18n.t("foo")
+          I18n.setup("en")
+          assert_equal "buz", I18n.t("foo")
+        end
+      end
+    end
+
+    def test_load_locale_invalid_yml
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          file = File.join(dir, "locale.yml")
+          File.open(file, "w"){|f| f.write("local: ja\nfoo: \"bar\"\n")}
+          assert_raises(ReVIEW::KeyError) do
+            I18n.setup
+          end
+        end
+      end
+    end
   end
 
   def test_ja
-    I18n.i18n "ja"
+    I18n.setup("ja")
     assert_equal "図", I18n.t("image")
     assert_equal "表", I18n.t("table")
     assert_equal "第1章", I18n.t("chapter", 1)
@@ -43,15 +102,16 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_ja_with_user_i18n
-    I18n.i18n "ja", {"image" => "ず"}
-    assert_equal "ず", I18n.t("image")
-    assert_equal "表", I18n.t("table")
-    assert_equal "第1章", I18n.t("chapter", 1) 
-    assert_equal "etc", I18n.t("etc")
+    i18n = I18n.new("ja")
+    i18n.update({"image" => "ず"}, "ja")
+    assert_equal "ず", i18n.t("image")
+    assert_equal "表", i18n.t("table")
+    assert_equal "第1章", i18n.t("chapter", 1)
+    assert_equal "etc", i18n.t("etc")
   end
 
   def test_en
-    I18n.i18n "en"
+    I18n.setup "en"
     assert_equal "Figure ", I18n.t("image")
     assert_equal "Table ", I18n.t("table")
     assert_equal "Chapter 1", I18n.t("chapter", 1)
@@ -59,7 +119,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_nil
-    I18n.i18n "nil"
+    I18n.setup "nil"
     assert_equal "image", I18n.t("image")
     assert_equal "table", I18n.t("table")
     assert_equal "etc", I18n.t("etc")
@@ -72,7 +132,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def _setup_htmlbuilder
-    I18n.i18n "en"
+    I18n.setup "en"
     @builder = HTMLBuilder.new()
     @config = {
       "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
@@ -89,7 +149,32 @@ class I18nTest < Test::Unit::TestCase
     @builder.bind(@compiler, @chapter, location)
   end
 
+  def test_update
+    i18n = ReVIEW::I18n.new("ja")
+    hash = {"foo"=>"bar"}
+    i18n.update(hash)
+    assert_equal "bar", i18n.t("foo")
+  end
+
+  def test_update_newlocale
+    i18n = ReVIEW::I18n.new("ja")
+    hash = {"foo"=>"bar"}
+    i18n.update(hash, "abc")
+    i18n.locale = "abc"
+    assert_equal "bar", i18n.t("foo")
+  end
+
+  def test_i18n_error
+    I18n.setup
+    assert_raises NotImplementedError do
+      I18n.i18n("ja")
+    end
+    assert_raises NotImplementedError do
+      I18n.i18n("ja",{})
+    end
+  end
+
   def teardown
-    I18n.i18n "ja"
+    I18n.setup "ja"
   end
 end

data/test/test_idgxmlbuilder.rb

@@ -25,6 +25,7 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
+    I18n.setup("ja")
   end
 
   def test_headline_level1
@@ -136,12 +137,12 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
 
   def test_inline_ttb
     actual = compile_inline("@<ttb>{test * <>\"}")
-    assert_equal %Q|<tt style='bold'>test * &lt;&gt;&quot;</tt><index value='test ESCAPED_ASTERISK &lt;&gt;&quot;' />|, actual
+    assert_equal %Q|<tt style='bold'>test * &lt;&gt;&quot;</tt>|, actual
   end
 
   def test_inline_ttbold
     actual = compile_inline("@<ttbold>{test * <>\"}")
-    assert_equal %Q|<tt style='bold'>test * &lt;&gt;&quot;</tt><index value='test ESCAPED_ASTERISK &lt;&gt;&quot;' />|, actual
+    assert_equal %Q|<tt style='bold'>test * &lt;&gt;&quot;</tt>|, actual
   end
 
   def test_inline_balloon
@@ -550,6 +551,31 @@ EOS
     assert_equal "nor\nmal", compile_inline("@<raw>{|idgxml|nor\\nmal}")
   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 = "<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.instance_eval{@path="./images/chap1-sampleimg.png"}
+      item
+    end
+
+    actual = compile_block "@<imgref>{sampleimg}\n"
+    expected = "<p><span type='image'>図1.1</span></p>"
+    assert_equal expected, actual
+  end
+
+
   def test_block_raw0
     actual = compile_block("//raw[<>!\"\\n& ]\n")
     expected = %Q(<>!\"\n& )