lib/surrounded/access_control.rb in surrounded-0.7.1 vs lib/surrounded/access_control.rb in surrounded-0.7.2

@@ -7,11 +7,11 @@
     
     private
     
     def disallow(*names, &block)
       names.map do |name|
-        define_method("disallow_#{name}?", &block)
+        define_access_method(name, &block)
       end
     end
     
     def redo_method(name)
       class_eval %{
@@ -31,19 +31,42 @@
           end
         end
       }
     end
     
+    def define_access_method(name, &block)
+      class_eval {
+        meth = AccessMethods.instance_method(:with_roles)
+        define_method "disallow_#{name}?" do
+          begin
+            apply_roles if __apply_role_policy == :trigger
+            instance_exec(&block)
+          ensure
+            remove_roles if __apply_role_policy == :trigger
+          end
+        end
+      }
+    end
+    
     module AccessMethods
       def all_triggers
         self.class.triggers
       end
     
       def triggers
         all_triggers.select {|name|
           method_restrictor = "disallow_#{name}?"
           !self.respond_to?(method_restrictor, true) || !self.send(method_restrictor)
         }.to_set
+      end
+      
+      def with_roles(policy = :trigger)
+        begin
+          apply_roles if __apply_role_policy == policy
+          yield
+        ensure
+          remove_roles if __apply_role_policy == policy
+        end
       end
     end
   end
 end
\ No newline at end of file