ready to release

catmando · zetachang · commit 2bae76fba818 · 2016-10-02T13:44:21.000+08:00
# Conflicts:
#	lib/reactive-ruby/rails/controller_helper.rb
diff --git a/lib/react/component/class_methods.rb b/lib/react/component/class_methods.rb
@@ -1,5 +1,6 @@
 module React
   module Component
+    # class level methods (macros) for components
     module ClassMethods
       def backtrace(*args)
         @dont_catch_exceptions = (args[0] == :none)
@@ -9,39 +10,34 @@ def backtrace(*args)
       def process_exception(e, component, reraise = nil)
         message = ["Exception raised while rendering #{component}"]
         if e.backtrace && e.backtrace.length > 1 && !@backtrace_off
-          message << "    #{e.backtrace[0]}"
-          message += e.backtrace[1..-1].collect { |line| line }
+          append_backtrace(message, e.backtrace)
         else
           message[0] += ": #{e.message}"
         end
-        message = message.join("\n")
-        `console.error(message)`
+        `console.error(#{message.join("\n")})`
         raise e if reraise || @dont_catch_exceptions
       end
 
+      def append_backtrace(message_array, backtrace)
+        message_array << "    #{backtrace[0]}"
+        backtrace[1..-1].each { |line| message_array << line }
+      end
+
       def deprecation_warning(message)
         @deprecation_messages ||= []
-        message = "Warning: Deprecated feature used in #{self.name}. #{message}"
+        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)
-        if container
-          if block
-            define_method :render do
-              send(container, params) { instance_eval &block }
-            end
+      def render(container = nil, params = {}, &block)
+        define_method :render do
+          if container
+            React::RenderingContext.render(container, params) { instance_eval(&block) if block }
           else
-            define_method :render do
-              send(container, params)
-            end
-          end
-        else
-          define_method :render do
-            instance_eval &block
+            instance_eval(&block)
           end
         end
       end
@@ -176,15 +172,19 @@ def static_call_backs
       end
 
       def export_component(opts = {})
-        export_name = (opts[:as] || name).split("::")
+        export_name = (opts[:as] || name).split('::')
         first_name = export_name.first
-        Native(`window`)[first_name] = add_item_to_tree(Native(`window`)[first_name], [React::API.create_native_react_class(self)] + export_name[1..-1].reverse).to_n
+        Native(`window`)[first_name] = add_item_to_tree(
+          Native(`window`)[first_name],
+          [React::API.create_native_react_class(self)] + export_name[1..-1].reverse
+        ).to_n
       end
 
       def imports(component_name)
-        React::API.import_native_component(self,
-                                           React::API.eval_native_react_component(component_name))
-        render {} # define a dummy render method - will never be called...
+        React::API.import_native_component(
+          self, React::API.eval_native_react_component(component_name)
+        )
+        define_method(:render) {} # define a dummy render method - will never be called...
       rescue Exception => e # rubocop:disable Lint/RescueException : we need to catch everything!
         raise "#{self} cannot import '#{component_name}': #{e.message}."
         # rubocop:enable Lint/RescueException
@@ -194,9 +194,11 @@ def imports(component_name)
 
       def add_item_to_tree(current_tree, new_item)
         if Native(current_tree).class != Native::Object || new_item.length == 1
-          new_item.inject { |memo, sub_name| { sub_name => memo } }
+          new_item.inject { |a, e| { e => a } }
         else
-          Native(current_tree)[new_item.last] = add_item_to_tree(Native(current_tree)[new_item.last], new_item[0..-2])
+          Native(current_tree)[new_item.last] = add_item_to_tree(
+            Native(current_tree)[new_item.last], new_item[0..-2]
+          )
           current_tree
         end
       end
diff --git a/lib/react/component/tags.rb b/lib/react/component/tags.rb
@@ -41,6 +41,8 @@ def present_as_node(component, *params, &children)
             React::RenderingContext.render(tag, *params, &children)
           end
         end
+        alias_method tag.upcase, tag
+        const_set tag.upcase, tag
         # handle deprecated _as_node style
         define_method("#{tag}_as_node") do |*params, &children|
           React::RenderingContext.build_only(tag, *params, &children)
