id_please 0.7.0 → 0.8.0

data/test/roles_test.rb

@@ -219,6 +219,7 @@ class RolesTest < ActiveSupport::TestCase
         @user1 = User.create!(:name => "User1")
         @user2 = User.create!(:name => "User2")
         @user3 = User.create!(:name => "User3")
+        @user4 = User.create!(:name => "User4")
         @group1 = Group.create!(:name => "Group1")
         @group2 = Group.create!(:name => "Group2")
         @group3 = Group.create!(:name => "Group3")
@@ -236,7 +237,6 @@ class RolesTest < ActiveSupport::TestCase
         @user1.in_group!(@group2)
         
         assert_same_elements @user1.groups, [@group1, @group2]
-        assert_same_elements_in_hash @user1.groups(:result => :hash), {@group1 => [@user1], @group2 => [@user1]}
         assert_same_elements @group1.children, [@user1, @user2]
         assert_equal @group2.children, [@user1]
         
@@ -257,6 +257,9 @@ class RolesTest < ActiveSupport::TestCase
           
           @user3.has_role!(:owner, @group4)
           
+          @user4.has_role!(:owner, @group2)
+          
+          
         end
 
         should "avoid circularity" do
@@ -277,15 +280,22 @@ class RolesTest < ActiveSupport::TestCase
         end
 
         should "handle nested groups" do
+          
           assert_same_elements @user1.groups(:nested => false), [@group1, @group3, @group4]
+        
           assert_same_elements @user1.groups, [@group1, @group2, @group3, @group4]
-          assert_same_elements_in_hash @user1.groups(:result => :hash), {@group1 => [@user1], @group2 => [@group1], @group3 => [@user1], @group4 => [@user1, @group2]}
+
+          assert_same_elements_in_hash @user1.groups_with_assignments[:member], {@group1 => [@user1], @group2 => [@group1], @group3 => [@user1], @group4 => [@user1, @group2]}
+
+          assert_same_elements_in_hash @user4.groups_with_assignments[:owner], {@group2 => [@user4]}
+
+
 
           assert_same_elements @user2.groups, [@group2, @group4]
           
-          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_same_elements @group4.children, [@group2, @group1, @user1, @user2, @user3, @user4]
+          assert_same_elements @group2.children, [@group1, @user1, @user2, @user4]
+          assert_same_elements @group2.children(:nested => false), [@group1, @user2, @user4]
 
           assert @group4.accepts_role?(:member, @user1)
           assert @group2.accepts_role?(:member, @user1)
@@ -296,7 +306,7 @@ class RolesTest < ActiveSupport::TestCase
         end
         
         should "be able to display hashes of subject permissions" do
-          assert_equal @group4.children(: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], @user4 => [:owner]}
         end
         
         should "display a list of roles, or a hash of roles to users" do
@@ -304,12 +314,12 @@ class RolesTest < ActiveSupport::TestCase
           
           role_hash =  @group4.children(:view => :role_hash)
           assert_same_elements role_hash[:member], [@group1, @group2, @user1, @user2] 
-          assert_same_elements role_hash[:owner], [@user3] 
+          assert_same_elements role_hash[:owner], [@user3, @user4] 
         end
         
         should "display a hash of roles to users with the relevant groups attached" do
           role_with_assignments = @group4.children(:view => :role_with_assignments)
-          assert_equal role_with_assignments[:owner], {@user3 => [@group4]}
+          assert_equal role_with_assignments[:owner], {@user3 => [@group4], @user4 => [@group2]}
           assert_same_elements role_with_assignments[:member].keys, [@user1, @user2, @group1, @group2] 
           assert_same_elements_in_hash role_with_assignments[:member], {@group2 => [@group4], @group1 => [@group2], @user1 => [@group1, @group4], @user2 => [@group2]}
 
@@ -328,7 +338,7 @@ class RolesTest < ActiveSupport::TestCase
           assert_false @user1.has_role?(:owner, @foo, :check_groups => false)
           
           
-          assert_same_elements @foo.list_owners, [@group2, @group1, @user1, @user2]
+          assert_same_elements @foo.list_owners, [@group2, @group1, @user1, @user2, @user4]
           assert_same_elements @foo.list_owners(:check_groups => false), [@group2]
           
           assert @foo.accepts_role?(:owner, @user1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: id_please
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - James Stuart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - lib/id_please/model_extensions/for_role.rb
 - lib/id_please/model_extensions/for_subject.rb
 - lib/id_please/model_extensions/for_user.rb
+- test/assignment_test.rb
 - test/database.yml
 - test/debug.log
 - test/id_please_test.rb
@@ -116,6 +117,7 @@ signing_key:
 specification_version: 3
 summary: Access control gem for rails
 test_files: 
+- test/assignment_test.rb
 - test/id_please_test.rb
 - test/roles_test.rb
 - test/support/models.rb