Skip to content
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
5 changes: 4 additions & 1 deletion declarative_authorization.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = Gem::Requirement.new('< 4.1')
spec.metadata['allowed_push_host'] = 'https://rubygems.org'

spec.add_dependency('actionpack', ['>= 7.2', '< 8.2'])
spec.add_dependency('activerecord', ['>= 7.2', '< 8.2'])
spec.add_dependency('activesupport', ['>= 7.2', '< 8.2'])
spec.add_dependency('blockenspiel', ['>= 0.5', '< 1'])
spec.add_dependency('rails', ['>= 7.2', '< 8.2'])
spec.add_dependency('railties', ['>= 7.2', '< 8.2'])
end
4 changes: 2 additions & 2 deletions lib/declarative_authorization/authorization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require File.dirname(__FILE__) + '/reader.rb'
require "set"
require "forwardable"
require 'rails'
require 'active_support'
require 'uri'

module Authorization
Expand Down Expand Up @@ -45,7 +45,7 @@ def self.configure
yield config
end

AUTH_DSL_FILES = [Pathname.new(Rails.root || '').join("config", "authorization_rules.rb").to_s] unless defined? AUTH_DSL_FILES
AUTH_DSL_FILES = [Pathname.new(defined?(::Rails) && ::Rails.respond_to?(:root) && ::Rails.root || '').join("config", "authorization_rules.rb").to_s] unless defined? AUTH_DSL_FILES

# Controller-independent method for retrieving the current user.
# Needed for model security where the current controller is not available.
Expand Down
2 changes: 1 addition & 1 deletion lib/declarative_authorization/railsengine.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rails'
require 'rails/engine'

module Authorization
class RailsEngine < Rails::Engine
Expand Down
Loading