silly merge

Author: Contra

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fractal <contact@wearefractal.com>
+Copyright (c) 2015 Fractal <contact@wearefractal.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -3,7 +3,7 @@
 ## Information
 
 <table>
-<tr> 
+<tr>
 <td>Package</td><td>goosestrap</td>
 </tr>
 <tr>
@@ -40,7 +40,7 @@ var Movie = db.model('Movie');
 
 (MIT License)
 
-Copyright (c) 2013 Fractal <contact@wearefractal.com>
+Copyright (c) 2015 Fractal <contact@wearefractal.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

lib/main.coffee

@@ -0,0 +1,13 @@
+mongoose   = require 'mongoose'
+glob = require 'glob'
+path = require 'path'
+
+module.exports = (url, modelPath) ->
+  db = mongoose.createConnection url
+  models = glob.sync modelPath
+  for model in models
+    name   = path.basename model, path.extname model
+    schema = require model
+    db.model name, schema
+
+  return db

package.json

@@ -1,14 +1,14 @@
 {
   "name": "goosestrap",
   "description": "bootstrap your mongoose",
-  "version": "0.0.5",
+  "version": "0.0.4",
   "homepage": "http://github.com/wearefractal/goosestrap",
   "repository": "git://github.com/wearefractal/goosestrap.git",
   "author": "Fractal <contact@wearefractal.com> (http://wearefractal.com/)",
   "main": "./index.js",
   "dependencies": {
-    "glob": "^4.0.2",
-    "require-dir": "^0.1.0"
+    "require-dir": "^0.1.0",
+    "glob": "^4.0.2"
   },
   "peerDependencies": {
     "mongoose": "^3.8.11"
@@ -19,7 +19,7 @@
     "should": "^4.0.0"
   },
   "scripts": {
-    "test": "mocha --compilers coffee:coffee-script/register --ui exports"
+    "test": "mocha --compilers coffee:coffee-script/register --ui exports --reporter spec"
   },
   "engines": {
     "node": ">= 0.4.0"

test/main.coffee

@@ -2,7 +2,7 @@ goosestrap = require '../'
 should     = require 'should'
 path       = require 'path'
 
-module.exports = 
+module.exports =
 
   "it should connect": =>
     @db = goosestrap "mongodb://localhost/goosestrap", path.resolve './test/models/*'
@@ -14,13 +14,16 @@ module.exports =
     (typeof @db.model 'User').should.equal 'function'
     (typeof @db.model 'Movie').should.equal 'function'
 
+  "it should load all object models": =>
+    (typeof @db.models.User).should.equal 'function'
+    (typeof @db.models.Movie).should.equal 'function'
+
   "it should support nested dir globbing": =>
     @db = goosestrap "mongodb://localhost/goosestrap", path.resolve './test/nested/**/models/*'
 
-  "db should be an object": =>
+  "db should be an object when nested": =>
     (typeof @db).should.equal 'object'
 
-  "it should load all models": =>
-    (typeof @db.model 'User').should.equal 'function'
-    (typeof @db.model 'Movie').should.equal 'function'
-
+  "it should load all object models when nested": =>
+    (typeof @db.models.User).should.equal 'function'
+    (typeof @db.models.Movie).should.equal 'function'

test/models/Movie.coffee

@@ -14,4 +14,4 @@ Movie = new Schema
     required: true
 
 
-module.exports = Movie
+module.exports = Movie

test/models/User.coffee

@@ -11,4 +11,4 @@ User = new Schema
     required: true
 
 
-module.exports = User
+module.exports = User

test/nested/bar/models/User.coffee

@@ -11,4 +11,4 @@ User = new Schema
     required: true
 
 
-module.exports = User
+module.exports = User

test/nested/foo/models/Movie.coffee

@@ -14,4 +14,4 @@ Movie = new Schema
     required: true
 
 
-module.exports = Movie
+module.exports = Movie