diff --git a/Appraisals b/Appraisals index e1103e1..dbb600a 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,11 @@ appraise "rails-4" do gem "rails", "~> 4.2" + gem "sqlite3", '~> 1.3.6' + gem "jsonapi-resources", "~> 0.9.10" end appraise "rails-5" do - gem "rails", "~> 5.0" + gem "rails", "~> 5.2" + gem "sqlite3", '~> 1.3.6' + gem "jsonapi-resources", "~> 0.9.10" end diff --git a/Gemfile b/Gemfile index ed815b6..033bb07 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'appraisal' # Dependencies for dummy application -gem 'sqlite3' +gem 'sqlite3', '~> 1.3.6' gem 'jsonapi-resources', '~> 0.8.0' gem 'pundit' diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile index 1ba611a..f5b6d6e 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.gemfile @@ -3,9 +3,9 @@ source "https://rubygems.org" gem "appraisal" -gem "sqlite3" -gem "jsonapi-resources", :github => "cerebris/jsonapi-resources" +gem "sqlite3", "~> 1.3.6" +gem "jsonapi-resources", "~> 0.9.10" gem "pundit" gem "rails", "~> 4.2" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index e2ec314..474a255 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -3,9 +3,9 @@ source "https://rubygems.org" gem "appraisal" -gem "sqlite3" -gem "jsonapi-resources", :github => "cerebris/jsonapi-resources" +gem "sqlite3", "~> 1.3.6" +gem "jsonapi-resources", "~> 0.9.10" gem "pundit" -gem "rails", "~> 5.0" +gem "rails", "~> 5.2" -gemspec :path => "../" +gemspec path: "../" diff --git a/pundit-resources.gemspec b/pundit-resources.gemspec index fbc2a63..c10b49a 100644 --- a/pundit-resources.gemspec +++ b/pundit-resources.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport" spec.add_dependency "jsonapi-resources" spec.add_dependency "pundit" - spec.add_dependency "rails", ">= 4.2.1", "< 5.1" + spec.add_dependency "rails", ">= 4.2.1", "< 6" spec.add_development_dependency "bundler", "~> 1.11" spec.add_development_dependency "rake", "~> 10.0" diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index e3964dd..4ade27e 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -19,6 +19,9 @@ class Application < Rails::Application if ActiveRecord::Base.respond_to?(:belongs_to_required_by_default=) config.active_record.belongs_to_required_by_default = false end + if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer) + config.active_record.sqlite3.represent_boolean_as_integer = true + end end end