ae_declarative_authorization 0.10.1 → 0.12.1.tim1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0ec830cacc22dd541280519d48973f4badb9d88
-  data.tar.gz: '089be3345bbc9ebe53b8f277a3ec82ebfa0ab789'
+SHA256:
+  metadata.gz: dff06fa9d8ff036d7582d582f34f09865a68faf2e7be458a3f0424cecdee3f89
+  data.tar.gz: 1055f0f6748d60ab7f8355b04ef5381a5b63f1d4a7b17595594f985eb9032f82
 SHA512:
-  metadata.gz: d14fafdecc1093d56e1004d8676caf62ab6a8acd98d015ed09fb6c18d32bc32e2ae2d0ec5eef1d166897e15208cec941ebb92a13f00ad4f7ca5886ed66a7c49c
-  data.tar.gz: 8e70bfe29899a458c5be5e110499a072abfba03d181c1ef124bd609e8b821a8595c8910c667aafe5fb880c395531121ff5320ae6f5f0f516f7991680f04d55c4
+  metadata.gz: 667443e834bdead0de53a90a140d7f096723661ae108b12b2e247d35baa0604a33199805e61eeca296b9a4442038e8680ff855e99b80563636a33f0f4199a62f
+  data.tar.gz: 74369200c33c9a93a830919a03dfcf81d2e2f01161d5c19b40dbb5b1f22cbdb58b850b53935bb2807934657cab0ddbf5d0bc749718c57f9c5c27156358e16fb1

data/.circleci/config.yml

@@ -0,0 +1,29 @@
+version: 2.1
+commands:
+  bundle_install_and_test:
+    steps:
+      - checkout
+      - run: bundle install
+      - run: bundle exec appraisal install
+      - run: bundle exec appraisal rake test
+
+jobs:
+  test-ruby-253:
+    docker:
+      - image: circleci/ruby:2.5.3
+    steps:
+      - bundle_install_and_test
+
+  test-ruby-263:
+    docker:
+      - image: circleci/ruby:2.6.3
+    steps:
+      - bundle_install_and_test
+
+workflows:
+  rc:
+    jobs:
+      - test-ruby-253:
+          context: appfolio_test_context
+      - test-ruby-263:
+          context: appfolio_test_context

data/.gitignore

@@ -0,0 +1,32 @@
+# Because this is a gem, ignore Gemfile.lock:
+
+Gemfile.lock
+gemfiles/*.gemfile.lock
+
+# And because this is Ruby, ignore the following
+# (source: https://github.com/github/gitignore/blob/master/Ruby.gitignore):
+
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+log
+rdoc
+spec/reports
+test/test.log
+test/tmp
+test/version_tmp
+test/test_app/log
+tmp
+test/profiles
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+.idea

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.6.3

data/Appraisals

@@ -1,31 +1,26 @@
-case RUBY_VERSION
+RAILS_VERSIONS = ['5.2.2.1', '6.0.2.1']
+GRAPE_VERSIONS = ['1.1.0', '1.2.3', '1.3.0']
 
-when '2.3.3', '2.5.3', '2.6.2' then
+case RUBY_VERSION
 
-  appraise "ruby-#{RUBY_VERSION}-rails507" do
-    gem 'rails', '5.0.7'
-    gem 'grape', '1.1.0'
-    gem 'rails-controller-testing'
-  end
+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
 
-  appraise "ruby-#{RUBY_VERSION}-rails516" do
-    gem 'rails', '5.1.6'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
-  end
+      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
 
-  appraise "ruby-#{RUBY_VERSION}-rails521" do
-    gem 'rails', '5.2.1'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
+      if Gem::Version.new(rails_version) >= Gem::Version.new('6')
+        gem 'sqlite3', '~> 1.4'
+      else
+        gem 'sqlite3', '~> 1.3.0'
+      end
+    end
   end
-
-  appraise "ruby-#{RUBY_VERSION}-rails522" do
-    gem 'rails', '5.2.2'
-    gem 'grape', '1.2.3'
-    gem 'rails-controller-testing'
-  end
-
 else
   raise "Unsupported Ruby version #{RUBY_VERSION}"
 

data/Gemfile

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

data/declarative_authorization.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/appfolio/ae_declarative_authorization'
   s.licenses    = ['MIT']
 
-  s.files         = Dir['**/*']
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|gemfiles)/}) }
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
   s.add_dependency(%q<blockenspiel>, ['~> 0.5.0'])
-  s.add_dependency(%q<rails>, ['>= 4.2.5.2', '< 6'])
+  s.add_dependency(%q<rails>, ['>= 4.2.5.2', '< 7'])
 end

data/lib/declarative_authorization/controller/grape.rb

@@ -37,6 +37,12 @@ module Authorization
           end
 
           def filter_access_filter # :nodoc:
+            begin
+              route
+            rescue
+              # Acceessing route raises an exception when the response is a 405 MethodNotAllowed
+              return
+            end
             unless allowed?("#{request.request_method} #{route.origin}")
               if respond_to?(:permission_denied, true)
                 # permission_denied needs to render or redirect
@@ -51,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/test/helpers.rb

@@ -155,8 +155,14 @@ module DeclarativeAuthorization
         alias :access_tests_not_required :this_is_an_abstract_controller_so_it_needs_no_access_tests
 
         def all_public_actions
-          actions = controller_class.public_instance_methods(false)
-          actions += controller_class.superclass.public_instance_methods(false)
+          actions = []
+          if defined?(Grape) && [Grape::API, Grape::API::Instance].any? { |base| controller_class < base }
+            actions += controller_class.routes.map { |api| "#{api.request_method} #{api.origin}" }
+          else
+            actions += controller_class.public_instance_methods(false)
+            actions += controller_class.superclass.public_instance_methods(false)
+          end
+
           actions.reject! do |method|
             method =~ /^_/ ||
               method =~ /^rescue_action/ ||

