yard 0.9.12 → 0.9.13

data/spec/handlers/constant_handler_spec.rb

@@ -33,6 +33,9 @@ RSpec.describe "YARD::Handlers::Ruby::#{LEGACY_PARSER ? "Legacy::" : ""}Constant
     expect(obj.constants[0].docstring).to eq 'A constant.'
     expect(obj.constants[0].name).to eq :CONSTANT
     expect(obj.constants[0].value).to eq "42"
+    expect(obj.constants[1].docstring).to eq 'Special constant (empty symbol)'
+    expect(obj.constants[1].name).to eq :EMPTY
+    expect(obj.constants[1].value).to eq ':""'
   end
 
   it "turns Const = Struct.new('Name', :sym) into class Const with attr :sym" do

data/spec/handlers/examples/constant_handler_001.rb.txt

@@ -21,6 +21,8 @@ MyEmptyStruct = Struct.new
 MyStructWithConstant = Struct.new do
   # A constant.
   CONSTANT = 42
+  # Special constant (empty symbol)
+  EMPTY = :''
 end
 
 # A crazy struct.

data/spec/parser/ruby/ruby_parser_spec.rb

@@ -303,6 +303,19 @@ eof
       end
     end
 
+    it "properly tokenizes symbols" do
+      tokens = tokenize(<<-eof)
+        class X
+          Foo = :''
+          Fuu = :bar
+          Bar = :BAR
+          Baz = :"B+z"
+        end
+      eof
+      symbols = tokens.select {|t| t[0] == :symbol }.map {|t| t[1] }
+      expect(symbols).to eq %w(:'' :bar :BAR :"B+z")
+    end
+
     it "parses %w() array in constant declaration" do
       s = stmt(<<-eof)
         class Foo

data/spec/templates/examples/module001.html

@@ -54,7 +54,11 @@
   
 </p>
 
-  <h2>Constant Summary</h2>
+  <h2>
+    Constant Summary
+
+    <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+  </h2>
   
     <dl class="constants">
       

data/spec/templates/examples/module003.html

@@ -28,7 +28,11 @@
 </div>
 
 
-  <h2>Constant Summary</h2>
+  <h2>
+    Constant Summary
+
+    <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+  </h2>
   
     <dl class="constants">
       

data/spec/templates/examples/module005.html

@@ -0,0 +1,82 @@
+<h1>Module: A
+
+
+
+</h1>
+<div class="box_info">
+
+
+
+
+
+
+
+
+
+
+
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>(stdin)</dd>
+  </dl>
+
+</div>
+
+
+
+    <h2>
+      Foo
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+
+        <dt id="FOO-constant" class="">FOO =
+
+        </dt>
+        <dd><pre class="code">1</pre></dd>
+
+        <dt id="BAR-constant" class="deprecated">BAR =
+          <div class="docstring">
+  <div class="discussion">
+    <div class="note deprecated"><strong>Deprecated.</strong> <div class='inline'></div></div>
+
+
+  </div>
+</div>
+<div class="tags">
+
+
+</div>
+        </dt>
+        <dd><pre class="code">2</pre></dd>
+
+    </dl>
+
+    <h2>
+      Bar
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+
+        <dt id="BAZ-constant" class="">BAZ =
+
+        </dt>
+        <dd><pre class="code">3</pre></dd>
+
+    </dl>
+
+    <h2>
+      Constant Summary
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+
+        <dt id="WORLD-constant" class="">WORLD =
+
+        </dt>
+        <dd><pre class="code">4</pre></dd>
+
+    </dl>

data/spec/templates/helpers/method_helper_spec.rb

@@ -79,4 +79,29 @@ RSpec.describe YARD::Templates::Helpers::MethodHelper do
       expect(format_block(Registry.at('#foo'))).to eq "{|a, b, c| ... }"
     end
   end
