Permalink
Browse files

Merge branch 'master' into feature/socket.io-mvc

  • Loading branch information...
2 parents 311b08d + 6ce2e9c commit 5de42422047e331fce5e1028d8472cf4c85f70f2 Techwraith committed Oct 30, 2012
View
@@ -111,7 +111,7 @@ module.exports = new (function () {
if (typeof adapter.connect == 'function') {
adapter.connect();
}
- model.loadedAdapters[adapterName] = adapter;
+ model.loadedAdapters[name] = adapter;
if (typeof adapter.createTable == 'function') {
// FIXME -- fire-and-forget bad, need to make this
// recursive
View
@@ -22,8 +22,19 @@ var session = new (function () {
this.store = null;
this.createStore = function (type, callback) {
- var key = geddy.string.capitalize(type);
- var constructor = require('./stores/' + type)[key];
+ var key
+ , constructor;
+
+ if (type === 'mongo') {
+ type = 'mongodb';
+ }
+ if (type === 'couch') {
+ type = 'couchdb';
+ }
+
+ key = geddy.string.capitalize(type);
+ constructor = require('./stores/' + type)[key];
+
session.store = new constructor(callback);
};
View
@@ -48,8 +48,8 @@ Templater.prototype.eventTypes = {
Templater.prototype.render = function (data, config) {
var templateFileName;
- // Register all the helper functions to Templato
- geddy.viewHelpers.registerData(data); // Enables access to the current params for `urlFor`
+ // Register data to helpers, and register the helpers to the adapter
+ geddy.viewHelpers.registerData(data);
Adapter.registerHelpers(geddy.viewHelpers);
// Rendering a template in a layout
@@ -18,7 +18,7 @@
var fs = require('fs')
, path = require('path')
- , engine = {cache: {}, compiledCache: {}};
+ , engine = {cache: {}};
engine.TemplateNode = function (id, data, params, parentNode, adapter) {
this.id = id;
View
@@ -7,7 +7,7 @@
"REST",
"MVC"
],
- "version": "0.5.5",
+ "version": "0.5.6",
"author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
"dependencies": {
"jake": "0.5.x",
@@ -6,7 +6,7 @@ html(lang="en")
meta(name="description", content="")
meta(name="author", content="")
meta(name="viewport", content="width=device-width")
- title Geddy | A simple, structured Web framework for Node.
+ title Geddy | The original MVC Web framework for Node - a simple, structured way to create full stack javascript applications
// The HTML5 shim, for IE6-8 support of HTML elements
//if lt IE 9
View
@@ -193,10 +193,10 @@ namespace('gen', function () {
};
var _formatModelProperties = function (properties) {
- var obj = {'default': {name: 'id', type: 'int'}};
if (!properties) {
- return obj;
+ return {};
}
+ var obj = {'default': {name: 'id', type: 'int'}};
var itemsArr = properties.split('%')
, name

0 comments on commit 5de4242

Please sign in to comment.