yard 0.9.13 → 0.9.15

data/spec/handlers/class_condition_handler_spec.rb

@@ -65,4 +65,23 @@ RSpec.describe "YARD::Handlers::Ruby::#{LEGACY_PARSER ? "Legacy::" : ""}ClassCon
     eof
     no_undoc_error "if caller.none? { |l| l =~ %r{lib/rails/generators\\.rb:(\\d+):in `lookup!'$} }; end"
   end
+
+  it "only parses identifiers or namespaces from defined? expressions" do
+    module A
+      @@value = nil
+      def self.b(value) @@value = value end
+      def self.value; @@value end
+    end
+
+    YARD.parse_string <<-eof
+      if defined? A.b(42).to_i
+        class Foo; end
+      else
+        class Bar; end
+      end
+    eof
+    expect(A.value).to be_nil
+    expect(YARD::Registry.at('Foo')).not_to be_nil
+    expect(YARD::Registry.at('Bar')).not_to be_nil
+  end
 end

data/spec/parser/ruby/legacy/token_list_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-include YARD::Parser::Ruby::Legacy
-include YARD::Parser::Ruby::Legacy::RubyToken
-
 RSpec.describe YARD::Parser::Ruby::Legacy::TokenList do
+  Legacy = YARD::Parser::Ruby::Legacy
+  TokenList = Legacy::TokenList
+  LT = Legacy::RubyToken
+
   describe "#initialize / #push" do
     it "accepts a tokenlist (via constructor or push)" do
       expect { TokenList.new(TokenList.new) }.not_to raise_error
@@ -11,8 +12,9 @@ RSpec.describe YARD::Parser::Ruby::Legacy::TokenList do
     end
 
     it "accept a token (via constructor or push)" do
-      expect { TokenList.new(Token.new(0, 0)) }.not_to raise_error
-      expect(TokenList.new.push(Token.new(0, 0), Token.new(1, 1)).size).to eq 2
+      expect { TokenList.new(LT::Token.new(0, 0)) }.not_to raise_error
+      expect(TokenList.new.push(LT::Token.new(0, 0),
+                                LT::Token.new(1, 1)).size).to eq 2
     end
 
     it "accepts a string and parse it as code (via constructor or push)" do
@@ -30,15 +32,15 @@ RSpec.describe YARD::Parser::Ruby::Legacy::TokenList do
     it "does not interpolate string data" do
       x = TokenList.new('x = "hello #{world}"')
       expect(x.size).to eq 6
-      expect(x[4].class).to eq TkDSTRING
+      expect(x[4].class).to eq LT::TkDSTRING
       expect(x.to_s).to eq 'x = "hello #{world}"' + "\n"
     end
 
     it "handles label syntax" do
       x = TokenList.new('a:1,b:2')
-      expect(x[0].class).to eq TkLABEL
+      expect(x[0].class).to eq LT::TkLABEL
       expect(x[0].text).to eq 'a:'
-      expect(x[3].class).to eq TkLABEL
+      expect(x[3].class).to eq LT::TkLABEL
       expect(x[3].text).to eq 'b:'
     end
   end
@@ -46,13 +48,13 @@ RSpec.describe YARD::Parser::Ruby::Legacy::TokenList do
   describe "#to_s" do
     before do
       @t = TokenList.new
-      @t << TkDEF.new(1, 1, "def")
-      @t << TkSPACE.new(1, 1)
-      @t << TkIDENTIFIER.new(1, 1, "x")
-      @t << TkStatementEnd.new(1, 1)
-      @t << TkSEMICOLON.new(1, 1) << TkSPACE.new(1, 1)
-      @t << TkBlockContents.new(1, 1)
-      @t << TkSPACE.new(1, 1) << TkEND.new(1, 1, "end")
+      @t << LT::TkDEF.new(1, 1, "def")
+      @t << LT::TkSPACE.new(1, 1)
+      @t << LT::TkIDENTIFIER.new(1, 1, "x")
+      @t << LT::TkStatementEnd.new(1, 1)
+      @t << LT::TkSEMICOLON.new(1, 1) << LT::TkSPACE.new(1, 1)
+      @t << LT::TkBlockContents.new(1, 1)
+      @t << LT::TkSPACE.new(1, 1) << LT::TkEND.new(1, 1, "end")
       @t[0].set_text "def"
       @t[1].set_text " "
       @t[2].set_text "x"

data/spec/parser/ruby/ruby_parser_spec.rb

@@ -310,10 +310,11 @@ eof
           Fuu = :bar
           Bar = :BAR
           Baz = :"B+z"
+          Qux = :if
         end
       eof
       symbols = tokens.select {|t| t[0] == :symbol }.map {|t| t[1] }
-      expect(symbols).to eq %w(:'' :bar :BAR :"B+z")
+      expect(symbols).to eq %w(:'' :bar :BAR :"B+z" :if)
     end
 
     it "parses %w() array in constant declaration" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.15
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
       YARD is a documentation generation tool for the Ruby programming language.
@@ -290,6 +290,7 @@ files:
 - spec/cli/markup_types_spec.rb
 - spec/cli/server_spec.rb
 - spec/cli/stats_spec.rb
+- spec/cli/yard_on_yard_spec.rb
 - spec/cli/yardoc_spec.rb
 - spec/cli/yri_spec.rb
 - spec/code_objects/base_spec.rb
@@ -638,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Documentation tool for consistent and usable documentation in Ruby.