bitclust-core 1.0.0 → 1.1.0

data/lib/bitclust/version.rb

@@ -1,3 +1,3 @@
 module BitClust
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/test_preprocessor.rb

@@ -80,5 +80,213 @@ HERE
     ret = Preprocessor.wrap(StringIO.new(src), params).to_a
     assert_equal(expected, ret.join)
   end
-end
 
+  def test_complex_condition
+    params = { 'version' => '2.4.0' }
+    src = <<HERE
+\#@until 1.9.2
+before 1.9.2
+\#@until 1.8.6
+before 1.8.6
+\#@end
+\#@until 1.9.1
+before 1.9.1
+\#@end
+\#@until 1.9.1
+before 1.9.1
+\#@end
+\#@since 1.9.1
+after 1.9.1
+\#@end
+\#@else
+Display here!
+\#@end
+HERE
+    expected = <<HERE
+Display here!
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@samplecode description
+puts("xxx")
+puts("yyy")
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[description][ruby]{
+puts("xxx")
+puts("yyy")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode_without_description
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@samplecode
+puts("xxx")
+puts("yyy")
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[][ruby]{
+puts("xxx")
+puts("yyy")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode_with_condition1
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@since 1.9.2
+\#@samplecode description1
+puts("xxx1")
+puts("yyy1")
+\#@end
+\#@else
+\#@samplecode description2
+puts("xxx2")
+puts("yyy2")
+\#@end
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[description1][ruby]{
+puts("xxx1")
+puts("yyy1")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode_with_condition2
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@samplecode description
+\#@since 1.9.2
+puts("xxx")
+\#@else
+puts("yyy")
+\#@end
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[description][ruby]{
+puts("xxx")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode_with_condition3
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@since 1.9.1
+\#@samplecode description
+\#@since 1.9.2
+puts("xxx")
+\#@else
+puts("yyy")
+\#@end
+\#@end
+\#@else
+zzz
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[description][ruby]{
+puts("xxx")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+
+  def test_samplecode_with_condition4
+    params = { 'version' => '1.9.2' }
+    src = <<HERE
+--- puts(str) -> String
+
+xxx
+
+\#@samplecode description
+puts("xxx")
+puts("yyy")
+\#@since 1.9.2
+puts("zzz")
+\#@end
+\#@end
+HERE
+
+    expected = <<HERE
+--- puts(str) -> String
+
+xxx
+
+//emlist[description][ruby]{
+puts("xxx")
+puts("yyy")
+puts("zzz")
+//}
+HERE
+    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+    assert_equal(expected, ret.join)
+  end
+end

data/test/test_rdcompiler.rb

@@ -341,6 +341,85 @@ HERE
     assert_compiled_method_source(expected, src)
   end
 
+  def test_method_with_param_and_emlist_with_caption_and_lang
+    src = <<'HERE'
+--- method
+
+@param arg dsc1
+//emlist[This is caption][ruby]{
+dsc2
+dsc3
+//}
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>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">
+<dl>
+<dt class='method-param'>[PARAM] arg:</dt>
+<dd>
+dsc1
+<pre class="highlight ruby">
+<span class="caption">This is caption</span>
+<code>
+dsc2
+dsc3
+</code></pre>
+</dd>
+</dl>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src)
+  end
+
+  def test_method_with_samplecode
+    src = <<'HERE'
+--- <=>
+
+abs
+//emlist[description][ruby]{
+puts "text"
+//}
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>self &lt;=&gt; </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>
+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>
+</code></pre>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src)
+  end
+
+  def test_method_with_samplecode_no_caption
+    src = <<'HERE'
+--- <=>
+
+abs
+//emlist[][ruby]{
+puts "text"
+//}
+HERE
+    expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>self &lt;=&gt; </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>
+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>
+</code></pre>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src)
+  end
+
   def test_method2
     @c = BitClust::RDCompiler.new(@u, 1, {:database => @db, :force => true})
     src = <<'HERE'

data/theme/default/style.css

@@ -118,6 +118,16 @@ pre {
     background-color: #eee;
     padding: 10px;
     font-weight: normal;
+    position: relative;
+}
+
+pre .caption {
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 0.2em;
+    background: #ddd;
+    border-width: 0 1px 1px 0;
 }
 
 blockquote {
@@ -176,6 +186,7 @@ td {
 
 table.entries {
     width: 100%;
+    height: 100%;
 }
 
 table.entries tr {
@@ -196,6 +207,7 @@ td.signature {
 td.signature a {
     display: block;
     padding: 0.3em;
+    height: 100%;
 }
 
 td.description {

data/theme/default/syntax-highlight.css

@@ -0,0 +1,209 @@
+.highlight table td { padding: 5px; }
+.highlight table pre { margin: 0; }
+.highlight .cm {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cp {
+  color: #999999;
+  font-weight: bold;
+}
+.highlight .c1 {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cs {
+  color: #999999;
+  font-weight: bold;
+  font-style: italic;
+}
+.highlight .c, .highlight .cd {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+.highlight .gd {
+  color: #000000;
+  background-color: #ffdddd;
+}
+.highlight .ge {
+  color: #000000;
+  font-style: italic;
+}
+.highlight .gr {
+  color: #aa0000;
+}
+.highlight .gh {
+  color: #999999;
+}
+.highlight .gi {
+  color: #000000;
+  background-color: #ddffdd;
+}
+.highlight .go {
+  color: #888888;
+}
+.highlight .gp {
+  color: #555555;
+}
+.highlight .gs {
+  font-weight: bold;
+}
+.highlight .gu {
+  color: #aaaaaa;
+}
+.highlight .gt {
+  color: #aa0000;
+}
+.highlight .kc {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kd {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kn {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kp {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kr {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kt {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .k, .highlight .kv {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .mf {
+  color: #009999;
+}
+.highlight .mh {
+  color: #009999;
+}
+.highlight .il {
+  color: #009999;
+}
+.highlight .mi {
+  color: #009999;
+}
+.highlight .mo {
+  color: #009999;
+}
+.highlight .m, .highlight .mb, .highlight .mx {
+  color: #009999;
+}
+.highlight .sb {
+  color: #d14;
+}
+.highlight .sc {
+  color: #d14;
+}
+.highlight .sd {
+  color: #d14;
+}
+.highlight .s2 {
+  color: #d14;
+}
+.highlight .se {
+  color: #d14;
+}
+.highlight .sh {
+  color: #d14;
+}
+.highlight .si {
+  color: #d14;
+}
+.highlight .sx {
+  color: #d14;
+}
+.highlight .sr {
+  color: #009926;
+}
+.highlight .s1 {
+  color: #d14;
+}
+.highlight .ss {
+  color: #990073;
+}
+.highlight .s {
+  color: #d14;
+}
+.highlight .na {
+  color: #008080;
+}
+.highlight .bp {
+  color: #999999;
+}
+.highlight .nb {
+  color: #0086B3;
+}
+.highlight .nc {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .no {
+  color: #008080;
+}
+.highlight .nd {
+  color: #3c5d5d;
+  font-weight: bold;
+}
+.highlight .ni {
+  color: #800080;
+}
+.highlight .ne {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nf {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nl {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nn {
+  color: #555555;
+}
+.highlight .nt {
+  color: #000080;
+}
+.highlight .vc {
+  color: #008080;
+}
+.highlight .vg {
+  color: #008080;
+}
+.highlight .vi {
+  color: #008080;
+}
+.highlight .nv {
+  color: #008080;
+}
+.highlight .ow {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .o {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .w {
+  color: #bbbbbb;
+}
+.highlight {
+  background-color: #f8f8f8;
+}