yard 0.2.3.4 → 0.2.3.5

data/lib/yard.rb

@@ -1,5 +1,5 @@
 module YARD
-  VERSION = "0.2.3.4"
+  VERSION = "0.2.3.5"
   ROOT = File.dirname(__FILE__)
   TEMPLATE_ROOT = File.join(File.dirname(__FILE__), '..', 'templates')
   

data/lib/yard/cli/yardoc.rb

@@ -150,7 +150,7 @@ module YARD
           options[:title] = title
         end
 
-        opts.on('-r', '--readme FILE', 'The readme file used as the title page of documentation.') do |readme|
+        opts.on('-r', '--readme FILE', '--main FILE', 'The readme file used as the title page of documentation.') do |readme|
           raise Errno::ENOENT, readme unless File.file?(readme)
           options[:readme] = readme
         end

data/lib/yard/generators/helpers/html_syntax_highlight_helper.rb

@@ -18,7 +18,7 @@ module YARD
             output << "</span>" if [:tstring_end, :regexp_end].include?(s[0])
           end
           output
-        rescue Parser::Ruby::ParserSyntaxError
+        rescue Parser::ParserSyntaxError
           source
         end
 

data/lib/yard/parser/ruby/ruby_parser.rb

@@ -87,7 +87,7 @@ module YARD
         REV_MAPPINGS = {}
         
         AST_TOKENS = [:CHAR, :backref, :const, :cvar, :gvar, :heredoc_end, :ident,
-          :int, :float, :ivar, :period, :regexp_end, :tstring_content, :backtick]
+          :int, :float, :ivar, :label, :period, :regexp_end, :tstring_content, :backtick]
 
         MAPPINGS.each do |k, v|
           if Array === v
@@ -208,20 +208,20 @@ module YARD
           args.first
         end
         
-        def on_hash(*args)
-          visit_event AstNode.new(:hash, [args.first], listline: lineno..lineno, listchar: charno...charno)
-        end
-        
         def on_assoc_new(*args)
           AstNode.new(:assoc, args)
         end
+
+        def on_hash(*args)
+          visit_event AstNode.new(:hash, args.first || [])
+        end
         
         def on_bare_assoc_hash(*args)
-          args.first
+          AstNode.new(:list, args.first)
         end
         
         def on_assoclist_from_args(*args)
-         args.first
+          args.first
         end
         
         def on_qwords_new
@@ -263,6 +263,14 @@ module YARD
           end
           ParameterNode.new(:params, args, listline: lineno..lineno, listchar: charno..charno)
         end
+        
+        def on_label(data)
+          add_token(:label, data)
+          ch = charno
+          @charno += data.length
+          @ns_charno = charno
+          AstNode.new(:label, [data[0...-1]], line: lineno..lineno, char: ch..charno-1, token: true)
+        end
 
         def on_comment(comment)
           visit_ns_token(:comment, comment)

data/lib/yard/registry.rb

@@ -11,14 +11,6 @@ module YARD
 
     class << self
       attr_reader :objects
-
-      def method_missing(meth, *args, &block)
-        if instance.respond_to? meth
-          instance.send(meth, *args, &block)
-        else
-          super
-        end
-      end
       
       def clear
         instance.clear 
@@ -141,6 +133,13 @@ module YARD
       end
       proxy_fallback ? CodeObjects::Proxy.new(orignamespace, name) : nil
     end
+    
+    # Define all instance methods as singleton methods on instance
+    (public_instance_methods(false) - public_methods(false)).each do |meth|
+      module_eval(<<-eof, __FILE__, __LINE__ + 1) 
+        def self.#{meth}(*args, &block) instance.send(:#{meth}, *args, &block) end
+      eof
+    end
 
     private
   

data/spec/cli/yardoc_spec.rb

@@ -13,6 +13,13 @@ describe YARD::CLI::Yardoc do
     @yardoc.optparse('--title', 'hello world')
     @yardoc.options[:title].should == :'hello world'
   end
+
+  it "should alias --main to the --readme flag" do
+    readme = File.join(File.dirname(__FILE__),'..','..','README.markdown')
+
+    @yardoc.optparse('--main', readme)
+    @yardoc.options[:readme].should == readme.to_sym
+  end
   
   it "should select a markup provider when --markup-provider or -mp is set" do
     @yardoc.optparse("-M", "test")
@@ -73,4 +80,4 @@ describe YARD::CLI::Yardoc do
     @yardoc.optparse
     @yardoc.files.should == %w( lib/**/*.rb )
   end
-end
+end

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

@@ -6,3 +6,11 @@ end
 module C
   extend self
 end
+
+module Q
+  module R
+    module S
+      extend A
+    end
+  end
+end

data/spec/handlers/extend_handler_spec.rb

@@ -12,4 +12,8 @@ describe "YARD::Handlers::Ruby::#{RUBY18 ? "Legacy::" : ""}ExtendHandler" do
     Registry.at(:C).class_mixins.should == [P(:C)]
     Registry.at(:C).instance_mixins.should be_empty
   end
+  
+  it "should extend module with correct namespace" do
+    Registry.at('Q::R::S').class_mixins.first.path.should == 'A'
+  end
 end

data/spec/parser/ruby/ruby_parser_spec.rb

@@ -67,6 +67,29 @@ if RUBY19
       it "should throw a ParserSyntaxError on invalid code" do
         lambda { stmt("Foo, bar.") }.should raise_error(YARD::Parser::ParserSyntaxError)
       end
+      
+      it "should handle bare hashes as method parameters" do
+        src = "command :a => 1, :b => 2, :c => 3"
+        stmt(src).jump(:command)[1].source.should == ":a => 1, :b => 2, :c => 3"
+        
+        src = "command a: 1, b: 2, c: 3"
+        stmt(src).jump(:command)[1].source.should == "a: 1, b: 2, c: 3"
+      end
+      
+      it "should handle source for hash syntax" do
+        src = "{ :a => 1, :b => 2, :c => 3 }"
+        stmt(src).jump(:hash).source.should == "{ :a => 1, :b => 2, :c => 3 }"
+      end
+      
+      it "should handle an empty hash" do
+        stmt("{}").jump(:hash).source.should == "{}"
+      end
+      
+      it "new hash label syntax should show label without colon" do
+        ast = stmt("{ a: 1 }").jump(:label)
+        ast[0].should == "a"
+        ast.source.should == "a:"
+      end
     end
   end
 end

data/spec/registry_spec.rb

@@ -3,6 +3,7 @@ include CodeObjects
 
 describe YARD::Registry do
   before { Registry.clear }
+  
   it "should have an empty path for root" do
     Registry.root.path.should == ""
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yard
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.4
+  version: 0.2.3.5
 platform: ruby
 authors: 
 - Loren Segal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -04:00
+date: 2009-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: []