From 129ae37010698e7af57ba3dde60f354129b9cda8 Mon Sep 17 00:00:00 2001 From: Quinn Shanahan Date: Tue, 4 Oct 2016 09:30:01 -0400 Subject: [PATCH] Remove rails as dependency * remove 'rails/all' from test helper * add activerecord and railties to gemspec --- Gemfile | 6 +++--- jsonapi-resources.gemspec | 3 ++- test/test_helper.rb | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 90a5af485..c58d1c896 100644 --- a/Gemfile +++ b/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 diff --git a/jsonapi-resources.gemspec b/jsonapi-resources.gemspec index d765f8b9f..3f031d173 100644 --- a/jsonapi-resources.gemspec +++ b/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 diff --git a/test/test_helper.rb b/test/test_helper.rb index b35a0d312..9ce9a60af 100644 --- a/test/test_helper.rb +++ b/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'