+
+  describe "#format_constant" do
+    include YARD::Templates::Helpers::HtmlHelper
+
+    it "displays correctly constant values which are quoted symbols" do
+      YARD.parse_string %(
+        class TestFmtConst
+          Foo = :''
+          Bar = :BAR
+          Baz = :'B+z'
+        end
+      )
+      # html_syntax_highlight will be called by format_constant for
+      # Foo, Bar and Baz and in turn will enquire for options.highlight
+      expect(self).to receive(:options).exactly(3).times.and_return(
+        Options.new.update(:highlight => false)
+      )
+      foo, bar, baz = %w(Foo Bar Baz).map do |c|
+        Registry.at("TestFmtConst::#{c}").value
+      end
+      expect(format_constant(foo)).to eq ":"""
+      expect(format_constant(bar)).to eq ':BAR'
+      expect(format_constant(baz)).to eq ":"B+z""
+    end
+  end
 end

data/spec/templates/module_spec.rb

@@ -179,4 +179,25 @@ RSpec.describe YARD::Templates::Engine.template(:default, :module) do
 
     html_equals(Registry.at('A').format(html_options(:embed_mixins => ['Foo', 'Bar', 'Baz::A*'])), :module004)
   end
+
+  it "renders constant groups correctly in html" do
+    Registry.clear
+    YARD.parse_string <<-'eof'
+      module A
+        # @group Foo
+        FOO = 1
+
+        # @deprecated
+        BAR = 2
+
+        # @group Bar
+        BAZ = 3
+
+        # @endgroup
+
+        WORLD = 4
+      end
+    eof
+    html_equals(Registry.at('A').format(html_options), :module005)
+  end
 end

data/templates/default/fulldoc/html/css/style.css

@@ -245,6 +245,7 @@ ul.toplevel { list-style: none; padding-left: 0; font-size: 1.1em; }
 
 dl.constants { margin-left: 10px; }
 dl.constants dt { font-weight: bold; font-size: 1.1em; margin-bottom: 5px; }
+dl.constants.compact dt { display: inline-block; font-weight: normal }
 dl.constants dd { width: 75%; white-space: pre; font-family: monospace; margin-bottom: 18px; }
 dl.constants .docstring .note:first-child { margin-top: 5px; }
 
@@ -326,13 +327,9 @@ ul.summary a, ul.summary a:visited {
   text-decoration: none; font-size: 1.1em;
 }
 ul.summary li { margin-bottom: 5px; }
