id_please 0.5.0 → 0.6.0

data/test/roles_test.rb

@@ -280,9 +280,10 @@ class RolesTest < ActiveSupport::TestCase
           assert_same_elements @user1.groups, [@group1, @group2, @group3, @group4]
           assert_same_elements @user2.groups, [@group2, @group4]
           
-          assert_same_elements @group4.children, [@group2, @group1, @user1, @user2]
+          assert_same_elements @group4.children, [@group2, @group1, @user1, @user2, @user3]
           assert_same_elements @group2.children, [@group1, @user1, @user2]
-          
+          assert_same_elements @group2.children(:nested => false), [@group1, @user2]
+
           assert @group4.accepts_role?(:member, @user1)
           assert @group2.accepts_role?(:member, @user1)
 
@@ -291,30 +292,23 @@ class RolesTest < ActiveSupport::TestCase
           assert_false @group4.accepts_role?(:member, @user1, :check_groups => false)
         end
         
-        should "be able to filter children based on roles" do
-          assert_same_elements @group4.children(), [@group2, @group1, @user1, @user2]
-          assert_same_elements @group4.children(:roles => :any), [@group2, @group1, @user1, @user2, @user3]
-          assert_same_elements @group4.children(:roles => [:member]), [@group2, @group1, @user1, @user2]
-          assert_same_elements @group4.children(:roles => [:owner]), [@user3]
-        end
-        
         should "be able to display hashes of subject permissions" do
-          assert_equal @group4.children(:roles => :any, :view => :subject_hash), {@group2 => [:member], @group1 => [:member], @user1 => [:member], @user2 => [:member], @user3 => [:owner]}
+          assert_equal @group4.children(:view => :subject_hash), {@group2 => [:member], @group1 => [:member], @user1 => [:member], @user2 => [:member], @user3 => [:owner]}
         end
         
         should "display a list of roles, or a hash of roles to users" do
-          assert_same_elements @group4.children(:roles => :any, :view => :roles), [:member, :owner]
+          assert_same_elements @group4.children(:view => :roles), [:member, :owner]
           
-          role_hash =  @group4.children(:roles => :any, :view => :role_hash)
+          role_hash =  @group4.children(:view => :role_hash)
           assert_same_elements role_hash[:member], [@group1, @group2, @user1, @user2] 
           assert_same_elements role_hash[:owner], [@user3] 
         end
         
         should "display a hash of roles to users with the relevant groups attached" do
-          role_with_assignments = @group4.children(:roles => :any, :view => :role_with_assignments)
+          role_with_assignments = @group4.children(:view => :role_with_assignments)
           assert_equal role_with_assignments[:owner], {@user3 => [@group4]}
           assert_same_elements role_with_assignments[:member].keys, [@user1, @user2, @group1, @group2] 
-          assert_equal role_with_assignments[:member], {@group2 => [@group4], @group1 => [@group2], @user1 => [@group1, @group4], @user2 => [@group2]}
+          assert_same_elements_in_hash role_with_assignments[:member], {@group2 => [@group4], @group1 => [@group2], @user1 => [@group1, @group4], @user2 => [@group2]}
 
         end
         
@@ -340,6 +334,27 @@ class RolesTest < ActiveSupport::TestCase
         
       end
       
+      context "given a group which is both an member and an owner" do
+        setup do
+         @user1.in_group!(@group1)
+         @group1.in_group!(@group2)
+         @group1.has_role!(:owner, @group2) 
+        end
+
+        should "propagate multiple roles through nested groups" do
+          @user1.has_role?(:owner, @group2)
+          @user1.has_role?(:member, @group2)
+        end
+        
+        should "display handle multiple roles propagated through the children function" do
+          assert_same_elements @group2.children(:view => :roles), [:member, :owner]
+          role_hash = @group2.children(:view => :role_hash)
+          
+          assert_same_elements role_hash[:member], [@group1, @user1]
+          assert_same_elements role_hash[:owner], [@group1, @user1]
+        end
+      end
+      
     end
   end
   

data/test/test_helper.rb

@@ -42,5 +42,22 @@ module Test::Unit::Assertions
   def assert_false(object, message="")
     assert_equal(false, object, message)
   end
+  
+  def assert_same_elements_in_hash(hash1, hash2, message = "")
+    assert_kind_of Hash, hash1, message + "First object must be a hash"
+    assert_kind_of Hash, hash2, message + "Second object must be a hash"
+    assert_equal hash1.keys, hash2.keys, "Keys of hashes mismatch"
+
+    hash1.each_pair do |k, v|
+      case v
+      when Hash
+        assert_same_elements_in_hash v,hash2[k], message + "Under key #{k.inspect} "
+      when Array
+        assert_same_elements v, hash2[k], message + "Under key #{k.inspect} "
+      else
+        assert_equal v, hash2[k], message + "Under key #{k.inspect} "
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: id_please
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - James Stuart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - VERSION
 - id_please.gemspec
 - lib/id_please.rb
+- lib/id_please/assignment_map.rb
 - lib/id_please/config.rb
 - lib/id_please/model_extensions.rb
 - lib/id_please/model_extensions/for_assignment.rb