objectreload-permissions 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/require_permissions.rb

@@ -4,47 +4,55 @@ module RequirePermissions
   def self.included(base)
     base.extend ClassMethods
   end
-  
+
   module ClassMethods
     def require_permissions(options = {})
       method = options.delete(:method)
       method ||= :editable_by?
-      
+
       redirect = options.delete(:redirect)
       redirect ||= nil
-      
+
       success = options.delete(:success)
       success ||= lambda {}
-      
+
       failure = options.delete(:failure)
       failure ||= lambda {
         if redirect
           flash[:error] = t("permissions.not_authorised_error") #You were not authorised to see that page
           redirect_to case redirect
-          when Symbol then self.send(redirect)
-          when Proc then instance_eval &redirect
-          else redirect
-          end
+                      when Symbol then self.send(redirect)
+                      when Proc then instance_eval &redirect
+                      else redirect
+                      end
         else
           raise Exceptions::UnathorizedAccess
         end
       }
-      
+
       options.each do |model, actions|
-        actions = {:only => actions} if actions.kind_of? Array
-        
+        actions = {:only => Array(actions)} unless actions.kind_of? Hash
+
         _method = actions.delete(:method) || method
         _method = _method.to_s
-        
+
         _success = actions.delete(:success) || success
         _failure = actions.delete(:failure) || failure
-        
+
         negative = _method.gsub!(/^\!/, '') ? true : false
         name = :"require_#{model}_permissions_#{rand}"
         define_method(name) do
           target = instance_variable_get("@#{model}")
           return false unless target
-          condition = target.send(_method.to_sym, current_user)
+
+          condition = case target.method(_method).arity
+                      when 1
+                        target.send(_method.to_sym, current_user)
+                      when -2
+                        target.send(_method.to_sym, current_user, params[model])
+                      else
+                        raise ArgumentError, "#{target.class.name}##{_method} takes incorrect number of arguments (#{target.method(_method).arity}) - only 1 or -2 allowed."
+                      end
           condition = negative ? !condition : condition
           if condition
             instance_eval &_success
@@ -56,7 +64,7 @@ module RequirePermissions
         before_filter name, actions
       end
     end
-    
+
     def require_visibility(options = {})
       require_permissions({:method => :visible_to?}.merge(options))
     end
@@ -64,4 +72,4 @@ module RequirePermissions
 end
 
 
-ActionController::Base.send(:include, RequirePermissions)
+ActionController::Base.send(:include, RequirePermissions)

data/test/require_permissions_test.rb

@@ -14,8 +14,8 @@ class RequirePermissionsTest < ActionController::TestCase
 
   class CommentsController < ActionController::Base
     require_permissions :comment => [:edit, :update, :destroy], :method => :editable_by?
-    require_permissions :photo => [:new, :create]
-    
+    require_permissions :photo => :create
+
     def new; render :inline => "ran action new" end
     def create; render :inline => "ran action create" end
     def edit; render :inline => "ran action edit" end
@@ -63,4 +63,4 @@ class RequirePermissionsTest < ActionController::TestCase
       @response = ActionController::TestResponse.new
       process(action)
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: objectreload-permissions
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Mateusz Drozdzynski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +02:00
+date: 2010-01-19 00:00:00 +02:00
 default_executable: 
 dependencies: []