ae_declarative_authorization 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e24437f98ca9123a9e0c007325f8cfe0b88ed691b4cfcba2be9e9972d413b263
-  data.tar.gz: 7c2b45c40951f5bc8ffc71f8c6b739727ee83aaaaea9f27f0d39f07640d3febb
+  metadata.gz: 751cbedf8879b1cc01f1353a5048e48253a2803b8d41a2acff126c0c39ddff42
+  data.tar.gz: a841b726d3501e12f7abed9143122ebf0325619498567ff044f996efc0a9f972
 SHA512:
-  metadata.gz: 6e437f0d1a24441216a86efd1213973be469838819409445c5af8c892c80939a460c2d789493954ec5c5f74ae41c429e2dc66b39d02fbd505f28954c442ff1cb
-  data.tar.gz: f25064eb69ea987a0387fc152dbf98cc1ac87e8b01de4fba54a87cfe2a5aa4acd5ecf525d39095a7a39f973c2e44ddc664b92ca90b814f3632b0fc79758cdd96
+  metadata.gz: d7572bb84e51d701713e1216d48b1d6d578cd99e5bad6e3f77e9e2f1158df46ac7d8b40c87ab034022c39e3301e6912d663a19b4cd4decb6f15208de6bb4210d
+  data.tar.gz: 955ca7bf9f17d9188ff372ae959ff7cbd95655025daf98cef65e31da1a965c654232f381ec584cccd28846c924f09d4bc84bd8619cf0a277555a3a5895e2b672

data/.circleci/config.yml

@@ -8,12 +8,6 @@ commands:
       - run: bundle exec appraisal rake test
 
 jobs:
-  test-ruby-233:
-    docker:
-      - image: circleci/ruby:2.3.3
-    steps:
-      - bundle_install_and_test
-
   test-ruby-253:
     docker:
       - image: circleci/ruby:2.5.3
@@ -29,8 +23,6 @@ jobs:
 workflows:
   rc:
     jobs:
-      - test-ruby-233:
-          context: appfolio_test_context
       - test-ruby-253:
           context: appfolio_test_context
       - test-ruby-263:

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.3
+ruby-2.6.3

data/Appraisals

@@ -1,40 +1,26 @@
-case RUBY_VERSION
-
-when '2.3.3', '2.5.3', '2.6.3' then
-
-  appraise "ruby-#{RUBY_VERSION}-rails507" do
-    gem 'rails', '5.0.7'
-    gem 'grape', '1.1.0'
-    gem 'rails-controller-testing'
-  end
-
-  appraise "ruby-#{RUBY_VERSION}-rails516" do
-    gem 'rails', '5.1.6'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
-  end
+RAILS_VERSIONS = ['5.2.2.1', '6.0.2.1']
+GRAPE_VERSIONS = ['1.1.0', '1.2.3', '1.3.0']
 
-  appraise "ruby-#{RUBY_VERSION}-rails521" do
-    gem 'rails', '5.2.1'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
-  end
-
-  appraise "ruby-#{RUBY_VERSION}-rails522" do
-    gem 'rails', '5.2.2'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
-  end
+case RUBY_VERSION
 
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-    appraise "ruby-#{RUBY_VERSION}-rails6" do
-      gem 'rails', '~> 6.0'
-      gem 'grape', '1.2.3'
-      gem 'rails-controller-testing'
-      gem 'sqlite3', '~> 1.4'
+when '2.5.3', '2.6.3' then
+  RAILS_VERSIONS.product(GRAPE_VERSIONS).each do |rails_version, grape_version|
+    appraise "ruby-#{RUBY_VERSION}-rails#{rails_version}-grape#{grape_version}" do
+      gem 'rails', rails_version
+      gem 'grape', grape_version
+
+      if Gem::Version.new(grape_version) < Gem::Version.new('1.3.0')
+        # https://github.com/ruby-grape/grape/pull/1956
+        gem "rack", "< 2.1.0"
+      end
+
+      if Gem::Version.new(rails_version) >= Gem::Version.new('6')
+        gem 'sqlite3', '~> 1.4'
+      else
+        gem 'sqlite3', '~> 1.3.0'
+      end
     end
   end
-
 else
   raise "Unsupported Ruby version #{RUBY_VERSION}"
 

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 gem 'appraisal', '~> 2.1'
 gem 'mocha', '~> 1.0', require: false
 gem 'sprockets', '< 4'
-gem 'sqlite3', '~> 1.3.0'
+
+gem 'rails-controller-testing'

data/lib/declarative_authorization/controller/grape.rb

@@ -57,13 +57,18 @@ module Authorization
             ::Rails.logger
           end
 
-          protected
-
           def api_class
             if options[:for].respond_to?(:base)
-              options[:for].base # Grape >= 1.2.0 controller
+              # Grape >= 1.2.0 endpoint
+              # Authorization::Controller::Grape can be included into either Grape::API
+              # or Grape::API::Instance, so we need to check both.
+              [
+                options[:for],
+                options[:for].base
+              ].detect { |api| api.respond_to?(:decl_auth_context) }
             else
-              options[:for]      # Grape  < 1.2.0 controller
+              # Grape < 1.2.0 endpoint
+              options[:for]
             end
           end
         end

data/lib/declarative_authorization/controller_permission.rb

@@ -68,11 +68,7 @@ module Authorization
 
     def controller_class(contr)
       if defined?(Grape) && contr.class < Grape::Endpoint
-        if contr.options[:for].respond_to?(:base)
-          contr.options[:for].base # Grape >= 1.2.0 controller
-        else
-          contr.options[:for]      # Grape  < 1.2.0 controller
-        end
+        contr.api_class
       else
         contr.class         # Rails controller
       end

data/lib/declarative_authorization/version.rb

@@ -1,3 +1,3 @@
 module DeclarativeAuthorization
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ae_declarative_authorization
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - AppFolio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blockenspiel
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ae_declarative_authorization is a Rails gem for maintainable authorization