activedirectory 1.0.0 → 1.0.1

data/lib/active_directory/rails/user.rb

@@ -21,117 +21,121 @@
 #
 #++ license
 
-module ActiveDirectory::Rails::User
-	def self.included(klass)
-		klass.extend(ClassMethods)
-		klass.send(:include, InstanceMethods)
-	end
-	
-	module InstanceMethods
-		# Is this Person active? Active people have valid
-		# usernames. Inactive people have empty usernames.
-		#
-		def active?
-			username != ""
-		end
+module ActiveDirectory
+			module Rails
+				module User
+			def self.included(klass)
+				klass.extend(ClassMethods)
+				klass.send(:include, InstanceMethods)
+			end
 
-		# Whether or not this Person has a corresponding Active Directory
-		# account that we can synchronize with, through the PeopleSynchronizer.
-		#
-		def in_active_directory?
-			!guid.blank?
-		end
+			module InstanceMethods
+				# Is this Person active? Active people have valid
+				# usernames. Inactive people have empty usernames.
+				#
+				def active?
+					username != ""
+				end
 
-		# Whether or not this Person can be authenticated with the
-		# given password, against Active Directory.
-		#
-		# For Active Directory authentication, we attempt to bind to the
-		# configured AD server as the user, and supply the password for
-		# authentication.
-		#
-		# There are two special cases for authentication, related to the
-		# environment the app is currently running in:
-		#
-		# *Development*
-		#
-		# In development, the blank password ('') will always cause this method
-		# to return true, thereby allowing developers to test functionality
-		# for a variety of roles.
-		#
-		# *Training*
-		#
-		# In training, a special training password ('trainme') will always
-		# cause this method to return true, thereby allowing trainers to
-		# use other people accounts to illustrate certain restricted processes.
-		#
-		def authenticates?(password)
-			# Never allow inactive users.
-			return false unless active?
-	
-			# Allow blank password for any account in development.
-			return true if password == "" and ENV['RAILS_ENV'] == 'development'
-			return true if password == "trainme" and ENV['RAILS_ENV'] == 'training'
+				# Whether or not this Person has a corresponding Active Directory
+				# account that we can synchronize with, through the PeopleSynchronizer.
+				#
+				def in_active_directory?
+					!guid.blank?
+				end
 
-			# Don't go against AD unless we really mean it.
-			return false unless ENV['RAILS_ENV'] == 'production'
+				# Whether or not this Person can be authenticated with the
+				# given password, against Active Directory.
+				#
+				# For Active Directory authentication, we attempt to bind to the
+				# configured AD server as the user, and supply the password for
+				# authentication.
+				#
+				# There are two special cases for authentication, related to the
+				# environment the app is currently running in:
+				#
+				# *Development*
+				#
+				# In development, the blank password ('') will always cause this method
+				# to return true, thereby allowing developers to test functionality
+				# for a variety of roles.
+				#
+				# *Training*
+				#
+				# In training, a special training password ('trainme') will always
+				# cause this method to return true, thereby allowing trainers to
+				# use other people accounts to illustrate certain restricted processes.
+				#
+				def authenticates?(password)
+					# Never allow inactive users.
+					return false unless active?
 
-			# If they are not in AD, fail.
-			return false unless in_active_directory?
-	
-			ad_user = ActiveDirectory::User.find_by_sAMAccountName(self.username)
-			ad_user and ad_user.authenticate(password)
-		end
+					# Allow blank password for any account in development.
+					return true if password == "" and ENV['RAILS_ENV'] == 'development'
+					return true if password == "trainme" and ENV['RAILS_ENV'] == 'training'
 
-		def active_directory_equivalent=(ad_user)
-			return unless ad_user
-			update_attributes(
-				:first_name  => ad_user.givenName,
-				:middle_name => ad_user.initials,
-				:last_name   => ad_user.sn,
-				:username    => ad_user.sAMAccountName,
-				:email       => ad_user.mail,
-				:guid        => ad_user.objectGUID
-			)
-		end
-	end
+					# Don't go against AD unless we really mean it.
+					return false unless ENV['RAILS_ENV'] == 'production'
 
-	module ClassMethods
-		# Attempt to authenticate someone with a username and password.
-		# This method properly handles both local store users and AD
-		# users.
-		#
-		# If the username is valid, and the password matches the username,
-		# the Person object corresponding to the username is return.
-		# 
-		# Otherwise, nil is returned, to indicate an authentication failure.
-		#
-		def authenticate(username, password)
-			person = find_by_username(username)
-			return person if (person and person.authenticates?(password))
-			nil
-		end
+					# If they are not in AD, fail.
+					return false unless in_active_directory?
 
