Add support for Rails 6

fixes #1280

Author: pabse

Diff for: .travis.yml

@@ -5,7 +5,7 @@ env:
   - "RAILS_VERSION=5.0.7.2"
   - "RAILS_VERSION=5.1.7"
   - "RAILS_VERSION=5.2.3"
-#  - "RAILS_VERSION=6.0.0.beta1"
+  - "RAILS_VERSION=6.0.0"
 #  - "RAILS_VERSION=master"
 rvm:
   - 2.3.8
@@ -15,9 +15,12 @@ rvm:
 matrix:
   allow_failures:
     - env: "RAILS_VERSION=master"
-    - env: "RAILS_VERSION=6.0.0.beta1"
   exclude:
     - rvm: 2.6.4
       env: "RAILS_VERSION=4.2.11"
+    - rvm: 2.3.8
+      env: "RAILS_VERSION=6.0.0"
+    - rvm: 2.4.7
+      env: "RAILS_VERSION=6.0.0"
 before_install:
   - gem install bundler --version 1.17.3

Diff for: Gemfile

@@ -2,10 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-platforms :ruby do
-  gem 'sqlite3', '1.3.13'
-end
-
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
@@ -17,7 +13,17 @@ when 'master'
   gem 'railties', { git: 'https://github.com/rails/rails.git' }
   gem 'arel', { git: 'https://github.com/rails/arel.git' }
 when 'default'
-  gem 'railties', '>= 5.0'
+  gem 'railties', '>= 6.0'
+when '6.0.0'
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.4'
+  end
+
+  gem 'railties', "~> #{version}"
 else
+  platforms :ruby do
+    gem 'sqlite3', '1.3.13'
+  end
+
   gem 'railties', "~> #{version}"
-end
+end

Diff for: lib/jsonapi-resources.rb

@@ -7,7 +7,13 @@
 require 'jsonapi/cached_response_fragment'
 require 'jsonapi/response_document'
 require 'jsonapi/acts_as_resource_controller'
-require 'jsonapi/resource_controller'
+if ActiveSupport.respond_to?(:on_load)
+  ActiveSupport.on_load(:action_controller_base) do
+    require 'jsonapi/resource_controller'
+  end
+else
+  require 'jsonapi/resource_controller'
+end
 require 'jsonapi/resource_controller_metal'
 require 'jsonapi/resources/version'
 require 'jsonapi/configuration'

Diff for: lib/jsonapi/active_relation/adapters/join_left_active_record_adapter.rb

@@ -8,7 +8,7 @@ module JoinLeftActiveRecordAdapter
         # example Post.joins(:comments).joins_left(comments: :author) will join the comments table twice,
         # once inner and once left in 5.2, but only as inner in earlier versions.
         def joins_left(*columns)
-          if Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2
+          if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
             left_joins(columns)
           else
             join_dependency = ActiveRecord::Associations::JoinDependency.new(self, columns, [])

Diff for: test/unit/active_relation_resource_finder/join_manager_test.rb

@@ -79,7 +79,7 @@ def test_add_joins_source_relationship_with_custom_apply
     records = Api::V10::PostResource.records({})
     records = join_manager.join(records, {})
 
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2
+    if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
       assert_equal 'SELECT "posts".* FROM "posts" INNER JOIN "comments" ON "comments"."post_id" = "posts"."id" WHERE "comments"."approved" = 1', records.to_sql
     else
       assert_equal 'SELECT "posts".* FROM "posts" INNER JOIN "comments" ON "comments"."post_id" = "posts"."id" WHERE "comments"."approved" = \'t\'', records.to_sql
@@ -99,7 +99,7 @@ def test_add_nested_scoped_joins
     records = Api::V10::PostResource.records({})
     records = join_manager.join(records, {})
 
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2
+    if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = 1 AND "author"."special" = 1', records.to_sql
     else
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = \'t\' AND "author"."special" = \'t\'', records.to_sql
@@ -123,7 +123,7 @@ def test_add_nested_scoped_joins
     records = join_manager.join(records, {})
 
     # Note sql is in different order, but aliases should still be right
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2
+    if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = 1 AND "author"."special" = 1', records.to_sql
     else
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = \'t\' AND "author"."special" = \'t\'', records.to_sql
@@ -163,7 +163,7 @@ def test_add_nested_joins_with_fields
     records = Api::V10::PostResource.records({})
     records = join_manager.join(records, {})
 
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2
+    if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = 1 AND "author"."special" = 1', records.to_sql
     else
       assert_equal 'SELECT "posts".* FROM "posts" LEFT OUTER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "posts"."author_id" LEFT OUTER JOIN "people" "authors_comments" ON "authors_comments"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" WHERE "comments"."approved" = \'t\' AND "author"."special" = \'t\'', records.to_sql
@@ -184,7 +184,7 @@ def test_add_joins_with_sub_relationship
     records = Api::V10::PostResource.records({})
     records = join_manager.join(records, {})
 
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2
+    if Rails::VERSION::MAJOR >= 6 || (Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2)
       assert_equal 'SELECT "posts".* FROM "posts" INNER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" LEFT OUTER JOIN "comments" "comments_people" ON "comments_people"."author_id" = "people"."id" WHERE "comments"."approved" = 1 AND "author"."special" = 1', records.to_sql
     else
       assert_equal 'SELECT "posts".* FROM "posts" INNER JOIN "comments" ON "comments"."post_id" = "posts"."id" LEFT OUTER JOIN "people" ON "people"."id" = "comments"."author_id" LEFT OUTER JOIN "comments_tags" ON "comments_tags"."comment_id" = "comments"."id" LEFT OUTER JOIN "tags" ON "tags"."id" = "comments_tags"."tag_id" LEFT OUTER JOIN "comments" "comments_people" ON "comments_people"."author_id" = "people"."id" WHERE "comments"."approved" = \'t\' AND "author"."special" = \'t\'', records.to_sql