yard 0.5.3 → 0.5.4

data/spec/templates/examples/class002.html

@@ -0,0 +1,37 @@
+<h1>Class: D 
+  
+  
+</h1>
+
+<dl class="box">
+  
+    <dt class="r1">Inherits:</dt>
+    <dd class="r1">
+      <span class="inheritName">Object</span>
+      
+        <ul class="fullTree">
+          <li>Object</li>
+          
+            <li class="next">D</li>
+          
+        </ul>
+        <a href="#" class="inheritanceTree">show all</a>
+      
+      </dd>
+    
+  
+  
+    
+  
+    
+  
+  
+    <dt class="r2 last">Defined in:</dt>
+    <dd class="r2 last">(stdin)<span class="defines">,<br />
+  (stdin),<br /> (stdin)</span>
+</dd>
+  
+</dl>
+<div class="clear"></div>
+
+

data/spec/templates/examples/method001.html

@@ -8,8 +8,8 @@
 <div class="clear"></div>
 
 <div class="method_details_list">
-<div id="method_details">
-  <div class="method_details first">
+  <div id="method_details">
+    <div class="method_details first">
   <p class="signature first" id="m-instance_method">
   
     - (<tt>String</tt>) <strong>m</strong>(x)  <span class="extras">(private)</span>
@@ -22,7 +22,7 @@
   
 </p><div class="docstring">
   <div class="discussion">
-    <p class="note deprecated"><strong>Deprecated.</strong> for great justice</p>
+    <p class="note deprecated"><strong>Deprecated.</strong> <div class='inline'>for great justice</div></p>
 Comments
 
   </div>
@@ -41,7 +41,7 @@ Comments
       
       
         &mdash;
-        the x argument
+        <div class='inline'>the x argument</div>
       
     </li>
   
@@ -57,7 +57,7 @@ Comments
       
       
         &mdash;
-        the result
+        <div class='inline'>the result</div>
       
     </li>
   
@@ -73,7 +73,7 @@ Comments
       
       
         &mdash;
-        hi!
+        <div class='inline'>hi!</div>
       
     </li>
   
@@ -95,5 +95,5 @@ def m(x) end</pre>
   </tr>
 </table>
 </div>
+  </div>
 </div>
-</div>

data/spec/templates/examples/method002.html

@@ -8,8 +8,8 @@
 <div class="clear"></div>
 
 <div class="method_details_list">
-<div id="method_details">
-  <div class="method_details first">
+  <div id="method_details">
+    <div class="method_details first">
   <p class="signature first" id="m-instance_method">
   
     - <strong>m</strong>(x, y)  <span class="extras">(private)</span>
@@ -44,7 +44,7 @@
       
       
         &mdash;
-        parameter x
+        <div class='inline'>parameter x</div>
       
     </li>
   
@@ -58,7 +58,7 @@
       
       
         &mdash;
-        parameter y
+        <div class='inline'>parameter y</div>
       
     </li>
   
@@ -82,5 +82,5 @@ def m(x) end</pre>
   </tr>
 </table>
 </div>
+  </div>
 </div>
-</div>

data/spec/templates/examples/method003.html

@@ -54,7 +54,7 @@
       
       
         —
-        parameter x
+        <div class='inline'>parameter x</div>
       
     </li>
   
@@ -68,7 +68,7 @@
       
       
         &mdash;
-        parameter y
+        <div class='inline'>parameter y</div>
       
     </li>
   
@@ -100,7 +100,7 @@
       
       
         &mdash;
-        parameter x
+        <div class='inline'>parameter x</div>
       
     </li>
   
@@ -114,7 +114,7 @@
       
       
         &mdash;
-        parameter y
+        <div class='inline'>parameter y</div>
       
     </li>
   
@@ -128,7 +128,7 @@
       
       
         &mdash;
-        parameter z
+        <div class='inline'>parameter z</div>
       
     </li>
   

data/spec/templates/examples/method004.html

@@ -8,8 +8,8 @@
 <div class="clear"></div>
 
 <div class="method_details_list">
-<div id="method_details">
-  <div class="method_details first">
+  <div id="method_details">
+    <div class="method_details first">
   <p class="signature first" id="m-instance_method">
   
     - (<tt>void</tt>) <strong>m</strong>(*args) 
@@ -40,5 +40,5 @@ def m(*args) end</pre>
   </tr>
 </table>
 </div>
+  </div>
 </div>
-</div>

data/spec/templates/examples/method005.html

@@ -68,7 +68,7 @@
       
       
         —
-        hi
+        <div class='inline'>hi</div>
       
     </li>
   

data/spec/templates/examples/module001.html

@@ -15,8 +15,13 @@
     
   
   
-    <dt class="r2 last">Defined in:</dt>
-    <dd class="r2 last">(stdin)</dd>
+    <dt class="r2">Included in:</dt>
+    <dd class="r2">TMP, TMP2</dd>
+    
+  
+  
+    <dt class="r1 last">Defined in:</dt>
+    <dd class="r1 last">(stdin)</dd>
   
 </dl>
 <div class="clear"></div>
@@ -47,12 +52,30 @@
     <dl class="constants">
       
         <dt id="CONSTANT-constant" class="">CONSTANT =
-            <span class="summary_desc"></span>
+          <div class="docstring">
+  <div class="discussion">
+    A long docstring for the constant. With extra text
+and newlines.
+
+  </div>
+</div>
+<div class="tags">
+  
+</div>
         </dt>
         <dd><pre class="code">'value'</pre></dd>
       
         <dt id="cvar-classvariable" class="deprecated">@@cvar =
