active_ldap.rb in activeldap-1.0.2

- old
+ new

@@ -903,16 +903,19 @@
 #
 # Any and all feedback and patches are welcome. I am very excited about this
 # package, and I'd like to see it prove helpful to more people than just myself.
 #
 
-require_gem_if_need = Proc.new do |library_name, gem_name|
+require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
   begin
+    if !gem_args.empty? and Object.const_defined?(:Gem)
+      gem gem_name, *gem_args
+    end
     require library_name
   rescue LoadError
     require 'rubygems'
-    gem gem_name
+    gem gem_name, *gem_args
     require library_name
   end
 end
 
 require_gem_if_need.call("active_support", "activesupport")
@@ -926,30 +929,32 @@
 if dependencies.respond_to?(:load_paths)
   dependencies.load_paths << File.expand_path(File.dirname(__FILE__))
 end
 
 module ActiveLdap
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end
 
 if RUBY_PLATFORM.match('linux')
   require 'active_ldap/timeout'
 else
   require 'active_ldap/timeout_stub'
 end
 
 require_gem_if_need.call("active_record", "activerecord")
 begin
-  require_gem_if_need.call("gettext/active_record", "gettext")
+  require_gem_if_need.call("locale")
+  require_gem_if_need.call("gettext", "gettext", ">= 1.94")
 rescue LoadError
 end
 require 'active_ldap/get_text'
 
 require 'active_ldap/base'
 
 require 'active_ldap/distinguished_name'
 require 'active_ldap/ldif'
+require 'active_ldap/xml'
 
 require 'active_ldap/associations'
 require 'active_ldap/attributes'
 require 'active_ldap/configuration'
 require 'active_ldap/connection'
@@ -959,9 +964,10 @@
 
 require 'active_ldap/acts/tree'
 
 require 'active_ldap/populate'
 require 'active_ldap/escape'
+require 'active_ldap/user_password'
 require 'active_ldap/helper'
 
 require 'active_ldap/validations'
 require 'active_ldap/callbacks'
 