Merge pull request #97 from milimetric/master

Add TwoLetterCountryCode data type

src/data/dataset/series-dataset.co

@@ -4,13 +4,14 @@ d3 = require 'd3'
 } = require './dataset'
 
 
-parseOrdinalCSV = (rawData) ->
+parseOrdinalCSV = (rawData, options) ->
     data = []
     lines = rawData.split '\n'
+    colSep = options?.colSep or ','
 
     _.each lines, (row) ~>
         return true unless row
-        data.push(row.split(','))
+        data.push(row.split(colSep))
     data
 
 

src/util/index.co

@@ -65,27 +65,30 @@ root.jQuery?.fn.invoke = (method, ...args) ->
 
 
 
-emitters    = exports.emitters    = require './emitters'
+emitters        = exports.emitters      = require './emitters'
 exports import emitters
 
-mixin       = exports.mixin       = require './mixin'
+mixin           = exports.mixin         = require './mixin'
 exports import mixin
 
-iterator    = exports.iterator    = require './iterator'
+iterator        = exports.iterator      = require './iterator'
 exports import iterator
 
-query       = exports.query       = require './query'
+query           = exports.query         = require './query'
 exports import query
 
-type_cache  = exports.type_cache  = require './type-cache'
+type_cache      = exports.type_cache    = require './type-cache'
 exports import type_cache
 
-collections = exports.collections = require './collections'
+collections     = exports.collections   = require './collections'
 exports import collections
 
-parse       = exports.parse       = require './parse'
+parse           = exports.parse         = require './parse'
 exports import parse
 
+countriesData   = exports.countriesData = require './countries-data'
+exports import countriesData
+
 formatters  = exports.formatters  = require './formatters'
 crc         = exports.crc         = require './crc'
 markdown    = exports.markdown    = require './markdown'

src/util/parse/parsers.co

@@ -1,11 +1,18 @@
 op = require 'operator'
+{ countriesData
+} = require '../../util'
 
 
 /**
  * @namespace Parsers by type.
  */
 parsers =
 
+    parseTwoLetterCountryCode: (v) ->
+        return null unless v?
+        s = op.toStr v
+        limn.util.countriesData[s]?.id or s
+
     parseBoolean: (v) ->
         op.toBool v