bitclust-core 1.2.6 → 1.6.0

data/test/test_rdcompiler.rb

@@ -19,15 +19,27 @@ class TestRDCompiler < Test::Unit::TestCase
     assert_equal(expected, @c.compile(src))
   end
 
-  def assert_compiled_method_source(expected, src)
+  def assert_compiled_method_source(expected, src, names: [], since_map: {}, until_map: {})
     method_entry = Object.new
     mock(method_entry).source{ src }
     mock(method_entry).index_id.any_times{ "dummy" }
     mock(method_entry).defined?.any_times{ true }
     mock(method_entry).id.any_times{ "String/i.index._builtin" }
+    mock(method_entry).names.any_times{ names }
+    mock(method_entry).since_map.any_times{ since_map }
+    mock(method_entry).until_map.any_times{ until_map }
     assert_equal(expected, @c.compile_method(method_entry))
   end
 
+  # badge のカタログ訳(「Ruby %s から」等)を検証するテストで使う、
+  # 日本語カタログを読み込んだ compiler を作る(setup の @c はカタログ無しの
+  # C ロケールなので、_() はキーそのまま(英語)を返してしまう)
+  def ja_catalog_compiler
+    prefix = File.expand_path('../data/bitclust/catalog', __dir__)
+    catalog = BitClust::MessageCatalog.load_with_locales(prefix, ['ja_JP.UTF-8'])
+    BitClust::RDCompiler.new(@u, 1, {:database => @db, :catalog => catalog})
+  end
+
   def test_dlist
     src = <<'HERE'
 : t1
@@ -202,6 +214,47 @@ HERE
     assert_compiled_method_source(expected, src)
   end
 
+  # bitclust#250: template.lillia/library だけが compile_method(m, true) で
+  # 第2引数(@opt)を渡し、見出し先頭に「クラス名+typemark」を付ける。4.0
+  # 以降のドキュメントではこの prefix も "?." 表示に切り替わる(識別子である
+  # typemark ではなく、表示専用の display_typemark を経由する)
+  def test_method_with_opt_prefixes_class_name_and_display_typemark
+    klass = Object.new
+    mock(klass).name { 'Kernel' }
+
+    method_entry = Object.new
+    mock(method_entry).source { "--- mf\n\nfoo\n" }
+    mock(method_entry).index_id.any_times { 'dummy' }
+    mock(method_entry).defined?.any_times { true }
+    mock(method_entry).id.any_times { 'Kernel/m.mf._builtin' }
+    mock(method_entry).names.any_times { ['mf'] }
+    mock(method_entry).since_map.any_times { {} }
+    mock(method_entry).until_map.any_times { {} }
+    mock(method_entry).klass.any_times { klass }
+    mock(method_entry).display_typemark.any_times { '?.' }
+
+    html = @c.compile_method(method_entry, true)
+    assert_include(html, '<code>Kernel?.mf</code>')
+  end
+
+  # opt を渡さない通常経路(class/method/function 各テンプレート)は
+  # klass/display_typemark に一切触れず、prefix なしのまま(回帰防止:
+  # klass/display_typemark をスタブしていないので、誤って参照すると
+  # 未定義呼び出しとして失敗する)
+  def test_method_without_opt_omits_the_class_and_typemark_prefix
+    method_entry = Object.new
+    mock(method_entry).source { "--- mf\n\nfoo\n" }
+    mock(method_entry).index_id.any_times { 'dummy' }
+    mock(method_entry).defined?.any_times { true }
+    mock(method_entry).id.any_times { 'Kernel/m.mf._builtin' }
+    mock(method_entry).names.any_times { ['mf'] }
+    mock(method_entry).since_map.any_times { {} }
+    mock(method_entry).until_map.any_times { {} }
+
+    html = @c.compile_method(method_entry)
+    assert_include(html, '<code>mf</code>')
+  end
+
   def test_method_with_emlist
     src = <<'HERE'
 --- <=>
@@ -359,10 +412,8 @@ HERE
 <dt class='method-param'>[PARAM] arg:</dt>
 <dd>
 dsc1
