team_api 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee9cac18edcb39d4c5dc0ce24e472ff1a25145b
-  data.tar.gz: b84db5f63148774f44b08dc934356166307e5f22
+  metadata.gz: b082409d55f76bea8898d5a6c1de80965ba7c131
+  data.tar.gz: aba420884aa800ce9b6f081c7cb19f52d7322a02
 SHA512:
-  metadata.gz: 3d2a04292be3885c6e4cdf84ff113fbff60b7ed10e2782814f86c1d983ae30d53794e55515ef1cfc542c3937e5ef2b7c9a944b16803c6a92ec2acab4464348d4
-  data.tar.gz: d1c43012bf09539655bb5bf780757bb704694ea0017c87ce4247b1ffb028a42e209eddc1ddfea1d777dedb71b87c32406b772f4b8ccb25028f8a02794367d629
+  metadata.gz: c65b65e63296bc6df730f2fca3b79c9a1223170d73ae86d53d587556a6c195e891b761cba248ed37e1e2927170877044e53eac5cd1ff735ed523689d9fb4e439
+  data.tar.gz: 9992a74f2887388b34a7c5742a358b138e6bb77a7d01326c931ca73f12c2b90bf43305ddaf73cb57be6f5a3e6833c80a51f217525341eb85e456d9b682e7acec

data/lib/team_api/joiner.rb

@@ -17,8 +17,8 @@ module TeamApi
     def self.join_data(site)
       impl = JoinerImpl.new site
       site.data.merge! impl.collection_data
-      impl.promote_or_remove_data
       impl.init_team_data site.data['team']
+      impl.promote_or_remove_data
       impl.join_project_data
       Api.add_self_links site
       impl.join_snippet_data
@@ -27,7 +27,7 @@ module TeamApi
 
   class TeamIndexer
     def initialize(data)
-      @team = data
+      @team = (data || {}).dup
     end
 
     def team
@@ -66,13 +66,27 @@ module TeamApi
         .concat((team['private'] || {}).values)
     end
 
-    def team_member_key(ref)
+    def team_member_key_by_type(ref)
       (ref.is_a? String) ? ref : (ref['id'] || ref['email'] || ref['github'])
     end
 
+    def team_member_key(ref)
+      key = team_member_key_by_type(ref).downcase
+      team_by_email[key] || team_by_github[key] || key
+    end
+
     def team_member_from_reference(reference)
+      key = team_member_key reference
+      if team['private']
+        team[key] || team['private'][key]
+      else
+        team[key]
+      end
+    end
+
+    def team_member_is_private(reference)
       key = team_member_key(reference).downcase
-      team[key] || team[team_by_email[key] || team_by_github[key]]
+      team['private'] && team['private'][key]
     end
   end
 
@@ -141,6 +155,23 @@ module TeamApi
       data['errors'][name] = errors
     end
 
+    def should_exclude_member(reference)
+      @public_mode && team_indexer.team_member_is_private(reference)
+    end
+
+    def get_canonical_reference(reference, errors)
+      member = team_indexer.team_member_from_reference reference
+      if member.nil?
+        errors << 'Unknown Team Member: ' +
+          team_indexer.team_member_key(reference)
+        nil
+      elsif should_exclude_member(reference)
+        nil
+      else
+        member['name'].downcase
+      end
+    end
+
     # Replaces each member of team_list with a key into the team hash.
     # Values can be:
     # - Strings that are already team hash keys
@@ -150,15 +181,7 @@ module TeamApi
     # - Hashes that contain a 'github' property
     def join_team_list(team_list, errors)
       (team_list || []).map! do |reference|
-        member = team_indexer.team_member_from_reference reference
-
-        if member.nil?
-          errors << 'Unknown Team Member: ' +
-            team_indexer.team_member_key(reference)
-          nil
-        else
-          member['name'].downcase
-        end
+        get_canonical_reference reference, errors
       end.compact! || []
     end
 

data/lib/team_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: team_api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike Bland