Skip to content

Commit 47b81c3

Browse files
author
Robert Mosolgo
committed
Merge pull request #270 from benpickles/fix-appraisals
Fix Appraisals and test against the intended version of Rails
2 parents 46bb0b5 + 6e4f0ee commit 47b81c3

10 files changed

+13
-28
lines changed

Appraisals

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
appraise "rails-3.1" do
2-
gem 'rails', '~> 3.1'
3-
# Buggy sprockets can break tests under Ruby 2.0. Use a decent version.
4-
# See https://github.com/sstephenson/sprockets/issues/352
5-
gem 'sprockets', '>= 2.2.2'
6-
end
7-
81
appraise "rails-3.2" do
9-
gem 'rails', '~> 3.2'
2+
gem 'rails', '~> 3.2.21'
103
end
114

125
appraise "rails-4.0" do
13-
gem 'rails', '~> 4.0'
6+
gem 'rails', '~> 4.0.13'
147
end
158

169
appraise "rails-4.0-with-therubyracer" do
17-
gem 'rails', '~> 4.0'
10+
gem 'rails', '~> 4.0.13'
1811
gem 'therubyracer', '0.12.0', :platform => :mri
1912
end
2013

2114
appraise "rails-4.1" do
22-
gem 'rails', '~> 4.1'
15+
gem 'rails', '~> 4.1.10'
2316
end
2417

2518
appraise "rails-4.2" do
26-
gem 'rails', '~> 4.2'
19+
gem 'rails', '~> 4.2.1'
2720
end

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# react-rails
99

1010

11-
`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.1+) application. `react-rails` can:
11+
`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.2+) application. `react-rails` can:
1212

1313
- Provide [various `react` builds](#reactjs-builds) to your asset bundle
1414
- Transform [`.jsx` in the asset pipeline](#jsx)

gemfiles/rails_3.1.gemfile

-8
This file was deleted.

gemfiles/rails_3.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 3.2"
5+
gem "rails", "~> 3.2.21"
66

77
gemspec :path => "../"

gemfiles/rails_4.0.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 4.0"
5+
gem "rails", "~> 4.0.13"
66

77
gemspec :path => "../"

gemfiles/rails_4.0_with_therubyracer.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 4.0"
5+
gem "rails", "~> 4.0.13"
66
gem "therubyracer", "0.12.0", :platform => :mri
77

88
gemspec :path => "../"

gemfiles/rails_4.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 4.1"
5+
gem "rails", "~> 4.1.10"
66

77
gemspec :path => "../"

gemfiles/rails_4.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "http://rubygems.org"
44

5-
gem "rails", "~> 4.2"
5+
gem "rails", "~> 4.2.1"
66

77
gemspec :path => "../"

react-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
2828
s.add_dependency 'coffee-script-source', '~>1.8'
2929
s.add_dependency 'connection_pool'
3030
s.add_dependency 'execjs'
31-
s.add_dependency 'rails', '>= 3.1'
31+
s.add_dependency 'rails', '>= 3.2'
3232
s.add_dependency 'tilt'
3333

3434
s.files = Dir[

test/dummy/config/initializers/secret_token.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
# if you're sharing your code publicly.
1212
Dummy::Application.config.secret_key_base = '43fa5672451bbd0a171668e625edc433eb00eeeb14c2606546e262e499ab853cfb532998d4809abe5019bf13888863e3a2c7d5cf7757de7a2b1fb50826d9874e'
1313

14-
# for rails 3.1 & 3.2
14+
# For Rails 3.2.
1515
Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base

0 commit comments

Comments
 (0)