Implement L1-L2 UA string maker

inukshuk · May 11, 2016 · a97f0e2 · a97f0e2
1 parent ae0d1a6
commit a97f0e2
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git a/src/bitmask.js b/src/bitmask.js
@@ -123,6 +123,19 @@ class Bitmask {
     })
   }
 
+  marks(values, symbol = '?') {
+    return values
+      .map((value, idx) => [
+        this.qualified(idx * 2) ? symbol : '',
+        value,
+        this.qualified(idx * 2 + 1) ? symbol : ''
+      ].join(''))
+  }
+
+  qualified(idx) {
+    return !!(idx && this.value === Bitmask.UA[idx])
+  }
+
   qualify(idx) {
     return (this.value = this.value | Bitmask.UA[idx]), this
   }

diff --git a/src/date.js b/src/date.js
@@ -179,7 +179,15 @@ class ExtDate extends Date {
     let values = this.values.map(pad)
 
     if (this.unspecified.value)
-      values = this.unspecified.masks(values)
+      return this.unspecified.masks(values).join('-')
+
+    if (this.uncertain.value)
+      values = this.uncertain.marks(values, '?')
+
+    if (this.approximate.value) {
+      values = this.approximate.marks(values, '~')
+        .map(value => value.replace(/~\?/, '%'))
+    }
 
     return values.join('-')
   }

diff --git a/test/date.js b/test/date.js
@@ -4,7 +4,7 @@ const { Date } = require('..')
 
 describe('Date', () => {
 
-  describe.only('.edtf', () => {
+  describe('.edtf', () => {
     it('default', () =>
       expect(new Date().edtf)
         .to.match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$/))
@@ -52,5 +52,35 @@ describe('Date', () => {
     it('YXYX-MX-DD', () =>
       expect(new Date({ values: [2014, 3, 15], unspecified: 'yxyxmxdd' }).edtf)
         .to.eql('2X1X-0X-15'))
+
+    it('YYYY-MM-DD?', () =>
+      expect(new Date({ values: [2014, 3, 15], uncertain: true }).edtf)
+        .to.eql('2014-04-15?'))
+
+    it('YYYY-MM-?DD', () =>
+      expect(new Date({ values: [2014, 3, 15], uncertain: 'day' }).edtf)
+        .to.eql('2014-04-?15'))
+
+    it('YYYY-MM?-DD', () =>
+      expect(new Date({ values: [2014, 3, 15], uncertain: 'xxxxxxdd' }).edtf)
+        .to.eql('2014-04?-15'))
+
+    it('YYYY-?MM-DD', () =>
+      expect(new Date({ values: [2014, 3, 15], uncertain: 'month' }).edtf)
+        .to.eql('2014-?04-15'))
+
+    it('YYYY?-MM-DD', () =>
+      expect(new Date({ values: [2014, 3, 15], uncertain: 'year' }).edtf)
+        .to.eql('2014?-04-15'))
+
+    it('YYYY-MM?-~DD', () =>
+      expect(new Date({
+        values: [2004, 5, 11], uncertain: 'xxxxxxdd', approximate: 'day'
+      }).edtf).to.eql('2004-06?-~11'))
+
+    it('YYYY-%MM-DD', () =>
+      expect(new Date({
+        values: [2004, 5, 11], uncertain: 'month', approximate: 'month'
+      }).edtf).to.eql('2004-%06-11'))
   })
 })