active_directory 1.3.1 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/active_directory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_directory}
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam T Kerr"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-02}
   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 = [

data/lib/active_directory/base.rb

@@ -32,6 +32,9 @@ module ActiveDirectory
 		NIL_FILTER = Net::LDAP::Filter.pres('cn')
 
 		@@ldap = nil
+		@@ldap_connected = false
+		@@caching = false
+		@@cache = {}
 
 		#
 		# Configures the connection for the Ruby/ActiveDirectory library.
@@ -88,12 +91,39 @@ module ActiveDirectory
 		# This method will try to connect, if we haven't already
 		def self.connected?
 			begin
-				@@ldap.nil? ? false : @@ldap.bind
+				@@ldap_connected ||= @@ldap.bind unless @@ldap.nil?
+				@@ldap_connected
 			rescue Net::LDAP::LdapError => e
 				false
 			end
 		end
 
+		##
+		# Check to see if result caching is enabled
+		def self.cache?
+			@@caching
+		end
+
+		##
+		# Clears the cache
+		def self.clear_cache
+			@@cache = {}
+		end
+
+		##
+		# Enable caching for queries against the DN only
+		# This is to prevent membership lookups from hitting the 
+		# AD unnecessarilly
+		def self.enable_cache
+			@@caching = true
+		end
+
+		##
+		# Disable caching
+		def self.disable_cache
+			@@caching = false
+		end
+
 		def self.filter # :nodoc:
 			NIL_FILTER 
 		end
@@ -208,7 +238,9 @@ module ActiveDirectory
 				:in => ''
 			}
 
-			# 
+			cached_results = find_cached_results(args[1])
+			return cached_results unless cached_results.nil?
+
 			options[:in] = [ options[:in].to_s, @@settings[:base] ].delete_if { |part| part.empty? }.join(",")
 
 			if options[:filter].is_a? Hash
@@ -216,7 +248,7 @@ module ActiveDirectory
 			end
 
 			options[:filter] = options[:filter] & filter unless self.filter == NIL_FILTER
-			
+
 			if (args.first == :all)
 				find_all(options)
 			elsif (args.first == :first)
@@ -226,17 +258,54 @@ module ActiveDirectory
 			end
 		end
 
+		##
+		# Filters the cache result by the object type we're looking for
+		#
+		def self.filter_cache_result(result)
+			result.delete_if { |entry| !entry.kind_of? self }
+		end
+
+		##
+		# Searches the cache and returns the result
+		#
+		def self.find_cached_results(filters)
+			return nil unless cache?
+
+			#Check to see if we're only looking for :distinguishedname
+			if filters.is_a? Hash and filters.keys == [:distinguishedname]
+				#Find keys we're looking up, convert to array
+				dns = filters[:distinguishedname]
+
+				if dns.kind_of? Array
+					#Check to see if all of the results are in teh cache
+					return nil unless (dns & @@cache.keys == dns)
+
+					result = []
+
+					dns.each { |dn| result << @@cache[dn] }
+
+					return filter_cache_result(result) if result.size == dns.size
+				else
+					return @@cache[dns] if @@cache.key? dns and @@cache[dns].is_a? self.class
+				end
+			end
+		end
+
 		def self.find_all(options)
 			results = []
 			@@ldap.search(:filter => options[:filter], :base => options[:in], :return_result => false) do |entry|
-				results << new(entry)
+				ad_entry = new(entry)
+				@@cache[ad_entry.dn] = ad_entry
+				results << ad_entry
 			end
 			results
 		end
 
 		def self.find_first(options)
 			@@ldap.search(:filter => options[:filter], :base => options[:in], :return_result => false) do |entry|
-				return new(entry)
+				ad_entry = new(entry)
+				@@cache[ad_entry.dn] = ad_entry
+				return ad_entry
 			end
 		end
 

data/lib/active_directory/field_type/member_dn_array.rb

@@ -32,8 +32,11 @@ module ActiveDirectory
 			# Decodes a list of DNs into the objects that they are
 			#
 			def self.decode(dn_array)
-				# How to do user or group?
-				User.find( :all, :distinguishedname => dn_array) + Group.find(:all, :distinguishedname => dn_array)
+				# Ensures that the objects are cast correctly
+				users = [User.find( :all, :distinguishedname => dn_array)].flatten
+				groups = [Group.find(:all, :distinguishedname => dn_array)].flatten
+
+				users + groups
 			end
 		end
 	end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_directory
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Adam T Kerr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency