Updates package; exposes view_helpers.

diff --git a/package.co b/package.co
index 5762feb..c9e51cc 100644 (file)
--- a/package.co
+++ b/package.co
@@ -42,5 +42,5 @@ devDependencies                 :
 # scripts                         : test:'expresso'
 repository                      : type:'git', url:'git://github.com/wikimedia/limn.git'
 
-engine                          : node:'>=0.8.1'
+engine                          : node:'>=0.8.x'
 license                         : 'MIT'

diff --git a/package.json b/package.json
index 5a7bcb5..9c7d005 100644 (file)
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "url": "git://github.com/wikimedia/limn.git"
   },
   "engine": {
-    "node": ">=0.8.1"
+    "node": ">=0.8.x"
   },
   "license": "MIT"
 }

diff --git a/src/server/middleware.co b/src/server/middleware.co
index 69c1eb6..0011eea 100755 (executable)
--- a/src/server/middleware.co
+++ b/src/server/middleware.co
@@ -15,7 +15,7 @@ express               = require 'express'
 {mkdirp, mkdirpAsync} = require './mkdirp'
 {readFilesAsync}      = require './files'
 Controller            = require './controller'
-
+view_helpers          = require './view-helpers'
 
 
 /**
@@ -159,7 +159,7 @@ application = limn.application =
                 config  : @set('limn options')
                 version : REV
                 IS_DEV, IS_PROD, REV
-            } import require './view-helpers'
+            } import view_helpers
             view_opts.__defineGetter__ 'mount', -> app.route or '/'
             @set 'view options', view_opts
             
@@ -311,4 +311,5 @@ application = limn.application =
         this
     
 
+limn.view_helpers = view_helpers
 

diff --git a/src/server/view-helpers.co b/src/server/view-helpers.co
index 5837480..5f38596 100644 (file)
--- a/src/server/view-helpers.co
+++ b/src/server/view-helpers.co
@@ -34,7 +34,7 @@ SOURCES_ENV = if process.env.LIMN_FORCE_BUNDLES then 'production' else NODE_ENV
 /**
  * Reify a modules.yaml file
  */
-sources = exports.sources = (modulesFile, node_env=SOURCES_ENV) ->
+sources = exports.sources = (node_env=SOURCES_ENV, modulesFile="#WWW/modules.yaml") ->
     mods = yaml.load fs.readFileSync modulesFile, 'utf8'
     modlist = (mods.all or []).concat (mods[node_env] or [])
     _.flatten modlist.map ({suffix or '', paths}) -> joinTree('', paths).map -> it+suffix

diff --git a/www/layout.jade b/www/layout.jade
index a7e58a3..12c5b27 100644 (file)
--- a/www/layout.jade
+++ b/www/layout.jade
@@ -31,7 +31,6 @@ html(lang="en", dir="ltr")
             
             footer
                 block footer
-                    include footer
             
             .scripts
                 block scripts
@@ -43,7 +42,7 @@ html(lang="en", dir="ltr")
                         var limn_config = !{ JSON.stringify(limn_config) };
                     
                     block lib-scripts
-                        for src in sources(WWW+'/modules.yaml')
+                        for src in sources()
                             script(src=path.join(mount, src)+"?"+version)
                     
                     block page-scripts