team_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef00943a7c4a579f14f2c11d6281999c080de7d1
-  data.tar.gz: 6f804bb279a6186020da17bbb59bfc5d07320e7b
+  metadata.gz: 9dff193621885b732e86f4796e1392e51f1d9025
+  data.tar.gz: b28833e5d8d114604ba3f2b76e0af14d132f842a
 SHA512:
-  metadata.gz: 71fb30ac148f71fd39923947e0d78a284568a9650b5ef612df866c40c5c7cbce0626e08f168c8fc8bd220be65f6ecad1f501e7b5586edfd017796837419ee4b1
-  data.tar.gz: a771ca5de1ebdb3f0ad1b8f9d23031391cd293ebaa5219674e470b64533da446a18c5eb7b1bcaa1d0a1f3966f1352a7c7224b3cbc81d195e0c5c977f5b97c42a
+  metadata.gz: 694d28f524bb623a665ea18b821d08966b0abcd4dcf8d23949bfc491c319e3ae0df785ba9dcb34e362813e23da0539a000d9a77ad4b44b168867028d430c1488
+  data.tar.gz: 38e1984b4bc4158481a5be7bd588b6c275b75156eadd32f73b77a392eb4fff2e12790f5448080aaf82a030e63de6b6a193af27d59b464fa5581f9f090594074d

data/lib/team_api/canonicalizer.rb

@@ -9,8 +9,13 @@ module TeamApi
     # Canonicalizes the order and names of certain fields within site_data.
     def self.canonicalize_data(site_data)
       sort_collections site_data
-      canonicalize_tag_category site_data['skills']
-      canonicalize_tag_category site_data['interests']
+      %w(skills interests).each do |category|
+        xrefs = site_data[category]
+        canonicalize_tag_category xrefs
+        site_data['team'].values.each do |member|
+          canonicalize_tags_for_item category, xrefs, member
+        end
+      end
     end
 
     def self.sort_collections(site_data)
@@ -121,5 +126,11 @@ module TeamApi
       [slug, result]
     end
     private_class_method :consolidate_xrefs
+
+    def self.canonicalize_tags_for_item(category, xrefs, item)
+      return if item[category].nil?
+      item[category].each { |tag| tag['name'] = xrefs[tag['slug']]['name'] }
+        .sort_by! { |tag| tag['name'] }
+    end
   end
 end

data/lib/team_api/cross_referencer.rb

@@ -110,10 +110,11 @@ module TeamApi
   # Builds cross-references between data sets.
   class CrossReferencer
     TEAM_FIELDS = %w(name last_name first_name full_name self)
-    PROJECT_FIELDS = %w(name project self)
+    PROJECT_FIELDS = %w(name full_name self)
     WORKING_GROUP_FIELDS = %w(name full_name self)
     GUILD_FIELDS = %w(name full_name self)
     TAG_CATEGORIES = %w(skills interests)
+    TAG_XREF_FIELDS = %w(name slug self)
 
     # Build cross-references between data sets.
     # +site_data+:: Jekyll +site.data+ object
@@ -140,10 +141,20 @@ module TeamApi
     private_class_method :create_xref_data
 
     def self.xref_tags_and_team_members(site, tag_categories, team_xref)
+      team = (site.data['team'] || {})
       tag_categories.each do |category|
-        xrefs = create_tag_xrefs(site, (site.data['team'] || {}).values,
-          category, team_xref)
-        site.data[category] = xrefs unless xrefs.empty?
+        xrefs = create_tag_xrefs(site, team.values, category, team_xref)
+        next if xrefs.empty?
+        site.data[category] = xrefs
+        replace_item_tags_with_xrefs category, xrefs, team.values
+      end
+    end
+
+    def self.replace_item_tags_with_xrefs(tag_category, tag_xrefs, items)
+      items.each do |item|
+        (item[tag_category] || []).map! do |tag|
+          tag_xrefs[tag].select { |field| TAG_XREF_FIELDS.include? field }
+        end
       end
     end
 

data/lib/team_api/version.rb

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

metadata

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