Fix stffn#193.

Author: aepstein

lib/declarative_authorization/authorization.rb

@@ -512,6 +512,14 @@ def validate? (attr_validator, object = nil, hash = nil)
       object ||= attr_validator.object
       return false unless object
 
+      if Authorization.is_a_association_proxy?(object)
+        return false unless object.length > 0
+        object.each do |member|
+          return true if validate?(attr_validator, member, hash)
+        end
+        return false
+      end
+            
       (hash || @conditions_hash).all? do |attr, value|
         attr_value = object_attribute_value(object, attr)
         if value.is_a?(Hash)
@@ -625,14 +633,7 @@ def to_long_s (hash = nil)
     protected
     def object_attribute_value (object, attr)
       begin
-        if object.respond_to?(:proxy_association)
-#          first = object.first
-#          object.delete(first)
-#          first.send(attr)
-          object.first.send(attr)
-        else
-          object.send(attr)
-        end
+        object.send(attr)
       rescue ArgumentError, NoMethodError => e
         raise AuthorizationUsageError, "Error occurred while validating attribute ##{attr} on #{object.inspect}: #{e}.\n" +
           "Please check your authorization rules and ensure the attribute is correctly spelled and \n" +

test/model_test.rb

@@ -1864,37 +1864,42 @@ def test_authorization_permit_association_proxy
     TestModel.delete_all
   end
 
-  # def test_authorization_permit_nested_association_proxy
-  #   reader = Authorization::Reader::DSLReader.new
-  #   reader.parse %{
-  #     authorization do
-  #       role :test_role do
-  #         has_permission_on :branches, :to => :read do
-  #           if_attribute :test_model => { :test_attrs => {:attr => 1 } }
-  #         end
-  #       end
-  #     end
-  #   }
-  #   engine = Authorization::Engine.instance(reader)
-
-  #   test_model = TestModel.create!
-  #   test_model.test_attrs.create!(:attr => 0)
-  #   test_attr = test_model.test_attrs.create!(:attr => 1)
-  #   test_model.test_attrs.create!(:attr => 3)
-  #   test_branch = Branch.create!(:test_model => test_model)
-
-  #   test_model_2 = TestModel.create!
-  #   test_attr_2 = test_model_2.test_attrs.create!(:attr => 2)
-  #   test_branch_2 = Branch.create!(:test_model => test_model_2)
-
-  #   assert engine.permit?(:read, :object => test_branch,
-  #                         :user => MockUser.new(:test_role))
-  #   assert !engine.permit?(:read, :object => test_branch_2,
-  #                         :user => MockUser.new(:test_role))
-  #   TestModel.delete_all
-  #   Branch.delete_all
-  #   TestAttr.delete_all
-  # end
+  def test_authorization_permit_nested_association_proxy
+   reader = Authorization::Reader::DSLReader.new
+   reader.parse %{
+     authorization do
+       role :test_role do
+         has_permission_on :branches, :to => :read do
+           if_attribute :test_model => { :test_attrs => {:attr => 1 } }
+         end
+       end
+     end
+   }
+   engine = Authorization::Engine.instance(reader)
+
+   test_model = TestModel.create!
+   test_model.test_attrs.create!(:attr => 0)
+   test_attr = test_model.test_attrs.create!(:attr => 1)
+   test_model.test_attrs.create!(:attr => 3)
+   test_branch = Branch.create!(:test_model => test_model)
+
+   test_model_2 = TestModel.create!
+   test_attr_2 = test_model_2.test_attrs.create!(:attr => 2)
+   test_branch_2 = Branch.create!(:test_model => test_model_2)
+   
+   test_model_3 = TestModel.create!
+   test_branch_3 = Branch.create!(:test_model => test_model_3)
+   
+   assert engine.permit?(:read, :object => test_branch,
+                         :user => MockUser.new(:test_role))
+   assert !engine.permit?(:read, :object => test_branch_2,
+                         :user => MockUser.new(:test_role))
+   assert !engine.permit?(:read, :object => test_branch_3,
+                         :user => MockUser.new(:test_role))
+   TestModel.delete_all
+   Branch.delete_all
+   TestAttr.delete_all
+  end
 
   def test_multiple_roles_with_has_many_through
     reader = Authorization::Reader::DSLReader.new