-<pre class="highlight ruby">
 <span class="caption">This is caption</span>
-<code>
-dsc2
+<pre class="highlight ruby"><code>dsc2
 dsc3
 </code></pre>
 </dd>
@@ -387,10 +438,8 @@ HERE
 <p>
 abs
 </p>
-<pre class="highlight ruby">
 <span class="caption">description</span>
-<code>
-<span class="nb">puts</span> <span class="s2">"</span><span class="s2">text</span><span class="s2">"</span>
+<pre class="highlight ruby"><code><span class="nb">puts</span> <span class="s2">"</span><span class="s2">text</span><span class="s2">"</span>
 </code></pre>
 </dd>
 HERE
@@ -412,10 +461,51 @@ HERE
 <p>
 abs
 </p>
-<pre class="highlight ruby">
-<code>
-<span class="nb">puts</span> <span class="s2">"</span><span class="s2">text</span><span class="s2">"</span>
+<pre class="highlight ruby"><code><span class="nb">puts</span> <span class="s2">"</span><span class="s2">text</span><span class="s2">"</span>
+</code></pre>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src)
+  end
+
+  def test_method_with_samplecode_singleton_class
+    src = <<'HERE'
+--- singleton_method(name) -> Method
+//emlist[][ruby]{
+class <<obj
+  def foo
+    Object.new
+  end
+end
+class << Object.new
+end
+class << self
+end
+class << FOO::BAR::BAZ
+end
+p Foo.singleton_method(:foo)
+//}
+end
+HERE
+  expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>singleton_method(name) -&gt; Method</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<pre class="highlight ruby"><code><span class="k">class</span> <span class="o">&lt;&lt;</span>obj
+  <span class="k">def</span> <span class="nf">foo</span>
+    <span class="no">Object</span><span class="p">.</span><span class="nf">new</span>
+  <span class="k">end</span>
+<span class="k">end</span>
+<span class="k">class</span> <span class="o">&lt;&lt;</span> <span class="no">Object</span><span class="p">.</span><span class="nf">new</span>
+<span class="k">end</span>
+<span class="k">class</span> <span class="o">&lt;&lt;</span> <span class="nc">self</span>
+<span class="k">end</span>
+<span class="k">class</span> <span class="o">&lt;&lt;</span> <span class="no">FOO</span><span class="o">::</span><span class="no">BAR</span><span class="o">::</span><span class="no">BAZ</span>
+<span class="k">end</span>
+<span class="nb">p</span> <span class="no">Foo</span><span class="p">.</span><span class="nf">singleton_method</span><span class="p">(</span><span class="ss">:foo</span><span class="p">)</span>
 </code></pre>
+<p>
+end
+</p>
 </dd>
 HERE
     assert_compiled_method_source(expected, src)
@@ -442,6 +532,176 @@ HERE
     assert_compiled_method_source(expected, src)
   end
 
