active_directory 1.2.1 → 1.2.2

data/README

@@ -1,4 +1,6 @@
 = Active Directory
 
-Ruby Integration with Microsoft's Active Directory system
+Ruby Integration with Microsoft's Active Directory system based on original code by Justin Mecham and James Hunt at http://rubyforge.org/projects/activedirectory
+
+See documentation on ActiveDirectory::Base for more information.
 

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/active_directory.gemspec

@@ -5,18 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_directory}
-  s.version = "1.2.1"
+  s.version = "1.2.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-02-10}
+  s.date = %q{2011-02-14}
   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 = [
     "README"
   ]
   s.files = [
-    "CHANGELOG",
     "README",
     "Rakefile",
     "VERSION",

data/lib/active_directory.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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
@@ -37,8 +34,16 @@ require 'active_directory/field_type/date.rb'
 require 'active_directory/field_type/timestamp.rb'
 
 module ActiveDirectory
+  
   #Special Fields
-  mattr_accessor :special_fields
+  def self.special_fields
+    @@special_fields
+  end
+
+  def self.special_fields= sp_fields
+    @@special_fields = sp_fields
+  end
+
   @@special_fields = {
 
     #All objects in the AD

data/lib/active_directory/base.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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
@@ -72,20 +69,29 @@ module ActiveDirectory
 			"#{@@ldap.get_operation_result.code}: #{@@ldap.get_operation_result.message}"
 		end
 
+		##
+		# Return the last errorcode that ldap generated
 		def self.error_code
 			@@ldap.get_operation_result.code
 		end
 
+		##
+		# Check to see if the last query produced an error
+		# Note: Invalid username/password combinations will not
+		# produce errors
 		def self.error?
-			!success?
-		end
-
-		def self.success?
-			@@ldap.get_operation_result.code == 0
+			@@ldap.nil? ? false : @@ldap.get_operation_result.code != 0
 		end
 
+		##
+		# Check to see if we are connected to the LDAP server
+		# This method will try to connect, if we haven't already
 		def self.connected?
-			@@ldap.bind
+			begin
+				@@ldap.nil? ? false : @@ldap.bind
+			rescue Net::LDAP::LdapError => e
+				false
+			end
 		end
 
 		def self.filter # :nodoc:
@@ -179,6 +185,8 @@ module ActiveDirectory
 		# matching your filter.
 		#
 		def self.find(*args)
+			return false unless connected?
+
 			options = {
 				:filter => NIL_FILTER,
 				:in => ''
@@ -401,24 +409,20 @@ module ActiveDirectory
 		def get_field_type(name)
 			#Extract class name
 			klass = self.class.name[/.*::(.*)/, 1]
-			::Rails.logger.add 0, "special_fields[#{klass.classify.to_sym}][#{name.downcase.to_sym}] = #{::ActiveDirectory.special_fields[klass.classify.to_sym][name.downcase.to_sym]}"
 			type = ::ActiveDirectory.special_fields[klass.classify.to_sym][name.downcase.to_sym]
 			type.to_s.classify unless type.nil?
 		end
 
 		def decode_field(name, value)
-			::Rails.logger.add 0, "Decoding #{name}, #{value}"
+			#Extract class name
 			type = get_field_type name
-			::Rails.logger.add 0, "Type: #{type}  Const: #{::ActiveDirectory::FieldType::const_get type unless type.nil?}"
 			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)
-			::Rails.logger.add 0, "Encoding #{name}, #{value}"
 			type = get_field_type name
-			::Rails.logger.add 0, "Type: #{type}  Const: #{::ActiveDirectory::FieldType::const_get type}"
-			return ::ActiveDirectory::FieldType::const_get(type).encode(value) if ::ActiveDirectory::FieldType::const_defined? type
+			return ::ActiveDirectory::FieldType::const_get(type).encode(value) if !type.nil? and ::ActiveDirectory::FieldType::const_defined? type
 			return value
 		end
 
@@ -433,44 +437,18 @@ module ActiveDirectory
 			return decode_field(name, @attributes[name.to_sym]) if @attributes.has_key?(name.to_sym)
 				
 			if @entry
-				# begin
+				begin
 					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
-					::Rails.logger.add 0, "Decoded as #{decode_field(name, value)}\n"
-					::Rails.logger.add 0, ""
 					return decode_field(name, value)
-				# rescue NoMethodError => e
-				# 	::Rails.logger.add 0, "#{e.inspect}"
-				# 	return nil
-				# end
+				rescue NoMethodError
+					return nil
+				end
 			end
 
 			super
 		end
 
-		# def method_missing(name, args = []) # :nodoc:
-		# 	name_s = name.to_s.downcase
-		# 	name = name_s.to_sym
-		# 	if name_s[-1,1] == '='
-		# 		@attributes[name_s[0,name_s.size-1].to_sym] = args
-		# 	else
-		# 		if @attributes.has_key?(name)
-		# 			return @attributes[name]
-		# 		elsif @entry
-		# 			begin
-		# 				value = @entry.send(name)
-		# 				value = value.first if value.kind_of?(Array) && value.size == 1
-		# 				value = value.to_s if value.nil? || value.size == 1
-		# 				return value
-		# 			rescue NoMethodError
-		# 				return nil
-		# 			end
-		# 		else
-		# 			super
-		# 		end
-		# 	end
-		# end
-
 	end
 end

data/lib/active_directory/computer.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/container.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/field_type/binary.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/field_type/date.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/field_type/password.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/field_type/timestamp.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/group.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/member.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

data/lib/active_directory/user.rb

@@ -1,10 +1,7 @@
 #-- license
 #
-# This file is part of the Ruby Active Directory Project
-# on the web at http://rubyforge.org/projects/activedirectory
-#
-#  Copyright (c) 2008, James Hunt <filefrog@gmail.com>
-#    based on original code by Justin Mecham
+#  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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_directory
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Adam T Kerr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -05:00
+date: 2011-02-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- CHANGELOG
 - README
 - Rakefile
 - VERSION

data/CHANGELOG

@@ -1,7 +0,0 @@
-2008-12-01	James Hunt	<filefrog@gmail.com>
-
-* Fixed bug [#22307] "syntax errors"
-  (http://rubyforge.org/tracker/index.php?func=detail&aid=22307&group_id=1580&atid=6154)
-
-  Broke out module declarations
-  Added parens around _merge_ call