active_directory 1.5.1 → 1.5.2

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/active_directory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_directory}
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam T Kerr"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-29}
   s.description = %q{ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying an Active Directory data store.  This is a fork of the activedirectory gem.}
   s.email = %q{ajrkerr@gmail.com}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/ajrkerr/active_directory}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{An interface library for accessing Microsoft's Active Directory.}
 
   if s.respond_to? :specification_version then

data/lib/active_directory/base.rb

@@ -305,7 +305,9 @@ module ActiveDirectory
 		end
 
 		def self.find_first(options)
-			ad_obj = new(@@ldap.search(:filter => options[:filter], :base => options[:in]))
+                        ldap_result = @@ldap.search(:filter => options[:filter], :base => options[:in])
+                        return nil if ldap_result.empty?
+			ad_obj = new(ldap_result[0])
 			@@cache[ad_obj.dn] = ad_obj unless ad_obj.instance_of? Base
 			return ad_obj
 		end

data/lib/active_directory/group.rb

@@ -98,26 +98,13 @@ module ActiveDirectory
 		# belong to this Group, or any of its subgroups, are returned.
 		# 
 		def member_users(recursive = false)
-			return [] unless has_members?
-			if recursive
-				if @member_users_r.nil?
-					@member_users_r = []
-					@entry.member.each do |member_dn|
-						subuser = User.find_by_distinguishedName(member_dn)
-						if subuser
-							@member_users_r << subuser
-						else
-							subgroup = Group.find_by_distinguishedName(member_dn)
-							if subgroup
-								@member_users_r = @member_users_r.concat(subgroup.member_users(true))
-							end
-						end
-					end
-				end
-				return @member_users_r
-			else
-				@member_users_non_r ||= User.find(:all, :distinguishedname => @entry.member).delete_if { |u| u.nil? }
-			end
+                        @member_users = User.find(:all, :distinguishedname => @entry.member).delete_if { |u| u.nil? }
+                        if recursive then
+                          self.member_groups.each do |group|
+                            @member_users.concat(group.member_users(true))
+                          end
+                        end
+                        return @member_users
 		end
 
 		#
@@ -130,22 +117,13 @@ module ActiveDirectory
 		# belong to this Group, or any of its subgroups, are returned.
 		# 
 		def member_groups(recursive = false)
-			return [] unless has_members?
-			if recursive
-				if @member_groups_r.nil?
-					@member_groups_r = []
-					@entry.member.each do |member_dn|
-						subgroup = Group.find_by_distinguishedName(member_dn)
-						if subgroup
-							@member_groups_r << subgroup
-							@member_groups_r = @member_groups_r.concat(subgroup.member_groups(true))
-						end
-					end
-				end
-				return @member_groups_r
-			else
-				@member_groups_non_r ||= Group.find(:all, :distinguishedname => @entry.member).delete_if { |g| g.nil? }
-			end
+                        @member_groups ||= Group.find(:all, :distinguishedname => @entry.member).delete_if { |g| g.nil? }
+                        if recursive then
+                          self.member_groups.each do |group|
+                            @member_groups.concat(group.member_groups(true))
+                          end
+                        end
+                        return @member_groups
 		end
 
 		#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_directory
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-03 00:00:00.000000000 -05:00
+date: 2011-03-29 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &2154136640 !ruby/object:Gem::Requirement
+  requirement: &2153031240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2154136640
+  version_requirements: *2153031240
 description: ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying
   an Active Directory data store.  This is a fork of the activedirectory gem.
 email: ajrkerr@gmail.com
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An interface library for accessing Microsoft's Active Directory.