diff --git a/lib/react/top_level.rb b/lib/react/top_level.rb
@@ -105,11 +105,6 @@ def self.unmount_component_at_node(node)
 end
 
 Element.instance_eval do
-  class Element
-    class DummyContext < React::Component::Base
-    end
-  end
-
   def self.find(selector)
     selector = begin
       selector.dom_node
@@ -123,11 +118,11 @@ def self.[](selector)
     find(selector)
   end
 
-  define_method :render do |&block|
-    React.render(
-      React::RenderingContext.render(nil) do
-        ::Element::DummyContext.new.instance_eval(&block)
-      end, self
-    )
+  define_method :render do |container = nil, params = {}, &block|
+    klass = Class.new(React::Component::Base)
+    klass.class_eval do
+      render(container, params, &block)
+    end
+    React.render(React.create_element(klass), self)
   end
 end if Object.const_defined?('Element')
diff --git a/lib/reactive-ruby/rails/controller_helper.rb b/lib/reactive-ruby/rails/controller_helper.rb
@@ -1,15 +1,15 @@
 require 'action_controller'
 
-module ReactiveRuby
-  module Rails
-    class ActionController::Base
-      def render_component(*args)
-        @component_name = ((args[0].is_a? Hash) || args.empty?) ? params[:action].camelize : args.shift
-        @render_params = args.shift || {}
-        options = args[0] || {}
-        layout = options.key?(:layout) ? options[:layout].to_s : :default
-        render inline: "<%= react_component @component_name, @render_params, { prerender: !params[:no_prerender] } %>", layout: layout
-      end
+module ActionController
+  # adds render_component helper to ActionControllers
+  class Base
+    def render_component(*args)
+      @component_name = (args[0].is_a? Hash) || args.empty? ? params[:action].camelize : args.shift
+      @render_params = args.shift || {}
+      options = args[0] || {}
+      render inline: '<%= react_component @component_name, @render_params, '\
+                     '{ prerender: !params[:no_prerender] } %>',
+             layout: options.key?(:layout) ? options[:layout].to_s : :default
     end
   end
 end
diff --git a/spec/react/dsl_spec.rb b/spec/react/dsl_spec.rb
@@ -42,7 +42,6 @@
 
       expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<span>hello fred</span>')
     end
-
   end
 
   it "will turn the last string in a block into a element" do
@@ -57,6 +56,18 @@ def render
     expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>hello</div>')
   end
 
+  it "can use the upcase version of builtin tags" do
+    stub_const 'Foo', Class.new
+    Foo.class_eval do
+      include React::Component
+      def render
+        DIV { "hello" }
+      end
+    end
+
+    expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>hello</div>')
+  end
+
   it "has a .span short hand String method" do
     stub_const 'Foo', Class.new
     Foo.class_eval do
diff --git a/spec/react/native_library_spec.rb b/spec/react/native_library_spec.rb
@@ -7,13 +7,13 @@ module NativeLibraryTestModule
   class Component < React::Component::Base
     param :time_stamp
     backtrace :none
-    render { puts "about to render Component"; NativeComponent(name: "There - #{params.time_stamp}") }
+    render { NativeComponent(name: "There - #{params.time_stamp}") }
   end
 
   class NestedComponent < React::Component::Base
     param :time_stamp
     backtrace :none
-    render { puts "about to render NestedComponent"; NativeLibrary::NativeNestedLibrary::NativeComponent(name: "There - #{params.time_stamp}") }
+    render { NativeLibrary::NativeNestedLibrary::NativeComponent(name: "There - #{params.time_stamp}") }
   end
 end
 
diff --git a/spec/react/opal_jquery_extensions_spec.rb b/spec/react/opal_jquery_extensions_spec.rb
@@ -6,8 +6,10 @@
     React::API.clear_component_class_cache
   end
 
-  it 'responds to render' do
-    expect(Element['body']).to respond_to :render
+  it 'renders a top level component using render' do
+    test_div = Element.new(:div)
+    test_div.render(:span, id: :render_test_span) { 'hello' }
+    expect(Element[test_div].find('#render_test_span').html).to eq('hello')
   end
 
   it 'will find the DOM node given a react element' do