+  # bitclust#132 P3: since/until バージョンバッジ。名前ごとの since_map/
+  # until_map が空なら(既存の全テストがそう)何も出ない = 従来どおりの
+  # 出力(このケースは assert_compiled_method_source のデフォルト引数で
+  # 既存テストとして担保済み)。以下は非空の場合の描画を確認する
+
+  def test_method_signature_since_badge_uniform_single_name
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge
+foo
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge</code><span class="method-since-badge">Ruby 2.0.0 から</span><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<p>
+foo
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge'], since_map: {'hoge' => '2.0.0'})
+  end
+
+  # 別名(alias)の全名が同じバージョンを持つ「一様」なケースでは、
+  # バッジは最初の dt にだけ出す(2つ目以降の dt では繰り返さない)
+  def test_method_signature_since_badge_uniform_alias
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge1
+--- hoge2
+bar
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge1</code><span class="method-since-badge">Ruby 2.0.0 から</span><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dt class="method-heading"><code>hoge2</code></dt>
+<dd class="method-description">
+<p>
+bar
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge1', 'hoge2'], since_map: {'hoge1' => '2.0.0', 'hoge2' => '2.0.0'})
+  end
+
+  # 別名の一部にしか値が無い「混在」なケースでは、一様とはみなさず名前ごとに
+  # 判定する。ここでは最初の名前(hoge1)ではなく2番目(hoge2)にだけ値がある
+  # ケースで、バッジが正しく hoge2 の dt にだけ付くことを確認する(2番目
+  # だから、ではなく「最初の dt だから」で誤って出ていないことの確認)
+  def test_method_signature_since_badge_mixed_alias
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge1
+--- hoge2
+bar
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge1</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dt class="method-heading"><code>hoge2</code><span class="method-since-badge">Ruby 2.0.0 から</span></dt>
+<dd class="method-description">
+<p>
+bar
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge1', 'hoge2'], since_map: {'hoge2' => '2.0.0'})
+  end
+
+  def test_method_signature_until_badge
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge
+foo
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge</code><span class="method-until-badge">Ruby 4.0 で削除</span><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<p>
+foo
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge'], until_map: {'hoge' => '4.0'})
+  end
+
+  # 同じ dt に since と until の両方が付く場合、since→until の順で
+  # 半角スペース1つ区切りで並ぶ
+  def test_method_signature_since_and_until_badges_on_same_dt
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge
+foo
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge</code><span class="method-since-badge">Ruby 2.0.0 から</span> <span class="method-until-badge">Ruby 4.0 で削除</span><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<p>
+foo
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge'], since_map: {'hoge' => '2.0.0'}, until_map: {'hoge' => '4.0'})
+  end
+
+  # bitclust#132: 特殊変数のシグネチャ名($ 付き)はエントリの names
+  # ($ なし)へ正規化して since_map を引く。正規化が無いと mixed 経路で
+  # 該当 dt にバッジが出ない
+  def test_method_signature_since_badge_special_variable_alias
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- $0
+--- $PROGRAM_NAME
+bar
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>$0</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dt class="method-heading"><code>$PROGRAM_NAME</code><span class="method-since-badge">Ruby 1.9.1 から</span></dt>
+<dd class="method-description">
+<p>
+bar
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['0', 'PROGRAM_NAME'], since_map: {'PROGRAM_NAME' => '1.9.1'})
+  end
+
+  # since_map の空文字値は「明示的に不明」(著者が {: since=""} で指定)。
+  # バッジは表示しない(bitclust#132: ドキュメント追加が遅れて算出が誤る場合の抑止)
+  def test_method_signature_empty_since_suppresses_badge
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge
+foo
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<p>
+foo
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge'], since_map: {'hoge' => ''})
+  end
+
+  def test_method_signature_empty_since_mixed_alias
+    @c = ja_catalog_compiler
+    src = <<'HERE'
+--- hoge1
+--- hoge2
+bar
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>hoge1</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dt class="method-heading"><code>hoge2</code><span class="method-since-badge">Ruby 2.0.0 から</span></dt>
+<dd class="method-description">
+<p>
+bar
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src,
+      names: ['hoge1', 'hoge2'], since_map: {'hoge1' => '', 'hoge2' => '2.0.0'})
+  end
+
   def test_ulist_simple
     src =  <<'HERE'
  * hoge1
@@ -494,13 +754,15 @@ HERE
     src = <<HERE
   * hoge1
     * fuga1
+      bar
   * hoge2
     * fuga2
 HERE
     expected = <<HERE
 <ul>
 <li>hoge1<ul>
-<li>fuga1</li>
+<li>fuga1
+bar</li>
 </ul>
 </li>
 <li>hoge2<ul>
@@ -508,7 +770,6 @@ HERE
 </ul>
 </li>
 </ul>
-
 HERE
     assert_compiled_source(expected, src)
   end
@@ -547,7 +808,6 @@ HERE
 </ol>
 </li>
 </ol>
-
 HERE
     assert_compiled_source(expected, src)
   end
@@ -574,7 +834,6 @@ HERE
 </ol>
 </li>
 </ul>
