role_authorization 0.3.3 → 0.3.4

data/lib/role_authorization/rules/defaults.rb

@@ -8,7 +8,7 @@ RoleAuthorization::Rules.define :role do
   else
     scope = if options[:scope]
               if options[:scope].is_a?(Proc)
-                instance_eval(&options[:scope])
+                controller_instance.instance_eval(&options[:scope])
               else
                 options[:scope]
               end
@@ -21,18 +21,22 @@ RoleAuthorization::Rules.define :role do
 end
 
 RoleAuthorization::Rules.define :user do
-  resource = controller_instance.instance_variable_get("@#{options[:resource]}".to_sym)
-
-  if resource.nil?
+  if controller_instance.current_user.blank?
     false
   else
-    controller_instance.current_user.try(:id) == resource.try(options[:check])
+    if options[:resource]
+      check_method = options[:check] || :id
+      resource_instance = controller_instance.instance_eval(&options[:resource])
+      controller_instance.current_user.id == resource_instance.try(check_method)
+    else
+      false
+    end
   end
 end
 
 RoleAuthorization::Rules.define :custom do
   unless options[:block].nil?
-    true if options[:block].call(controller_instance) == true
+    true if controller_instance.instance_eval(&options[:block]) == true
   else
     false
   end

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - John 'asceth' Long