Skip to content

Commit

Permalink
added convenience function renderStr and made view.run work even if n…
Browse files Browse the repository at this point in the history
…ot passed a vm context (it makes its own as needed)
  • Loading branch information
malgorithms committed Jul 1, 2013
1 parent 5c79198 commit 7661773
Show file tree
Hide file tree
Showing 16 changed files with 455 additions and 205 deletions.
3 changes: 2 additions & 1 deletion Cakefile
Expand Up @@ -3,7 +3,6 @@ fs = require 'fs'
jison = require 'jison'
path = require 'path'
express_test = require './test/generate_express_test'
run_cases = require './test/run_cases'

task 'build', 'build the whole jam', (cb) ->
console.log "Building"
Expand All @@ -19,10 +18,12 @@ task 'build', 'build the whole jam', (cb) ->
cb() if typeof cb is 'function'

task 'test', 'test server and browser support', (cb) ->
run_cases = require './test/run_cases'
run_cases.test ->
console.log "Done."

runCoffee = (args, cb) ->
console.log args
proc = spawn 'coffee', args
proc.stderr.on 'data', (buffer) -> console.log buffer.toString()
proc.on 'exit', (status) ->
Expand Down
17 changes: 11 additions & 6 deletions index.coffee
Expand Up @@ -2,14 +2,19 @@
{engine} = require('./lib/engine')
{view, getCommonHeaders, getCommonHeadersJs} = require('./lib/view')

exports.engine = engine
exports.view = view
exports.getCommonHeaders = getCommonHeaders
exports.engine = engine
exports.view = view
exports.getCommonHeaders = getCommonHeaders
exports.getCommonHeadersJs = getCommonHeadersJs

exports.expressEngine = e = new engine { verbose: false, prettyPrintErrors: true }
exports.render = e.run
exports.expressEngine = e = new engine { verbose: false, prettyPrintErrors: true }
exports.render = e.run

# given a template string, returns a function that can be called
# on an object to render it.
exports.compileStr = (template_str, options) ->
v = new view template_str, options
return (x) -> v.run x

# express 3.x support;
__express = exports.__express = (filename, options, cb) ->
Expand All @@ -32,7 +37,7 @@ exports.__consolidate_engine_render = (filename, options, cb) ->
cb null, res

# consolidate.js wants this, but it might generally be useful
exports.str_render = (template_str, options, cb) ->
exports.str_render = exports.strRender = (template_str, options, cb) ->
v = new view template_str, options
[err, res] = v.run options
cb err, res
Expand Down
14 changes: 10 additions & 4 deletions index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions lib/command_line.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/consts.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 3 additions & 11 deletions lib/engine.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 1 addition & 10 deletions lib/errorHandler.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/pool.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7661773

Please sign in to comment.