-
 HERE
     assert_compiled_source(expected, src)
   end
@@ -595,6 +854,8 @@ HERE
 <li>boo1</li>
 </ol>
 </li>
+</ol>
+</li>
 <li>hoge2<ol>
 <li>fuga2<ol>
 <li>boo2</li>
@@ -603,9 +864,6 @@ HERE
 </ol>
 </li>
 </ol>
-</li>
-</ol>
-
 HERE
     assert_compiled_source(expected, src)
   end
@@ -653,20 +911,25 @@ HERE
        "instance method"     => ['[[m:String#dump]]', '<a href="dummy/method/String/i/dump">String#dump</a>'],
        "indexer"             => ['[[m:String#[] ]]',  '<a href="dummy/method/String/i/=5b=5d">String#[]</a>'],
        "C API"               => ['[[f:rb_ary_new3]]', '<a href="dummy/function/rb_ary_new3">rb_ary_new3</a>'],
-       "C API root"          => ['[[f:/]]',           '<a href="dummy/function/">All C API</a>'],
-       "C API index"         => ['[[f:_index]]',      '<a href="dummy/function/">All C API</a>'],
+       "C API root"          => ['[[f:/]]',           '<a href="dummy/function/">Function Index</a>'],
+       "C API index"         => ['[[f:_index]]',      '<a href="dummy/function/">Function Index</a>'],
        "standard library"    => ['[[lib:jcode]]',     '<a href="dummy/library/jcode">jcode</a>'],
+       "library root"        => ['[[lib:/]]',         '<a href="dummy/library/">Library Index</a>'],
+       "library index"       => ['[[lib:_index]]',    '<a href="dummy/library/_index">Library Index</a>'],
+       "builtin library"     => ['[[lib:_builtin]]',  '<a href="dummy/library/_builtin">Builtin Library</a>'],
        "man command"         => ['[[man:tr(1)]]',     '<a class="external" href="http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html">tr(1)</a>'],
        "man header"          => ['[[man:sys/socket.h(header)]]', '<a class="external" href="http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html">sys/socket.h(header)</a>'],
        "man system call"     => ['[[man:fopen(3linux)]]', '<a class="external" href="http://man7.org/linux/man-pages/man3/fopen.3.html">fopen(3linux)</a>'],
        "RFC"                 => ['[[RFC:2822]]',      '<a class="external" href="https://tools.ietf.org/html/rfc2822">[RFC2822]</a>'],
+       "ISO standard"        => ['[[ISO:8601]]',      'ISO 8601'],
+       "JIS standard"        => ['[[JIS:X 0301]]',    'JIS X 0301'],
        "special var $~"      => ['[[m:$~]]',          '<a href="dummy/method/Kernel/v/=7e">$~</a>'],
        "special var $,"      => ['[[m:$,]]',          '<a href="dummy/method/Kernel/v/=2c">$,</a>'],
        "extra close bracket" => ['[[c:String]]]', '<a href="dummy/class/String">String</a>]'],
        "continuity"          => ['[[c:String]][[c:String]]', '<a href="dummy/class/String">String</a><a href="dummy/class/String">String</a>'],
        "constant"            => ['[[m:File::SEPARATOR]]', '<a href="dummy/method/File/c/SEPARATOR">File::SEPARATOR</a>'],
        "url"                 => ['[[url:http://i.loveruby.net]]', '<a class="external" href="http://i.loveruby.net">http://i.loveruby.net</a>'],
-       "ruby-list"           => ['[[ruby-list:12345]]', '<a class="external" href="http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/12345">[ruby-list:12345]</a>'],
+       "ruby-list"           => ['[[ruby-list:12345]]', '<a class="external" href="https://blade.ruby-lang.org/ruby-list/12345">[ruby-list:12345]</a>'],
        "bugs.r-l.o feature"  => ['[[feature:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[feature#12345]</a>'],
        "bugs.r-l.o bug"      => ['[[bug:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[bug#12345]</a>'],
        "bugs.r-l.o misc"     => ['[[misc:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[misc#12345]</a>'])
