active_directory 1.2.5 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.3.0

data/active_directory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_directory}
-  s.version = "1.2.5"
+  s.version = "1.3.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-22}
+  s.date = %q{2011-02-25}
   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 = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "lib/active_directory/container.rb",
     "lib/active_directory/field_type/binary.rb",
     "lib/active_directory/field_type/date.rb",
+    "lib/active_directory/field_type/dn_array.rb",
     "lib/active_directory/field_type/password.rb",
     "lib/active_directory/field_type/timestamp.rb",
     "lib/active_directory/group.rb",

data/lib/active_directory.rb

@@ -32,6 +32,7 @@ require 'active_directory/field_type/password.rb'
 require 'active_directory/field_type/binary.rb'
 require 'active_directory/field_type/date.rb'
 require 'active_directory/field_type/timestamp.rb'
+require 'active_directory/field_type/dn_array.rb'
 
 module ActiveDirectory
   
@@ -47,31 +48,35 @@ module ActiveDirectory
   @@special_fields = {
 
     #All objects in the AD
-    # :Base => {
-    #   :objectguid => :binary,
-    #   :whencreated => :date,
-    #   :whenchanged => :date
-    # },
+    :Base => {
+      :objectguid => :Binary,
+      :whencreated => :Date,
+      :whenchanged => :Date,
+      :memberof => :DnArray,
+    },
 
     #User objects
     :User => {
-      :objectguid => :binary,
-      :whencreated => :date,
-      :whenchanged => :date,
-      :objectsid => :binary,
-      :msexchmailboxguid => :binary,
-      :msexchmailboxsecuritydescriptor => :binary,
-      :lastlogontimestamp => :timestamp,
-      :pwdlastset => :timestamp,
-      :accountexpires => :timestamp
+      :objectguid => :Binary,
+      :whencreated => :Date,
+      :whenchanged => :Date,
+      :objectsid => :Binary,
+      :msexchmailboxguid => :Binary,
+      :msexchmailboxsecuritydescriptor => :Binary,
+      :lastlogontimestamp => :Timestamp,
+      :pwdlastset => :Timestamp,
+      :accountexpires => :Timestamp,
+      :memberof => :DnArray,
     },
 
     #Group objects
     :Group => {
-      :objectguid => :binary,
-      :whencreated => :date,
-      :whenchanged => :date,
-      :objectsid => :binary,
+      :objectguid => :Binary,
+      :whencreated => :Date,
+      :whenchanged => :Date,
+      :objectsid => :Binary,
+      :memberof => :DnArray,
+      :member => :DnArray,
     },
   }
 end

data/lib/active_directory/base.rb

@@ -144,19 +144,35 @@ module ActiveDirectory
 			!@attributes.empty?
 		end
 
+		##
+		# Makes a single filter from a given key and value
+		# It will try to encode an array if there is a process for it
+		# Otherwise, it will treat it as an or condition
+		def self.make_filter(key, value)
+			#Join arrays using OR condition
+			if value.is_a? Array
+				filter = ~NIL_FILTER
+
+				value.each do |v|
+					filter |= Net::LDAP::Filter.eq(key, encode_field(key, v).to_s)
+				end
+			else
+				filter = Net::LDAP::Filter.eq(key, encode_field(key, value).to_s)
+			end
+
+			return filter
+		end
+
 		def self.make_filter_from_hash(hash) # :nodoc:
 			return NIL_FILTER if hash.nil? || hash.empty?
 
-			#I'm sure there's a better way to do this
-			#Grab the first one, then do the rest
-			key, value = hash.shift
-			f = Net::LDAP::Filter.eq(key, encode_field(key, value).to_s)
-			
+			filter = NIL_FILTER
+
 			hash.each do |key, value|
-				f = f & Net::LDAP::Filter.eq(key, encode_field(key, value).to_s)
+				filter &= make_filter(key, value)
 			end
 
-			return f
+			return filter
 		end
 
 		#
@@ -177,7 +193,7 @@ module ActiveDirectory
 		# method, partial searches are allowed.
 		#
 		# This method always returns an array if the caller specifies
-		# :all for the search type (first argument).  If no results
+		# :all for the search e (first argument).  If no results
 		# are found, the array will be empty.
 		#
 		# If you call find(:first, ...), you will either get an object
@@ -188,14 +204,17 @@ module ActiveDirectory
 			return false unless connected?
 
 			options = {
-				:filter => NIL_FILTER,
+				:filter => (args[1].nil?) ? NIL_FILTER : args[1],
 				:in => ''
 			}
-			options.merge!(:filter => args[1]) unless args[1].nil?
+
+			# 
 			options[:in] = [ options[:in].to_s, @@settings[:base] ].delete_if { |part| part.empty? }.join(",")
+
 			if options[:filter].is_a? Hash
 				options[:filter] = make_filter_from_hash(options[:filter])
 			end
