Merge d0791d5 into 5cb8fe3

.travis.yml

@@ -1,9 +1,11 @@
 rvm:
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - 2.5.3
+  - 2.2.10
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 
 gemfile:
   - gemfiles/rails_3.2.gemfile
@@ -13,6 +15,7 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 
 matrix:
   exclude:
@@ -22,32 +25,53 @@ matrix:
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_6.0.gemfile
+
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails_6.0.gemfile
+
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.0.gemfile
+
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_6.0.gemfile
 
-    - rvm: 2.3.4
+    - rvm: 2.5.7
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.3.4
+    - rvm: 2.5.7
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.3.4
+    - rvm: 2.5.7
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.3.4
+    - rvm: 2.5.7
       gemfile: gemfiles/rails_4.2.gemfile
 
-    - rvm: 2.4.1
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_4.2.gemfile
 
-    - rvm: 2.5.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_4.2.gemfile
 
 sudo: false

Appraisals

@@ -33,5 +33,8 @@ end
 
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
-  gem 'pg'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
 end

eaco.gemspec

@@ -17,14 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", '>= 1.6', '< 3'
   spec.add_development_dependency "rake"
   spec.add_development_dependency "byebug"
-  # Starting from version 2.12.7, guard includes listen >= 2.7, and
-  # starting from version 3.1.2, listen includes ruby_dep, that
-  # works only from Ruby 2.2.3 onwards. However eaco supports 2.0
-  # and up.
-  spec.add_development_dependency "guard", "< 2.12.7"
+  spec.add_development_dependency "guard"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "rspec"
@@ -35,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "guard-shell"
   spec.add_development_dependency "rails"
-  spec.add_development_dependency "pg", "~> 0.21"
+  spec.add_development_dependency "pg"
 end

features/authorization_parse_error.feature

@@ -6,11 +6,11 @@ Feature: Authorization rules error handling
   Scenario: Giving rubbish
     When I have a wrong authorization definition such as
      """
-     if you give me rubbish please go elsewhere
+     1+1=2
      """
     Then I should receive a DSL error SyntaxError saying
      """
-     \(feature\):1: syntax error.+please go elsewhere
+     \(feature\):1: syntax error, unexpected '=', expecting end-of-input
      """
 
   Scenario: Referencing a non-existing model

features/enterprise_authorization.feature

@@ -199,7 +199,7 @@ Feature: Role-based, flexible authorization
   Scenario: Authorizing a controller
     When I have an authorized Controller defined as
     """
-      if ActionPack::VERSION::MAJOR == 5
+      if ActionPack::VERSION::MAJOR >= 5
         before_action :find_document
       else
         before_filter :find_document

gemfiles/rails_5.2.gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
-gem "pg"
 
 gemspec path: "../"

gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

lib/eaco/adapters/active_record/compatibility.rb

@@ -13,6 +13,7 @@ class Compatibility
         autoload :V50, 'eaco/adapters/active_record/compatibility/v50.rb'
         autoload :V51, 'eaco/adapters/active_record/compatibility/v51.rb'
         autoload :V52, 'eaco/adapters/active_record/compatibility/v52.rb'
+        autoload :V60, 'eaco/adapters/active_record/compatibility/v60.rb'
 
         autoload :Scoped,    'eaco/adapters/active_record/compatibility/scoped.rb'
         autoload :Sanitized, 'eaco/adapters/active_record/compatibility/sanitized.rb'

lib/eaco/adapters/active_record/compatibility/v60.rb

@@ -0,0 +1,30 @@
+module Eaco
+  module Adapters
+    module ActiveRecord
+      class Compatibility
+
+        ##
+        # Rails 6.0 support module.
+        #
+        # JSONB works correctly, but we need +.scoped+ so we revive it through
+        # the {Scoped} support module.
+        #
+        # @see Scoped
+        #
+        # Sanitize has dissapeared in favour of quote.
+        #
+        # @see Sanitized
+        #
+        module V60
+          extend ActiveSupport::Concern
+
+          included do
+            extend Scoped
+            extend Sanitized
+          end
+        end
+
+      end
+    end
+  end
+end

lib/eaco/controller.rb

@@ -54,7 +54,7 @@ def authorize(*actions)
         actions.each {|action| authorization_permissions.update(action => target)}
 
         @_eaco_filter_installed ||= begin
-          if ActionPack::VERSION::MAJOR == 5
+          if ActionPack::VERSION::MAJOR >= 5
             before_action :confront_eaco
           else
             before_filter :confront_eaco