activeldap 1.2.2 → 1.2.3

data/CHANGES

@@ -1,5 +1,29 @@
 = CHANGES
 
+== 1.2.3: 2011-04-30
+
+* [#40] Ignored nil value attribute.
+  [christian.pennafort]
+* [#48] Escaped ":" in filter value.
+  [planetmcd]
+* Added missing rubygems require.
+  [spoidar]
+* Used fast_gettext instead of gettext.
+  [Peter Fern]
+* Supported Rails 2.3.11.
+  [Kris Wehner]
+* Fixed wrong assertion in test.
+  [Ryan Tandy]
+
+=== Thanks
+
+* christian.pennafort
+* planetmcd
+* spoidar
+* Peter Fern
+* Kris Wehner
+* Ryan Tandy
+
 == 1.2.2: 2010-07-04
 
 * Supported ActiveRecord 2.3.8 and Rails 2.3.8.

data/README

@@ -3,7 +3,7 @@
 ruby library for object-oriented LDAP interction
 
 * Copyright (C) 2004-2006 Will Drewry <tt><will@alum.bu.edu></tt>
-* Copyright (C) 2006-2009 Kouhei Sutou <tt><kou@clear-code.com></tt>
+* Copyright (C) 2006-2011 Kouhei Sutou <tt><kou@clear-code.com></tt>
 
 Contributors::
   * Dick Davies <tt><rasputnik AT hellooperator.net></tt>
@@ -90,7 +90,9 @@ list, please point out.
 * Nobody: Bug reports and API improveent ideas.
 * James Hughes: Bug reports and advices and documentations.
 * Buzz Chopra: Documentations.
-* Christoph Lipp: Bug reports.
+* Christoph Lipp:
+  * Bug reports.
+  * Tell us character escape syntax.
 * Jeff Hall: Bug reports.
 * Ernie Miller: Bug reports and advices.
 * Daniel Pfile: Patches.
@@ -99,7 +101,6 @@ list, please point out.
   * Bug reports.
   * Nederlands translations.
 * Iain Pople: Bug reports and API improvement ideas.
-* Christoph Lipp: Tell us character escape syntax.
 * Kevin McCarthy: Patches.
 * Perry Smith: Patches, bug reports and indications.
 * Marc Dequènes: API suggestions.
@@ -146,3 +147,8 @@ list, please point out.
 * Anthony M. Martinez: Helped SASL options support
 * ilusi0n.x: A bug report.
 * projekttabla: A suggestion.
+* christian.pennaforte: A bug report.
+* planetmcd: A bug report.
+* spoidar: Rails 3 support.
+* Kris Wehner: Rails 2.3.8 support.
+* Ryan Tandy: A test bug fix.

data/Rakefile

@@ -1,5 +1,6 @@
 # -*- ruby -*-
 
+require 'thread'
 require 'rubygems'
 require 'hoe'
 require 'find'
@@ -16,7 +17,7 @@ manifest = File.join(base_dir, "Manifest.txt")
 manifest_contents = []
 base_dir_included_components = %w(CHANGES COPYING LICENSE Manifest.txt
                                   README Rakefile TODO)
-excluded_components = %w(.svn .test-result .config doc log tmp
+excluded_components = %w(.svn .git .test-result .config doc log tmp
                          pkg html config.yaml database.yml ldap.yml)
 excluded_suffixes = %w(.help .sqlite3)
 white_list_paths =
@@ -53,9 +54,10 @@ at_exit do
   FileUtils.rm_f("History.txt")
 end
 
-ENV["VERSION"] = ActiveLdap::VERSION
+ENV["VERSION"] ||= ActiveLdap::VERSION
+version = ENV["VERSION"]
 project = Hoe.spec('activeldap') do
-  self.version = ActiveLdap::VERSION
+  self.version = version
   self.rubyforge_name = 'ruby-activeldap'
   self.author = ['Will Drewry', 'Kouhei Sutou']
   self.email = ['redpig@dataspill.org', 'kou@cozmixng.org']
@@ -66,10 +68,10 @@ project = Hoe.spec('activeldap') do
   self.extra_deps = [
                      # ['ruby-ldap', '= 0.9.9'],
                      # ['net-ldap', '= 0.1.1'],
-                     ['activerecord', '= 2.3.8'],
+                     ['activerecord', '~> 2.3.11'],
                      ['locale', '= 2.0.5'],
-                     ['gettext', '= 2.1.0'],
-                     ['gettext_activerecord', '= 2.1.0'],
+                     ['fast_gettext', '= 0.5.8'],
+                     ['gettext_i18n_rails', '= 0.2.2'],
                     ]
   self.remote_rdoc_dir = "doc"
   self.rsync_args += " --chmod=Dg+ws,Fg+w"
@@ -106,54 +108,26 @@ ObjectSpace.each_object(Rake::RDocTask) do |task|
   task.rdoc_files = project.spec.require_paths + project.spec.extra_rdoc_files
 end
 
-desc 'Tag the repository for release.'
-task :tag do
-  system "svn copy -m 'New release tag' https://ruby-activeldap.googlecode.com/svn/trunk https://ruby-activeldap.googlecode.com/svn/tags/r#{ActiveLdap::VERSION}"
+begin
+  require "gettext_i18n_rails/tasks"
+rescue LoadError
+  puts "gettext_i18n_rails is not installed, you probably should run 'rake gems:install' or 'bundle install'."
 end
 
+desc "Publish HTML to Web site."
+task :publish_html do
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+  host = "#{config["username"]}@rubyforge.org"
 
-desc "Update *.po/*.pot files and create *.mo from *.po files"
-task :gettext => ["gettext:po:update", "gettext:mo:create"]
-
-namespace :gettext do
-  desc "Setup environment for GetText"
-  task :environment do
-    require "gettext/tools"
-  end
-
-  namespace :po do
-    desc "Update po/pot files (GetText)"
-    task :update => "gettext:environment" do
-      require 'active_ldap/get_text/parser'
-      dummy_file = "@@@dummy-for-active-ldap@@@"
-      parser = Object.new
-      parser.instance_eval do
-        @parser = ActiveLdap::GetText::Parser.new
-        @dummy_file = dummy_file
-      end
-      def parser.target?(file)
-        file == @dummy_file
-      end
-      def parser.parse(file, targets)
-        @parser.extract_all_in_schema(targets)
-      end
-
-      GetText::RGetText.add_parser(parser)
-      files = [dummy_file] + Dir.glob("{lib,rails,benchmark}/**/*.rb")
-      GetText.update_pofiles("active-ldap",
-                             files,
-                             "Ruby/ActiveLdap #{ActiveLdap::VERSION}")
-    end
-  end
-
-  namespace :mo do
-    desc "Create *.mo from *.po (GetText)"
-    task :create => "gettext:environment" do
-      GetText.create_mofiles
-    end
-  end
+  rsync_args = "-av --exclude '*.erb' --exclude '*.svg' --exclude .svn"
+  remote_dir = "/var/www/gforge-projects/#{project.rubyforge_name}/"
+  sh "rsync #{rsync_args} html/ #{host}:#{remote_dir}"
 end
 
-task(:gem).prerequisites.unshift("gettext:mo:create")
+desc "Tag the current revision."
+task :tag do
+  message = "Released ActiveLdap #{version}!"
+  sh 'git', 'tag', '-a', version, '-m', message
+end
 
 # vim: syntax=ruby

data/examples/al-admin/Rakefile

@@ -7,4 +7,10 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+begin
+  require "gettext_i18n_rails/tasks"
+rescue LoadError
+  puts "gettext_i18n_rails is not installed, you probably should run 'rake gems:install'."
+end
+
 require 'tasks/rails'

data/examples/al-admin/app/controllers/application_controller.rb

@@ -8,13 +8,14 @@ class ApplicationController < ActionController::Base
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery # :secret => '5965eefc93d824a9c145fe8edb6d1a36'
 
-  init_gettext "al-admin"
-
   include ExceptionNotifiable
 
   include AuthenticatedSystem
+
   before_filter :login_from_cookie
 
+  before_filter :set_gettext_locale
+
   filter_parameter_logging :password, :password_confirmation
 
   private
@@ -36,4 +37,10 @@ class ApplicationController < ActionController::Base
   def authorized?
     current_ldap_user.connected?
   end
+
+  def set_gettext_locale
+    FastGettext.text_domain = 'al-admin'
+    FastGettext.available_locales = ['en', 'ja', 'nl']
+    super
+  end
 end

data/examples/al-admin/config/environment.rb

@@ -28,7 +28,14 @@ Rails::Initializer.run do |config|
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
   # config.gem "locale_rails", :version => "2.0.5"
-  config.gem "gettext_rails", :version => "2.1.0"
+  # config.gem "gettext_rails", :version => "2.1.0"
+  config.gem "fast_gettext", :version => '>=0.5.8'
+  #only used for mo/po file generation in development, !do not load(:lib=>false), will needlessly eat ram!
+  config.gem "gettext", :lib => false, :version => '>=2.1.0'
+  #this is needed for language/country translations
+  config.gem "gettext_i18n_rails", :version => '>=0.2.2'
+  #this is needed for language/country translations
+  config.gem "i18n_data", :version => '>=0.2.3'
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
@@ -37,8 +44,7 @@ Rails::Initializer.run do |config|
 
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
-  config.load_paths += ["#{RAILS_ROOT}/../../lib",
-                        "#{RAILS_ROOT}/vendor/locale_rails/lib"]
+  config.load_paths += ["#{RAILS_ROOT}/../../lib"]
   config.plugin_paths += %W(#{RAILS_ROOT}/../..)
 
   # Force all environments to use the same logger level

data/examples/al-admin/config/initializers/fast_gettext.rb

@@ -0,0 +1,3 @@
+FastGettext.add_text_domain 'al-admin', :path => 'po'
+FastGettext.default_available_locales = ['en','ja','nl'] #all you want to allow
+FastGettext.default_text_domain = 'al-admin'

data/examples/al-admin/config/session_secret.txt

@@ -1 +1 @@
-23aa39bc18aa4a5d9adc7e060acd5e8c196d5c8261c8ebbe675b0973ca3b8dce836950b4de879f6f70e6240df94868bc967af33cd6f69ec7bed15f9f6c80291f
+ebcc497433c106b5b66580c617c287f8e771a290bfcc015c81015dd1b11b35c56d913c09abdb77200f7776faab0636cff0f0d8293bd10619226b6930320b9763

data/lib/active_ldap.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/ruby
 # = ActiveLdap
 #
 #   Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
@@ -888,10 +887,6 @@
 # package, and I'd like to see it prove helpful to more people than just myself.
 #
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", "net-ldap", "lib"))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", "ldap", "lib"))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", "ldap"))
-
 require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
   gem_name ||= library_name
   begin
@@ -906,20 +901,13 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
   end
 end
 
-require_gem_if_need.call("active_support", "activesupport", "= 2.3.8")
+require_gem_if_need.call("active_support", "activesupport", "~> 2.3.11")
 
-if ActiveSupport.const_defined?(:Dependencies)
-  dependencies = ActiveSupport::Dependencies
-else
-  dependencies = Dependencies
-end
-
-if dependencies.respond_to?(:load_paths)
-  dependencies.load_paths << File.expand_path(File.dirname(__FILE__))
-end
+# TODO: This should be removed when Rails 3 is supported.
+ActiveSupport::Dependencies.autoload_paths << File.expand_path(File.dirname(__FILE__))
 
 module ActiveLdap
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end
 
 if RUBY_PLATFORM.match('linux')
@@ -928,11 +916,10 @@ else
   require 'active_ldap/timeout_stub'
 end
 
-require_gem_if_need.call("active_record", "activerecord", "= 2.3.8")
+require_gem_if_need.call("active_record", "activerecord", "~> 2.3.11")
 begin
   require_gem_if_need.call("locale", nil, "= 2.0.5")
-  require_gem_if_need.call("gettext", nil, "= 2.1.0")
-  require_gem_if_need.call("gettext_activerecord", nil, "= 2.1.0")
+  require_gem_if_need.call("fast_gettext", nil, "= 0.5.8")
 rescue LoadError
 end
 require 'active_ldap/get_text'

data/lib/active_ldap/adapter/base.rb

@@ -131,11 +131,15 @@ module ActiveLdap
           ]
           base ||= root_dse_values('subschemaSubentry', options)[0]
           base ||= 'cn=schema'
-          dn, attributes = search(:base => base,
-                                  :scope => :base,
-                                  :filter => '(objectClass=subschema)',
-                                  :attributes => attrs).first
-          Schema.new(attributes)
+          schema = nil
+          search(:base => base,
+                 :scope => :base,
+                 :filter => '(objectClass=subschema)',
+                 :attributes => attrs,
+                 :limit => 1) do |dn, attributes|
+            schema = Schema.new(attributes)
+          end
+          schema || Schema.new([])
         end
       end
 
@@ -157,17 +161,10 @@ module ActiveLdap
         limit = nil if limit <= 0
 
         attrs = attrs.to_a # just in case
-
-        values = []
-        callback = Proc.new do |value, block|
-          value = block.call(value) if block
-          values << value
-        end
-
         base = ensure_dn_string(base)
         begin
           operation(options) do
-            yield(base, scope, filter, attrs, limit, callback)
+            yield(base, scope, filter, attrs, limit)
           end
         rescue LdapError::NoSuchObject, LdapError::InvalidDnSyntax
           # Do nothing on failure
@@ -176,8 +173,6 @@ module ActiveLdap
             _("Ignore error %s(%s): filter %s: attributes: %s") % args
           end
         end
-
-        values
       end
 
       def delete(targets, options={})
@@ -318,7 +313,7 @@ module ActiveLdap
         n_retries = 0
         retry_limit = options[:retry_limit] || @retry_limit
         begin
-          Timeout.alarm(@timeout, &block)
+          do_in_timeout(@timeout, &block)
         rescue Timeout::Error => e
           @logger.error {_('Requested action timed out.')}
           if @retry_on_timeout and retry_limit < 0 and n_retries <= retry_limit
@@ -333,6 +328,10 @@ module ActiveLdap
         end
       end
 
+      def do_in_timeout(timeout, &block)
+        Timeout.alarm(timeout, &block)
+      end
+
       def sasl_bind(bind_dn, options={})
         # Get all SASL mechanisms
         mechanisms = operation(options) do
@@ -503,7 +502,7 @@ module ActiveLdap
         when Time
           value = Schema::GeneralizedTime.new.normalize_value(value)
         end
-        value.gsub(/(?:[()\\\0]|\*\*?)/) do |s|
+        value.gsub(/(?:[:()\\\0]|\*\*?)/) do |s|
           if s == "*"
             s
           else
@@ -622,7 +621,7 @@ module ActiveLdap
       end
 
       def root_dse_values(key, options={})
-        dse = root_dse([key], options)[0]
+        dse = root_dse([key], options)
         return [] if dse.nil?
         normalized_key = key.downcase
         dse.each do |_key, _value|
@@ -632,11 +631,14 @@ module ActiveLdap
       end
 
       def root_dse(attrs, options={})
+        found_attributes = nil
         search(:base => "",
                :scope => :base,
-               :attributes => attrs).collect do |dn, attributes|
-          attributes
+               :attributes => attrs,
+               :limit => 1) do |dn, attributes|
+          found_attributes = attributes
         end
+        found_attributes
       end
 
       def construct_uri(host, port, ssl)

data/lib/active_ldap/adapter/jndi.rb

@@ -42,13 +42,12 @@ module ActiveLdap
       end
 
       def search(options={}, &block)
-        super(options) do |base, scope, filter, attrs, limit, callback|
+        super(options) do |base, scope, filter, attrs, limit|
           info = {
             :base => base, :scope => scope_name(scope), :filter => filter,
             :attributes => attrs, :limit => limit,
           }
-          execute(:search, info,
-                  base, scope, filter, attrs, limit, callback, &block)
+          execute(:search, info, base, scope, filter, attrs, limit, &block)
         end
       end
 

data/lib/active_ldap/adapter/jndi_connection.rb

@@ -105,7 +105,7 @@ module ActiveLdap
         bound?
       end
 
-      def search(base, scope, filter, attrs, limit, callback, &block)
+      def search(base, scope, filter, attrs, limit)
         controls = SearchControls.new
         controls.search_scope = scope
 
@@ -121,7 +121,7 @@ module ActiveLdap
               value.is_a?(String) ? value : String.from_java_bytes(value)
             end
           end
-          callback.call([result.name_in_namespace, attributes], block)
+          yield([result.name_in_namespace, attributes])
         end
       end
 

data/lib/active_ldap/adapter/ldap.rb

@@ -79,8 +79,8 @@ module ActiveLdap
         end
       end
 
-      def search(options={}, &block)
-        super(options) do |base, scope, filter, attrs, limit, callback|
+      def search(options={})
+        super(options) do |base, scope, filter, attrs, limit|
           begin
             info = {
               :base => base, :scope => scope_name(scope),
@@ -90,9 +90,10 @@ module ActiveLdap
                     info, base, scope, filter, attrs, limit) do |entry|
               attributes = {}
               entry.attrs.each do |attr|
-                attributes[attr] = entry.vals(attr)
+                value = entry.vals(attr)
+                attributes[attr] = value if value
               end
-              callback.call([entry.dn, attributes], block)
+              yield([entry.dn, attributes])
             end
           rescue RuntimeError
             if $!.message == "no result returned by search"
@@ -182,6 +183,10 @@ module ActiveLdap
         end
       end
 
+      def do_in_timeout(timeout, &block)
+        Timeout.timeout(timeout, &block)
+      end
+
       def ensure_method(method)
         normalized_method = method.to_s.downcase
         Method.constants.each do |name|