-		# Retrieves all of the Person objects that have corresponding
-		# Active Directory accounts. This method does not contact
-		# the AD servers to retrieve the AD objects -- that is left up
-		# to the caller.
-		#
-		def in_active_directory
-			find(:all, :conditions => 'guid IS NOT NULL AND guid != ""')
-		end
+					ad_user = ActiveDirectory::User.find_by_sAMAccountName(self.username)
+					ad_user and ad_user.authenticate(password)
+				end
 
-		# Retrieves all Person objects that are currently active,
-		# meaning they have not been disabled by PeopleSynchronizer.
-		#
-		def active
-			find(:all, :conditions => 'username != ""')
-		end
+				def active_directory_equivalent=(ad_user)
+					return unless ad_user
+					update_attributes(
+						:first_name  => ad_user.givenName,
+						:middle_name => ad_user.initials,
+						:last_name   => ad_user.sn,
+						:username    => ad_user.sAMAccountName,
+						:email       => ad_user.mail,
+						:guid        => ad_user.objectGUID
+					)
+				end
+			end
 
-		# Retrieves all Person objects that are currently inactive,
-		# meaning they have been disabled by PeopleSynchronizer.
-		#
-		def inactive
-			find(:all, :conditions => 'username = ""')
-		end
-	end
-end 
+			module ClassMethods
+				# Attempt to authenticate someone with a username and password.
+				# This method properly handles both local store users and AD
+				# users.
+				#
+				# If the username is valid, and the password matches the username,
+				# the Person object corresponding to the username is return.
+				# 
+				# Otherwise, nil is returned, to indicate an authentication failure.
+				#
+				def authenticate(username, password)
+					person = find_by_username(username)
+					return person if (person and person.authenticates?(password))
+					nil
+				end
+
+				# Retrieves all of the Person objects that have corresponding
+				# Active Directory accounts. This method does not contact
+				# the AD servers to retrieve the AD objects -- that is left up
+				# to the caller.
+				#
+				def in_active_directory
+					find(:all, :conditions => 'guid IS NOT NULL AND guid != ""')
+				end
+
+				# Retrieves all Person objects that are currently active,
+				# meaning they have not been disabled by PeopleSynchronizer.
+				#
+				def active
+					find(:all, :conditions => 'username != ""')
+				end
+
+				# Retrieves all Person objects that are currently inactive,
+				# meaning they have been disabled by PeopleSynchronizer.
+				#
+				def inactive
+					find(:all, :conditions => 'username = ""')
+				end
+			end
+		end # module User
+	end # module Rails
+end #module ActiveDirectory

data/lib/active_directory/user.rb

@@ -128,10 +128,10 @@ module ActiveDirectory
 		# time they successfully log into the domain.
 		#
 		def change_password(new_password, force_change = false)
-			settings = @@settings.dup.merge {
+			settings = @@settings.dup.merge({
 				:port => 636,
 				:encryption => { :method => :simple_tls }
-			}
+			})
 
 			ldap = Net::LDAP.new(settings)
 			ldap.modify(

metadata

@@ -1,64 +1,72 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: activedirectory
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2008-08-02 00:00:00 -05:00
-summary: An interface library for accessing Microsoft's Active Directory.
-require_paths: 
-- lib
-email: filefrog@gmail.com
-homepage: http://rubyforge.net/projects/activedirectory
-rubyforge_project: activedirectory
-description: ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying an Active Directory data store.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- James R. Hunt
-files: 
-- lib/active_directory/container.rb
-- lib/active_directory/timestamp.rb
-- lib/active_directory/user.rb
-- lib/active_directory/computer.rb
-- lib/active_directory/password.rb
-- lib/active_directory/member.rb
-- lib/active_directory/base.rb
-- lib/active_directory/rails/user.rb
-- lib/active_directory/rails/synchronizer.rb
-- lib/active_directory/group.rb
-- lib/active_directory.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
+- James R Hunt
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-12-01 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-net-ldap
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.4
     version: 
+description: ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying an Active Directory data store.
+email: james@niftylogic.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/active_directory.rb
+- lib/active_directory/password.rb
+- lib/active_directory/container.rb
+- lib/active_directory/computer.rb
+- lib/active_directory/user.rb
+- lib/active_directory/base.rb
+- lib/active_directory/group.rb
+- lib/active_directory/timestamp.rb
+- lib/active_directory/member.rb
+- lib/active_directory/rails/user.rb
+- lib/active_directory/rails/synchronizer.rb
+has_rdoc: true
+homepage: http://gems.niftylogic.net/activedirectory
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: activedirectory
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: An interface library for accessing Microsoft's Active Directory.
+test_files: []
+