id_please 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/id_please.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{id_please}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-16}
   s.description = %q{Access control gem}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "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",
@@ -49,7 +50,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Access control gem for rails}
   s.test_files = [
-    "test/id_please_test.rb",
+    "test/assignment_test.rb",
+     "test/id_please_test.rb",
      "test/roles_test.rb",
      "test/support/models.rb",
      "test/support/schema.rb",

data/lib/id_please/assignment_map.rb

@@ -25,31 +25,38 @@ module IdPlease
   
     def initialize(*args)
       options = args.extract_options!
-      options = {:direction => :down, :nested => true}.merge(options)
+      options = {:direction => :down, :nested => true, :members_only => false}.merge(options)
       @subjects = options[:subjects] # || raise("You must provide a subject")
       @subjects = [@subjects] unless @subjects.kind_of?(Array)
       @direction = options[:direction]
       @assign_class = options[:assignment_class] # || raise("You must provide the assignment class through :assignment_class")
       @nested = options[:nested] 
       @member_role = options[:member_role] || :member
+      @members_only = options[:members_only]
       @assignments = []
       @calculated = false
       add_all_assignments(@subjects)
     end
   
     def add_all_assignments(subjects)
-      
       @calculated = false
-      if @direction == :down
-        assignments = @assign_class.role_authorizable_eq(*subjects).all(:include => [:subject, {:role => :authorizable}])
-
-        @assignments += assignments
+      
+      search_proc = lambda { @direction == :down ? @assign_class.role_authorizable_eq(*subjects) : @assign_class.subject_eq(*subjects) }
+      
+      search_with_role = lambda { |a| @members_only ? a.role_name_eq(@member_role.to_s) : a}
+      
+      assignments =  search_with_role.call(search_proc.call).all(:include => [:subject, {:role => :authorizable}])
+      
+      @assignments +=  assignments
+      
         
-        if @nested
-          subjects_to_search = assignments.collect(&:subject).select { |s| s._auth_is_group }
-          
-          add_all_assignments(subjects_to_search) unless subjects_to_search.empty?
+      if @nested
+        subjects_to_search = if @direction == :down
+          assignments.select { |a| a.role.name.to_sym == @member_role}.collect(&:subject).select { |s| s._auth_is_group }
+        else
+          assignments.select { |a| a.role.name.to_sym == @member_role}.collect { |a| a.role.authorizable }.select { |s|  s.respond_to?(:_auth_is_group) && s._auth_is_group }
         end
+        add_all_assignments(subjects_to_search) unless subjects_to_search.empty?
       end
     end
 
@@ -100,6 +107,25 @@ module IdPlease
       return result
     end
   
+    def targets
+      calculate! unless @calculated
+      @targets = @assignment_links.collect(&:target).uniq
+    end
+
+
+    def targets_with_assignments
+      calculate! unless @calculated
+      result = Hash.new { |h,k| h[k] = Hash.new() }
+      @assignment_links.each do |a|
+        result[a.role][a.target] ||= []
+        result[a.role][a.target] << (a.via || a.subject)
+      end
+      
+      result.each_key { |name| result[name].each_pair { |target,v| result[name][target] = v.compact.uniq }}
+      return result
+    end
+
+  
     def map
       return self
     end
@@ -113,14 +139,16 @@ module IdPlease
       
       @assignment_links = []
       
-      @assignments.each do |a|
+      @assignments.select { |a| !@members_only || a.role.name.to_sym == @member_role }.each do |a|
         al = AssignmentLink.new(:assignment => a)
         @assignment_links << al
       end
       
       @assignment_links.select { |al| al.role != @member_role }.each do |al|
+
         all_members_of(al.subject).each do |member| 
-          @assignment_links << AssignmentLink.new(:role => al.role, :target => al.subject, :subject => member, :via => al.subject)
+
+          @assignment_links << AssignmentLink.new(:role => al.role, :target => al.target, :subject => member, :via => al.subject)
         end
       end
       

data/lib/id_please/model_extensions/for_subject.rb

@@ -28,38 +28,49 @@ module IdPlease
         all_groups.each { |group| self.not_in_group!(group) }
       end
 
+
+      def groups_with_assignments(*args)
+        options = args.extract_options!.merge(:view => :targets_with_assignments)
+        groups(options)
+      end
+
       def groups(*args)
         raise "Groups must be enabled for this model" unless _auth_groups_enabled
+
+        options = {:view => :targets}.merge(args.extract_options!)
+        view = options[:view]
+        valid_views = [:targets, :targets_with_assignments, :map]
+        
         
-        options = {:result => :list}.merge(args.extract_options!)
-        group_hash = {}
+        raise "Invalid view argument, must be one of #{valid_views}" unless valid_views.include?(view)
+        
+        members_only = if options.has_key?(:members_only)
+          options[:members_only]
+        else
+          view == :targets ? true : false 
+        end
+          
 
-        all_groups = direct_parent_groups(self)
-        all_groups.each { |g| group_hash[g] = [self]}
+        map = IdPlease::AssignmentMap.new(:assignment_class => _auth_assign_class, :direction => :up, :subjects => self, :members_only => members_only, :nested => _auth_nested_groups && options[:nested] != false)
+        
         
+        return map.send(view)
+        
+        options = args.extract_options!
+        all_groups = direct_parent_groups(self)
         
         if _auth_nested_groups && options[:nested] != false
           infinite_loop_counter = 25
           to_find = all_groups.dup
           
           until to_find.empty? || (infinite_loop_counter -=1) <= 0
-            all_child_groups = []
-            to_find.each do |parent_group|
-              child_groups = direct_parent_groups(parent_group)
-              child_groups.each { |g| group_hash.has_key?(g) ? group_hash[g] << parent_group : group_hash[g] = [parent_group]}
-              all_child_groups += child_groups
-            end
-            all_child_groups.uniq!
-            all_groups += all_child_groups
-            to_find = all_child_groups
+            to_find = direct_parent_groups(*to_find)
+            all_groups += to_find
           end
-        end
-        
-        case options[:result]
-        when :list
+          
           all_groups.uniq
-        when :hash
-          group_hash
+        else
+          all_groups
         end
       end
       
@@ -133,7 +144,7 @@ module IdPlease
 
       def self_and_groups
         if _auth_groups_enabled
-          groups << self
+          groups(:members_only => false) << self
         else
           [self]
         end

data/test/assignment_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class AssignmentTest < ActiveSupport::TestCase
+  context "given users and groups" do
+    setup do
+      @user_a = User.create!(:name => "Alice")
+      @user_b = User.create!(:name => "Bob")
+      @user_c = User.create!(:name => "Charles")
+      @group_execs = Group.create!(:name => "Executives")
+      @group_company = Group.create!(:name => "Company")
+      @group_division = Group.create!(:name => "Division")
+    
+      @user_a.in_group!(@group_execs)
+      @group_execs.has_role!(:owner, @group_division)
+      @group_division.in_group!(@group_company)
+      @group_execs.in_group!(@group_company)
+      
+    end
+    
+    should "make an Assignment Map" do
+      map = IdPlease::AssignmentMap.new(:assignment_class => Assignment, :direction => :up, :subjects => @user_a)
+      assert_kind_of IdPlease::AssignmentMap, map
+      
+      
+      
+    end
+    
+    should "handle groups, even nested" do
+      assert_same_elements @user_a.groups, [@group_execs, @group_company]
+      assert_same_elements_in_hash @user_a.groups_with_assignments(:members_only => true)[:member], {@group_execs => [@user_a], @group_company => [@group_execs]}
+      assert_same_elements_in_hash @user_a.groups_with_assignments(:members_only => false)[:member], {@group_execs => [@user_a], @group_company => [@group_execs]}
+      
+      assert_same_elements_in_hash @user_a.groups_with_assignments(:members_only => true)[:owner], {}
+      assert_same_elements_in_hash @user_a.groups_with_assignments(:members_only => false)[:owner], {@group_division => [@group_execs]}
+
+    end
+  end
+end