Merge pull request #309 from Partyista/master

Enabled interoperability with Rails 5.0.x...

Author: rwz

.travis.yml

@@ -20,7 +20,7 @@ gemfile:
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_edge.gemfile
+  - gemfiles/rails_5_0.gemfile
 
 matrix:
   allow_failures:
@@ -30,15 +30,15 @@ matrix:
   fast_finish: true
   exclude:
     - rvm: 1.9
-      gemfile: gemfiles/rails_edge.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.0
-      gemfile: gemfiles/rails_edge.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_edge.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: jruby-19mode
-      gemfile: gemfiles/rails_edge.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: rbx
-      gemfile: gemfiles/rails_edge.gemfile
+      gemfile: gemfiles/rails_5_0.gemfile
 
 notifications:
   email: false

Appraisals

@@ -37,8 +37,8 @@ appraise "rails-4-2" do
   gem "activemodel", "~> 4.2.0"
 end
 
-appraise "rails-edge" do
-  gem "rails",  ">= 5.0.0.alpha", github: "rails/rails"
-  gem "arel",   ">= 7.0.0.alpha", github: "rails/arel"
-  gem "rack",   ">= 2.0.0.alpha", github: "rack/rack"
+appraise "rails-5-0" do
+  gem "railties", ">= 5.0.0.beta1", "< 5.1"
+  gem "actionpack", ">= 5.0.0.beta1", "< 5.1"
+  gem "activemodel", ">= 5.0.0.beta1", "< 5.1"
 end

gemfiles/rails_5_0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "pry"
+gem "railties", ">= 5.0.0.beta1", "< 5.1"
+gem "actionpack", ">= 5.0.0.beta1", "< 5.1"
+gem "activemodel", ">= 5.0.0.beta1", "< 5.1"
+
+gemspec :path => "../"

jbuilder.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'activesupport', '>= 3.0.0', '< 5'
+  s.add_dependency 'activesupport', '>= 3.0.0', '< 5.1'
   s.add_dependency 'multi_json',    '~> 1.2'
 
   s.files         = `git ls-files`.split("\n")