role_authorization 0.5.9 → 0.6.0

data/app/models/role.rb

@@ -0,0 +1,7 @@
+class Role < ActiveRecord::Base
+  acts_as_role_manager
+
+  def to_s
+    nickname.to_s.humanize
+  end
+end

data/db/migrate/20120130200006_add_roles.rb

@@ -0,0 +1,10 @@
+class AddRoles < ActiveRecord::Migration
+  def change
+    create_table :roles do |t|
+      t.string :name
+      t.string :nickname
+      t.text :user_ids
+      t.timestamps
+    end
+  end
+end

data/lib/rails/role_authorization.rb

@@ -1,5 +1,5 @@
 module RoleAuthorization
-  class Railtie < Rails::Railtie
+  class Railtie < Rails::Engine
     initializer "role_authorization.initialize" do |app|
       RoleAuthorization.load_rules
       ::ActiveRecord::Base.send :extend, RoleAuthorization::ActiveRecord if defined?(::ActiveRecord)

data/lib/role_authorization/controller.rb

@@ -18,7 +18,7 @@ module RoleAuthorization
         add_role_authorization_filter
       end
 
-      def allow(&block)
+      def allow(options = {}, &block)
         add_to_ruleset(self.controller_rule_name, &block)
         add_role_authorization_filter
       end
@@ -40,6 +40,7 @@ module RoleAuthorization
 
     module InstanceMethods
       def check_request_authorization
+        params[:role_authorization_user_data] = nil
         unless authorized_action?(self, self.class.controller_rule_name, action_name.to_sym, params[:id])
           raise SecurityError, "You do not have the required clearance to access this resource."
         end

data/lib/role_authorization/rules/rule.rb

@@ -18,7 +18,13 @@ module RoleAuthorization
       def authorized?(*args)
         @controller_instance, @controller, @action, @id = args
 
-        instance_eval(&returning)
+        if instance_eval(&returning)
+          true
+        else
+          # need to run an on_fail proc?
+          controller_instance.instance_eval(&options[:on_fail]) if options[:on_fail]
+          false
+        end
       end
     end
   end

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_authorization
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23450000 !ruby/object:Gem::Requirement
+  requirement: &19974160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23450000
+  version_requirements: *19974160
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &23449580 !ruby/object:Gem::Requirement
+  requirement: &19973740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23449580
+  version_requirements: *19973740
 description: A gem for handling authorization in rails using roles
 email:
 - machinist@asceth.com
@@ -49,6 +49,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/models/role.rb
+- db/migrate/20120130200006_add_roles.rb
 - lib/rails/role_authorization.rb
 - lib/role_authorization.rb
 - lib/role_authorization/active_record.rb
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: role_authorization
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Role Authorization gem for Rails