Permalink
Browse files

Switched ejs => jade; added smarter content negotiation

  • Loading branch information...
1 parent 850c029 commit d6a05a4ca6475354e01a35a034af94b014122a77 @bbyars committed Jun 13, 2011
Showing with 17 additions and 4,591 deletions.
  1. +0 −3 server/deps/ejs/.gitignore
  2. +0 −3 server/deps/ejs/.gitmodules
  3. +0 −65 server/deps/ejs/History.md
  4. +0 −19 server/deps/ejs/Makefile
  5. +0 −142 server/deps/ejs/Readme.md
  6. +0 −14 server/deps/ejs/benchmark.js
  7. +0 −526 server/deps/ejs/ejs.js
  8. +0 −2 server/deps/ejs/ejs.min.js
  9. +0 −5 server/deps/ejs/examples/client.html
  10. +0 −7 server/deps/ejs/examples/list.ejs
  11. +0 −16 server/deps/ejs/examples/list.js
  12. +0 −2 server/deps/ejs/index.js
  13. +0 −248 server/deps/ejs/lib/ejs.js
  14. +0 −198 server/deps/ejs/lib/filters.js
  15. +0 −23 server/deps/ejs/lib/utils.js
  16. +0 −8 server/deps/ejs/package.json
  17. +0 −173 server/deps/ejs/support/compile.js
  18. +0 −3 server/deps/ejs/support/expresso/.gitignore
  19. +0 −3 server/deps/ejs/support/expresso/.gitmodules
  20. +0 −87 server/deps/ejs/support/expresso/History.md
  21. +0 −50 server/deps/ejs/support/expresso/Makefile
  22. +0 −39 server/deps/ejs/support/expresso/Readme.md
  23. +0 −775 server/deps/ejs/support/expresso/bin/expresso
  24. +0 −989 server/deps/ejs/support/expresso/docs/api.html
  25. +0 −380 server/deps/ejs/support/expresso/docs/index.html
  26. +0 −292 server/deps/ejs/support/expresso/docs/index.md
  27. +0 −3 server/deps/ejs/support/expresso/docs/layout/foot.html
  28. +0 −47 server/deps/ejs/support/expresso/docs/layout/head.html
  29. +0 −4 server/deps/ejs/support/expresso/lib/bar.js
  30. +0 −16 server/deps/ejs/support/expresso/lib/foo.js
  31. +0 −9 server/deps/ejs/support/expresso/package.json
  32. +0 −84 server/deps/ejs/support/expresso/test/assert.test.js
  33. +0 −6 server/deps/ejs/support/expresso/test/async.test.js
  34. +0 −12 server/deps/ejs/support/expresso/test/bar.test.js
  35. +0 −13 server/deps/ejs/support/expresso/test/foo.test.js
  36. +0 −76 server/deps/ejs/support/expresso/test/http.test.js
  37. +0 −245 server/deps/ejs/test/ejs.test.js
  38. +17 −4 server/lib/controlServer.js