@@ -675,18 +938,147 @@ HERE
     assert_equal(expected, @c.send(:compile_text, target), target)
   end
 
-  data("doc"             => ['[[d:hoge/bar]]',            '<a href="dummy/hoge/bar">.*</a>'],
-       "ref doc"         => ['[[ref:d:hoge/bar#frag]]',   '<a href="dummy/hoge/bar#frag">.*</a>'],
-       "ref class"       => ['[[ref:c:Hoge#frag]]',       '<a href="dummy/class/Hoge#frag">.*</a>'],
-       "ref special var" => ['[[ref:m:$~#frag]]',         '<a href="dummy/method/Kernel/v/=7e#frag">.*</a>'],
-       "ref library"     => ['[[ref:lib:jcode#frag]]',    '<a href="dummy/library/jcode#frag">.*</a>'],
-       "ref class error" => ['[[ref:c:Hoge]]',            'compileerror'],
-       "ref ref"         => ['[[ref:ref:hoge/bar#frag]]', 'compileerror'],)
+  # bitclust#282: 参照のデフォルトラベル(記載どおりの spec 文字列)も
+  # 表示専用なので、module function の ".#" は DB バージョンが 4.0 以降
+  # なら "?." で表示する(#250/#277 の display_typemark と同じ選択規則)。
+  # URL・アンカー(識別子)は変えない。
+  data("pre-4.0 keeps .#" => ['3.4', 'Kernel.#at_exit'],
+       "4.0 shows ?."     => ['4.0', 'Kernel?.at_exit'],
+       "4.1 shows ?."     => ['4.1', 'Kernel?.at_exit'])
+  def test_bracket_link_module_function_display(data)
+    version, label = data
+    db = BitClust::MethodDatabase.dummy("version" => version)
+    c = BitClust::RDCompiler.new(@u, 1, {:database => db})
+    assert_equal(%Q(<a href="dummy/method/Kernel/m/at_exit">#{label}</a>),
+                 c.send(:compile_text, '[[m:Kernel.#at_exit]]'))
+  end
+
+  def test_reference_link_module_function_title_display
+    # refs テーブルに見出しがある場合の「spec/見出し」ラベルの spec 側も
+    # 4.0 以降は "?." 表示にする(doctree に現時点で用例は無い理論エッジ
+    # だが、デフォルトラベルと同じ選択規則で一貫させる)
+    refs = Object.new
+    def refs.[](type, id, frag) = '深掘り'
+    db = BitClust::MethodDatabase.dummy("version" => "4.0")
+    stub(db).refs { refs }
+    c = BitClust::RDCompiler.new(@u, 1, {:database => db})
+    assert_equal(%Q(<a href="dummy/method/Kernel/m/at_exit#frag">Kernel?.at_exit/深掘り</a>),
+                 c.send(:compile_text, '[[ref:m:Kernel.#at_exit#frag]]'))
+  end
+
+  def test_bracket_link_other_typemarks_unchanged_at_4_0
+    db = BitClust::MethodDatabase.dummy("version" => "4.0")
+    c = BitClust::RDCompiler.new(@u, 1, {:database => db})
+    assert_equal('<a href="dummy/method/String/s/new">String.new</a>',
+                 c.send(:compile_text, '[[m:String.new]]'))
+    assert_equal('<a href="dummy/method/String/i/dump">String#dump</a>',
+                 c.send(:compile_text, '[[m:String#dump]]'))
+    assert_equal('<a href="dummy/method/Kernel/v/=7e">$~</a>',
+                 c.send(:compile_text, '[[m:$~]]'))
+  end
+
+  data("library root"    => ['[[lib:/]]',        '<a href="dummy/library/">ライブラリ一覧</a>'],
+       "builtin library" => ['[[lib:_builtin]]', '<a href="dummy/library/_builtin">組み込みライブラリ</a>'],
+       "C API root"      => ['[[f:/]]',          '<a href="dummy/function/">関数一覧</a>'])
+  def test_bracket_link_with_catalog(data)
+    target, expected = data
+    prefix = File.expand_path('../data/bitclust/catalog', __dir__)
+    catalog = BitClust::MessageCatalog.load_with_locales(prefix, ['ja_JP.UTF-8'])
+    compiler = BitClust::RDCompiler.new(@u, 1, {:database => @db, :catalog => catalog})
+    assert_equal(expected, compiler.send(:compile_text, target), target)
+  end
+
+  data("doc"                    => ['[[d:hoge/bar]]',                 '<a href="dummy/hoge/bar">.*</a>'],
+       "ref doc"                => ['[[ref:d:hoge/bar#frag]]',        '<a href="dummy/hoge/bar#frag">.*</a>'],
+       "ref doc hyphen frag"    => ['[[ref:d:hoge/bar#thread-safe]]', '<a href="dummy/hoge/bar#thread-safe">.*</a>'],
+       "ref class"              => ['[[ref:c:Hoge#frag]]',            '<a href="dummy/class/Hoge#frag">.*</a>'],
+       "ref special var"        => ['[[ref:m:$~#frag]]',              '<a href="dummy/method/Kernel/v/=7e#frag">.*</a>'],
+       "ref library"            => ['[[ref:lib:jcode#frag]]',         '<a href="dummy/library/jcode#frag">.*</a>'],
+       "ref class error"        => ['[[ref:c:Hoge]]',                 'compileerror'],
+       "ref ref"                => ['[[ref:ref:hoge/bar#frag]]',      'compileerror'],)
   def test_bracket_link_doc(data)
     target, expected = data
     assert_match(/#{expected}/, @c.send(:compile_text, target), target)
   end
 
+  def test_reference_link_same_page_hyphen_fragment
+    # [ref:frag]（type:name 無し）は同一ページ内アンカーへのリンク。
+    # ハイフン入りフラグメント（doctree/manual の {#id} アンカーに合わせる）
+    entry = BitClust::DocEntry.new(@db, 'glossary')
+    entry.source = "### スレッドセーフ {#thread-safe}\n\n本文。\n"
+    refs = BitClust::RefsDatabase.new
+    refs.extract(entry)
+    stub(@db).refs { refs }
+    compiler = BitClust::RDCompiler.new(@u, 1, {:database => @db, :entry => entry})
+    assert_equal('<a href="#thread-safe">スレッドセーフ</a>',
+                 compiler.send(:reference_link, 'thread-safe'))
+  end
+
+  def test_nomethod_is_not_rendered
+    src = <<'HERE'
+--- to_a -> Array
+{: nomethod}
+
+説明のためここに記載しています。
+HERE
+    method_entry = Object.new
+    mock(method_entry).source { src }
+    mock(method_entry).index_id.any_times { "dummy" }
+    mock(method_entry).defined?.any_times { true }
+    mock(method_entry).id.any_times { "String/i.index._builtin" }
+    mock(method_entry).names.any_times { [] }
+    mock(method_entry).since_map.any_times { {} }
+    mock(method_entry).until_map.any_times { {} }
+    html = @c.compile_method(method_entry)
+    assert_not_include(html, 'UNKNOWN_META_INFO')
+    assert_not_include(html, '{:')
+    assert_include(html, '説明のためここに記載しています。')
+  end
+
+  def test_attribute_lines_between_alias_signatures_are_not_rendered
+    src = <<'HERE'
+--- to_a -> Array
+{: nomethod}
+--- to_a2 -> Array
+{: nomethod}
+
+説明のためここに記載しています。
+HERE
+    method_entry = Object.new
+    mock(method_entry).source { src }
+    mock(method_entry).index_id.any_times { "dummy" }
+    mock(method_entry).defined?.any_times { true }
+    mock(method_entry).id.any_times { "String/i.index._builtin" }
+    mock(method_entry).names.any_times { [] }
+    mock(method_entry).since_map.any_times { {} }
+    mock(method_entry).until_map.any_times { {} }
+    html = @c.compile_method(method_entry)
+    assert_not_include(html, '{:')
+    assert_include(html, 'to_a2')
+    assert_include(html, '説明のためここに記載しています。')
+    # 別名はひとつのエントリとして描画される(dt 2つ + dd 1つ)
+    assert_equal(1, html.scan(/<dd class="method-description">/).size)
+    assert_equal(2, html.scan(/<dt class="method-heading"/).size)
+  end
+
+  def test_undef_attribute_renders_message
+    src = <<'HERE'
+--- <=>(other) -> -1 | 0 | 1 | nil
+{: undef}
+HERE
+    method_entry = Object.new
+    mock(method_entry).source { src }
+    mock(method_entry).index_id.any_times { "dummy" }
+    mock(method_entry).defined?.any_times { true }
+    mock(method_entry).id.any_times { "String/i.index._builtin" }
+    mock(method_entry).names.any_times { [] }
+    mock(method_entry).since_map.any_times { {} }
+    mock(method_entry).until_map.any_times { {} }
+    html = @c.compile_method(method_entry)
+    assert_not_include(html, '{:')
+    assert_include(html, 'このメソッドは定義されていません。')
+  end
+
   def test_array_join
     src = <<'HERE'
 --- join(sep = $,)    -> String
@@ -822,6 +1214,16 @@ HERE
           :method_id => "ARGF.class/i.binmode.argf._builtin",
           :version   => "2.0.0",
           :expected  => "https://docs.ruby-lang.org/en/2.0.0/ARGF.html#method-i-binmode"
+       },
+       "Kernel.#trace_var" => {
+          :method_id => "Kernel/m.trace_var._builtin",
+          :version   => "2.0.0",
+          :expected  => "https://docs.ruby-lang.org/en/2.0.0/Kernel.html#method-i-trace_var"
+       },
+       "Math.#sqrt" => {
+          :method_id => "Math/m.sqrt._builtin",
+          :version   => "2.0.0",
+          :expected  => "https://docs.ruby-lang.org/en/2.0.0/Math.html#method-c-sqrt"
        })
   def test_rdoc_url(data)
     assert_equal(data[:expected], @c.rdoc_url(data[:method_id], data[:version]))

