Merge pull request #9 from radify/handle-untagged-entries

Handle untagged entries

Author: gavD

fixtures/mostly-untagged.ics

@@ -0,0 +1,93 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:Gavin Test Time Tracking
+X-WR-TIMEZONE:Europe/London
+X-WR-CALDESC:To test my ical software
+BEGIN:VEVENT
+DTSTART:20150506T113000Z
+DTEND:20150506T173000Z
+DTSTAMP:20150601T214818Z
+UID:jaf9dur4v611bg5oci2nrime3g@google.com
+CREATED:20150508T084343Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084343Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:notags
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20150506T073000Z
+DTEND:20150506T110000Z
+DTSTAMP:20150601T214818Z
+UID:na28627isf4g647eqlf7tn6n78@google.com
+CREATED:20150508T084332Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084333Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:meeting and emails
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20150504T130000Z
+DTEND:20150504T170000Z
+DTSTAMP:20150601T214818Z
+UID:pi8ddn7ag9lokp472k7645813c@google.com
+CREATED:20150508T084323Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084323Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:sprint planning
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20150504T080000Z
+DTEND:20150504T123000Z
+DTSTAMP:20150601T214818Z
+UID:9kf9tfbhmt5720ksai6pa99ps0@google.com
+CREATED:20150506T155217Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084314Z
+LOCATION:
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:Refactoring
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20150505T120000Z
+DTEND:20150505T163000Z
+DTSTAMP:20150601T214818Z
+UID:45g3cidmcdgjh7tms6kop0dp94@google.com
+CREATED:20150506T155212Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084258Z
+LOCATION:
+SEQUENCE:3
+STATUS:CONFIRMED
+SUMMARY:[project-a] debugging
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20150505T073000Z
+DTEND:20150505T110000Z
+DTSTAMP:20150601T214818Z
+UID:6j8qt69apv47f4c5a274kfnmtk@google.com
+CREATED:20150506T155207Z
+DESCRIPTION:
+LAST-MODIFIED:20150508T084257Z
+LOCATION:
+SEQUENCE:2
+STATUS:CONFIRMED
+SUMMARY:[project-a] Updating documentation
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

icalstats.js

@@ -6,6 +6,38 @@ function dateFromUTC() {
   return new Date(utcDate);
 }
 
+describe('handling of untagged elements', function() {
+
+  var fixture;
+
+  // applied before each nested describe()
+  beforeEach(function() {
+    fixture = ical.parseFile('./fixtures/mostly-untagged.ics');
+    iCalStats.load(fixture, '2015-05-01', '2015-06-05');
+  });
+
+  describe('getHighLevelBreakdown()', function() {
+    it('groups untagged elements into an untagged collection', function() {
+      var hlb = iCalStats.getHighLevelBreakdown();
+
+      expect(hlb.untagged).toEqual(18);
+      expect(hlb.project).toEqual(8);
+
+    });
+  });
+
+  describe('getTree()', function() {
+    it('groups all untagged elements into a high level collection', function() {
+      var tree = iCalStats.getTree();
+      expect(tree.untagged.value).toEqual(18);
+      expect(tree.untagged.notags.value).toEqual(6);
+
+      expect(tree.untagged['meeting_and_emails'].value).toEqual(3.5);
+      expect(tree.untagged['sprint_planning'].value).toEqual(4);
+    });
+  });
+});
+
 describe('iCalStats Library Test Suite:', function() {
 
   var fixture;

spec/test.js

@@ -3,22 +3,21 @@
   var _ = require('lodash');
 
   function extractTags(event) {
-    if (!event.summary || event.summary === '') {
-      return ['no-tags'];
+    var summary = event.summary.replace(/ /g, '_');
+    if (!summary || summary === '') {
+      return ['untagged-' + summary];
     }
 
-    var regex = /\[([a-zA-Z\.\s\-]*?)\]/g;
-    var tags = event.summary.match(regex);
+    // get everything that looks like a tag
+    var tags = summary.match(/\[([a-zA-Z0-9\_\.\s\-]*?)\]/g);
 
-    if (!tags || tags.length === 0) {
-      return ['no-tags'];
+    if (_.isEmpty(tags)) {
+      tags = ['untagged-' + summary];
     }
 
-    for (var i = 0; i < tags.length; i++) {
-      tags[i] = tags[i].toLowerCase().replace('[', '').replace(']', '');
-    }
-
-    return tags;
+    return _(tags).map(function(tag) {
+      return tag.toLowerCase().replace('[', '').replace(']', '').replace(/ /g, '_');
+    }).value();
   }
 
   function getLengthInHours(event) {
@@ -65,7 +64,6 @@
         }
       }
 
-
       function inDateRange(ev) {
         if (ev.start < filterStartDate) {
           return false;