Merge branch 'master' of github.com:mde/geddy

geddy · Feb 3, 2012 · 1cecd81 · 1cecd81
2 parents 544bbfa + f6e0a76
commit 1cecd81
Show file tree

Hide file tree

Showing 39 changed files with 7,045 additions and 943 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -42,6 +42,7 @@ geddy.RegExpRouter = RegExpRouter;
 geddy.inFlight = new InFlight();
 geddy.inflection = inflection;
 geddy.model = model;
+geddy.utils = utils;
 
 var App = function () {
   var JSPAT = /\.js$/;

diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -21,6 +21,7 @@ var geddy
   , uri = require('./uri').uri
   , date = require('./date').date
   , request = require('./request').request
+  , EventBuffer = require('./event_buffer').EventBuffer
   , SortedCollection = require('./sorted_collection').SortedCollection;
 
 var utils = new (function () {
@@ -114,6 +115,7 @@ utils.uri = uri;
 utils.date = date;
 utils.request = request;
 utils.SortedCollection = SortedCollection;
+utils.EventBuffer = EventBuffer;
 
 module.exports = utils;