Refactor and update to LowDB 0.4

Author: typicode

README.md

@@ -16,7 +16,7 @@ _Powers http://jsonplaceholder.typicode.com_
 
 ```javascript
 // db.json
-{ 
+{
   "posts": [
     { "id": 1, "body": "foo" }
   ]
@@ -33,13 +33,11 @@ $ curl -i http://localhost:3000/posts/1
 ```javascript
 var server = require('json-server');
 
-server.low.db = { 
+server({
   posts: [
     { id: 1, body: 'foo' }
   ]
-}
-
-server.listen(3000);
+}).listen(3000);
 ```
 
 You can find a running demo here: http://jsonplaceholder.typicode.com.
@@ -62,20 +60,18 @@ $ npm install -g json-server
 ## CLI usage
 
 ```bash
+json-server <source>
 
-  Usage: json-server <source> [options]
-
-  Options:
-
-    --version      output version
-    --port <port>  set port
+Examples:
+  json-server db.json
+  json-server file.js
+  json-server http://example.com/db.json
 
-  Exemples:
 
-    json-server db.json
-    json-server seed.js
-    json-server http://example.com/db.json
-    
+Options:
+  --help, -h     Show help
+  --version, -v  Show version number
+  --port, -p     Set port             [default: 3000]
 ```
 
 #### Input
@@ -97,10 +93,10 @@ Here's 2 examples showing how to format JSON or JS seed file:
 }
 ```
 
-* __seed.js__
+* __file.js__
 
 ```javascript
-exports.run = function() {
+module.exports = function() {
   var data = {};
 
   data.posts = [];
@@ -111,7 +107,7 @@ exports.run = function() {
 }
 ```
 
-JSON Server expects JS files to export a ```run``` method that returns an object.
+JSON Server expects JS files to export a function that returns an object.
 
 Seed files are useful if you need to programmaticaly create a lot of data.
 
@@ -159,4 +155,4 @@ Returns default index file or content of ./public/index.html (useful if you need
 ## Links
 
 * [Fast prototyping using Restangular and Json-server](http://bahmutov.calepin.co/fast-prototyping-using-restangular-and-json-server.html)
-* [Grunt plugin](https://github.com/tfiwm/grunt-json-server)
+* [grunt plugin](https://github.com/tfiwm/grunt-json-server)

bin/index.js

@@ -1,20 +1,74 @@
 #!/usr/bin/env node
-var minimist       = require('minimist')
 var updateNotifier = require('update-notifier')
-var cli            = require('../src/cli')
-
-var notifier = updateNotifier({packagePath: '../package'})
-if (notifier.update) notifier.notify()
-
-var argv = minimist(process.argv.slice(2), {
-    boolean: ["silent"],
-    alias: {
-        'p': 'port',
-        's': 'silent'
-    },
-    default: {
-        silent: false
+var _db = require('underscore-db')
+var yargs = require('yargs')
+var chalk = require('chalk')
+var got = require('got')
+var pkg = require('../package.json')
+var server = require('../src')
+
+updateNotifier({packageName: pkg.name, packageVersion: pkg.version}).notify()
+
+var argv = yargs
+  .usage('$0 <source>')
+  .help('help').alias('help', 'h')
+  .version(pkg.version, 'version').alias('version', 'v')
+  .options({
+    port: {
+      alias: 'p',
+      description: 'Set port',
+      default: 3000
+    }
+  })
+  .example('$0 db.json', '')
+  .example('$0 file.js', '')
+  .example('$0 http://example.com/db.json', '')
+  .require(1, 'Missing <source> argument')
+  .argv
+
+function start(object, filename) {
+  for (var prop in object) {
+    console.log('http://localhost:' + port + '/' + chalk.green(prop))
+  }
+
+  console.log(
+    '\nEnter ' + chalk.green('`s`') + ' at any time to create a snapshot of the db\n'
+  )
+
+  process.stdin.resume()
+  process.stdin.setEncoding('utf8')
+  process.stdin.on('data', function (chunk) {
+    if (chunk.trim().toLowerCase() === 's') {
+      var file = 'db-' + Date.now() + '.json'
+      _db.save(object, filename)
+      console.log('\nSaved snapshot to ' + chalk.green(file) + '\n')
     }
-})
+  })
+
+  server(object, filename).listen(port)
+}
+
+var source = argv._[0]
+var port = process.env.PORT || argv.port
+
+console.log(chalk.green('\n{^ ^} Yo!\n'))
+console.log('Loading database from ' + source + '\n')
+
+if (/\.json$/.test(source)) {
+  var filename = process.cwd() + '/' + source
+  var object = require(filename)
+  start(object, filename)
+}
+
+if (/\.js$/.test(source)) {
+  var object = require(process.cwd() + '/' + source)()
+  start(object)
+}
 
-cli.run(argv)
+if (/^http/.test(source)) {
+  got(source, function(err, data) {
+    if (err) throw err
+    var object = JSON.parse(data)
+    start(object)
+  })
+}

package.json

@@ -12,17 +12,18 @@
     "chalk": "^0.4.0",
     "cors": "^2.3.0",
     "errorhandler": "^1.2.0",
-    "express": "^4.9.0",
-    "lowdb": "^0.3.0",
+    "express": "^4.9.5",
+    "got": "^1.2.2",
+    "lowdb": "^0.4.2",
     "method-override": "^2.1.2",
-    "minimist": "0.0.8",
     "morgan": "^1.3.1",
     "serve-static": "^1.6.1",
-    "superagent": "~0.15.7",
-    "underscore": "~1.5.2",
+    "superagent": "^0.15.7",
+    "underscore": "^1.5.2",
+    "underscore-db": "^0.8.0",
     "underscore.inflections": "~0.2.1",
-    "update-notifier": "^0.1.8",
-    "yargs": "^1.2.1"
+    "update-notifier": "^0.2.2",
+    "yargs": "^1.3.1"
   },
   "devDependencies": {
     "supertest": "~0.8.1",

public/index.html

@@ -52,7 +52,7 @@ <h4>Documentation</h4>
       </p>
 
       <h4>Issues</h4>
-      <p>Please go 
+      <p>Please go
         <a href="https://github.com/typicode/jsonplaceholder/issues">here</a>.
       </p>