github-ldap 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ef77cae7b6d41804fd11a87a169001313320ec
-  data.tar.gz: 0d9fc6ed121d40dfcead6c8cd1c29cedc7598672
+  metadata.gz: a23a62005338f49107b2e82997fbdb9c02d4004c
+  data.tar.gz: bb3a1b3bed1dfb66a1b110bf2e7b31e5a74d7378
 SHA512:
-  metadata.gz: 55c95dda73fffdce9e46a9718a8d1d58f32c9e47fc367b73c835a0f2e17b161a764c46cdeac24fc67331978764289696a99ea5586fc6c0382bf7d77ece583ad0
-  data.tar.gz: 8cb01bc061b35bf11f00b34c4340fe08ebe826f419f142c4e3949c720d0e54857ac15066d0c49ef29f26d60f8b85402718fabd13c0e2c648f4b04017ce7bbd7b
+  metadata.gz: 24548e4cf5b738fb303b635297fd12c634d5a85d42076e367763e833fd0f59e107e398a3f9ff00ce8a69bb4a5d119bf91f5180661d5274e7c6f79e3445ed2bb3
+  data.tar.gz: 56669b0b27287bdd8cdf3b7820690e2b2832ac9adf12eacb5b882c6d71e687b05c1aa0f4459231738e0001dda538fed02817b13496bbf7e8c4366cc52dacc5c6

data/github-ldap.gemspec

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

data/lib/github/ldap.rb

@@ -95,14 +95,15 @@ module GitHub
     # Public - Search entries in the ldap server.
     #
     # options: is a hash with the same options that Net::LDAP::Connection#search supports.
+    # block: is an optional block to pass to the search.
     #
     # Returns an Array of Net::LDAP::Entry.
-    def search(options)
+    def search(options, &block)
       result = if options[:base]
-        @connection.search(options)
+        @connection.search(options, &block)
       else
         search_domains.each_with_object([]) do |base, result|
-          rs = @connection.search(options.merge(:base => base))
+          rs = @connection.search(options.merge(:base => base), &block)
           result.concat Array(rs) unless rs == false
         end
       end

data/lib/github/ldap/domain.rb

@@ -27,9 +27,13 @@ module GitHub
 
       # List all groups under this tree that match the query.
       #
+      # query: is the partial name to filter for.
+      # opts: additional options to filter with. It's specially recommended to restrict this search by size.
+      # block: is an optional block to pass to the search.
+      #
       # Returns a list of ldap entries.
-      def filter_groups(query)
-        search(filter: group_contains_filter(query))
+      def filter_groups(query, opts = {}, &block)
+        search(opts.merge(filter: group_contains_filter(query)), &block)
       end
 
       # List the groups in the ldap server that match the configured ones.
@@ -97,7 +101,7 @@ module GitHub
       # Returns the user if the login matches any `uid`.
       # Returns nil if there are no matches.
       def user?(login)
-        search(filter: login_filter(@uid, login), limit: 1).first
+        search(filter: login_filter(@uid, login), size: 1).first
       end
 
       # Check if a user can be bound with a password.
@@ -127,16 +131,16 @@ module GitHub
 
       # Search entries using this domain as base.
       #
-      # options: is a Hash with the options for the search.
-      # The base option is always overriden.
+      # options: is a Hash with the options for the search. The base option is always overriden.
+      # block: is an optional block to pass to the search.
       #
       # Returns an array with the entries found.
-      def search(options)
+      def search(options, &block)
         options[:base] = @base_name
         options[:attributes] ||= []
         options[:paged_searches_supported] = true
 
-        @ldap.search(options)
+        @ldap.search(options, &block)
       end
 
       # Provide a meaningful result after a protocol operation (for example,
@@ -153,7 +157,7 @@ module GitHub
       #
       # Returns a Net::LDAP::Entry
       def bind
-        search({}).first
+        search(size: 1, scope: Net::LDAP::SearchScope_BaseObject).first
       end
     end
   end

data/test/group_test.rb

@@ -32,6 +32,19 @@ class GitHubLdapGroupTest < GitHub::Ldap::Test
     assert_equal 1, groups.size
   end
 
+  def test_filter_domain_groups_limited
+    groups = []
+    groups_domain.filter_groups('enter', size: 1) do |entry|
+      groups << entry
+    end
+    assert_equal 1, groups.size
+  end
+
+  def test_filter_domain_groups_unlimited
+    groups = groups_domain.filter_groups('ent')
+    assert_equal 3, groups.size
+  end
+
   def test_unknown_group
     refute @ldap.group("cn=foobar,ou=groups,dc=github,dc=com"),
       "Expected to not bind any group"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-ldap
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap