github-ldap 1.0.7 → 1.0.8

data/README.md

@@ -39,7 +39,7 @@ Initialize a new adapter using those required options:
   ldap = GitHub::Ldap.new options
 ```
 
-### Quering
+### Querying
 
 Searches are performed against an individual domain base, so the first step is to get a new `GitHub::Ldap::Domain` object for the connection:
 

data/github-ldap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "github-ldap"
-  spec.version       = "1.0.7"
+  spec.version       = "1.0.8"
   spec.authors       = ["David Calavera"]
   spec.email         = ["david.calavera@gmail.com"]
   spec.description   = %q{Ldap authentication for humans}

data/lib/github/ldap/domain.rb

@@ -36,9 +36,7 @@ module GitHub
       def groups(group_names)
         filter = group_filter(group_names)
 
-        @connection.search(base: @base_name,
-          attributes: %w{ou cn dn sAMAccountName member},
-          filter: filter)
+        search(attributes: %w{ou cn dn sAMAccountName member}, filter: filter)
       end
 
       # List the groups that a user is member of.
@@ -51,9 +49,7 @@ module GitHub
         or_filters    = group_names.map {|g| Net::LDAP::Filter.eq("cn", g)}.reduce(:|)
         member_filter = Net::LDAP::Filter.eq("member", user_dn) & or_filters
 
-        @connection.search(base: @base_name,
-          attributes: %w{ou cn dn sAMAccountName member},
-          filter: member_filter)
+        search(attributes: %w{ou cn dn sAMAccountName member}, filter: member_filter)
       end
 
       # Check if the user is include in any of the configured groups.
@@ -103,6 +99,19 @@ module GitHub
 
         return user if user && is_member?(user.dn, group_names)
       end
+
+      # Search entries using this domain as base.
+      #
+      # options: is a Hash with the options for the search.
+      # The base option is always overriden.
+      #
+      # Returns an array with the entries found.
+      # Returns nil if there are no entries.
+      def search(options)
+        options[:base] = @base_name
+
+        @connection.search(options)
+      end
     end
   end
 end

data/test/domain_test.rb

@@ -87,5 +87,18 @@ class GitHubLdapDomainTest < Minitest::Test
     assert_equal 1, groups.size
     assert_equal 'cn=Enterprise,ou=Group,dc=github,dc=com', groups.first.dn
   end
+
+  def test_search
+    assert 1, @domain.search(
+      attributes: %w(uid),
+      filter: Net::LDAP::Filter.eq('uid', 'calavera')).size
+  end
+
+  def test_search_override_base_name
+    assert 1, @domain.search(
+      base: "this base name is incorrect",
+      attributes: %w(uid),
+      filter: Net::LDAP::Filter.eq('uid', 'calavera')).size
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-ldap
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap