set options if falsy

fortunejs · Aug 20, 2015 · 257255a · 257255a
1 parent 6482727
commit 257255a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 
+##### 1.1.0 (2015-08-20)
+- Feature: pass request meta-data to adapters. Thanks [@avens19](https://github.com/avens19)!
+- Revert: do run `prepublish` on install.
+
+
 ##### 1.0.5 (2015-08-19)
 - Improvement: do not run `prepublish` script on install.
 

diff --git a/lib/adapter/adapters/common.js b/lib/adapter/adapters/common.js
@@ -4,6 +4,8 @@ import { BadRequestError } from '../../common/errors'
 
 
 export function applyOptions (count, fields, records, options) {
+  if (!options) options = {}
+
   if ('match' in options) {
     records = records.filter(matchByField.bind(null, fields, options.match))
     count = records.length

diff --git a/lib/adapter/adapters/indexeddb/index.js b/lib/adapter/adapters/indexeddb/index.js
@@ -89,7 +89,7 @@ export default Adapter => class IndexedDBAdapter extends Adapter {
   }
 
 
-  find (type, ids, options = {}) {
+  find (type, ids, options) {
     if (ids && !ids.length) return super.find()
 
     const { db, recordTypes } = this

diff --git a/lib/adapter/adapters/memory/index.js b/lib/adapter/adapters/memory/index.js
@@ -27,7 +27,6 @@ export default Adapter => class MemoryAdapter extends Adapter {
 
 
   find (type, ids, options) {
-    if (!options) options = {}
     if (ids && !ids.length) return super.find()
 
     const { db, recordTypes } = this

diff --git a/lib/adapter/adapters/webstorage/index.js b/lib/adapter/adapters/webstorage/index.js
@@ -50,7 +50,7 @@ export default Adapter => class WebStorageAdapter extends Adapter {
   }
 
 
-  find (type, ids, options = {}) {
+  find (type, ids, options) {
     if (ids && !ids.length) return super.find()
 
     const { store, recordTypes, options: { prefix } } = this

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "build:test": "mkdirp dist/test && babel test --out-dir dist/test",
     "build:website": "babel-node website/build",
     "lint": "eslint lib test website",
-    "prepublish": "not-in-install && npm run clean && npm run build",
+    "prepublish": "npm run clean && npm run build",
     "postpublish": "npm run deploy:website",
     "test": "npm run lint && npm run test:server && npm run test:browser",
     "test:server": "npm run build && node dist/test | tap-dot",
@@ -52,7 +52,6 @@
     "highlight.js": "^8.7.0",
     "html-minifier": "^0.7.2",
     "http-server": "^0.8.0",
-    "in-publish": "^2.0.0",
     "isparta": "^3.0.3",
     "marked": "^0.3.5",
     "mkdirp": "^0.5.1",