Skip to content

Commit dbf6976

Browse files
committed
upgraded to version 3 of react on rails
1 parent abd15e4 commit dbf6976

13 files changed

+402
-387
lines changed

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.2.4

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language:
22
- ruby
33
rvm:
4-
- 2.2.3
4+
- 2.2.4
55
sudo: false
66
addons:
77
apt:

Diff for: Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
2-
ruby "2.2.3"
2+
ruby "2.2.4"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
@@ -37,7 +37,7 @@ gem "sdoc", group: :doc
3737
# Use Rails Html Sanitizer for HTML sanitization
3838
gem "rails-html-sanitizer"
3939

40-
gem "react_on_rails"
40+
gem "react_on_rails", git: "[email protected]:shakacode/react_on_rails.git", tag: "3.0.0-beta.1"
4141

4242
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4343
gem "therubyracer"

Diff for: Gemfile.lock

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: [email protected]:shakacode/react_on_rails.git
3+
revision: 562c58f2b37e13cecc86fd4bd4e85edb10acd86d
4+
tag: 3.0.0-beta.1
5+
specs:
6+
react_on_rails (3.0.0.beta.1)
7+
connection_pool
8+
execjs (~> 2.5)
9+
foreman
10+
rails (>= 3.2)
11+
rainbow (~> 2.1)
12+
113
GEM
214
remote: https://rubygems.org/
315
specs:
@@ -201,11 +213,6 @@ GEM
201213
rake (10.5.0)
202214
rdoc (4.2.1)
203215
json (~> 1.4)
204-
react_on_rails (2.3.0)
205-
connection_pool
206-
execjs (~> 2.5)
207-
rails (>= 3.2)
208-
rainbow (~> 2.1)
209216
ref (2.0.0)
210217
rest-client (1.8.0)
211218
http-cookie (>= 1.0.2, < 2.0)
@@ -345,7 +352,7 @@ DEPENDENCIES
345352
rails-html-sanitizer
346353
rails_12factor
347354
rainbow
348-
react_on_rails
355+
react_on_rails!
349356
rspec-rails
350357
rspec-retry
351358
rubocop

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ See package.json and Gemfile for versions
6666
1. Be sure that you have Node installed! We suggest [nvm](https://github.com/creationix/nvm), with node version `v5.0` or above. See this article [Updating and using nvm](http://forum.shakacode.com/t/updating-and-using-nvm/293).
6767
1. `git clone [email protected]:shakacode/react-webpack-rails-tutorial.git`
6868
1. `cd react-webpack-rails-tutorial`
69-
1. Check that you have Ruby 2.2.3
69+
1. Check that you have Ruby 2.2.4
7070
1. Check that you're using the right version of node. Run `nvm list` to check.
7171
1. Check that you have Postgres installed. Run `which postgres` to check.
7272
1. `bundle install`

Diff for: app/controllers/pages_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def index
66
# compared to he view. However, it's more convenient to use Jbuilder from the view. See
77
# app/views/pages/index.html.erb:20
88
#
9-
# <%= react_component('App', render(template: "/comments/index.json.jbuilder"),
9+
# <%= react_component('App', props: render(template: "/comments/index.json.jbuilder"),
1010
# prerender: true) %>
1111
#
1212
#

Diff for: app/views/pages/index.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<a href="https://github.com/shakacode/react_on_rails">react_on_rails gem</a>)</h2>
33
<%= render "header" %>
44

5-
<%= react_component('RouterApp', render(template: "/comments/index.json.jbuilder"),
5+
<%= react_component('RouterApp', props: render(template: "/comments/index.json.jbuilder"),
66
prerender: true, raise_on_prerender_error: true) %>

Diff for: app/views/pages/no_router.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<a href="https://github.com/shakacode/react_on_rails">react_on_rails gem</a>)</h2>
33
<%= render "header" %>
44

5-
<%= react_component('App', render(template: "/comments/index.json.jbuilder"),
5+
<%= react_component('App', props: render(template: "/comments/index.json.jbuilder"),
66
prerender: false) %>

Diff for: app/views/pages/simple.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
</ul>
1010
<hr/>
1111

12-
<%= react_component('SimpleCommentScreen', {}, prerender: false) %>
12+
<%= react_component('SimpleCommentScreen', props: {}, prerender: false) %>

0 commit comments

Comments
 (0)