look up non sibling ancestor components

catmando · zetachang · commit e3df4bc870b9 · 2016-10-02T13:47:12.000+08:00
diff --git a/lib/react/component/tags.rb b/lib/react/component/tags.rb
@@ -61,7 +61,6 @@ def method_missing(name, *params, &children)
           component = find_component(name)
           return React::RenderingContext.render(component, *params, &children) if component
         end
-        puts "about to super for #{name}"
         Object.method_missing(name, *params, &children)
       end
 
@@ -95,13 +94,13 @@ def find_name_and_parent(component)
       private
 
       def find_component(name)
-        component = self.class.const_get(name) if self.class.const_defined? name
-        if component
-          unless component.method_defined? :render
-            raise "#{name} does not appear to be a react component."
-          end
-          component
-        end
+        scopes = self.class.name.split('::').inject([Module]) do |nesting, next_const|
+          nesting + [nesting.last.const_get(next_const)]
+        end.reverse
+        scope = scopes.detect { |s| s.const_defined?(name) } || return
+        component = scope.const_get(name)
+        return component if component.method_defined?(:render)
+        raise "#{name} does not appear to be a react component."
       end
     end
   end
diff --git a/spec/react/dsl_spec.rb b/spec/react/dsl_spec.rb
@@ -116,6 +116,38 @@ def render
     expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div><p>hello</p></div>')
   end
 
+  it 'can do a method call on a class name that is not a direct sibling' do
+    stub_const 'Mod', Module.new
+    stub_const 'Mod::NestedMod', Module.new
+    stub_const 'Mod::Comp', Class.new(React::Component::Base)
+    Mod::Comp.class_eval do
+      render { 'Mod::Comp' }
+    end
+    stub_const 'Mod::NestedMod::NestedComp', Class.new(React::Component::Base)
+    Mod::NestedMod::NestedComp.class_eval do
+      render do
+        Comp()
+      end
+    end
+    expect(React.render_to_static_markup(React.create_element(Mod::NestedMod::NestedComp)))
+      .to eq('<span>Mod::Comp</span>')
+  end
+
+  it 'raises a meaningful error if a Constant Name is not actually a component' do
+    stub_const 'Mod', Module.new
+    stub_const 'Mod::NestedMod', Module.new
+    stub_const 'Mod::Comp', Class.new
+    stub_const 'Mod::NestedMod::NestedComp', Class.new(React::Component::Base)
+    Mod::NestedMod::NestedComp.class_eval do
+      backtrace :none
+      render do
+        Comp()
+      end
+    end
+    expect { React.render_to_static_markup(React.create_element(Mod::NestedMod::NestedComp)) }
+      .to raise_error('Comp does not appear to be a react component.')
+  end
+
   it "will treat the component class name as a first class component name" do
     stub_const 'Mod::Bar', Class.new
     Mod::Bar.class_eval do
