rails/init.rb in activeldap-1.0.2 vs rails/init.rb in activeldap-1.0.9

- old
+ new

@@ -1,9 +1,9 @@ require_library_or_gem 'active_ldap' ActiveLdap::Base.logger ||= RAILS_DEFAULT_LOGGER -required_version = ["1", "0", "0"] +required_version = ["1", "1", "0"] if (ActiveLdap::VERSION.split(".") <=> required_version) < 0 ActiveLdap::Base.class_eval do format = _("You need ActiveLdap %s or later") logger.error(format % required_version.join(".")) end @@ -11,10 +11,10 @@ ldap_configuration_file = File.join(RAILS_ROOT, 'config', 'ldap.yml') if File.exist?(ldap_configuration_file) configurations = YAML.load(ERB.new(IO.read(ldap_configuration_file)).result) ActiveLdap::Base.configurations = configurations - ActiveLdap::Base.establish_connection + ActiveLdap::Base.setup_connection else ActiveLdap::Base.class_eval do format = _("You should run 'script/generator scaffold_active_ldap' to make %s.") logger.error(format % ldap_configuration_file) end