Merge pull request #389 from maclover7/jm-rails-51

Add Rails 5.1 support to JBuilder

.travis.yml

@@ -22,6 +22,7 @@ gemfile:
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 
 matrix:
   allow_failures:
@@ -32,14 +33,24 @@ matrix:
   exclude:
     - rvm: 1.9
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.0
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: rbx
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: rbx
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.4.0
       gemfile: gemfiles/rails_3_0.gemfile
     - rvm: 2.4.0

Appraisals

@@ -42,3 +42,9 @@ appraise "rails-5-0" do
   gem "actionpack",  "~> 5.0.0"
   gem "activemodel", "~> 5.0.0"
 end
+
+appraise "rails-5-1" do
+  gem "railties",    ">= 5.1.0.beta1", "< 5.2"
+  gem "actionpack",  ">= 5.1.0.beta1", "< 5.2"
+  gem "activemodel", ">= 5.1.0.beta1", "< 5.2"
+end

gemfiles/rails_5_1.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.1.0.beta1", "< 5.2"
+gem "actionpack", ">= 5.1.0.beta1", "< 5.2"
+gem "activemodel", ">= 5.1.0.beta1", "< 5.2"
+
+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.1'
+  s.add_dependency 'activesupport', '>= 3.0.0', '< 5.2'
   s.add_dependency 'multi_json',    '~> 1.2'
 
   s.files         = `git ls-files`.split("\n")