socialcast_ldap_integration 1.1.10 → 1.1.11

data/lib/socialcast/ldap_integration/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module LdapIntegration
-    VERSION = "1.1.10"
+    VERSION = "1.1.11"
   end
 end

data/lib/socialcast/ldap_integration.rb

@@ -1,4 +1,5 @@
 require "net/ldap"
+require "active_support/core_ext"
 
 module Socialcast
   module LdapIntegration
@@ -15,18 +16,21 @@ module Socialcast
     
     def self.available?
       return false unless self.config
+
       return self.config['connections'].all? do |connection|
-        ['searcher_username', 'searcher_password', 'filter_string', 'base', 'host', 'port', 'ssl', 'map'].all? { |field| !connection[field].to_s.blank? } && self.required_fields.all? { |field| !connection['map'][field].blank? }
+        self.connection_fields_present?(connection) && self.required_fields_present?(connection)
       end
     end
   
     def self.scheduled?
-      self.config['enableLdapSchedule']
+      self.config['enableLdapSchedule'].to_s == 'true'
     end
     
     def self.mirror_lazily?
+      # should we really return true here if the connection is unavailable?
       return true unless self.available? 
-      self.config['lazy_mirroring']
+
+      self.config['lazy_mirroring'].to_s == 'true'
     end
   
     def self.schedule
@@ -56,6 +60,7 @@ module Socialcast
     # - Connection settings for the connection
     def self.connect(options={})
       raise ArgumentError.new("connect requires a block, see connect_to") unless block_given?
+
       config = options[:config] ? [options[:config]] : Socialcast::LdapIntegration.config['connections']
       config.each do |connection_options|
         ldap = connect_to(connection_options)
@@ -87,19 +92,35 @@ module Socialcast
     
       return ldap
     end
-  
+
     # Supported options
-    # [:filter] A string representing the search filter to use instead of the default search filter.  Overrides any :auxiliary_filter option.
-    # [:auxiliary_filter] A string representing a search filter to use in addition to the defualt search filter.  The two filters will be combined
-    #   using a logical AND.
-    # [:limit] A number representing the maxmimum number of records to return, defaults to unlimited.
+    # [:filter] A string representing the search filter to use instead
+    #   of the default search filter.  Overrides any :auxiliary_filter 
+    #   option.
+    # [:auxiliary_filter] A string representing a search filter to use 
+    #   in addition to the default search filter.  The two filters
+    #   will be combined using a logical AND.
+    # [:limit] A number representing the maxmimum number of records to 
+    #   return, defaults to unlimited.
     def self.search(options={})
       options.reverse_merge! :connect_options => {}
       Socialcast::LdapIntegration.connect(options.delete(:connect_options) || {}) do |ldap, connection|
         ldap_search_options = self.construct_filter_for_search(connection, options.delete(:filter), options.delete(:auxiliary_filter))
         ldap_search_options[:size] = options[:limit] if options.has_key?(:limit)
-        ldap.search(ldap_search_options) do |entry|
-          yield(entry, connection) if block_given?
+        ldap_search_options[:return_result] = false
+
+        options_for_search = [ldap_search_options]
+
+        if connection[:base].blank?
+          tree_root = ldap.search_root_dse
+          distinguished_names = Array.wrap(tree_root.namingcontexts)
+          options_for_search = distinguished_names.map { |dn| ldap_search_options.merge(:base => dn ) }
+        end
+
+        options_for_search.each do |options|
+          ldap.search(options) do |entry|
+            yield(entry, connection) if block_given?
+          end
         end
       end
     end
@@ -109,6 +130,7 @@ module Socialcast
     #   Defaults to 'company_login'
     def self.authenticated?(identifier, password, options = {})
       return false if password.blank?
+
       identifying_field = options.reverse_merge!({:identifying_field => 'company_login'}).delete(:identifying_field)
 
       Socialcast::LdapIntegration.connect do |ldap, connection|
@@ -118,7 +140,13 @@ module Socialcast
         host = connection['host']
         port = connection['port']
         map = connection['map']
-        connection_options.reverse_merge! :host => host, :port => port, :base => base, :filter => "#{map[identifying_field]}=#{identifier}", :password => password
+        connection_options.reverse_merge!({
+          :host => host, 
+          :port => port, 
+          :base => base, 
+          :filter => "#{map[identifying_field]}=#{identifier}", 
+          :password => password
+        })
         return true if !ldap.bind_as(connection_options).blank?
       end
       return false
@@ -130,7 +158,6 @@ module Socialcast
       self.available? && (["password", "email"].include?(string_field))
     end
     
-    
     def self.fetch_account_info(identifier, options = {})
       identifying_field = options.delete(:identifying_field) || 'company_login'
       matched_account = nil
@@ -148,10 +175,13 @@ module Socialcast
           return mapped_account_info
         end
       end
+
       nil
     end
     
+
     protected
+
     def self.construct_filter_for_search(connection, filter_options=nil, auxiliary_filter=nil)
       unless filter_options
         search_filter = connection['filter_string'].blank? ? NULL_FILTER : Net::LDAP::Filter.construct(connection['filter_string'])
@@ -160,8 +190,22 @@ module Socialcast
       end
       {:filter => filter_options}
     end
+
+    def self.required_fields_present?(connection)
+      self.required_fields.all? { |field| !connection['map'][field].blank? }
+    end
+
     def self.required_fields
       ['email', 'company_login']
     end
+
+    def self.connection_fields_present?(connection)
+      connection_fields.all? { |field| !connection[field].to_s.blank? }
+    end
+
+    def self.connection_fields
+      ['searcher_username', 'searcher_password', 'filter_string', 'host', 'port', 'ssl', 'map']
+    end
+
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast_ldap_integration
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,20 +11,57 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap
-  requirement: &2153018180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153018180
-description: ! 'BLAH. '
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+description: ! 'The most bestest LDAP integration gem thine eyes hath ever beholded. '
 email:
 - mitch@socialcast.com
 - sean@socialcast.com
@@ -55,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast_ldap_integration
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides support for connecting to and traversing LDAP trees.