-.summary .summary_signature {
-  padding: 4px 8px;
-  background: #f8f8f8;
-  border: 1px solid #f0f0f0;
-  border-radius: 5px;
-}
+.summary_signature { padding: 4px 8px; background: #f8f8f8; border: 1px solid #f0f0f0; border-radius: 5px; }
 .summary_signature:hover { background: #CFEBFF; border-color: #A4CCDA; cursor: pointer; }
+.summary_signature.deprecated { background: #ffe5e5; border-color: #e9dada; }
 ul.summary.compact li { display: inline-block; margin: 0px 5px 0px 0px; line-height: 2.6em;}
 ul.summary.compact .summary_signature { padding: 5px 7px; padding-right: 4px; }
 #content .summary_signature:hover a,
@@ -485,7 +482,7 @@ pre.code .rubyid_nth_ref { color: #6D79DE; }
 pre.code .regexp, .dregexp { color: #036A07; }
 pre.code a { border-bottom: 1px dotted #bbf; }
 /* inline code */
-p > code {
+*:not(pre) > code {
 	padding: 1px 3px 1px 3px;
 	border: 1px solid #E1E1E8;
 	background: #F7F7F9;

data/templates/default/fulldoc/html/js/app.js

@@ -120,6 +120,49 @@ function summaryToggle() {
   } else { localStorage.summaryCollapsed = "expand"; }
 }
 
+function constantSummaryToggle() {
+  $('.constants_summary_toggle').click(function(e) {
+    e.preventDefault();
+    localStorage.summaryCollapsed = $(this).text();
+    $('.constants_summary_toggle').each(function() {
+      $(this).text($(this).text() == "collapse" ? "expand" : "collapse");
+      var next = $(this).parent().parent().nextAll('dl.constants').first();
+      if (next.hasClass('compact')) {
+        next.toggle();
+        next.nextAll('dl.constants').first().toggle();
+      }
+      else if (next.hasClass('constants')) {
+        var list = $('<dl class="constants compact" />');
+        list.html(next.html());
+        list.find('dt').each(function() {
+           $(this).addClass('summary_signature');
+           $(this).text( $(this).text().split('=')[0]);
+          if ($(this).has(".deprecated").length) {
+             $(this).addClass('deprecated');
+          };
+        });
+        // Add the value of the constant as "Tooltip" to the summary object
+        list.find('pre.code').each(function() {
+          console.log($(this).parent());
+          var dt_element = $(this).parent().prev();
+          var tooltip = $(this).text();
+          if (dt_element.hasClass("deprecated")) {
+             tooltip = 'Deprecated. ' + tooltip;
+          };
+          dt_element.attr('title', tooltip);
+        });
+        list.find('.docstring, .tags, dd').remove();
+        next.before(list);
+        next.toggle();
+      }
+    });
+    return false;
+  });
+  if (localStorage.summaryCollapsed == "collapse") {
+    $('.constants_summary_toggle').first().click();
+  } else { localStorage.summaryCollapsed = "expand"; }
+}
+
 function generateTOC() {
   if ($('#filecontents').length === 0) return;
   var _toc = $('<ol class="top"></ol>');
@@ -241,6 +284,7 @@ $(document).ready(function() {
   searchFrameButtons();
   linkSummaries();
   summaryToggle();
+  constantSummaryToggle();
   generateTOC();
   mainFocus();
 });

data/templates/default/module/html/constant_summary.erb

@@ -1,11 +1,17 @@
 <% if constant_listing.size > 0 %>
-  <h2>Constant Summary</h2>
-  <dl class="constants">
-    <% constant_listing.each do |cnst| %>
-      <dt id="<%= anchor_for(cnst) %>" class="<%= cnst.has_tag?(:deprecated) ? 'deprecated' : '' %>"><%= cnst.name %> =
-        <%= yieldall :object => cnst %>
-      </dt>
-      <dd><pre class="code"><%= format_constant cnst.value %></pre></dd>
-    <% end %>
-  </dl>
+  <% groups(constant_listing, "Constant") do |list, name| %>
+    <h2>
+      <%= name %>
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+      <% list.each do |cnst| %>
+        <dt id="<%= anchor_for(cnst) %>" class="<%= cnst.has_tag?(:deprecated) ? 'deprecated' : '' %>"><%= cnst.name %> =
+          <%= yieldall :object => cnst %>
+        </dt>
+        <dd><pre class="code"><%= format_constant cnst.value %></pre></dd>
+      <% end %>
+    </dl>
+  <% end %>
 <% end %>

data/templates/default/module/setup.rb

@@ -131,17 +131,22 @@ def groups(list, type = "Method")
   else
     others = []
     group_data = {}
-    list.each do |meth|
-      if meth.group
-        (group_data[meth.group] ||= []) << meth
+    list.each do |itm|
+      if itm.group
+        (group_data[itm.group] ||= []) << itm
       else
-        others << meth
+        others << itm
       end
     end
     group_data.each {|group, items| yield(items, group) unless items.empty? }
   end
 
-  scopes(others) {|items, scope| yield(items, "#{scope.to_s.capitalize} #{type} Summary") }
+  return if others.empty?
+  if others.first.respond_to?(:scope)
+    scopes(others) {|items, scope| yield(items, "#{scope.to_s.capitalize} #{type} Summary") }
+  else
+    yield(others, "#{type} Summary")
+  end
 end
 
 def scopes(list)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies: []
 description: |2
       YARD is a documentation generation tool for the Ruby programming language.
@@ -454,6 +454,7 @@ files:
 - spec/templates/examples/module002.html
 - spec/templates/examples/module003.html
 - spec/templates/examples/module004.html
+- spec/templates/examples/module005.html
 - spec/templates/examples/tag001.txt
 - spec/templates/helpers/base_helper_spec.rb
 - spec/templates/helpers/html_helper_spec.rb