Add support for Pundit v2 (#104)

* Allow to use Pundit v2

* Use Appraisal to test Pundit v2

* Add more Rails versions to test Pundit v2

.gitignore

@@ -10,3 +10,4 @@
 /spec/dummy/tmp/
 *.orig
 .ruby-version
+/gemfiles/*.gemfile.lock

.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
 Style/FileName:
   Exclude:
     - lib/jsonapi-authorization.rb
+    - Appraisals
 
 Metrics/LineLength:
   Enabled: true

.travis.yml

@@ -1,13 +1,15 @@
 language: ruby
-env:
-  - JSONAPI_RESOURCES_VERSION=0.9 RAILS_VERSION=4.2.0
-  - JSONAPI_RESOURCES_VERSION=0.9 RAILS_VERSION=5.0.0
-  - JSONAPI_RESOURCES_VERSION=0.9 RAILS_VERSION=5.1.0
-  - JSONAPI_RESOURCES_VERSION=0.9 RAILS_VERSION=5.2.0
-install:
-  - bundle install
 rvm:
   - 2.3
+gemfile:
+  - gemfiles/rails_4_2_pundit_1.gemfile
+  - gemfiles/rails_5_0_pundit_1.gemfile
+  - gemfiles/rails_5_1_pundit_1.gemfile
+  - gemfiles/rails_5_2_pundit_1.gemfile
+  - gemfiles/rails_4_2_pundit_2.gemfile
+  - gemfiles/rails_5_0_pundit_2.gemfile
+  - gemfiles/rails_5_1_pundit_2.gemfile
+  - gemfiles/rails_5_2_pundit_2.gemfile
 before_install: gem install bundler -v 1.16.2
 notifications:
   email: false

Appraisals

@@ -0,0 +1,47 @@
+appraise 'rails-4-2 pundit-1' do
+  gem 'rails', '4.2.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 1.0'
+end
+
+appraise 'rails-5-0 pundit-1' do
+  gem 'rails', '5.0.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 1.0'
+end
+
+appraise 'rails-5-1 pundit-1' do
+  gem "rails", "5.1.0"
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 1.0'
+end
+
+appraise 'rails-5-2 pundit-1' do
+  gem 'rails', '5.2.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 1.0'
+end
+
+appraise 'rails-4-2 pundit-2' do
+  gem 'rails', '4.2.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 2.0'
+end
+
+appraise 'rails-5-0 pundit-2' do
+  gem 'rails', '5.0.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 2.0'
+end
+
+appraise 'rails-5-1 pundit-2' do
+  gem 'rails', '5.1.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 2.0'
+end
+
+appraise 'rails-5-2 pundit-2' do
+  gem 'rails', '5.2.0'
+  gem 'jsonapi-resources', '0.9'
+  gem 'pundit', '~> 2.0'
+end

Gemfile

@@ -1,23 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-rails_version = ENV['RAILS_VERSION'] || 'default'
-jsonapi_resources_version = ENV['JSONAPI_RESOURCES_VERSION'] || 'default'
-
-case rails_version
-when 'master'
-  gem 'rails', git: 'https://github.com/rails/rails.git'
-  gem 'arel', git: 'https://github.com/rails/arel.git'
-when 'default'
-  gem 'rails', '>= 4.2'
-else
-  gem 'rails', "~> #{rails_version}"
-end
-
-case jsonapi_resources_version
-when 'default'
-  gem 'jsonapi-resources', '0.9'
-else
-  gem 'jsonapi-resources', jsonapi_resources_version
-end

gemfiles/rails_4_2_pundit_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 1.0"
+
+gemspec path: "../"

gemfiles/rails_4_2_pundit_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 2.0"
+
+gemspec path: "../"

gemfiles/rails_5_0_pundit_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.0.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 1.0"
+
+gemspec path: "../"

gemfiles/rails_5_0_pundit_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.0.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 2.0"
+
+gemspec path: "../"

gemfiles/rails_5_1_pundit_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.1.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 1.0"
+
+gemspec path: "../"

gemfiles/rails_5_1_pundit_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.1.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 2.0"
+
+gemspec path: "../"

gemfiles/rails_5_2_pundit_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.2.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 1.0"
+
+gemspec path: "../"

gemfiles/rails_5_2_pundit_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.2.0"
+gem "jsonapi-resources", "0.9"
+gem "pundit", "~> 2.0"
+
+gemspec path: "../"

jsonapi-authorization.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "jsonapi-resources", "~> 0.9"
-  spec.add_dependency "pundit", "~> 1.0"
+  spec.add_dependency "pundit", ">= 1.0.0", "< 3.0.0"
 
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-rails", "~> 3.7"
+  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "rspec-rails", "~> 3.8"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-doc"