Merge pull request #105 from grahamcracker/0.12

update to react-source 0.12 final

Author: zpao

README.md

@@ -58,13 +58,11 @@ Alternatively, you can include it directly as a separate script tag:
 
 ### JSX
 
-To transform your JSX into JS, simply create `.js.jsx` files, and ensure that the file has the `/** @jsx React.DOM */` docblock. These files will be transformed on request, or precompiled as part of the `assets:precompile` task.
+To transform your JSX into JS, simply create `.js.jsx` files. These files will be transformed on request, or precompiled as part of the `assets:precompile` task.
 
-CoffeeScript files can also be used, by creating `.js.jsx.coffee` files. You must use this form of the docblock at the top of each file: `###* @jsx React.DOM ###`. We also need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example:
+CoffeeScript files can also be used, by creating `.js.jsx.coffee` files. We also need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example:
 
 ```coffee
-###* @jsx React.DOM ###
-
 Component = React.createClass
   render: ->
     `<ExampleComponent videos={this.props.videos} />`
@@ -191,8 +189,6 @@ In order for us to render your React components, we need to be able to find them
 This will bring in all files located in the `app/assets/javascripts/components` directory.  You can organize your code however you like, as long as a request for `/assets/javascripts/components.js` brings in a concatenated file containing all of your React components, and each one has to be available in the global scope (either `window` or `global` can be used). For `.js.jsx` files this is not a problem, but if you are using `.js.jsx.coffee` files then the wrapper function needs to be taken into account:
 
 ```coffee
-###* @jsx React.DOM ###
-
 Component = React.createClass
   render: ->
     `<ExampleComponent videos={this.props.videos} />`
@@ -258,8 +254,6 @@ end
 It is possible to use JSX with CoffeeScript. The caveat is that you will still need to include the docblock. Since CoffeeScript doesn't allow `/* */` style comments, we need to do something a little different. We also need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example:
 
 ```coffee
-###* @jsx React.DOM ###
-
 Component = React.createClass
   render: ->
     `<ExampleComponent videos={this.props.videos} />`

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

react-rails.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'execjs'
   s.add_dependency 'rails', '>= 3.1'
-  s.add_dependency 'react-source', '0.11.1'
+  s.add_dependency 'react-source', '0.12'
   s.add_dependency 'connection_pool'
 
   s.files = Dir[

test/dummy/app/assets/javascripts/components/Todo.js.jsx.coffee

@@ -1,5 +1,3 @@
-###* @jsx React.DOM ###
-
 Todo = React.createClass
   render: ->
     `<li>{this.props.todo}</li>`