team_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09cb397221c7524d2b837eb6d94b5a980b589688
-  data.tar.gz: 1310a085598f49a6ef07be1a6d126420745a471e
+  metadata.gz: 92beac432b5216c8507073f4ba3d815f65efbabb
+  data.tar.gz: 6b1a9d0fb5c19b7d4d510673c99ed514b020a4a3
 SHA512:
-  metadata.gz: 7a74743fc65e50316b66dba13f061d9eef35cae2985be85ce2a87109a0649f9ef0e3898689c7a694e0fbe8b6cedfdc1f22f65d60c65b440aa7a840172d116a39
-  data.tar.gz: 2bbe5b4ea8be6e3a7a2de7b89387e776a029d8bc08610dd06b78d2e03e5ff40c9eb955c7ccaec57996c9a29d5133b2be173324c56c4e43753315209c1c3f7c20
+  metadata.gz: b0e9d43b58f878f42500ea32a6a8f5c230b4bfccd0ad1090b2d930a63593e892c7f5eb75e3b57b13b40005faad1d1f4d0b8319e5e5a45ab4d54b14fd6198b8e8
+  data.tar.gz: 8dd4d5b9f88de7b1031bb6dddc8d4ea54b5da085d81260212b6971d1eb41a2e06bb9a2e5c84e5b0eae5f74b2ec6026d2e29f593248e63d680b964c0d9e29f827

data/lib/team_api/joiner.rb

@@ -20,6 +20,7 @@ module TeamApi
     def self.join_data(site)
       impl = JoinerImpl.new site
       site.data.merge! impl.collection_data
+      impl.create_indexes
       impl.promote_or_remove_data
       impl.join_project_data
       Api.add_self_links site
@@ -81,6 +82,11 @@ module TeamApi
       data['team'] ||= {}
     end
 
+    def create_indexes
+      team_by_email
+      team_by_github
+    end
+
     # Returns an index of team member usernames keyed by email address.
     def team_by_email
       @team_by_email ||= team_index_by_field 'email'
@@ -93,12 +99,21 @@ module TeamApi
 
     # Returns an index of team member usernames keyed by a particular field.
     def team_index_by_field(field)
-      team.values.map do |member|
+      team_members.map do |member|
         value = member[field]
+        value = member['private'][field] if value.nil? && member['private']
         [value, member['name']] unless value.nil?
       end.compact.to_h
     end
 
+    # Returns the list of team members, with site.data['team']['private']
+    # members included.
+    def team_members
+      @team_members ||= team.map { |key, value| value unless key == 'private' }
+        .compact
+        .concat((team['private'] || {}).values)
+    end
+
     # Replaces each member of team_list with a key into the team hash.
     # Values can be:
     # - Strings that are already team hash keys
@@ -129,7 +144,9 @@ module TeamApi
     # from team members not appearing in +site.data[+'team'] or
     # +team_by_email+.
     def join_snippet_data
-      data['snippets'] = data['snippets'].map do |timestamp, snippets|
+      raw_snippets = data['snippets']
+      return if raw_snippets.nil?
+      data['snippets'] = raw_snippets.map do |timestamp, snippets|
         joined = snippets.map { |snippet| join_snippet snippet }
           .compact.each { |i| i.delete 'username' }
         [timestamp, joined] unless joined.empty?

data/lib/team_api/version.rb

@@ -1,5 +1,5 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module TeamApi
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: team_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler