From: dsc <dsc@less.ly>
Date: Wed, 18 Apr 2012 00:28:44 +0000 (-0700)
Subject: Merge branch 'master' of less.ly:kraken-ui
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=c41a129710be5fc666c4cdd72574df1511acab93;p=limn-bak.git

Merge branch 'master' of less.ly:kraken-ui

Conflicts:
	lib/server/server.co
---

c41a129710be5fc666c4cdd72574df1511acab93
diff --cc lib/server/server.co
index 3a06277,6d87783..e0d98da
--- a/lib/server/server.co
+++ b/lib/server/server.co
@@@ -6,7 -7,11 +6,9 @@@ glob   = require 'glob
  {existsSync:exists} = path
  {exec, spawn} = require 'child_process'
  {mkdirp, mkdirpAsync} = require './mkdirp'
 -{readFilesAsync} = require './files'
++{ readFilesAsync, readJSONFilesAsync,
++} = require './files'
  
 -_        = require 'underscore'
 -_.str    = require 'underscore.string'
 -_.mixin _.str.exports()
  
  Seq      = require 'seq'
  yaml     = require 'js-yaml'
@@@ -147,12 -150,21 +149,12 @@@ app.controller require './controllers/d
  YAML_EXT_PAT = /\.ya?ml$/i
  app.get '/datasources/all', (req, res, next) ->
      data = {}
 -    files = []
 -    Seq(findit.sync 'data/datasources')
 -        # .seq fs.readdir, 'data/datasources', Seq
 -        # .flatten()
 -        .filter -> /\.(json|ya?ml)$/.test it
 -        .seq ->
 -            files := @stack.slice()
 -            # console.log 'files:', files
 -            @ok files
 -        .flatten()
 -        .parMap (f) ->
 -            # console.log "fs.readFile '#CWD/data/#f'"
 -            fs.readFile f, 'utf8', this
 -        .parMap (text, i) ->
 -            f = files[i]
 +    Seq
 +        .seq glob, 'data/datasources/**/*.@(yaml|json)', {+nocase, +nosort}, Seq
-         .seq (paths) -> files.readFilesAsync paths, this
++        .seq (paths) -> readFilesAsync paths, this
 +        .seq (txts) -> @ok _.items txts
 +        .flatten false
 +        .parMap ([f, text]) ->
              # console.log "parsing file[#i]: '#f' -> text[#{text.length}]..."
              k = f.replace YAML_EXT_PAT, '.json'
              v = data[k] = {}