@@ -1,3 +0,0 @@
-# ignore any vim files:
-*.sw[a-z]
-vim/.netrwhist
@@ -1,3 +0,0 @@
-[submodule "support/expresso"]
- path = support/expresso
- url = http://github.com/visionmedia/expresso.git
View
@@ -1,65 +0,0 @@
-
-0.4.2 / 2011-05-11
-==================
-
- * Added client side support
-
-0.4.1 / 2011-04-21
-==================
-
- * Fixed error context
-
-0.4.0 / 2011-04-21
-==================
-
- * Added; ported jade's error reporting to ejs. [slaskis]
-
-0.3.1 / 2011-02-23
-==================
-
- * Fixed optional `compile()` options
-
-0.3.0 / 2011-02-14
-==================
-
- * Added 'json' filter [Yuriy Bogdanov]
- * Use exported version of parse function to allow monkey-patching [Anatoliy Chakkaev]
-
-0.2.1 / 2010-10-07
-==================
-
- * Added filter support
- * Fixed _cache_ option. ~4x performance increase
-
-0.2.0 / 2010-08-05
-==================
-
- * Added support for global tag config
- * Added custom tag support. Closes #5
- * Fixed whitespace bug. Closes #4
-
-0.1.0 / 2010-08-04
-==================
-
- * Faster implementation [ashleydev]
-
-0.0.4 / 2010-08-02
-==================
-
- * Fixed single quotes for content outside of template tags. [aniero]
- * Changed; `exports.compile()` now expects only "locals"
-
-0.0.3 / 2010-07-15
-==================
-
- * Fixed single quotes
-
-0.0.2 / 2010-07-09
-==================
-
- * Fixed newline preservation
-
-0.0.1 / 2010-07-09
-==================
-
- * Initial release
View
@@ -1,19 +0,0 @@
-SRC = $(shell find lib -name "*.js" -type f)
-UGLIFY_FLAGS = --no-mangle
-
-test:
- @./support/expresso/bin/expresso -I lib test/*.test.js
-
-ejs.js: $(SRC)
- @node support/compile.js $^
-
-ejs.min.js: ejs.js
- @uglifyjs $(UGLIFY_FLAGS) $< > $@ \
- && du ejs.min.js \
- && du ejs.js
-
-clean:
- rm -f ejs.js
- rm -f ejs.min.js
-
-.PHONY: test
View
@@ -1,142 +0,0 @@
-
-# EJS
-
-Embedded JavaScript templates.
-
-## Installation
-
- $ npm install ejs
-
-## Features
-
- * Complies with the [Express](http://expressjs.com) view system
- * Static caching of intermediate JavaScript
- * Unbuffered code for conditionals etc `<% code %>`
- * Escapes html by default with `<%= code %>`
- * Unescaped buffering with `<%- code %>`
- * Supports tag customization
- * Filter support for designer-friendly templates
- * Client-side support
-
-## Example
-
- <% if (user) { %>
- <h2><%= user.name %></h2>
- <% } %>
-
-## Usage
-
- ejs.compile(str, options);
- // => Function
-
- ejs.render(str, options);
- // => str
-
-## Options
-
- - `locals` Local variables object
- - `cache` Compiled functions are cached, requires `filename`
- - `filename` Used by `cache` to key caches
- - `scope` Function execution context
- - `debug` Output generated function body
- - `open` Open tag, defaulting to "<%"
- - `close` Closing tag, defaulting to "%>"
-
-## Custom Tags
-
-Custom tags can also be applied globally:
-
- var ejs = require('ejs');
- ejs.open = '{{';
- ejs.close = '}}';
-
-Which would make the following a valid template:
-
- <h1>{{= title }}</h1>
-
-## Filters
-
-EJS conditionally supports the concept of "filters". A "filter chain"
-is a designer friendly api for manipulating data, without writing JavaScript.
-
-Filters can be applied by supplying the _:_ modifier, so for example if we wish to take the array `[{ name: 'tj' }, { name: 'mape' }, { name: 'guillermo' }]` and output a list of names we can do this simply with filters:
-
-Template:
-
- <p><%=: users | map:'name' | join %></p>
-
-Output:
-
- <p>Tj, Mape, Guillermo</p>
-
-Render call:
-
- ejs.render(str, {
- locals: {
- users: [
- { name: 'tj' },
- { name: 'mape' },
- { name: 'guillermo' }
- ]
- }
- });
-
-Or perhaps capitalize the first user's name for display:
-
- <p><%=: users | first | capitalize %></p>
-
-## Filter List
-
-Currently these filters are available:
-
- - first
- - last
- - capitalize
- - downcase
- - upcase
- - sort
- - sort_by:'prop'
- - size
- - length
- - plus:n
- - minus:n
- - times:n
- - divided_by:n
- - join:'val'
- - truncate:n
- - truncate_words:n
- - replace:pattern,substitution
- - prepend:val
- - append:val
- - map:'prop'
- - reverse
- - get:'prop'
-
-## client-side support
-
- include `./ejs.js` or `./ejs.min.js` and `require("ejs").compile(str)`.
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2009-2010 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,14 +0,0 @@
-
-
-var ejs = require('./lib/ejs'),
- str = '<% if (foo) { %><p><%= foo %></p><% } %>',
- times = 50000;
-
-console.log('rendering ' + times + ' times');
-
-var start = new Date;
-while (times--) {
- ejs.render(str, { cache: true, filename: 'test', locals: { foo: 'bar' }});
-}
-
-console.log('took ' + (new Date - start) + 'ms');
Oops, something went wrong.

0 comments on commit d6a05a4

Please sign in to comment.