ae_declarative_authorization 0.11.0.pre1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdac3b23cd265e87af2b4fa946cd3420d3f72383da302c63cc3178aa0a5d4aa5
-  data.tar.gz: cd5cf8ca8959bf0fa6fb388e997fe4bea2835d9abdc94b71213a03eb107e0af2
+  metadata.gz: e24437f98ca9123a9e0c007325f8cfe0b88ed691b4cfcba2be9e9972d413b263
+  data.tar.gz: 7c2b45c40951f5bc8ffc71f8c6b739727ee83aaaaea9f27f0d39f07640d3febb
 SHA512:
-  metadata.gz: a3c6d73c6af0ec42ac5881323ab4d926e74253ec658234dec0866aa74052e689db6f51e289e4d5a9f75bfb2f4defb0b3fa52a45d93b1a74a25ec0ec079320af3
-  data.tar.gz: 67ea6f76363ab72f6fac1139482e4f22ce295591198e96c6cd7fc1657ace2c35a8ea63bcd32351e500851469b50e3d84f22a2a37ecd48fdb90fd2647c892faa7
+  metadata.gz: 6e437f0d1a24441216a86efd1213973be469838819409445c5af8c892c80939a460c2d789493954ec5c5f74ae41c429e2dc66b39d02fbd505f28954c442ff1cb
+  data.tar.gz: f25064eb69ea987a0387fc152dbf98cc1ac87e8b01de4fba54a87cfe2a5aa4acd5ecf525d39095a7a39f973c2e44ddc664b92ca90b814f3632b0fc79758cdd96

data/.circleci/config.yml

@@ -8,6 +8,12 @@ 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
@@ -23,6 +29,8 @@ 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.6.3
+ruby-2.3.3

data/Appraisals

@@ -1,26 +1,40 @@
-RAILS_VERSIONS = ['5.2.2.1', '6.0.2.1']
-GRAPE_VERSIONS = ['1.1.0', '1.2.3', '1.3.0']
-
 case RUBY_VERSION
 
-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
+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
+
+  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
+
+  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'
     end
   end
+
 else
   raise "Unsupported Ruby version #{RUBY_VERSION}"
 

data/Gemfile

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

data/lib/declarative_authorization/controller/grape.rb

@@ -57,18 +57,13 @@ module Authorization
             ::Rails.logger
           end
 
+          protected
+
           def api_class
             if options[:for].respond_to?(:base)
-              # 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) }
+              options[:for].base # Grape >= 1.2.0 controller
             else
-              # Grape < 1.2.0 endpoint
-              options[:for]
+              options[:for]      # Grape  < 1.2.0 controller
             end
           end
         end

data/lib/declarative_authorization/controller_permission.rb

@@ -68,7 +68,11 @@ module Authorization
 
     def controller_class(contr)
       if defined?(Grape) && contr.class < Grape::Endpoint
-        contr.api_class
+        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
       else
         contr.class         # Rails controller
       end

data/lib/declarative_authorization/version.rb

@@ -1,3 +1,3 @@
 module DeclarativeAuthorization
-  VERSION = '0.11.0.pre1'.freeze
+  VERSION = '0.11.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.pre1
+  version: 0.11.0
 platform: ruby
 authors:
 - AppFolio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blockenspiel
@@ -99,11 +99,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ae_declarative_authorization is a Rails gem for maintainable authorization