Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ancestor lookup when using prepended modules #17

Merged
merged 3 commits into from
Apr 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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-233:
docker:
- image: circleci/ruby:2.3.3
steps:
- bundle_install_and_test

test-ruby-253:
docker:
- image: circleci/ruby:2.5.3
steps:
- bundle_install_and_test

test-ruby-262:
docker:
- image: circleci/ruby:2.6.2
steps:
- bundle_install_and_test

workflows:
rc:
jobs:
- test-ruby-233:
context: appfolio_test_context
- test-ruby-253:
context: appfolio_test_context
- test-ruby-262:
context: appfolio_test_context
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

18 changes: 5 additions & 13 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
case RUBY_VERSION

when '2.3.3' then
when '2.3.3', '2.5.3', '2.6.2' then

appraise 'rails4252' do
gem 'rails', '4.2.5.2'
end

appraise 'rails4271' do
gem 'rails', '4.2.7.1'
end

appraise 'rails507' do
appraise "ruby-#{RUBY_VERSION}-rails507" do
gem 'rails', '5.0.7'
gem 'grape', '1.1.0'
gem 'rails-controller-testing'
end

appraise 'rails516' do
appraise "ruby-#{RUBY_VERSION}-rails516" do
gem 'rails', '5.1.6'
gem 'grape', '1.2.3'
gem 'rails-controller-testing'
end

appraise 'rails521' do
appraise "ruby-#{RUBY_VERSION}-rails521" do
gem 'rails', '5.2.1'
gem 'grape', '1.2.3'
gem 'rails-controller-testing'
end

appraise 'rails522' do
appraise "ruby-#{RUBY_VERSION}-rails522" do
gem 'rails', '5.2.2'
gem 'grape', '1.2.3'
gem 'rails-controller-testing'
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ source "http://rubygems.org"
gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "4.2.5.2"
gem "rails", "5.0.7"
gem "grape", "1.1.0"
gem "rails-controller-testing"

gemspec path: "../"
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ source "http://rubygems.org"
gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "4.2.7.1"
gem "rails", "5.1.6"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.5.3_rails521.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.2.1"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.5.3_rails522.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.2.2"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.6.2_rails507.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.0.7"
gem "grape", "1.1.0"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.6.2_rails516.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.1.6"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.6.2_rails521.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.2.1"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
12 changes: 12 additions & 0 deletions gemfiles/ruby_2.6.2_rails522.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "~> 2.1"
gem "mocha", "~> 1.0", require: false
gem "sqlite3", "~> 1.3.0"
gem "rails", "5.2.2"
gem "grape", "1.2.3"
gem "rails-controller-testing"

gemspec path: "../"
6 changes: 3 additions & 3 deletions lib/declarative_authorization/controller/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ def decl_auth_context

def filter_access_permissions # :nodoc:
unless filter_access_permissions?
ancestors[1..-1].reverse.each do |mod|
mod.filter_access_permissions if mod.respond_to?(:filter_access_permissions, true)
end
ancestors
.select { |mod| mod != self && mod.respond_to?(:filter_access_permissions, true) }
.reverse_each { |mod| mod.filter_access_permissions }
end
class_variable_set(:@@declarative_authorization_permissions, {}) unless filter_access_permissions?
class_variable_get(:@@declarative_authorization_permissions)[self.name] ||= []
Expand Down