Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request stffn#146 from bterkuile/master
Allow declarative_authorization to be used without ActiveRecord
  • Loading branch information
stffn committed Jun 12, 2012
2 parents 4819d0c + a1db63a commit 86b521f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/declarative_authorization.rb
@@ -1,8 +1,10 @@
require File.join(%w{declarative_authorization rails_legacy})
require File.join(%w{declarative_authorization helper})
require File.join(%w{declarative_authorization in_controller})
require File.join(%w{declarative_authorization in_model})
require File.join(%w{declarative_authorization obligation_scope})
if defined?(ActiveRecord)
require File.join(%w{declarative_authorization in_model})
require File.join(%w{declarative_authorization obligation_scope})
end

min_rails_version = "2.1.0"
if Rails::VERSION::STRING < min_rails_version
Expand All @@ -14,4 +16,4 @@
ActionController::Base.send :include, Authorization::AuthorizationInController
ActionController::Base.helper Authorization::AuthorizationHelper

ActiveRecord::Base.send :include, Authorization::AuthorizationInModel
ActiveRecord::Base.send :include, Authorization::AuthorizationInModel if defined?(ActiveRecord)

0 comments on commit 86b521f

Please sign in to comment.