Inject React::Component::API

zetachang · zetachang · commit e9e520eca034 · 2015-02-22T21:39:31.000+08:00
diff --git a/lib/react/component.rb b/lib/react/component.rb
@@ -5,6 +5,7 @@
 module React
   module Component
     def self.included(base)
+      base.include(API)
       base.include(React::Callbacks)
       base.class_eval do
         class_attribute :init_state, :validator
@@ -30,35 +31,13 @@ def refs
       Native(`#{@native}.refs`)
     end
 
-    def emit(event_name, *args)
-      self.params["_on#{event_name.to_s.event_camelize}"].call(*args)
-    end
-
-    def mounted?
-      `#{@native}.isMounted()`
-    end
-
     def state
       raise "No native ReactComponent associated" unless @native
       Native(`#{@native}.state`)
     end
 
-    def set_state(state, &block)
-      raise "No native ReactComponent associated" unless @native
-      %x{
-        #{@native}.setState(#{state.to_n}, function(){
-          #{block.call if block}
-        });
-      }
-    end
-
-    def set_state!(state, &block)
-      raise "No native ReactComponent associated" unless @native
-      %x{
-        #{@native}.replaceState(#{state.to_n}, function(){
-          #{block.call if block}
-        });
-      }
+    def emit(event_name, *args)
+      self.params["_on#{event_name.to_s.event_camelize}"].call(*args)
     end
 
     def component_will_mount
@@ -169,5 +148,29 @@ def define_state(*states)
         end
       end
     end
+
+    module API
+      def mounted?
+        `#{@native}.isMounted()`
+      end
+
+      def set_state(state, &block)
+        raise "No native ReactComponent associated" unless @native
+        %x{
+          #{@native}.setState(#{state.to_n}, function(){
+            #{block.call if block}
+          });
+        }
+      end
+
+      def set_state!(state, &block)
+        raise "No native ReactComponent associated" unless @native
+        %x{
+          #{@native}.replaceState(#{state.to_n}, function(){
+            #{block.call if block}
+          });
+        }
+      end
+    end
   end
 end
diff --git a/lib/react/top_level.rb b/lib/react/top_level.rb
@@ -1,6 +1,5 @@
 require "native"
 require 'active_support'
-require "promise"
 
 module React
   HTML_TAGS = %w(a abbr address area article aside audio b base bdi bdo big blockquote body br
@@ -28,14 +27,9 @@ def self.create_element(type, properties = {}, &block)
   end
 
   def self.render(element, container)
-    if block_given?
-      %x{
-        React.render(#{element.to_n}, container, function(){#{ yield }})
-      }
-    else
-      `React.render(#{element.to_n}, container, function(){})`
-    end
-    return nil
+    component = Native(`React.render(#{element.to_n}, container, function(){#{yield if block_given?}})`)
+    component.class.include(React::Component::API)
+    component
   end
 
   def self.is_valid_element(element)
diff --git a/spec/react_spec.rb b/spec/react_spec.rb
@@ -131,6 +131,14 @@ def render
       React.render(React.create_element('span') { "lorem" }, div)
     end
 
+    it "should return a React::Component::API compatible object" do
+      div = `document.createElement("div")`
+      component = React.render(React.create_element('span') { "lorem" }, div)
+      React::Component::API.public_instance_methods(true).each do |method_name|
+        expect(component).to respond_to(method_name)
+      end
+    end
+
     pending "should return nil to prevent abstraction leakage" do
       div = `document.createElement("div")`
       expect {
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,27 +2,28 @@
 
 module ReactTestHelpers
   `var ReactTestUtils = React.addons.TestUtils`
-  
+
   def renderToDocument(type, options = {})
     element = React.create_element(type, options)
     return renderElementToDocument(element)
   end
-  
+
   def renderElementToDocument(element)
-    instance = `ReactTestUtils.renderIntoDocument(#{element.to_n})`
-    return Native(instance)
+    instance = Native(`ReactTestUtils.renderIntoDocument(#{element.to_n})`)
+    instance.class.include(React::Component::API)
+    return instance
   end
-  
+
   def simulateEvent(event, element, params = {})
     simulator = Native(`ReactTestUtils.Simulate`)
     simulator[event.to_s].call(`#{element.to_n}.getDOMNode()`, params)
   end
-  
+
   def isElementOfType(element, type)
     `React.addons.TestUtils.isElementOfType(#{element.to_n}, #{type.cached_component_class})`
   end
 end
 
 RSpec.configure do |config|
   config.include ReactTestHelpers
-end
+end
