activeldap 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ef32fb85ed5c2137308ba532b8f99650160a13
-  data.tar.gz: 7f8dcf79cc1f7a9429b4ed2806c4128054780ec3
+  metadata.gz: 68d1e26bd0a299b5afa18d537f9c0dc973798acb
+  data.tar.gz: 354eae82bd94b70f77d0f3a62b66ec45cc69afef
 SHA512:
-  metadata.gz: e8210af85a2630ad646f7384290ce3b2d87652564c043e3f899083758c003daffc39c5fa3df5f92d3cb312e670736dfa0a6bcef51583a82658f83dd376d80bf5
-  data.tar.gz: f43645ddd1c12fd63ee4b898b9eb3175d21bbfc84d4d96077f29f4edb40141ef16dc6650556bfe930f1d44aa0502a70575a253dd7c0ec70199cbc370bc44821b
+  metadata.gz: 248bab09098603beb4c65c1a4a01461f2330a82a7bc1d65eaca4cd8c1ce393d9a6a7457dd6fbf5e653ca97af5c91b85c3d13c5f92aea487f839b589896f1f1d0
+  data.tar.gz: 4d502e9d14654390f95c1d2dae264144e28490662dd3739c492b9413b107ba809ceb2aed0b0baa40ae3eb8adcc1b8d9627dad66f4b6701edf5446e986b83625d

data/doc/text/news.textile

@@ -1,5 +1,42 @@
 h1. News
 
+h2(#4-0-3). 4.0.3: 2014-05-15
+
+h3. Improvements
+
+* Supported stopping colorize logging by @config.colorize_logging = false@.
+  [GitHub:#81] [Reported by nengxu]
+* Supported PagedResults defined in RFC 2696 in the net-ldap adapter.
+  [activeldap-discuss] Paged results
+  [Suggested by Aaron Knister]
+* Supported PagedResults defined in RFC 2696 in the ldap adapter.
+  [GitHub#83] [Patch by Aaron Knister]
+* Stopped to override ORM generator by default.
+  [GitHub#87] [Patch by Josef Šimánek]
+* Supported Rails 4.1.0.
+  [GitHub#90] [Patch by Francisco Miguel Biete]
+* document: Removed obsoleted description.
+  [activeldap-discuss] [Reported by Jarod Watkins]
+* Supported @ActiveLdap::Base.attribute_method?@ .
+  [GitHub#92] [Reported by Renaud Chaput]
+
+h3. Fixes
+
+* Fixed a bug that @belongs_to :many@ 's inconsistent behavior.
+  You get DN attribute when you add an entry by DN attribute to
+  belongs_to :many collection. It should return entry object instead of
+  DN attribute. Because loaded collection returns entry objects.
+  [activeldap-discuss] [Reported by Jarod Watkins]
+
+h3. Thanks
+
+* nengxu
+* Aaron Knister
+* Josef Šimánek
+* Francisco Miguel Biete
+* Jarod Watkins
+* Renaud Chaput
+
 h2(#4-0-2). 4.0.2: 2014-01-04
 
 h3. Improvements

data/doc/text/rails.textile

@@ -1,6 +1,6 @@
 h1. Rails
 
-ActiveLdap supports Rails 3.1.
+ActiveLdap supports Rails 4.0 or later.
 
 h2. Install
 
@@ -30,7 +30,7 @@ connection configurations per environment. Similarly, the
 ldap.yml file allows configurations to be set for
 development, test, and production environments.
 
-You can generate 'config/ldap.yml' by the follwoing command:
+You can generate 'config/ldap.yml' by the following command:
 
 <pre class="command">
 % script/rails generate active_ldap:scaffold
@@ -54,13 +54,17 @@ When your application starts up,
 ActiveLdap::Base.setup_connection will be called with the
 parameters specified for your current environment.
 
+You can replace default orm generators with gems one
+to skip active_ldap prefix in 'config/application.rb':
+<pre>config.app_generators.orm :active_ldap</pre>
+
 h2. Model
 
 You can generate a User model that represents entries under
 ou=Users by the following command:
 
 <pre class="command">
-% script/rails generate model User --dn-attribute uid --classes person PosixAccount
+% script/rails generate active_ldap:model User --dn-attribute uid --classes person PosixAccount
 </pre>
 
 It generates the following app/model/user.rb:
@@ -125,7 +129,7 @@ end
 You can also generate a Ou model by the following command:
 
 <pre class="command">
-% script/rails generate model Ou --prefix '' --classes organizationalUnit
+% script/rails generate active_ldap:model Ou --prefix '' --classes organizationalUnit
 </pre>
 
 <pre>

data/doc/text/tutorial.textile

@@ -313,15 +313,6 @@ Relation is resolved by searching entries of :class_name class with :foreign_key
 
 :many is used for an object belongs to many objects. All of matched objects are treated as belonged objects.
 
-In addition, you can do simple membership tests by doing the following:
-
-<pre>
-irb> me.groups.member? 'root'
-=> false
-irb> me.groups.member? 'develop'
-=> true
-</pre>
-
 h5. has_many
 
 This method is the opposite of belongs_to. Instead of checking other objects in

data/lib/active_ldap/adapter/base.rb

@@ -1,8 +1,7 @@
-require 'benchmark'
-
 require 'active_ldap/schema'
 require 'active_ldap/entry_attribute'
 require 'active_ldap/ldap_error'
+require 'active_ldap/supported_control'
 
 module ActiveLdap
   module Adapter
@@ -19,9 +18,7 @@ module ActiveLdap
 
       @@row_even = true
 
-      attr_reader :runtime
       def initialize(configuration={})
-        @runtime = 0
         @connection = nil
         @disconnected = false
         @bound = false
@@ -36,11 +33,6 @@ module ActiveLdap
         @instrumenter = ActiveSupport::Notifications.instrumenter
       end
 
-      def reset_runtime
-        runtime, @runtime = @runtime, 0
-        runtime
-      end
-
       def connect(options={})
         host = options[:host] || @host
         method = options[:method] || @method || :plain
@@ -148,6 +140,11 @@ module ActiveLdap
         root_dse_values('namingContexts')
       end
 
+      def supported_control
+        @supported_control ||=
+          SupportedControl.new(root_dse_values("supportedControl"))
+      end
+
       def entry_attribute(object_classes)
         @entry_attributes[object_classes.uniq.sort] ||=
           EntryAttribute.new(schema, object_classes)
@@ -240,13 +237,6 @@ module ActiveLdap
         end
       end
 
-      def log_info(name, runtime_in_seconds, info=nil)
-        return unless @logger
-        return unless @logger.debug?
-        message = "LDAP: #{name} (#{'%.1f' % (runtime_in_seconds * 1000)}ms)"
-        @logger.debug(format_log_entry(message, info))
-      end
-
       private
       def ensure_port(method)
         if method == :ssl
@@ -589,7 +579,7 @@ module ActiveLdap
             @logger.error do
               _("Reconnect to server failed: %s\n" \
                 "Reconnect to server failed backtrace:\n" \
-                "%s") % [detail.exception, detail.backtrace.join("\n")]
+                "%s") % [detail.message, detail.backtrace.join("\n")]
             end
             # Do not loop if forced
             raise ConnectionError, detail.message if force
@@ -645,7 +635,8 @@ module ActiveLdap
                :scope => :base,
                :attributes => attrs,
                :limit => 1,
-               :try_reconnect => try_reconnect) do |dn, attributes|
+               :try_reconnect => try_reconnect,
+               :use_paged_results => false) do |dn, attributes|
           found_attributes = attributes
         end
         found_attributes
@@ -666,42 +657,13 @@ module ActiveLdap
       end
 
       def log(name, info=nil)
-        if block_given?
-          result = nil
-          @instrumenter.instrument(
-            "log_info.active_ldap",
-            :info => info,
-            :name => name) { result = yield }
-          result
-        else
-          log_info(name, 0, info)
-          nil
-        end
-      rescue Exception
-        log_info("#{name}: FAILED", 0,
-                 (info || {}).merge(:error => $!.class.name,
-                                    :error_message => $!.message))
-        raise
-      end
-
-      def format_log_entry(message, info=nil)
-        if ActiveLdap::Base.colorize_logging
-          if @@row_even
-            message_color, dump_color = "4;36;1", "0;1"
-          else
-            @@row_even = true
-            message_color, dump_color = "4;35;1", "0"
-          end
-          @@row_even = !@@row_even
-
-          log_entry = "  \e[#{message_color}m#{message}\e[0m"
-          log_entry << ": \e[#{dump_color}m#{info.inspect}\e[0m" if info
-          log_entry
-        else
-          log_entry = message
-          log_entry += ": #{info.inspect}" if info
-          log_entry
+        result = nil
+        payload = {:name => name}
+        payload[:info] = info if info
+        @instrumenter.instrument("log_info.active_ldap", payload) do
+          result = yield if block_given?
         end
+        result
       end
 
       def ensure_dn_string(dn)

data/lib/active_ldap/adapter/ldap.rb

@@ -55,8 +55,10 @@ module ActiveLdap
           uri = construct_uri(host, port, method.ssl?)
           with_start_tls = method.start_tls?
           info = {:uri => uri, :with_start_tls => with_start_tls}
-          [log("connect", info) {method.connect(host, port)},
-           uri, with_start_tls]
+          connection = log("connect", info) do
+            method.connect(host, port)
+          end
+          [connection, uri, with_start_tls]
         end
       end
 
@@ -82,12 +84,23 @@ module ActiveLdap
       def search(options={})
         super(options) do |base, scope, filter, attrs, limit|
           begin
+            use_paged_results = options[:use_paged_results]
+            if use_paged_results or use_paged_results.nil?
+              use_paged_results = supported_control.paged_results?
+            end
             info = {
               :base => base, :scope => scope_name(scope),
               :filter => filter, :attributes => attrs, :limit => limit,
             }
-            execute(:search_with_limit,
-                    info, base, scope, filter, attrs, limit) do |entry|
+            options = {
+              :base              => base,
+              :scope             => scope,
+              :filter            => filter,
+              :attributes        => attrs,
+              :limit             => limit,
+              :use_paged_results => use_paged_results
+            }
+            execute(:search_full, info, options) do |entry|
               attributes = {}
               entry.attrs.each do |attr|
                 value = entry.vals(attr)

data/lib/active_ldap/adapter/ldap_ext.rb

@@ -1,6 +1,7 @@
-require 'ldap'
-require 'ldap/ldif'
-require 'ldap/schema'
+require "ldap"
+require "ldap/ldif"
+require "ldap/schema"
+require "ldap/control"
 
 module LDAP
   unless const_defined?(:LDAP_OPT_ERROR_NUMBER)
@@ -57,16 +58,26 @@ module LDAP
       @@have_search_ext = false
     end
 
-    def search_with_limit(base, scope, filter, attributes, limit, &block)
+    def search_full(options, &block)
+      base              = options[:base]
+      scope             = options[:scope]
+      filter            = options[:filter]
+      attributes        = options[:attributes]
+      limit             = options[:limit] || 0
+      use_paged_results = options[:use_paged_results]
       if @@have_search_ext
-        search_ext(base, scope, filter, attributes,
-                   false, nil, nil, 0, 0, limit || 0, &block)
+        if use_paged_results
+          paged_search(base, scope, filter, attributes, limit, &block)
+        else
+          search_ext(base, scope, filter, attributes,
+                     false, nil, nil, 0, 0, limit, &block)
+        end
       else
         i = 0
         search(base, scope, filter, attributes) do |entry|
           i += 1
           block.call(entry)
-          break if limit and limit <= i
+          break if 0 < limit and limit <= i
         end
       end
     end
@@ -101,5 +112,37 @@ module LDAP
       klass ||= ActiveLdap::LdapError
       raise klass, message
     end
+
+    private
+    def find_paged_results_control(controls)
+      controls.find do |control|
+        control.oid == LDAP::LDAP_CONTROL_PAGEDRESULTS
+      end
+    end
+
+    def paged_search(base, scope, filter, attributes, limit, &block)
+      # work around a bug with openldap
+      page_size = 126
+      cookie = ""
+      critical = true
+
+      loop do
+        ber_string = LDAP::Control.encode(page_size, cookie)
+        control = LDAP::Control.new(LDAP::LDAP_CONTROL_PAGEDRESULTS,
+                                    ber_string,
+                                    critical)
+
+        search_ext(base, scope, filter, attributes,
+                   false, [control], nil, 0, 0, limit, &block)
+
+        control = find_paged_results_control(@controls)
+        break if control.nil?
+        returned_size, cookie = control.decode
+        returned_size = returned_size.to_i
+        page_size = returned_size if returned_size > 0
+
+        break if cookie.empty?
+      end
+    end
   end
 end

data/lib/active_ldap/adapter/net_ldap.rb

@@ -63,6 +63,12 @@ module ActiveLdap
       end
 
       def search(options={})
+        use_paged_results = options[:use_paged_results]
+        if use_paged_results or use_paged_results.nil?
+          paged_results_supported = supported_control.paged_results?
+        else
+          paged_results_supported = false
+        end
         super(options) do |base, scope, filter, attrs, limit|
           args = {
             :base => base,
@@ -70,10 +76,12 @@ module ActiveLdap
             :filter => filter,
             :attributes => attrs,
             :size => limit,
+            :paged_searches_supported => paged_results_supported,
           }
           info = {
             :base => base, :scope => scope_name(scope),
-            :filter => filter, :attributes => attrs, :limit => limit
+            :filter => filter, :attributes => attrs, :limit => limit,
+            :paged_results_supported => paged_results_supported,
           }
           execute(:search, info, args) do |entry|
             attributes = {}

data/lib/active_ldap/association/belongs_to_many.rb

@@ -4,9 +4,13 @@ module ActiveLdap
   module Association
     class BelongsToMany < Collection
       private
-      def insert_entry(entry)
+      def normalize_entry(entry)
         _foreign_class = foreign_class
         entry = _foreign_class.find(entry) unless entry.is_a?(_foreign_class)
+        entry
+      end
+
+      def insert_entry(entry)
         old_value = entry[@options[:many], true]
         primary_key_name = @options[:primary_key_name]
         if primary_key_name == "dn"
@@ -23,7 +27,7 @@ module ActiveLdap
       end
 
       def delete_entries(entries)
-          _foreign_class = foreign_class
+        _foreign_class = foreign_class
         entries.each do |entry|
           entry = _foreign_class.find(entry) unless entry.is_a?(_foreign_class)
           old_value = entry[@options[:many], true]

data/lib/active_ldap/association/collection.rb

@@ -71,6 +71,10 @@ module ActiveLdap
         end.flatten
       end
 
+      def normalize_entry(entry)
+        entry
+      end
+
       def insert_entry(entry)
         entry[@options[:foreign_key_name]] = @owner[@options[:local_key_name]]
         entry.save
@@ -81,6 +85,7 @@ module ActiveLdap
         load_target
 
         flatten_deeper(entries).each do |entry|
+          entry = normalize_entry(entry)
           unless @owner.new_entry?
             infect_connection(entry)
             result &&= insert_entry(entry)

data/lib/active_ldap/base.rb

@@ -292,9 +292,6 @@ module ActiveLdap
       end
     end
 
-    cattr_accessor :colorize_logging, :instance_writer => false
-    @@colorize_logging = true
-
     VALID_LDAP_MAPPING_OPTIONS = [:dn_attribute, :prefix, :scope,
                                   :classes, :recommended_classes,
                                   :excluded_classes, :sort_by, :order]

data/lib/active_ldap/connection.rb

@@ -165,13 +165,6 @@ module ActiveLdap
         connection.schema
       end
 
-      def reset_runtime
-        active_connections.inject(0) do |result, (name, connection)|
-          _ = name # for suppress a warning on Ruby 1.9.3
-          result + connection.reset_runtime
-        end
-      end
-
       private
       def active_connection_key(k=self)
         k.name.blank? ? k.object_id : k.name

data/lib/active_ldap/ldap_controls.rb

@@ -0,0 +1,11 @@
+module ActiveLdap
+  module LdapControls
+    PAGED_RESULTS         = "1.2.840.113556.1.4.319"
+    ASSERTION             = "1.3.6.1.1.12"
+    PRE_READ              = "1.3.6.1.1.13.1"
+    POST_READ             = "1.3.6.1.1.13.2"
+    SUBENTRIES            = "1.3.6.1.4.1.4203.1.10.1"
+    MANAGE_DSA_IT         = "2.16.840.1.113730.3.4.2"
+    PROXIED_AUTHORIZATION = "2.16.840.1.113730.3.4.18"
+  end
+end

data/lib/active_ldap/log_subscriber.rb

@@ -3,42 +3,45 @@ module ActiveLdap
     def self.runtime=(value)
       Thread.current["active_ldap_runtime"] = value
     end
-    
+
     def self.runtime
       Thread.current["active_ldap_runtime"] ||= 0
     end
-    
+
     def self.reset_runtime
       rt, self.runtime = runtime, 0
       rt
     end
-    
+
     def initialize
       super
-      @odd_or_even = false
+      @odd = false
     end
-    
+
     def log_info(event)
       self.class.runtime += event.duration
       return unless logger.debug?
-  
+
       payload = event.payload
-      name = 'LDAP: %s (%.1fms)' % [payload[:name], event.duration]
+      label = payload[:name]
+      label += ": FAILED" if payload[:info][:exception]
+      name = 'LDAP: %s (%.1fms)' % [label, event.duration]
       info = payload[:info].inspect
-  
+
       if odd?
-        name_color, dump_color = "4;36;1", "0;1"
+        name = color(name, CYAN, true)
+        info = color(info, nil, true)
       else
-        name_color, dump_color = "4;35;1", "0"
+        name = color(name, MAGENTA, true)
       end
-  
-      debug "  \e[#{name_color}m#{name}\e[0m: \e[#{dump_color}m#{info}\e[0m"
+
+      debug "  #{name} #{info}"
     end
-    
+
     def odd?
-      @odd_or_even = !@odd_or_even
+      @odd = !@odd
     end
-    
+
     def logger
       ActiveLdap::Base.logger
     end

data/lib/active_ldap/railtie.rb

@@ -6,8 +6,6 @@ Locale.init(:driver => :cgi)
 
 module ActiveLdap
   class Railtie < Rails::Railtie
-    config.app_generators.orm :active_ldap
-
     initializer "active_ldap.setup_connection" do
       ldap_configuration_file = Rails.root.join('config', 'ldap.yml')
       if File.exist?(ldap_configuration_file)

data/lib/active_ldap/supported_control.rb

@@ -0,0 +1,14 @@
+require "active_ldap/ldap_controls"
+
+module ActiveLdap
+  class SupportedControl
+    def initialize(controls)
+      @controls = controls
+      @paged_results = @controls.include?(LdapControls::PAGED_RESULTS)
+    end
+
+    def paged_results?
+      @paged_results
+    end
+  end
+end

data/lib/active_ldap/validations.rb

@@ -2,7 +2,20 @@ module ActiveLdap
   module Validations
     extend ActiveSupport::Concern
     include ActiveModel::Validations
-    
+
+    module ClassMethods
+      def attribute_method?(attribute)
+        normalized_attribute = entry_attribute.normalize(attribute)
+        normalized_attribute and normalized_attribute != "objectClass"
+      end
+
+      private
+      def entry_attribute
+        @entry_attribute ||=
+          connection.entry_attribute(classes.collect(&:name))
+      end
+    end
+
     included do
       alias_method :new_record?, :new_entry?
       class << self

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

data/test/run-test.rb

@@ -6,9 +6,10 @@ $KCODE = 'u' if RUBY_VERSION < "1.9"
 
 base_dir = File.expand_path(File.dirname(__FILE__))
 top_dir = File.expand_path(File.join(base_dir, ".."))
-$LOAD_PATH.unshift(File.join(top_dir))
-$LOAD_PATH.unshift(File.join(top_dir, "lib"))
-$LOAD_PATH.unshift(File.join(top_dir, "test"))
+lib_dir = File.join(top_dir, "lib")
+test_dir = File.join(top_dir, "test")
+$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(test_dir)
 
 require "rubygems"
 require "bundler/setup"
@@ -17,6 +18,10 @@ require "test/unit"
 require "test/unit/notify"
 Test::Unit::Priority.enable
 
+Dir.glob(File.join(test_dir, "**", "test_*.rb")) do |test_file|
+  require test_file
+end
+
 succeeded = true
 target_adapters = [ENV["ACTIVE_LDAP_TEST_ADAPTER"]]
 # target_adapters << "ldap"
@@ -25,7 +30,7 @@ target_adapters = [ENV["ACTIVE_LDAP_TEST_ADAPTER"]]
 target_adapters.each do |adapter|
   ENV["ACTIVE_LDAP_TEST_ADAPTER"] = adapter
   puts "using adapter: #{adapter ? adapter : 'default'}"
-  unless Test::Unit::AutoRunner.run(true, File.dirname($0), ARGV.dup)
+  unless Test::Unit::AutoRunner.run(false, nil, ARGV.dup)
     succeeded = false
   end
   puts

data/test/test_associations.rb

@@ -294,6 +294,24 @@ EOX
     end
   end
 
+  def test_belongs_to_many_add_by_dn_attribute
+    make_temporary_group do |group1|
+      make_temporary_group do |group2|
+        make_temporary_user do |user,|
+          user.update_attribute(:cn, "new #{user.cn}")
+
+          user.groups = [group1]
+          assert_equal([group1.id].sort,
+                       user.groups.collect {|g| g.id}.sort)
+
+          user.groups << group2.id
+          assert_equal([group1.id, group2.id].sort,
+                       user.groups.collect {|g| g.id}.sort)
+        end
+      end
+    end
+  end
+
   def test_belongs_to_many_delete
     make_temporary_group do |group1|
       make_temporary_group do |group2|

data/test/test_connection.rb

@@ -47,7 +47,10 @@ class TestConnection < Test::Unit::TestCase
         raise
       end
     end
-    assert_equal("Unknown key: bind_format", exception.message)
+    expected_message = "Unknown key: :bind_format. Valid keys are: "
+    valid_keys = ActiveLdap::Adapter::Base::VALID_ADAPTER_CONFIGURATION_KEYS
+    expected_message << valid_keys.collect(&:inspect).join(", ")
+    assert_equal(expected_message, exception.message)
   end
 
   def test_can_reconnect?

data/test/test_supported_control.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+require 'al-test-utils'
+
+class TestSupportedControl < Test::Unit::TestCase
+  def supported_control(controls)
+    ActiveLdap::SupportedControl.new(controls)
+  end
+
+  class TestPagedResults < self
+    def paged_results?(controls)
+      supported_control(controls).paged_results?
+    end
+
+    def test_true
+      assert_true(paged_results?(ActiveLdap::LdapControls::PAGED_RESULTS))
+    end
+
+    def test_false
+      assert_true(paged_results?(ActiveLdap::LdapControls::PAGED_RESULTS))
+    end
+  end
+end

data/test/test_validation.rb

@@ -5,7 +5,38 @@ class TestValidation < Test::Unit::TestCase
   include AlTestUtils
   include ActiveLdap::Helper
 
+  class TestAttributeMethod < self
+    priority :must
+
+    priority :normal
+    def test_symbol
+      assert_true(@user_class.attribute_method?(:cn))
+    end
+
+    def test_string
+      assert_true(@user_class.attribute_method?("cn"))
+    end
+
+    def test_upper_case
+      assert_true(@user_class.attribute_method?(:CN))
+    end
+
+    def test_mixed_case
+      assert_true(@user_class.attribute_method?(:Cn))
+    end
+
+    def test_snake_case
+      assert_true(@user_class.attribute_method?(:common_name))
+    end
+
+    def test_full_name
+      assert_true(@user_class.attribute_method?(:commonName))
+    end
+  end
+
   priority :must
+
+  priority :normal
   def test_octet_string
     make_temporary_user(:simple => true) do |user,|
       utf8_encoded_binary_value = "\xff".force_encoding("UTF-8")
@@ -15,7 +46,6 @@ class TestValidation < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_rename_duplicated
     make_temporary_user(:simple => true) do |user1,|
       make_temporary_user(:simple => true) do |user2,|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Will Drewry
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext_i18n_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -178,7 +178,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - COPYING
 - Gemfile
 - LICENSE
@@ -214,7 +214,6 @@ files:
 - examples/usermod-binary-del
 - examples/usermod-lang-add
 - lib/active_ldap.rb
-- lib/active_ldap/action_controller/ldap_benchmarking.rb
 - lib/active_ldap/acts/tree.rb
 - lib/active_ldap/adapter/base.rb
 - lib/active_ldap/adapter/jndi.rb
@@ -253,6 +252,7 @@ files:
 - lib/active_ldap/get_text/parser.rb
 - lib/active_ldap/helper.rb
 - lib/active_ldap/human_readable.rb
+- lib/active_ldap/ldap_controls.rb
 - lib/active_ldap/ldap_error.rb
 - lib/active_ldap/ldif.rb
 - lib/active_ldap/log_subscriber.rb
@@ -264,6 +264,7 @@ files:
 - lib/active_ldap/railties/controller_runtime.rb
 - lib/active_ldap/schema.rb
 - lib/active_ldap/schema/syntaxes.rb
+- lib/active_ldap/supported_control.rb
 - lib/active_ldap/timeout.rb
 - lib/active_ldap/timeout_stub.rb
 - lib/active_ldap/user_password.rb
@@ -311,6 +312,7 @@ files:
 - test/test_persistence.rb
 - test/test_reflection.rb
 - test/test_schema.rb
+- test/test_supported_control.rb
 - test/test_syntax.rb
 - test/test_user.rb
 - test/test_user_password.rb
@@ -335,17 +337,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
@@ -384,6 +386,7 @@ test_files:
 - test/test_persistence.rb
 - test/test_reflection.rb
 - test/test_schema.rb
+- test/test_supported_control.rb
 - test/test_syntax.rb
 - test/test_user.rb
 - test/test_user_password.rb

data/lib/active_ldap/action_controller/ldap_benchmarking.rb

@@ -1,55 +0,0 @@
-module ActiveLdap
-  module ActionController
-    module LdapBenchmarking
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :render_with_benchmark, :active_ldap
-          if private_method_defined?(:view_runtime)
-            alias_method_chain :view_runtime, :active_ldap
-          else
-            alias_method_chain :rendering_runtime, :active_ldap
-          end
-        end
-      end
-
-      protected
-      def render_with_benchmark_with_active_ldap(*args, &block)
-        if logger
-          ldap_runtime_before_render = ActiveLdap::Base.reset_runtime
-        end
-        result = render_with_benchmark_without_active_ldap(*args, &block)
-        if logger
-          @ldap_runtime_before_render = ldap_runtime_before_render
-          @ldap_runtime_after_render = ActiveLdap::Base.reset_runtime
-          if defined?(@rendering_runtime)
-            @rendering_runtime -= @ldap_runtime_after_render
-          else
-            @view_runtime -= @ldap_runtime_after_render
-          end
-        end
-        result
-      end
-
-      private
-      def rendering_runtime_with_active_ldap(runtime)
-        result = rendering_runtime_without_active_ldap(runtime)
-        ldap_runtime = ActiveLdap::Base.reset_runtime
-        ldap_runtime += @ldap_runtime_before_render || 0
-        ldap_runtime += @ldap_runtime_after_render || 0
-        ldap_percentage = ldap_runtime * 100 / runtime
-        result + (" | LDAP: %.5f (%d%%)" % [ldap_runtime, ldap_percentage])
-      end
-
-      def view_runtime_with_active_ldap
-        result = view_runtime_without_active_ldap
-        ldap_runtime = ActiveLdap::Base.reset_runtime
-        @ldap_runtime_before_render ||= 0
-        @ldap_runtime_after_render ||= 0
-        ldap_runtime += @ldap_runtime_before_render
-        ldap_runtime += @ldap_runtime_after_render
-        result + (", LDAP: %.0f" % (ldap_runtime * 1000))
-      end
-    end
-  end
-end
-