fix deprecated calls and provide expected messages for 0.12

Author: grahamcracker

gemfiles/rails_3.1.gemfile

@@ -5,4 +5,4 @@ source "http://rubygems.org"
 gem "rails", "~> 3.1"
 gem "sprockets", ">= 2.2.2"
 
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_3.2.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2"
 
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_4.0.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_4.0_with_therubyracer.gemfile

@@ -3,6 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.0"
-gem "therubyracer", "0.12.0", :platform=>:mri
+gem "therubyracer", "0.12.0", :platform => :mri
 
-gemspec :path=>"../"
+gemspec :path => "../"

gemfiles/rails_4.1.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.1"
 
-gemspec :path=>"../"
+gemspec :path => "../"

lib/assets/javascripts/react_ujs.js

@@ -25,7 +25,7 @@
       var constructor = window[className] || eval.call(window, className);
       var propsJson = node.getAttribute(PROPS_ATTR);
       var props = propsJson && JSON.parse(propsJson);
-      React.renderComponent(constructor(props), node);
+      React.render(React.createElement(constructor, props), node);
     }
   };
 

lib/react/renderer.rb

@@ -70,7 +70,7 @@ def render(component, args={})
       react_props = React::Renderer.react_props(args)
       jscode = <<-JS
         function() {
-          return React.renderComponentToString(#{component}(#{react_props}));
+          return React.renderToString(React.createElement(#{component}, #{react_props}));
         }()
       JS
       context.eval(jscode).html_safe

test/react_renderer_test.rb

@@ -30,8 +30,9 @@ class ReactRendererTest < ActiveSupport::TestCase
     err = assert_raises React::Renderer::PrerenderError do
       React::Renderer.render("NonexistentComponent", {error: true, exists: false})
     end
-    expected_message = 'Encountered error "ReferenceError: Can\'t find variable: NonexistentComponent" when prerendering NonexistentComponent with {"error":true,"exists":false}'
-    assert_equal expected_message, err.message
+    expected_message_one = 'Encountered error "ReferenceError: Can\'t find variable: NonexistentComponent" when prerendering NonexistentComponent with {"error":true,"exists":false}'
+    expected_message_two = 'Encountered error "ReferenceError: NonexistentComponent is not defined" when prerendering NonexistentComponent with {"error":true,"exists":false}'
+    assert (expected_message_one == err.message || expected_message_two == err.message)
   end
 
   test 'prerender errors are thrown when given a string' do
@@ -43,7 +44,8 @@ class ReactRendererTest < ActiveSupport::TestCase
     err = assert_raises React::Renderer::PrerenderError do
       React::Renderer.render("NonexistentComponent", json_string)
     end
-    expected_message = 'Encountered error "ReferenceError: Can\'t find variable: NonexistentComponent" when prerendering NonexistentComponent with {"error":true,"exists":false}'
-    assert_equal expected_message, err.message
+    expected_message_one = 'Encountered error "ReferenceError: Can\'t find variable: NonexistentComponent" when prerendering NonexistentComponent with {"error":true,"exists":false}'
+    expected_message_two = 'Encountered error "ReferenceError: NonexistentComponent is not defined" when prerendering NonexistentComponent with {"error":true,"exists":false}'
+    assert (expected_message_one == err.message || expected_message_two == err.message)
   end
 end