darkhelmet-role_on 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/role_on.rb

@@ -2,11 +2,9 @@ module RoleOn
   module RoleOnControllerMethods
     def role_on(role, options = {})
       before_filter do |c|
-        if c.respond_to?(:role_on_defaults)
-          options = c.role_on_defaults.merge(options)
-        end
+        options = c.__send__(:role_on_defaults).merge(options) if (c.methods | c.protected_methods | c.private_methods).include?('role_on_defaults')
         action = c.params[:action].intern
-        user_roles = c.current_user.roles.map(&:name).map(&:intern)
+        user_roles = c.__send__(:current_user).roles.map(&:name).map(&:intern)
         restricted_actions = if options.include?(:on)
                                [options[:on]].flatten
                              elsif options.include?(:except)
@@ -15,10 +13,11 @@ module RoleOn
                                c.class.action_methods.to_a.map(&:intern)
                              end
         if restricted_actions.include?(action) && !user_roles.include?(role) && (options.include?(:sa) ? !user_roles.include?(options[:sa]) : false)
-          c.send(:access_denied)
+          c.__send__(:access_denied)
           false
+        else
+          true
         end
-        true
       end
     end
   end

data/role_on.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{role_on}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2009-07-30}
+  s.date = %q{2009-08-21}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-role_on
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: []