merged with v8 stable

catmando · catmando · commit 3ffaa5af0c1c · 2016-06-27T17:49:59.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 #gem 'opal', "~> 0.9.x"
 #gem 'opal-rails', git: "https://github.com/reactrb/opal-rails.git"
 #gem 'opal-rspec-rails', git: 'https://github.com/reactrb/opal-rspec-rails.git'
-
+gem 'pry'
 gemspec
diff --git a/lib/generators/reactive_ruby/test_app/templates/views/layouts/test_layout.html.erb b/lib/generators/reactive_ruby/test_app/templates/views/layouts/test_layout.html.erb
diff --git a/lib/generators/reactive_ruby/test_app/test_app_generator.rb b/lib/generators/reactive_ruby/test_app/test_app_generator.rb
@@ -34,6 +34,10 @@ def configure_test_app
         "#{test_app_path}/app/views/components/hello_world.rb", force: true
       template 'views/components/todo.rb',
         "#{test_app_path}/app/views/components/todo.rb", force: true
+      template 'views/layouts/test_layout.html.erb',
+        "#{test_app_path}/app/views/layouts/test_layout.html.erb", force: true
+      template 'views/layouts/test_layout.html.erb',
+        "#{test_app_path}/app/views/layouts/explicit_layout.html.erb", force: true
     end
 
     def clean_superfluous_files
diff --git a/lib/react/top_level.rb b/lib/react/top_level.rb
@@ -71,20 +71,29 @@ def self.unmount_component_at_node(node)
 end
 
 Element.instance_eval do
-
-  class ::Element::DummyContext < React::Component::Base
+  class Element
+    class DummyContext < React::Component::Base
+    end
   end
 
   def self.find(selector)
-    selector = selector.dom_node if selector.respond_to? :dom_node rescue selector
+    selector = begin
+      selector.dom_node
+    rescue
+      selector
+    end if selector.respond_to? :dom_node
     `$(#{selector})`
   end
 
   def self.[](selector)
     find(selector)
   end
 
-  def render(&block)
-    React.render(React::RenderingContext.render(nil) {::Element::DummyContext.new.instance_eval &block}, self)
+  define_method :render do |&block|
+    React.render(
+      React::RenderingContext.render(nil) do
+        ::Element::DummyContext.new.instance_eval(&block)
+      end, self
+    )
   end
-end if Object.const_defined?("Element")
+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,13 +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[0].is_a? Hash) ? args[0] : {}
-        render inline: '<%= react_component(@component_name, @render_params, { prerender: !params[:no_prerender] }) %>', layout: 'application'
-      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/lib/reactive-ruby/version.rb b/lib/reactive-ruby/version.rb
@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.8.2"
+  VERSION = '0.8.4'
 end
diff --git a/reactrb.gemspec b/reactrb.gemspec
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '4.2.4'
   s.add_development_dependency 'react-rails'
   s.add_development_dependency 'opal-rails'
+  s.add_development_dependency 'pry'
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'jdbc-sqlite3'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
diff --git a/spec/controller_helper_spec.rb b/spec/controller_helper_spec.rb
@@ -8,14 +8,26 @@ class TestController < ActionController::Base; end
 
   describe '#render_component' do
     controller do
+
+      layout "test_layout"
+
       def index
         render_component
       end
+
+      def new
+        render_component "Index", {}, layout: :explicit_layout
+      end
     end
 
-    it 'renders the application layout' do
+    it 'renders with the default layout' do
       get :index, no_prerender: true
-      expect(response).to render_template(layout: :application)
+      expect(response).to render_template(layout: :test_layout)
+    end
+
+    it "renders with a specified layout" do
+      get :new, no_prerender: true
+      expect(response).to render_template(layout: :explicit_layout)
     end
   end
 end
diff --git a/spec/react/opal_jquery_extensions_spec.rb b/spec/react/opal_jquery_extensions_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+if opal?
+describe 'Element' do
+  after(:each) do
+    React::API.clear_component_class_cache
+  end
+
+  it 'responds to render' do
+    expect(Element['body']).to respond_to :render
+  end
+
+  it 'will find the DOM node given a react element' do
+    stub_const 'Foo', Class.new(React::Component::Base)
+    Foo.class_eval do
+      def render
+        div { 'hello' }
+      end
+    end
+
+    expect(Element[renderToDocument(Foo)].html).to eq('hello')
+  end
+end
+end
