sails - npm Package Compare versions

Comparing version 0.7.9 to 0.8.0

bin/blueprints/model.js

@@ -5,3 +5,3 @@ /*---------------------
 ---------------------*/
-var <%- entity %> = {
+module.exports = {
 	
@@ -21,3 +21,2 @@ // Attributes / Schema
 
-};
-module.exports = <%- entity %>;
+};

lib/common.js

@@ -22,3 +22,2 @@ ////////////////////////////////////////////////////////////
 
-
 // Node.js dependencies
@@ -111,5 +110,4 @@ var fs = require('fs');
 
-	// Load app's models and custom adapters
+	// Load app's models
 	// Case-insensitive, using filename to determine identity
-	// (default waterline adapters are included automatically)
 	sails.models = modules.optional({
@@ -119,9 +117,3 @@ dirname		: sails.config.paths.models,
 	});
-	sails.adapters = modules.optional({
-		dirname		: sails.config.paths.adapters,
-		filter		: /(.+Adapter)\.js$/,
-		replaceExpr	: /Adapter/
-	});
 
-	
 	// Augment models with room/socket logic (& bind context)
@@ -133,2 +125,16 @@ for (var identity in sails.models) {
 
+	// Load custom adapters
+	// Case-insensitive, using filename to determine identity
+	sails.adapters = modules.optional({
+		dirname		: sails.config.paths.adapters,
+		filter		: /(.+Adapter)\.js$/,
+		replaceExpr	: /Adapter/
+	});
+
+	// Include default adapters automatically
+	// (right now, just waterline-dirty)
+	_.extend(sails.adapters, {
+		'waterline-dirty': require('waterline-dirty')
+	});
+
 	// Start up waterline (ORM) and pass in adapters and models
@@ -138,2 +144,5 @@ // as well as the sails logger and a copy of the default adapter configuration
 		
+		// Let waterline know about our app path
+		appPath: userConfig.appPath,
+
 		adapters: sails.adapters,
@@ -140,0 +149,0 @@

lib/configuration.js

@@ -85,3 +85,3 @@ var _ = require('underscore');
 		modelDefaults: {
-			adapter: 'waterline-dirty'
+			adapter: 'memory'
 		},
@@ -88,0 +88,0 @@

package.json

@@ -26,3 +26,3 @@ {
   ],
-  "version": "0.7.9",
+  "version": "0.8.0",
   "description": "API-driven framework for building realtime apps, using MVC conventions (based on Express and Socket.io)",
@@ -55,3 +55,3 @@ "homepage": "http://sailsjs.com",
   "dependencies": {
-    "waterline": "0.4.7",
+    "waterline": "0.5.0",
     "waterline-dirty": "0.4.2",
@@ -58,0 +58,0 @@ "express": "= 2.5.11",

No alert changes

Improved metrics

Total package byte prevSize

113557

increased by0.17%

Lines of code

2488

increased by0.28%

Dependency changes

• + Addedwaterline@0.5.0(transitive)

• - Removedwaterline@0.4.7(transitive)

• Updatedwaterline@0.5.0