change to use single schema member

Screwtapello · May 9, 2012 · b3542a8 · b3542a8
1 parent c3039ed
commit b3542a8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 38 deletions.
diff --git a/lib/model/accesstoken.js b/lib/model/accesstoken.js
@@ -27,15 +27,13 @@ var databank = require('databank'),
 var AccessToken = DatabankObject.subClass('accesstoken');
 
 AccessToken.schema = {
-    accesstoken: {
-        pkey: 'token',
-        fields: ['token_secret',
-                 'consumer_key',
-                 'username',
-                 'created',
-                 'updated'],
-        indices: ['username', 'consumer_key']
-    }
+    pkey: 'token',
+    fields: ['token_secret',
+             'consumer_key',
+             'username',
+             'created',
+             'updated'],
+    indices: ['username', 'consumer_key']
 };
 
 exports.AccessToken = AccessToken;

diff --git a/lib/model/client.js b/lib/model/client.js
@@ -25,18 +25,18 @@ var databank = require('databank'),
 var Client = DatabankObject.subClass('client');
 
 Client.schema = {
-    'client': {pkey: 'consumer_key',
-               fields: ['title',
-                        'description',
-                        'host',
-                        'secret',
-                        'contacts',
-                        'logo_url',
-                        'redirect_uris',
-                        'type',
-                        'created',
-                        'updated'],
-               indices: ['title']}
+    pkey: 'consumer_key',
+    fields: ['title',
+             'description',
+             'host',
+             'secret',
+             'contacts',
+             'logo_url',
+             'redirect_uris',
+             'type',
+             'created',
+             'updated'],
+    indices: ['title']
 };
 
 Client.keyPair = function(callback) {

diff --git a/lib/model/requesttoken.js b/lib/model/requesttoken.js
@@ -27,20 +27,18 @@ var databank = require('databank'),
 var RequestToken = DatabankObject.subClass('requesttoken');
 
 RequestToken.schema = {
-    requesttoken: {
-        pkey: 'token',
-        fields: ['consumer_key',
-                 'callback',
-                 'used',
-                 'token_secret',
-                 'verifier',
-                 'authenticated',
-                 'username',
-                 'access_token',
-                 'created',
-                 'updated'],
-        indices: ['access_token']
-    }
+    pkey: 'token',
+    fields: ['consumer_key',
+             'callback',
+             'used',
+             'token_secret',
+             'verifier',
+             'authenticated',
+             'username',
+             'access_token',
+             'created',
+             'updated'],
+    indices: ['access_token']
 };
 
 exports.RequestToken = RequestToken;

diff --git a/lib/schema.js b/lib/schema.js
@@ -36,9 +36,9 @@ var getSchema = function() {
     schema.usercount = {'pkey': 'id'};
 
     _.extend(schema, Stream.schema);
-    _.extend(schema, Client.schema);
-    _.extend(schema, RequestToken.schema);
-    _.extend(schema, AccessToken.schema);
+    schema[Client.type] = Client.schema;
+    schema[RequestToken.type] = RequestToken.schema;
+    schema[AccessToken.type] = AccessToken.schema;
 
     for (i = 0; i < Activity.objectTypes.length; i++) {
         type = Activity.objectTypes[i];