yard 0.8.6.1 → 0.8.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423812ba8b57f788358b8e8a063406734ffcd8aa
-  data.tar.gz: 3847cd78486e1964b9a6c71bc3a791e82331a763
+  metadata.gz: 79ac2562993c76c250d449d1c1b0e2a62b41790f
+  data.tar.gz: bb2c0b58aac5e48b9c687e9495dbe5a420433259
 SHA512:
-  metadata.gz: 8f9ac29d7ed76bc7100931b4403c655d78fc2078102fb0c3d44fc972a4f2bcf31302ebd1676927b7322b980621a5274a8a1682ba7235f4ee7cf2d24c561250bc
-  data.tar.gz: b450ef97c370faaa21934a7b9c2af03b32a4f692db7a2246efb39204fd039f89a07bcda58a533bcdcfe301b5904a2c598fcd315f5b0f1cfdb6aa57e04e2f2fb0
+  metadata.gz: a404522e86cef2f801bef43ab15d49af955968afcad5d31784c61e30089ba3a50e904cebf99aa2465109043544fdf4b04010e6ba901eca1c46220e730f2a882c
+  data.tar.gz: 0be733bd7b4c1599710cbffc77af09ff879a0a823774eab1ec5d94923b0f7b185f68ae0ffef42b5eaa180149516586e29797b1d4d3d0c084532c755ef717a117

data/README.md

@@ -7,8 +7,8 @@
 **Contributors**: See Contributors section below    
 **Copyright**:    2007-2013    
 **License**:      MIT License    
-**Latest Version**: 0.8.6.1    
-**Release Date**: April 14th 2013    
+**Latest Version**: 0.8.6.2    
+**Release Date**: June 27th 2013    
 
 ## Synopsis
 
@@ -283,6 +283,9 @@ More options can be seen by typing `yard graph --help`, but here is an example:
 
 ## Changelog
 
+- **June.27.13**: 0.8.6.2 release
+    - Fixed issue where `yard graph` was not displaying methods
+
 - **April.14.13**: 0.8.6.1 release
     - Fixed broken links in File menu on default HTML template
     - Added --layout switch to `yard display` to wrap output in layout template.

data/lib/yard/cli/graph.rb

@@ -66,7 +66,7 @@ module YARD
       # Parses commandline options.
       # @param [Array<String>] args each tokenized argument
       def optparse(*args)
-        visibilities = []
+        visibilities = [:public]
         opts = OptionParser.new
 
         opts.separator ""
@@ -113,7 +113,8 @@ module YARD
 
         Registry.load
 
-        options.verifier = Verifier.new("object.type != :method || #{visibilities.uniq.inspect}.include?(object.visibility)")
+        expression = "#{visibilities.uniq.inspect}.include?(object.visibility)"
+        options.verifier = Verifier.new(expression)
         if args.first
           @objects = args.map {|o| Registry.at(o) }.compact
         else

data/lib/yard/cli/yardoc.rb

@@ -683,7 +683,7 @@ module YARD
 
         opts.on('--po-dir DIR',
                 'The directory that has .po files.',
-                '  (defaults to #{YARD::Registry.po_dir})') do |dir|
+                "  (defaults to #{YARD::Registry.po_dir})") do |dir|
           YARD::Registry.po_dir = dir
         end
       end

data/lib/yard/parser/c/c_parser.rb

@@ -80,7 +80,9 @@ module YARD
           stmts = nil
           if prevchar == '{'
             stmts = consume_body_statements
