active_directory 1.2.2 → 1.2.4

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.4

data/active_directory.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_directory}
-  s.version = "1.2.2"
+  s.version = "1.2.4"
 
   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-14}
+  s.date = %q{2011-02-18}
   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.rb

@@ -47,11 +47,11 @@ module ActiveDirectory
   @@special_fields = {
 
     #All objects in the AD
-    :Base => {
-      :objectguid => :binary,
-      :whencreated => :date,
-      :whenchanged => :date
-    },
+    # :Base => {
+    #   :objectguid => :binary,
+    #   :whencreated => :date,
+    #   :whenchanged => :date
+    # },
 
     #User objects
     :User => {
@@ -68,6 +68,9 @@ module ActiveDirectory
 
     #Group objects
     :Group => {
+      :objectguid => :binary,
+      :whencreated => :date,
+      :whenchanged => :date,
       :objectsid => :binary,
     },
   }

data/lib/active_directory/base.rb

@@ -150,10 +150,10 @@ module ActiveDirectory
 			#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, value.to_s)
+			f = Net::LDAP::Filter.eq(key, encode_field(key, value).to_s)
 			
 			hash.each do |key, value|
-				f = f & Net::LDAP::Filter.eq(key, value.to_s)
+				f = f & Net::LDAP::Filter.eq(key, encode_field(key, value).to_s)
 			end
 
 			return f
@@ -406,21 +406,24 @@ module ActiveDirectory
 			end
 		end
 
-		def get_field_type(name)
+		## 
+		# Grabs the field type depending on the class it is called from 
+		# Takes the field name as a parameter
+		def self.get_field_type(name)
 			#Extract class name
-			klass = self.class.name[/.*::(.*)/, 1]
-			type = ::ActiveDirectory.special_fields[klass.classify.to_sym][name.downcase.to_sym]
+			klass = self.name[/.*::(.*)/, 1]
+			type = ::ActiveDirectory.special_fields[klass.classify.to_sym][name.to_s.downcase.to_sym]
 			type.to_s.classify unless type.nil?
 		end
 
-		def decode_field(name, value)
+		def self.decode_field(name, value)
 			#Extract class name
 			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 encode_field(name, value)
+		def self.encode_field(name, value)
 			type = get_field_type name
 			return ::ActiveDirectory::FieldType::const_get(type).encode(value) if !type.nil? and ::ActiveDirectory::FieldType::const_defined? type
 			return value
@@ -441,7 +444,7 @@ module ActiveDirectory
 					value = @entry.send(name.to_sym)
 					value = value.first if value.kind_of?(Array) && value.size == 1
 					value = value.to_s if value.nil? || value.size == 1
-					return decode_field(name, value)
+					return self.class.decode_field(name, value)
 				rescue NoMethodError
 					return nil
 				end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_directory
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Adam T Kerr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency