activeldap 1.2.1 → 1.2.2

data/examples/al-admin/vendor/locale_rails/test/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/examples/al-admin/vendor/locale_rails/test/script/about

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
+require 'commands/about'

data/examples/al-admin/vendor/locale_rails/test/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/examples/al-admin/vendor/locale_rails/test/script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

data/examples/al-admin/vendor/locale_rails/test/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/examples/al-admin/vendor/locale_rails/test/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/examples/al-admin/vendor/locale_rails/test/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

data/examples/al-admin/vendor/locale_rails/test/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/examples/al-admin/vendor/locale_rails/test/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'

data/examples/al-admin/vendor/locale_rails/test/script/runner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

data/examples/al-admin/vendor/locale_rails/test/script/server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

data/examples/al-admin/vendor/locale_rails/test/test/functional/articles_controller_test.rb

@@ -0,0 +1,161 @@
+require 'test_helper'
+require 'fileutils'
+
+class ArticlesControllerTest < ActionController::TestCase
+
+  def setup
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR;ja;q=0.7,de;q=0.3"
+    Locale.clear
+  end
+
+  test "localized template with accept_language" do
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en-US"
+    get :index
+    assert_equal "index.html.erb", @response.body.chop
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "ja-jp"
+    get :index, :lang => "ja"
+    assert_equal "index_ja.html.erb", @response.body.chop
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR"
+    get :index
+    assert_equal "index_fr_FR.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr"
+    get :index
+    assert_equal "index.html.erb", @response.body.chop
+  end
+
+  test "localized template with accept_languages" do
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_fr_FR.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_ja.html.erb", @response.body.chop
+  end
+
+  test "localized template with query string" do
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en,ja;q=0.7,de;q=0.3"
+    get :index, :lang => "ja"
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR,ja;q=0.7,de;q=0.3"
+    get :index, :lang => "ja"
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "ja;q=0.7,de;q=0.3"
+    get :index, :lang => "en"
+    assert_equal "index.html.erb", @response.body.chop
+  end
+
+  test "localized template with accept_languages and default is de" do
+    # index_de.html.erb is existed.
+    Locale.default = "de"
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_fr_FR.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "de;q=0.7,en;q=0.3"
+    get :index
+    assert_equal "index_de.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "zh"
+    get :index
+    assert_equal "index_de.html.erb", @response.body.chop
+  end
+
+  test "localized template with accept_languages and default is zh" do
+    # index_zh.html.erb is not existed.
+    Locale.default = "zh"
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "fr-FR,ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_fr_FR.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "ja;q=0.7,de;q=0.3"
+    get :index
+    assert_equal "index_ja.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en;q=0.7;nl;q=0.3"
+    get :index
+    assert_equal "index.html.erb", @response.body.chop
+
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "zh"
+    get :index
+    assert_equal "index.html.erb", @response.body.chop
+  end
+
+  test "list.html.erb should be cached" do
+    cache_path = RAILS_ROOT + "/tmp/cache/views"
+    FileUtils.rm_rf cache_path
+    @request.env["HTTP_ACCEPT_LANGUAGE"] = "en,ja;q=0.7,de;q=0.3"
+    get :list
+    assert_equal "list:en", @response.body.chop
+
+    path = Dir.glob(cache_path + "/**/list_en.cache")[0]
+    st = File.stat(path)
+    last_modified_en = [st.ctime.to_s, st.mtime.to_s]
+
+    get :list, :lang => "ja"
+    assert_equal "list:ja", @response.body.chop
+
+    path = Dir.glob(cache_path + "/**/list_ja.cache")[0]
+    st = File.stat(path)
+    last_modified_ja = [st.ctime.to_s, st.mtime.to_s]
+
+    get :list
+    st = File.stat(path)
+
+    assert_equal last_modified_en, [st.ctime.to_s, st.mtime.to_s]
+    assert_equal "list:en", @response.body.chop
+
+    get :list, :lang => "ja"
+    st = File.stat(path)
+    assert_equal last_modified_ja, [st.ctime.to_s, st.mtime.to_s]
+    assert_equal "list:ja", @response.body.chop
+
+    # expire test
+    assert_equal 2, Dir.glob(cache_path + "/**/*.cache").size
+    get :expire_cache, :lang => "ja"
+    assert_equal [], Dir.glob(cache_path + "/**/*.cache")
+  end
+
+  test "is robust against malformed parameters" do
+    # default to "de" when parsing does not work
+    Locale.default = "de"
+
+    assert_nothing_raised do
+      Locale.default = "de"
+      get :index, :lang => ["en"]
+      assert_equal "index_de.html.erb", @response.body.chop
+
+      get :index, :lang => []
+      assert_equal "index_de.html.erb", @response.body.chop
+    end
+  end
+
+  test "find template with specific format" do
+    xhr :get, :show
+    assert_template 'show.html'
+  end
+
+  teardown do
+    Locale.default = nil
+  end
+end
+

data/examples/al-admin/vendor/locale_rails/test/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionController::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/examples/al-admin/vendor/locale_rails/test/test/test_helper.rb

@@ -0,0 +1,38 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'test_help'
+
+class ActiveSupport::TestCase
+  # Transactional fixtures accelerate your tests by wrapping each test method
+  # in a transaction that's rolled back on completion.  This ensures that the
+  # test database remains unchanged so your fixtures don't have to be reloaded
+  # between every test method.  Fewer database queries means faster tests.
+  #
+  # Read Mike Clark's excellent walkthrough at
+  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
+  #
+  # Every Active Record database supports transactions except MyISAM tables
+  # in MySQL.  Turn off transactional fixtures in this case; however, if you
+  # don't care one way or the other, switching from MyISAM to InnoDB tables
+  # is recommended.
+  #
+  # The only drawback to using transactional fixtures is when you actually 
+  # need to test transactions.  Since your test is bracketed by a transaction,
+  # any transactions started in your code will be automatically rolled back.
+  self.use_transactional_fixtures = true
+
+  # Instantiated fixtures are slow, but give you @david where otherwise you
+  # would need people(:david).  If you don't want to migrate your existing
+  # test cases which use the @david style and don't mind the speed hit (each
+  # instantiated fixtures translates to a database query per test method),
+  # then set this back to true.
+  self.use_instantiated_fixtures  = false
+
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/lib/active_ldap.rb

@@ -2,7 +2,7 @@
 # = ActiveLdap
 #
 #   Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
-#   Copyright (C) 2006-2009 Kouhei Sutou <kou@clear-code.com>
+#   Copyright (C) 2006-2010 Kouhei Sutou <kou@clear-code.com>
 #
 # == Introduction
 #
@@ -432,6 +432,7 @@
 #   bind methods fail
 # * :try_sasl, when true, tells ActiveLdap to attempt a SASL-GSSAPI bind
 # * :sasl_quiet, when true, tells the SASL libraries to not spew messages to STDOUT
+# * :sasl_options, if defined, should be a hash of options to pass through. This currently only works with the ruby-ldap adapter, which currently only supports :realm, :authcid, and :authzid.
 # * :retry_limit - indicates the number of attempts to reconnect that will be undertaken when a stale connection occurs. -1 means infinite.
 # * :retry_wait - seconds to wait before retrying a connection
 # * :scope - dictates how to find objects. (Default: :one)
@@ -887,6 +888,10 @@
 # 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
@@ -901,7 +906,7 @@ 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.5")
+require_gem_if_need.call("active_support", "activesupport", "= 2.3.8")
 
 if ActiveSupport.const_defined?(:Dependencies)
   dependencies = ActiveSupport::Dependencies
@@ -914,7 +919,7 @@ if dependencies.respond_to?(:load_paths)
 end
 
 module ActiveLdap
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end
 
 if RUBY_PLATFORM.match('linux')
@@ -923,7 +928,7 @@ else
   require 'active_ldap/timeout_stub'
 end
 
-require_gem_if_need.call("active_record", "activerecord", "= 2.3.5")
+require_gem_if_need.call("active_record", "activerecord", "= 2.3.8")
 begin
   require_gem_if_need.call("locale", nil, "= 2.0.5")
   require_gem_if_need.call("gettext", nil, "= 2.1.0")

data/lib/active_ldap/adapter/base.rb

@@ -15,7 +15,7 @@ module ActiveLdap
                                           :password_block, :try_sasl,
                                           :sasl_mechanisms, :sasl_quiet,
                                           :allow_anonymous, :store_password,
-                                          :scope]
+                                          :scope, :sasl_options]
 
       @@row_even = true
 
@@ -169,7 +169,7 @@ module ActiveLdap
           operation(options) do
             yield(base, scope, filter, attrs, limit, callback)
           end
-        rescue LdapError
+        rescue LdapError::NoSuchObject, LdapError::InvalidDnSyntax
           # Do nothing on failure
           @logger.info do
             args = [$!.class, $!.message, filter, attrs.inspect]
@@ -274,7 +274,7 @@ module ActiveLdap
           with_timeout(try_reconnect, options) do
             yield
           end
-        rescue Errno::EPIPE, ConnectionError
+        rescue ConnectionError
           if try_reconnect and !retried
             retried = true
             @disconnected = true

data/lib/active_ldap/adapter/jndi.rb

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

data/lib/active_ldap/adapter/jndi_connection.rb

@@ -109,13 +109,12 @@ module ActiveLdap
         controls = SearchControls.new
         controls.search_scope = scope
 
+        controls.count_limit = limit if limit
         unless attrs.blank?
           controls.returning_attributes = attrs.to_java(:string)
         end
 
-        i = 0
         @context.search(base, filter, controls).each do |result|
-          i += 1
           attributes = {}
           result.attributes.get_all.each do |attribute|
             attributes[attribute.get_id] = attribute.get_all.collect do |value|
@@ -123,7 +122,6 @@ module ActiveLdap
             end
           end
           callback.call([result.name_in_namespace, attributes], block)
-          break if limit and limit <= i
         end
       end
 

data/lib/active_ldap/adapter/ldap.rb

@@ -82,26 +82,19 @@ module ActiveLdap
       def search(options={}, &block)
         super(options) do |base, scope, filter, attrs, limit, callback|
           begin
-            i = 0
             info = {
               :base => base, :scope => scope_name(scope),
-              :filter => filter, :attributes => attrs,
+              :filter => filter, :attributes => attrs, :limit => limit,
             }
-            execute(:search, info, base, scope, filter, attrs) do |entry|
-              i += 1
+            execute(:search_with_limit,
+                    info, base, scope, filter, attrs, limit) do |entry|
               attributes = {}
               entry.attrs.each do |attr|
                 attributes[attr] = entry.vals(attr)
               end
               callback.call([entry.dn, attributes], block)
-              break if limit and limit <= i
             end
           rescue RuntimeError
-            begin
-              @connection.assert_error_code
-            rescue LDAP::ServerDown
-              raise ConnectionError, $!.message
-            end
             if $!.message == "no result returned by search"
               @logger.debug do
                 args = [filter, attrs.inspect]
@@ -234,8 +227,15 @@ module ActiveLdap
             sasl_quiet = @connection.sasl_quiet
             @connection.sasl_quiet = quiet unless quiet.nil?
             args = [_bind_dn, mechanism]
+            credential = nil
             if need_credential_sasl_mechanism?(mechanism)
-              args << password(_bind_dn, options)
+              credential = password(_bind_dn, options)
+            end
+            if @sasl_options
+              credential ||= ""
+              args.concat([credential, nil, nil, @sasl_options])
+            else
+              args << credential if credential
             end
             info = {
               :name => "bind: SASL", :dn => _bind_dn, :mechanism => mechanism

data/lib/active_ldap/adapter/ldap_ext.rb

@@ -50,6 +50,27 @@ module LDAP
   end
 
   class Conn
+    begin
+      instance_method(:search_ext)
+      @@have_search_ext = true
+    rescue NameError
+      @@have_search_ext = false
+    end
+
+    def search_with_limit(base, scope, filter, attributes, limit, &block)
+      if @@have_search_ext
+        search_ext(base, scope, filter, attributes,
+                   false, nil, nil, 0, 0, limit || 0, &block)
+      else
+        i = 0
+        search(base, scope, filter, attributes) do |entry|
+          i += 1
+          block.call(entry)
+          break if limit and limit <= i
+        end
+      end
+    end
+
     def failed?
       not error_code.zero?
     end
@@ -71,13 +92,14 @@ module LDAP
     def assert_error_code
       return unless failed?
       code = error_code
+      message = error_message
       klass = ActiveLdap::LdapError::ERRORS[code]
       klass ||= IMPLEMENT_SPECIFIC_ERRORS[code]
-      if klass.nil? and error_message == "Can't contact LDAP server"
-        klass = LDAP::ServerDown
+      if klass.nil? and message == "Can't contact LDAP server"
+        klass = ActiveLdap::ConnectionError
       end
       klass ||= ActiveLdap::LdapError
-      raise klass, LDAP.err2string(code)
+      raise klass, message
     end
   end
 end