added _as_node support to NativeLibrary

catmando · zetachang · commit 6cdee7a8d614 · 2016-10-02T13:50:49.000+08:00
# Conflicts:
#	lib/react/component/class_methods.rb
diff --git a/lib/react/component.rb b/lib/react/component.rb
@@ -29,6 +29,15 @@ def self.included(base)
       base.extend(ClassMethods)
     end
 
+    def self.deprecation_warning(message)
+      @deprecation_messages ||= []
+      message = "Warning: Deprecated feature used in #{name}. #{message}"
+      unless @deprecation_messages.include? message
+        @deprecation_messages << message
+        IsomorphicHelpers.log message, :warning
+      end
+    end
+
     def initialize(native_element)
       @native = native_element
     end
diff --git a/lib/react/component/class_methods.rb b/lib/react/component/class_methods.rb
@@ -23,15 +23,6 @@ def append_backtrace(message_array, backtrace)
         backtrace[1..-1].each { |line| message_array << line }
       end
 
-      def deprecation_warning(message)
-        @deprecation_messages ||= []
-        message = "Warning: Deprecated feature used in #{name}. #{message}"
-        unless @deprecation_messages.include? message
-          @deprecation_messages << message
-          IsomorphicHelpers.log message, :warning
-        end
-      end
-
       def render(container = nil, params = {}, &block)
         define_method :render do
           if container
@@ -128,16 +119,16 @@ def export_state(*states, &block)
 
       def define_state_methods(this, name, from = nil, &block)
         this.define_method("#{name}") do
-          self.class.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead." if from.nil? || from == this
+          React::Component.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead." if from.nil? || from == this
           State.get_state(from || self, name)
         end
         this.define_method("#{name}=") do |new_state|
-          self.class.deprecation_warning "Direct assignment to state `#{name}`.  Use `#{(from && from != this) ? from : 'state'}.#{name}!` instead."
+          React::Component.deprecation_warning "Direct assignment to state `#{name}`.  Use `#{(from && from != this) ? from : 'state'}.#{name}!` instead."
           yield name, State.get_state(from || self, name), new_state if block && block.arity > 0
           State.set_state(from || self, name, new_state)
         end
         this.define_method("#{name}!") do |*args|
-          self.class.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead."  if from.nil? or from == this
+          React::Component.deprecation_warning "Direct access to state `#{name}`.  Use `state.#{name}` instead."  if from.nil? or from == this
           if args.count > 0
             yield name, State.get_state(from || self, name), args[0] if block && block.arity > 0
             current_value = State.get_state(from || self, name)
diff --git a/lib/react/component/props_wrapper.rb b/lib/react/component/props_wrapper.rb
@@ -2,7 +2,7 @@ module React
   module Component
 
     def deprecated_params_method(name, *args, &block)
-      self.class.deprecation_warning "Direct access to param `#{name}`.  Use `params.#{name}` instead."
+      React::Component.deprecation_warning"Direct access to param `#{name}`.  Use `params.#{name}` instead."
       params.send(name, *args, &block)
     end
 
diff --git a/lib/react/native_library.rb b/lib/react/native_library.rb
@@ -45,11 +45,17 @@ def const_missing(const_name)
         import_const_from_native(self, const_name, true) || super
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing(method_name, *args, &block)
+        method = method_name.gsub(/_as_node$/, '')  # remove once _as_node is deprecated.
         component_class = get_const(method) if const_defined?(method)
         component_class ||= import_const_from_native(self, method, false)
-        return React::RenderingContext.render(component_class, *args, &block) if component_class
-        raise "could not import a react component named: #{scope_native_name method}"
+        raise 'could not import a react component named: '\
+              "#{scope_native_name method}" unless component_class
+        if method == method_name
+          React::RenderingContext.render(component_class, *args, &block)
+        else # remove once _as_node is deprecated.
+          React::RenderingContext.build_only(component_class, *args, &block)
+        end
       end
 
       private
diff --git a/lib/react/rendering_context.rb b/lib/react/rendering_context.rb
@@ -4,7 +4,7 @@ class << self
       attr_accessor :waiting_on_resources
     end
 
-    def build_only(name, *args, &block)
+    def self.build_only(name, *args, &block)
       React::Component.deprecation_warning(
         '..._as_node is deprecated.  Render component and then use the .node method instead'
       )
diff --git a/lib/reactrb/auto-import.rb b/lib/reactrb/auto-import.rb
@@ -18,9 +18,14 @@ def const_missing(const_name)
       end
 
       def method_missing(method_name, *args, &block)
-        component_class = React::NativeLibrary.import_const_from_native(self, method_name, false)
-        return React::RenderingContext.render(component_class, *args, &block) if component_class
-        _reactrb_original_method_missing(method_name, *args, &block)
+        method = method_name.gsub(/_as_node/, '') # remove once _as_node is deprecated.
+        component_class = React::NativeLibrary.import_const_from_native(self, method, false)
+        _reactrb_original_method_missing(method, *args, &block) unless component_class
+        if method == method_name
+          React::RenderingContext.render(component_class, *args, &block)
+        else # remove once _as_node is deprecated.
+          React::RenderingContext.build_only(component_class, *args, &block)
+        end
       end
     end
   end
diff --git a/spec/react/native_library_spec.rb b/spec/react/native_library_spec.rb
@@ -192,6 +192,48 @@ class NestedComponent < React::Component::Base
         React.create_element(Foo))).to eq('<div>Hello There</div>')
     end
 
+    it 'will automatically import a React.js component when referenced in another component with the _as_node suffix' do
+      stub_const 'Foo', Class.new(React::Component::Base)
+      Foo.class_eval do
+        render(:div) do
+          e = React::Element.new(NativeComponent_as_node(name: 'There'))
+          2.times { e.render }
+        end
+      end
+      %x{
+        window.NativeComponent = React.createClass({
+          displayName: "HelloMessage",
+          render: function render() {
+            return React.createElement("div", null, "Hello ", this.props.name);
+          }
+        })
+      }
+      expect(React.render_to_static_markup(
+        React.create_element(Foo))).to eq('<div><div>Hello There</div><div>Hello There</div></div>')
+    end
+
+    it "will automatically import a React.js component in a library when referenced in another component with the _as_node suffix" do
+      stub_const 'Foo', Class.new(React::Component::Base)
+      Foo.class_eval do
+        render(:div) do
+          e = React::Element.new(NativeLibrary::NativeComponent_as_node(name: 'There'))
+          2.times { e.render }
+        end
+      end
+      %x{
+        window.NativeLibrary = {
+          NativeComponent: React.createClass({
+            displayName: "HelloMessage",
+            render: function render() {
+              return React.createElement("div", null, "Hello ", this.props.name);
+            }
+          })
+        }
+      }
+      expect(React.render_to_static_markup(
+        React.create_element(Foo))).to eq('<div><div>Hello There</div><div>Hello There</div></div>')
+    end
+
     it "will automatically import a React.js component when referenced as a constant" do
       %x{
         window.NativeComponent = React.createClass({

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ class << self`
`4`	`4`	`attr_accessor :waiting_on_resources`
`5`	`5`	`end`
`6`	`6`
`7`		`- def build_only(name, *args, &block)`
	`7`	`+ def self.build_only(name, *args, &block)`
`8`	`8`	`React::Component.deprecation_warning(`
`9`	`9`	`'..._as_node is deprecated. Render component and then use the .node method instead'`
`10`	`10`	`)`