-            consume_until(';') if decl =~ /\A(typedef|enum|class|struct|union)\b/
+            if decl =~ /\A(typedef|enum|class|#{struct}|union)/
+              consume_until(';')
+            end
           end
           statement.source = @content[start..@index]
           statement.block = stmts
@@ -219,6 +221,10 @@ module YARD
         def char(num = 1) @content[@index, num] end
         def prevchar(num = 1) @content[@index - 1, num] end
         def nextchar(num = 1) @content[@index + 1, num] end
+
+        def struct
+          /struct\s[:alnum:]+\s\{/
+        end
       end
     end
   end

data/lib/yard/templates/helpers/markup/rdoc_markup.rb

@@ -72,7 +72,7 @@ module YARD
                 next str
               end
               next str unless code_tags == 0
-              first_text + '<tt>' + CGI.escapeHTML(type_text) + '</tt>'
+              first_text + '<tt>' + type_text + '</tt>'
             end
           end
 

data/lib/yard/version.rb

@@ -1,3 +1,3 @@
 module YARD
-  VERSION = "0.8.6.1"
+  VERSION = "0.8.6.2"
 end

data/spec/parser/c_parser_spec.rb

@@ -46,6 +46,11 @@ describe YARD::Parser::C::CParser do
         parse(@contents)
         Registry.at('Multifile#extra').docstring.should == ''
       end
+
+      it "should differentiate between a struct and a pointer to a struct retval" do
+        parse(@contents)
+        Registry.at('Multifile#hello_mars').docstring.should == 'Hello Mars'
+      end
     end
 
     describe 'Foo class' do

data/spec/parser/examples/multifile.c.txt

@@ -1,6 +1,22 @@
+struct hoge *
+rb_fuga(VALUE obj)
+{
+  return Qtrue;
+}
+
+/*
+ * Hello Mars
+ */
+VALUE
+rb_hello_mars(VALUE obj, VALUE n)
+{
+    return Qtrue;
+}
+
 void
 Init_Multifile(void)
 {
     rb_cMultifile  = rb_define_class("Multifile", rb_cObject);
     rb_define_method(rb_cMultifile, "extra", rb_extra, 1); /* in extra.c */
+    rb_define_method(rb_cMultifile, "hello_mars", rb_hello_mars, 1);
 }

data/spec/parser/source_parser_spec.rb

@@ -647,7 +647,7 @@ describe YARD::Parser::SourceParser do
       it "should display a warning for a syntax error (with new parser)" do
         log.should_receive(:warn).with(/Syntax error in/)
         log.should_receive(:backtrace)
-        YARD::Parser::SourceParser.parse_string("$$$", :ruby)
+        YARD::Parser::SourceParser.parse_string("%!!!", :ruby)
       end
     end
 

data/spec/templates/helpers/markup/rdoc_markup_spec.rb

@@ -45,20 +45,29 @@ describe YARD::Templates::Helpers::Markup::RDocMarkup do
     end
   end
 
+  describe '#to_html' do
+    def to_html(text)
+      html = YARD::Templates::Helpers::Markup::RDocMarkup.new(text).to_html
+      html.strip.gsub(/\r?\n/, '')
+    end
+
+    it 'handles typewriter text' do
+      to_html('Hello +<code>+').should == '<p>Hello <tt>&lt;code&gt;</tt></p>'
+    end
+  end
+
   describe '#fix_typewriter' do
     def fix_typewriter(text)
       YARD::Templates::Helpers::Markup::RDocMarkup.new('').send(:fix_typewriter, text)
     end
 
     it "should use #fix_typewriter to convert +text+ to <tt>text</tt>" do
-      fix_typewriter("Some +typewriter text <+.").should ==
-        "Some <tt>typewriter" +
-        " text &lt;</tt>."
+      fix_typewriter("Some +typewriter text &lt;+.").should ==
+        "Some <tt>typewriter text &lt;</tt>."
       fix_typewriter("Not +typewriter text.").should ==
         "Not +typewriter text."
       fix_typewriter("Alternating +type writer+ text +here+.").should ==
-        "Alternating <tt>type writer" +
-        "</tt> text <tt>here</tt>."
+        "Alternating <tt>type writer</tt> text <tt>here</tt>."
       fix_typewriter("No ++problem.").should ==
         "No ++problem."
       fix_typewriter("Math + stuff +is ok+").should ==

data/templates/default/fulldoc/html/full_list.erb

@@ -11,6 +11,7 @@
       <script type="text/javascript" charset="utf-8" src="<%= url_for(javascript) %>"></script>
     <% end %>
 
+    <title><%= @list_title %></title>
     <base id="base_target" target="_parent" />
   </head>
   <body>

data/templates/default/fulldoc/html/full_list_class.erb

@@ -1,2 +1,2 @@
-<li><%= link_object(Registry.root, nil, nil, false) %></li>
+<li><%= link_object(Registry.root, Registry.root.title, nil, false) %></li>
 <%= class_list %>

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

@@ -111,11 +111,11 @@ clicked = null;
 function linkList() {
   $('#full_list li, #full_list li a:last').click(function(evt) {
     if ($(this).hasClass('toggle')) return true;
-    if ($(this).find('.object_link a').length === 0) {
-      $(this).children('a.toggle').click();
-      return false;
-    }
     if (this.tagName.toLowerCase() == "li") {
+      if ($(this).find('.object_link a').length === 0) {
+        $(this).children('a.toggle').click();
+        return false;
+      }
       var toggle = $(this).children('a.toggle');
       if (toggle.size() > 0 && evt.pageX < toggle.offset().left) {
         toggle.click();
@@ -125,7 +125,7 @@ function linkList() {
     if (clicked) clicked.removeClass('clicked');
     var win = window.top.frames.main ? window.top.frames.main : window.parent;
     if (this.tagName.toLowerCase() == "a") {
-      clicked = $(this).parent('li').addClass('clicked');
+      clicked = $(this).parents('li').addClass('clicked');
       win.location = this.href;
     }
     else {

data/templates/guide/fulldoc/html/setup.rb

@@ -45,7 +45,7 @@ end
 
 def serialize_file(file)
   index = options.files.index(file)
-  outfile = file.name + '.html'
+  outfile = file.name.downcase + '.html'
   options.file = file
   if file.attributes[:namespace]
     options.object = Registry.at(file.attributes[:namespace])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard
 version: !ruby/object:Gem::Version
-  version: 0.8.6.1
+  version: 0.8.6.2
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: |2
       YARD is a documentation generation tool for the Ruby programming language.
@@ -596,7 +596,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yard
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Documentation tool for consistent and usable documentation in Ruby.