data/lib/declarative_authorization/version.rb

@@ -1,3 +1,3 @@
 module DeclarativeAuthorization
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.12.1.tim1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ae_declarative_authorization
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.1.tim1
 platform: ruby
 authors:
 - AppFolio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blockenspiel
@@ -34,7 +34,7 @@ dependencies:
         version: 4.2.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: 4.2.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 description: ae_declarative_authorization is a Rails gem for maintainable authorization
   based on readable authorization rules.
 email: dev@appfolio.com
@@ -52,40 +52,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".gitignore"
+- ".ruby-version"
 - Appraisals
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - README.rdoc
 - Rakefile
 - authorization_rules.dist.rb
 - declarative_authorization.gemspec
-- gemfiles/ruby_2.3.3_rails507.gemfile
-- gemfiles/ruby_2.3.3_rails507.gemfile.lock
-- gemfiles/ruby_2.3.3_rails516.gemfile
-- gemfiles/ruby_2.3.3_rails516.gemfile.lock
-- gemfiles/ruby_2.3.3_rails521.gemfile
-- gemfiles/ruby_2.3.3_rails521.gemfile.lock
-- gemfiles/ruby_2.3.3_rails522.gemfile
-- gemfiles/ruby_2.3.3_rails522.gemfile.lock
-- gemfiles/ruby_2.5.3_rails507.gemfile
-- gemfiles/ruby_2.5.3_rails507.gemfile.lock
-- gemfiles/ruby_2.5.3_rails516.gemfile
-- gemfiles/ruby_2.5.3_rails516.gemfile.lock
-- gemfiles/ruby_2.5.3_rails521.gemfile
-- gemfiles/ruby_2.5.3_rails521.gemfile.lock
-- gemfiles/ruby_2.5.3_rails522.gemfile
-- gemfiles/ruby_2.5.3_rails522.gemfile.lock
-- gemfiles/ruby_2.6.2_rails507.gemfile
-- gemfiles/ruby_2.6.2_rails507.gemfile.lock
-- gemfiles/ruby_2.6.2_rails516.gemfile
-- gemfiles/ruby_2.6.2_rails516.gemfile.lock
-- gemfiles/ruby_2.6.2_rails521.gemfile
-- gemfiles/ruby_2.6.2_rails521.gemfile.lock
-- gemfiles/ruby_2.6.2_rails522.gemfile
-- gemfiles/ruby_2.6.2_rails522.gemfile.lock
 - init.rb
 - lib/declarative_authorization.rb
 - lib/declarative_authorization/authorization.rb
@@ -106,30 +84,6 @@ files:
 - lib/generators/authorization/rules/rules_generator.rb
 - lib/generators/authorization/rules/templates/authorization_rules.rb
 - lib/tasks/authorization_tasks.rake
-- log/test.log
-- pkg/ae_declarative_authorization-0.10.0.gem
-- pkg/ae_declarative_authorization-0.9.0.gem
-- pkg/ae_declarative_authorization-0.9.0.tim1.gem
-- pkg/ae_declarative_authorization-0.9.1.gem
-- pkg/ae_declarative_authorization-0.9.2.gem
-- test/authorization_test.rb
-- test/controller_filter_resource_access_test.rb
-- test/database.yml
-- test/dsl_reader_test.rb
-- test/functional/filter_access_to_with_id_in_scope_test.rb
-- test/functional/no_filter_access_to_test.rb
-- test/functional/params_block_arity_test.rb
-- test/grape_api_test.rb
-- test/helper_test.rb
-- test/maintenance_test.rb
-- test/model_test.rb
-- test/profiles/access_checking
-- test/rails_controller_test.rb
-- test/schema.sql
-- test/test_helper.rb
-- test/test_support/grape.rb
-- test/test_support/minitest_compatibility.rb
-- test/test_support/rails.rb
 homepage: http://github.com/appfolio/ae_declarative_authorization
 licenses:
 - MIT
@@ -145,32 +99,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ae_declarative_authorization is a Rails gem for maintainable authorization
   based on readable authorization rules.
-test_files:
-- test/authorization_test.rb
-- test/controller_filter_resource_access_test.rb
-- test/database.yml
-- test/dsl_reader_test.rb
-- test/functional/filter_access_to_with_id_in_scope_test.rb
-- test/functional/no_filter_access_to_test.rb
-- test/functional/params_block_arity_test.rb
-- test/grape_api_test.rb
-- test/helper_test.rb
-- test/maintenance_test.rb
-- test/model_test.rb
-- test/profiles/access_checking
-- test/rails_controller_test.rb
-- test/schema.sql
-- test/test_helper.rb
-- test/test_support/grape.rb
-- test/test_support/minitest_compatibility.rb
-- test/test_support/rails.rb
+test_files: []

data/Gemfile.lock

@@ -1,138 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ae_declarative_authorization (0.10.1)
-      blockenspiel (~> 0.5.0)
-      rails (>= 4.2.5.2, < 6)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actioncable (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.2.1)
-      actionview (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2.1)
-      activesupport (= 5.2.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2.1)
-      activesupport (= 5.2.2.1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.2.1)
-      activesupport (= 5.2.2.1)
-    activerecord (5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    blockenspiel (0.5.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    mocha (1.7.0)
-      metaclass (~> 0.0.1)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.2.1)
-      actioncable (= 5.2.2.1)
-      actionmailer (= 5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      activestorage (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ae_declarative_authorization!
-  appraisal (~> 2.1)
-  mocha (~> 1.0)
-  sqlite3 (~> 1.3.0)
-
-BUNDLED WITH
-   1.17.1