-            <span class="summary_desc"></span>
+          <div class="docstring">
+  <div class="discussion">
+    <p class="note deprecated"><strong>Deprecated.</strong> <div class='inline'></div></p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+</div>
         </dt>
         <dd><pre class="code">'value'</pre></dd>
       
@@ -85,7 +108,7 @@
   
 
   
-    <span class="summary_desc">Returns the value of attribute attr1.</span>
+    <span class="summary_desc"><div class='inline'>Returns the value of attribute attr1.</div></span>
   
 </li>
 
@@ -108,7 +131,7 @@
   
 
   
-    <span class="summary_desc">Returns the value of attribute attr2.</span>
+    <span class="summary_desc"><div class='inline'>Returns the value of attribute attr2.</div></span>
   
 </li>
 
@@ -131,7 +154,7 @@
   
 
   
-    <span class="summary_desc"></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
@@ -154,7 +177,7 @@
   
 
   
-    <span class="summary_desc">Sets the attribute attr4.</span>
+    <span class="summary_desc"><div class='inline'>Sets the attribute attr4.</div></span>
   
 </li>
 
@@ -162,11 +185,12 @@
   </ul>
 
 
-  <h2>Class Method Summary</h2>
+  
+    <h2>Class Method Summary</h2>
 
-  <ul class="summary">
-    
-      <li class="public ">
+    <ul class="summary">
+      
+        <li class="public ">
   <span class="summary_signature">
     
       <a  title="a (class method)">+ <strong>a</strong> </a>
@@ -181,18 +205,18 @@
   
 
   
-    <span class="summary_desc"></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
-    
-  </ul>
-
-  <h2>Instance Method Summary</h2>
+      
+    </ul>
+  
+    <h2>Instance Method Summary</h2>
 
-  <ul class="summary">
-    
-      <li class="public ">
+    <ul class="summary">
+      
+        <li class="public ">
   <span class="summary_signature">
     
       <a  title="#a (instance method)">- <strong>a</strong> </a>
@@ -209,12 +233,12 @@
   
 
   
-    <span class="summary_desc"></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
-    
-      <li class="public ">
+      
+        <li class="public ">
   <span class="summary_signature">
     
       <a  title="#test_multi_overload (instance method)">- <strong>test_multi_overload</strong>(*args) </a>
@@ -229,12 +253,12 @@
   
 
   
-    <span class="summary_desc"></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
-    
-      <li class="public ">
+      
+        <li class="public ">
   <span class="summary_signature">
     
       <a  title="#test_overload (instance method)">- <strong>test_overload</strong>(a) </a>
@@ -249,12 +273,12 @@
   
 
   
-    <span class="summary_desc">hello2.</span>
+    <span class="summary_desc"><div class='inline'>hello2.</div></span>
   
 </li>
 
-    
-      <li class="public ">
+      
+        <li class="public ">
   <span class="summary_signature">
     
       <a  title="#void_meth (instance method)">- <strong>void_meth</strong> </a>
@@ -269,13 +293,17 @@
   
 
   
-    <span class="summary_desc"></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
-    
-  </ul>
+      
+    </ul>
+  
 
+
+  
+  
   
   
   
@@ -411,7 +439,7 @@ end</pre>
       
       
         &mdash;
-        a string
+        <div class='inline'>a string</div>
       
     </li>
   
@@ -443,7 +471,7 @@ end</pre>
       
       
         &mdash;
-        sets the string
+        <div class='inline'>sets the string</div>
       
     </li>
   
@@ -505,7 +533,7 @@ end</pre>
       
       
         &mdash;
-        the value to set the attribute attr4 to.
+        <div class='inline'>the value to set the attribute attr4 to.</div>
       
     </li>
   
@@ -668,7 +696,7 @@ def test_multi_overload(*args) end</pre>
       
       
         &mdash;
-        hi
+        <div class='inline'>hi</div>
       
     </li>
   

data/spec/templates/helpers/html_helper_spec.rb

@@ -32,6 +32,34 @@ describe YARD::Templates::Helpers::HtmlHelper do
     end
   end
   
+  describe '#charset' do
+    it "should return foo if LANG=foo" do
+      ENV.should_receive(:[]).with('LANG').and_return('shift_jis') if RUBY18
+      Encoding.default_external.should_receive(:name).and_return('shift_jis') if RUBY19
+      charset.should == 'shift_jis'
+    end
+    
+    ['US-ASCII', 'ASCII-7BIT', 'ASCII-8BIT'].each do |type|
+      it "should convert #{type} to iso-8859-1" do
+        ENV.should_receive(:[]).with('LANG').and_return(type) if RUBY18
+        Encoding.default_external.should_receive(:name).and_return(type) if RUBY19
+        charset.should == 'iso-8859-1'
+      end
+    end
+    
+    if RUBY18
+      it "should return utf-8 if no LANG env is set" do
+        ENV.should_receive(:[]).with('LANG').and_return(nil)
+        charset.should == 'utf-8'
+      end
+
+      it "should only return charset part of lang" do
+        ENV.should_receive(:[]).with('LANG').and_return('en_US.UTF-8')
+        charset.should == 'utf-8'
+      end
+    end
+  end
+  
   describe '#format_types' do
     it "should include brackets by default" do
       text = ["String"]