id_please 0.4.0 → 0.5.0

data/test/roles_test.rb

@@ -6,8 +6,8 @@ class ActiveSupport::TestCase
       setup do
         Role.delete_all
         [subject_class, Foo, Bar, Uuid].each { |c| c.delete_all }
-        @subject1 = subject_class.create!
-        @subject2 = subject_class.create!
+        @subject1 = subject_class.create!(:name => "#{subject_class.to_s}1")
+        @subject2 = subject_class.create!(:name => "#{subject_class.to_s}2")
         @foo = Foo.create!
         @bar = Bar.create!
         @uuid = Uuid.create!(:uuid => "C41642EE-2780-0001-189F-17F3101B26E0")
@@ -216,14 +216,14 @@ class RolesTest < ActiveSupport::TestCase
     
     context "group testing: " do
       setup do
-        @user1 = User.create!
-        @user2 = User.create!
-        @user3 = User.create!
-        @group1 = Group.create!
-        @group2 = Group.create!
-        @group3 = Group.create!
-        @group4 = Group.create!
-        @group5 = Group.create!
+        @user1 = User.create!(:name => "User1")
+        @user2 = User.create!(:name => "User2")
+        @user3 = User.create!(:name => "User3")
+        @group1 = Group.create!(:name => "Group1")
+        @group2 = Group.create!(:name => "Group2")
+        @group3 = Group.create!(:name => "Group3")
+        @group4 = Group.create!(:name => "Group4")
+        @group5 = Group.create!(:name => "Group5")
 
         
         @foo = Foo.create!
@@ -249,9 +249,13 @@ class RolesTest < ActiveSupport::TestCase
           @user1.in_group!(@group1)
           @group1.in_group!(@group2)
           @group2.in_group!(@group4)
+          @user1.in_group!(@group4)
 
           @user1.in_group!(@group3)
           @user2.in_group!(@group2)
+          
+          @user3.has_role!(:owner, @group4)
+          
         end
 
         should "avoid circularity" do
@@ -272,7 +276,7 @@ class RolesTest < ActiveSupport::TestCase
         end
 
         should "handle nested groups" do
-          assert_same_elements @user1.groups(:nested => false), [@group1, @group3]
+          assert_same_elements @user1.groups(:nested => false), [@group1, @group3, @group4]
           assert_same_elements @user1.groups, [@group1, @group2, @group3, @group4]
           assert_same_elements @user2.groups, [@group2, @group4]
           
@@ -281,30 +285,39 @@ class RolesTest < ActiveSupport::TestCase
           
           assert @group4.accepts_role?(:member, @user1)
           assert @group2.accepts_role?(:member, @user1)
-          
+
+          assert @group4.accepts_role?(:member, @user1, :check_groups => false)
+          @user1.not_in_group!(@group4)
           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(:roles => :any), [@group2, @group1, @user1, @user2]
-          assert_same_elements @group4.children(:roles => [:member]), [@group2, @group1, @user1, @user2]
-          assert_same_elements @group4.children(:roles => [:owner]), []
-          
-          
-          @user3.has_role!(:owner, @group4)
-          
           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
-          @user3.has_role!(:owner, @group4)
           assert_equal @group4.children(:roles => :any, :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]
+          
+          role_hash =  @group4.children(:roles => :any, :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)
+          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]}
+
+        end
+        
         should "check roles based on groups" do
 
           assert @user2.has_role?(:member, @group2)

data/test/support/models.rb

@@ -9,14 +9,26 @@ end
 
 class User < ActiveRecord::Base
   acts_as_authorization_subject
+  
+  def to_s
+    name
+  end
 end
 
 class UserNoGroup < ActiveRecord::Base
   acts_as_authorization_subject :groups_enabled => false, :nested_groups => false
+
+  def to_s
+    name
+  end
 end
 
 class Group < ActiveRecord::Base
   acts_as_authorization_group
+  
+  def to_s
+    name
+  end
 end
 
 class Foo < ActiveRecord::Base

data/test/support/schema.rb

@@ -6,9 +6,13 @@ ActiveRecord::Schema.define(:version => 0) do
     t.timestamps
   end
   
-  create_table "users", :force => true do |t| end
+  create_table "users", :force => true do |t|
+    t.string "name"
+  end
   
-  create_table "user_no_groups", :force => true do |t| end
+  create_table "user_no_groups", :force => true do |t| 
+    t.string "name"  
+  end
   
   create_table "roles", :force => true do |t|
     t.string   "name",        :limit => 50, :null => false
@@ -17,7 +21,9 @@ ActiveRecord::Schema.define(:version => 0) do
     t.timestamps
   end
   
-  create_table "groups", :force => true do |t| end
+  create_table "groups", :force => true do |t| 
+    t.string "name"
+  end
   
   create_table "foos", :force => true do |t|
     t.timestamps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: id_please
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - James Stuart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency