github-ldap 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ecee7518b9ae2fdedb3c08c9c4b08e583543b1
-  data.tar.gz: 9ba97e83307141282fafc3363e163c6eab0102e7
+  metadata.gz: c2875d8763d34a8f62c3a4ae77dc9cc054b29fdc
+  data.tar.gz: fb968ff1b0ed9276f7a5586b38487387c8f079a9
 SHA512:
-  metadata.gz: daebbb8c5c0903dd0185893c3ac7f71c0701d5db0625c6e20f26b38e48519933aa65128cf6166893a57f1fb3c02cc456a03c76bb220d765f2bc6da02d5e748f8
-  data.tar.gz: c4704da31546a9d34eb40ec0d79cf4062a9a19bae41c6580d33f58811dcb856eeb57665942fce43879dfecaa0a9afe59d3ec718d3db51eedae2e90ef5c6086b9
+  metadata.gz: a679ac3db436a73260c120ff3504880ae948b3b6339aa20e72e90b7df51df3e983c9f39ca70dca1fc2ee6d9e8ee4b4f034c9c2f2140af94f67dc7e0dfbf582bd
+  data.tar.gz: 6bc82a3b3cc07c91c12438f8fe9ada80419a21aceeba5bb0c8034c5e3c3e4305c2067130969d41b6f5ecfe1bd5c22529a7b7880e165f6e9f6257fd0cd2f49a43

data/github-ldap.gemspec

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

data/lib/github/ldap/domain.rb

@@ -137,7 +137,10 @@ module GitHub
         options[:ignore_server_caps] ||= true
         options[:paged_searches_supported] ||= true
 
-        Array(@ldap.search(options))
+        rs = @ldap.search(options)
+        return [] if rs == false
+
+        Array(rs)
       end
 
       # Provide a meaningful result after a protocol operation (for example,

data/lib/github/ldap/group.rb

@@ -21,32 +21,18 @@ module GitHub
       #
       # Returns an array with all the member entries.
       def members
-        groups, members = groups_and_members
-        results = members
-
-        cache = load_cache(groups)
-
-        loop_cached_groups(groups, cache) do |_, users|
-          results.concat users
-        end
-
-        results.uniq {|m| m.dn }
+        return @all_members if @all_members
+        group_and_member_entries
+        @all_members
       end
 
       # Public - Get all the subgroups from a group recursively.
       #
       # Returns an array with all the subgroup entries.
       def subgroups
-        groups, _ = groups_and_members
-        results = groups
-
-        cache = load_cache(groups)
-
-        loop_cached_groups(groups, cache) do |subgroups, _|
-          results.concat subgroups
-        end
-
-        results
+        return @all_groups if @all_groups
+        group_and_member_entries
+        @all_groups
       end
 
       # Public - Check if a user dn is included in the members of this group and its subgroups.
@@ -119,6 +105,26 @@ module GitHub
       def groups_and_members
         member_entries.partition {|e| group?(e[:objectclass])}
       end
+
+      # Internal - Inspect the ldap server searching for group and member entries.
+      #
+      # Returns two arrays, the first one with subgroups and the second one with users.
+      def group_and_member_entries
+        groups, members = groups_and_members
+        @all_members = members
+        @all_groups  = groups
+
+        cache = load_cache(groups)
+
+        loop_cached_groups(groups, cache) do |subgroups, users|
+          @all_groups.concat subgroups
+          @all_members.concat users
+        end
+
+        @all_members.uniq! {|m| m.dn }
+
+        [@all_groups, @all_members]
+      end
     end
   end
 end

metadata

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