3.0.0-alpha.4

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-alpha.4 - 23 February 2016
+
+- Improved find, destroy, and update methods
+- Upgraded to [email protected]
+
 ##### 3.0.0-alpha.3 - 23 February 2016
 
 - Upgraded dependencies

CONTRIBUTORS

@@ -4,4 +4,4 @@
 #
 # Names should be added to this file as:
 #   [commit count] Name <email address>
-    60	Jason Dobry <[email protected]>
+    62	Jason Dobry <[email protected]>

dist/js-data-localstorage.js

@@ -4,7 +4,10 @@ beforeEach(function () {
 
 TestRunner.init({
   debug: false,
-  features: [],
+  features: [
+    'findHasManyLocalKeys',
+    'findHasManyForeignKeys'
+  ],
   JSData: JSData,
   Adapter: LocalStorageAdapter,
   adapterConfig: {

dist/js-data-localstorage.js.map

@@ -1,7 +1,7 @@
 {
   "name": "js-data-localstorage",
   "description": "localStorage adapter for js-data.",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "homepage": "https://github.com/js-data/js-data-localstorage",
   "repository": {
     "type": "git",
@@ -43,6 +43,7 @@
     "gzip": "echo gzipped size: $(cat dist/js-data-localstorage.min.js | gzip -f9 | wc -c)kb",
     "build": "npm run lint && npm run bundle && npm run min && npm run version && npm run banner",
     "karma": "karma start",
+    "quick": "npm run bundle && npm run karma",
     "test": "npm run build && npm run karma",
     "release": "npm test && npm run doc && node scripts/authors.js",
     "ci": "npm test && cat ./coverage/PhantomJS*/lcov.info | coveralls || true && cat ./coverage/PhantomJS*/lcov.info | codacy-coverage || true"
@@ -60,7 +61,7 @@
     "codacy-coverage": "1.1.3",
     "coveralls": "2.11.6",
     "ink-docstrap": "1.1.2",
-    "js-data-adapter-tests": "^2.0.0-alpha.5",
+    "js-data-adapter-tests": "^2.0.0-alpha.6",
     "jsdoc": "3.4.0",
     "karma": "0.13.21",
     "karma-browserstack-launcher": "0.1.10",

dist/js-data-localstorage.min.js

@@ -404,18 +404,24 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
           self.dbg(op, id, opts)
           // Destroy the record
           // TODO: Destroy related records when the "with" option is provided
-          self.storage.removeItem(self.getIdPath(mapper, opts, id))
-          self.removeId(id, mapper, opts)
+          const key = self.getIdPath(mapper, opts, id)
+          const recordJson = self.storage.getItem(key)
+          let deleted = 0
+          if (recordJson) {
+            self.storage.removeItem(key)
+            self.removeId(id, mapper, opts)
+            deleted++
+          }
 
           // afterDestroy lifecycle hook
           op = opts.op = 'afterDestroy'
-          return self[op](mapper, id, opts).then(function (_id) {
+          return resolve(self[op](mapper, id, opts, deleted ? id : undefined)).then(function (_id) {
             // Allow for re-assignment from lifecycle hook
             id = isUndefined(_id) ? id : _id
             return opts.raw ? {
-              data: id,
-              deleted: 1
-            } : id
+              data: deleted ? id : undefined,
+              deleted
+            } : deleted ? id : undefined
           })
         }).then(success, failure)
       })
@@ -522,7 +528,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
       self.dbg(op, id, opts)
       const key = self.getIdPath(mapper, opts, id)
       record = self.storage.getItem(key)
-      if (isUndefined(record)) {
+      if (!record) {
         record = undefined
         return
       }
@@ -548,7 +554,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
           let localKeys = []
           let itemKeys = get(record, def.localKeys) || []
           itemKeys = Array.isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
-          localKeys = localKeys.concat(itemKeys || [])
+          localKeys = localKeys.concat(itemKeys)
           task = self.findAll(relatedMapper, {
             where: {
               [relatedMapper.idAttribute]: {
@@ -559,6 +565,17 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
             set(record, def.localField, relatedItems)
             return relatedItems
           })
+        } else if (def.type === 'hasMany' && def.foreignKeys) {
+          task = self.findAll(relatedMapper, {
+            where: {
+              [def.foreignKeys]: {
+                'contains': get(record, mapper.idAttribute)
+              }
+            }
+          }, __opts).then(function (relatedItems) {
+            set(record, def.localField, relatedItems)
+            return relatedItems
+          })
         } else if (def.type === 'belongsTo') {
           task = self.find(relatedMapper, get(record, def.foreignKey), __opts).then(function (relatedItem) {
             set(record, def.localField, relatedItem)
@@ -857,6 +874,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
           const key = self.getIdPath(mapper, opts, id)
           let record = self.storage.getItem(key)
           record = record ? fromJson(record) : undefined
+
           let updated = 0
 
           // Update the record
@@ -865,11 +883,13 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
             deepMixIn(record, props)
             self.storage.setItem(key, toJson(record))
             updated++
+          } else {
+            throw new Error('Not Found')
           }
 
           // afterUpdate lifecycle hook
           op = opts.op = 'afterUpdate'
-          return self[op](mapper, id, props, opts, record).then(function (_record) {
+          return resolve(self[op](mapper, id, props, opts, record)).then(function (_record) {
             // Allow for re-assignment from lifecycle hook
             record = isUndefined(_record) ? record : _record
             return opts.raw ? {