data/test/test_refsdatabase.rb

@@ -81,4 +81,36 @@ HERE
       assert_equal(s.upcase, db.refs['class',  'ARGF', s])
     end
   end
+
+  # rd 形式の [a:xxx] アンカーもハイフンを含められる（doctree/bitclust#(このPR)）
+  S3 = <<HERE
+===[a:with-hyphen] With Hyphen
+HERE
+
+  def test_make_refs_rd_anchor_with_hyphen
+    _, db = BitClust::RRDParser.parse(S3, 'dummy')
+    db.make_refs
+    assert_equal('With Hyphen', db.refs['library', 'dummy', 'with-hyphen'])
+  end
+
+  # md ソースの見出しアンカー {#xxx} 収集はハイフンを許容する
+  # （doctree/manual の glossary.md 等、用語アンカーはハイフン区切り）
+  def test_extract_markdown_heading_anchor_with_hyphen
+    db = BitClust::MethodDatabase.dummy("version" => "3.4.0")
+    entry = BitClust::DocEntry.new(db, 'glossary')
+    entry.source = "### スレッドセーフ {#thread-safe}\n\n本文。\n"
+    refs = BitClust::RefsDatabase.new
+    refs.extract(entry)
+    assert_equal('スレッドセーフ', refs['doc', 'glossary', 'thread-safe'])
+  end
+
+  # 従来のアンダースコア・単語アンカーの回帰が無いことも確認する
+  def test_extract_markdown_heading_anchor_with_underscore
+    db = BitClust::MethodDatabase.dummy("version" => "3.4.0")
+    entry = BitClust::DocEntry.new(db, 'glossary')
+    entry.source = "### 見出し {#my_anchor}\n\n本文。\n"
+    refs = BitClust::RefsDatabase.new
+    refs.extract(entry)
+    assert_equal('見出し', refs['doc', 'glossary', 'my_anchor'])
+  end
 end