Merge pull request #1468 from ccutrer/ensure-mixins-loaded

use ensure_loaded! with mixin objects

lib/yard/handlers/ruby/mixin_handler.rb

@@ -34,7 +34,10 @@ def process_mixin(mixin)
     end
 
     rec = recipient(mixin)
-    return if rec.nil? || rec.mixins(scope).include?(obj)
+    return if rec.nil?
+
+    ensure_loaded!(rec)
+    return if rec.mixins(scope).include?(obj)
 
     shift = statement.method_name(true) == :include ? :unshift : :push
     rec.mixins(scope).send(shift, obj)

spec/handlers/examples/mixin_handler_002.rb.txt

@@ -0,0 +1,3 @@
+module B1; end
+
+A1.include(B1)

spec/handlers/examples/mixin_handler_003.rb.txt

@@ -0,0 +1 @@
+module A1; end

spec/handlers/mixin_handler_spec.rb

@@ -62,11 +62,18 @@
   it "can mixin a const by complex path" do
     YARD.parse_string <<-eof
       class A1; class B1; class C1; end end end
-      class D1; class E1; class F1; end end end
+      class D1; class E1; module F1; end end end
       A1::B1::C1.include D1::E1::F1
     eof
 
     expect(YARD::Registry.root.instance_mixins).not_to eq [P('D1::E1::F1')]
     expect(P('A1::B1::C1').instance_mixins).to eq [P('D1::E1::F1')]
   end
+
+  it "ensures the recipient is loaded from another file" do
+    # 002 includes a module into a module defined in 003
+    parse_file [:mixin_handler_002, :mixin_handler_003], __FILE__
+
+    expect(P('A1').instance_mixins).to eq [P('B1')]
+  end
 end

spec/spec_helper.rb

@@ -31,10 +31,10 @@ def self.parser_type; @parser_type == :ruby ? :ruby18 : @parser_type end
 
 NAMED_OPTIONAL_ARGUMENTS = RUBY_VERSION >= '2.1.0'
 
-def parse_file(file, thisfile = __FILE__, log_level = log.level, ext = '.rb.txt')
+def parse_file(files, thisfile = __FILE__, log_level = log.level, ext = '.rb.txt')
   Registry.clear
-  path = File.join(File.dirname(thisfile), 'examples', file.to_s + ext)
-  YARD::Parser::SourceParser.parse(path, [], log_level)
+  paths = Array(files).map { |file| File.join(File.dirname(thisfile), 'examples', file.to_s + ext) }
+  YARD::Parser::SourceParser.parse(paths, [], log_level)
 end
 
 def described_in_docs(klass, meth, file = nil)