Merge pull request #860 from quinn/master

Remove rails as dependency

Author: lgebhardt

Gemfile

@@ -14,10 +14,10 @@ version = ENV['RAILS_VERSION'] || 'default'
 
 case version
 when 'master'
-  gem 'rails', { git: 'https://github.com/rails/rails.git' }
+  gem 'railties', { git: 'https://github.com/rails/rails.git' }
   gem 'arel', { git: 'https://github.com/rails/arel.git' }
 when 'default'
-  gem 'rails', '>= 5.0'
+  gem 'railties', '>= 5.0'
 else
-  gem 'rails', "~> #{version}"
+  gem 'railties', "~> #{version}"
 end

jsonapi-resources.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'concurrent-ruby-ext'
-  spec.add_dependency 'rails', '>= 4.0'
+  spec.add_dependency 'activerecord', '>= 4.1'
+  spec.add_dependency 'railties', '>= 4.1'
   spec.add_dependency 'concurrent-ruby'
 end

test/test_helper.rb

@@ -18,7 +18,7 @@
   end
 end
 
-require 'rails/all'
+require 'active_record/railtie'
 require 'rails/test_help'
 require 'minitest/mock'
 require 'jsonapi-resources'