+
 			options[:filter] = options[:filter] & filter unless self.filter == NIL_FILTER
 			
 			if (args.first == :all)
@@ -411,19 +430,19 @@ module ActiveDirectory
 		# Takes the field name as a parameter
 		def self.get_field_type(name)
 			#Extract class name
+			throw "Invalid field name" if name.nil?
 			klass = self.name.include?('::') ? self.name[/.*::(.*)/, 1] : self.name
-			type = ::ActiveDirectory.special_fields[klass.classify.to_sym][name.to_s.downcase.to_sym]
-			type.to_s.classify unless type.nil?
+			type = ::ActiveDirectory.special_fields[klass.to_sym][name.to_s.downcase.to_sym]
+			type.to_s unless type.nil?
 		end
 
-		def self.decode_field(name, value)
-			#Extract class name
+		def self.decode_field(name, value) # :nodoc:
 			type = get_field_type name
 			return ::ActiveDirectory::FieldType::const_get(type).decode(value) if !type.nil? and ::ActiveDirectory::FieldType::const_defined? type
 			return value
 		end
 
-		def self.encode_field(name, value)
+		def self.encode_field(name, value) # :nodoc:
 			type = get_field_type name
 			return ::ActiveDirectory::FieldType::const_get(type).encode(value) if !type.nil? and ::ActiveDirectory::FieldType::const_defined? type
 			return value
@@ -445,7 +464,7 @@ module ActiveDirectory
 					value = value.first if value.kind_of?(Array) && value.size == 1
 					value = value.to_s if value.nil? || value.size == 1
 					return self.class.decode_field(name, value)
-				rescue NoMethodError
+				rescue NoMethodError => e
 					return nil
 				end
 			end

data/lib/active_directory/field_type/dn_array.rb

@@ -0,0 +1,39 @@
+#-- license
+#
+#  Based on original code by Justin Mecham and James Hunt
+#  at http://rubyforge.org/projects/activedirectory
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#++ license
+
+module ActiveDirectory
+	module FieldType
+		class DnArray
+			#
+			# Encodes an array of objects into a list of dns
+			# 
+			def self.encode(obj_array)
+				obj_array.collect { |obj| obj.dn }
+			end
+
+			#
+			# Decodes a list of DNs into the objects that they are
+			#
+			def self.decode(dn_array)
+				Base.find( :all, :distinguishedname => dn_array)
+			end
+		end
+	end
+end

data/lib/active_directory/group.rb

@@ -116,7 +116,7 @@ module ActiveDirectory
 				end
 				return @member_users_r
 			else
-				@member_users_non_r ||= @entry.member.collect { |dn| User.find_by_distinguishedName(dn) }.delete_if { |u| u.nil? }
+				@member_users_non_r ||= User.find(:all, :distinguishedname => @entry.member).delete_if { |u| u.nil? }
 			end
 		end
 
@@ -144,7 +144,7 @@ module ActiveDirectory
 				end
 				return @member_groups_r
 			else
-				@member_groups_non_r ||= @entry.member.collect { |dn| Group.find_by_distinguishedName(dn) }.delete_if { |g| g.nil? }
+				@member_groups_non_r ||= Group.find(:all, :distinguishedname => @entry.member).delete_if { |g| g.nil? }
 			end
 		end
 
@@ -153,7 +153,7 @@ module ActiveDirectory
 		#
 		def groups
 			return [] if memberOf.nil?
-			@groups ||= memberOf.collect { |group_dn| Group.find_by_distinguishedName(group_dn) }
+			@groups ||= Group.find(:all, :distinguishedname => @entry.memberOf).delete_if { |g| g.nil? }
 		end
 	end
 end

data/lib/active_directory/user.rb

@@ -75,7 +75,7 @@ module ActiveDirectory
 		# called Marketting, this method would only return the Sales group.
 		#
 		def groups
-			@groups ||= memberOf.collect { |dn| Group.find_by_distinguishedName(dn) }
+			@groups ||= Group.find(:all, :distinguishedname => @entry.memberOf)
 		end
 
 		#
@@ -84,7 +84,7 @@ module ActiveDirectory
 		#
 		def direct_reports
 			return [] if @entry.directReports.nil?
-			@direct_reports ||= @entry.directReports.collect { |dn| User.find_by_distinguishedName(dn) }
+			@direct_reports ||= User.find(:all, @entry.directReports)
 		end
 
 		#

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_directory
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Adam T Kerr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/active_directory/container.rb
 - lib/active_directory/field_type/binary.rb
 - lib/active_directory/field_type/date.rb
+- lib/active_directory/field_type/dn_array.rb
 - lib/active_directory/field_type/password.rb
 - lib/active_directory/field_type/timestamp.rb
 - lib/active_directory/group.rb