Store high level arrays as __dsList

Author: yasserf

CHANGELOG.md

@@ -1,7 +1,13 @@
-[1.0.1] 2016-07-13
+## [1.0.2] 2016-07-25
 
-Bug Fix
+### Bug Fix
 
-Storage connector no longer mutates original object state
+###### Storage connector stores high level arrays under __dsList ( records should only contain objects and not arrays on a highlevel )
 
-[1.0.0] 2016-07-01
+## [1.0.1] 2016-07-13
+
+### Bug Fix
+
+###### Storage connector no longer mutates original object state
+
+## [1.0.0] 2016-07-01

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepstream.io-storage-rethinkdb",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Connects deepstream.io to rethinkdb",
   "main": "src/connector.js",
   "scripts": {

src/transform-data.js

@@ -1,6 +1,9 @@
 "use strict"
 
 /**
+ * This method is for the storage connector, to allow queries to happen more naturally
+ * do not use in cache connectors
+ *
  * Inverts the data from the deepstream structure to reduce nesting.
  *
  * { _v: 1, _d: { name: 'elasticsearch' } } -> { name: 'elasticsearch', __ds = { _v: 1 } }
@@ -12,13 +15,26 @@
  */
 module.exports.transformValueForStorage = function ( value ) {
   value = JSON.parse( JSON.stringify( value ) )
+
   var data = value._d
   delete value._d
-  data.__ds = value
+
+  if( data instanceof Array ) {
+    data = {
+      __dsList: data,
+      __ds: value
+    }
+  } else {
+    data.__ds = value
+  }
+
   return data
 }
 
 /**
+ * This method is for the storage connector, to allow queries to happen more naturally
+ * do not use in cache connectors
+ *
  * Inverts the data from the stored structure back to the deepstream structure
  *
  * { name: 'elasticsearch', __ds = { _v: 1 } } -> { _v: 1, _d: { name: 'elasticsearch' } }
@@ -29,8 +45,16 @@ module.exports.transformValueForStorage = function ( value ) {
  * @returns {Object} data
  */
 module.exports.transformValueFromStorage = function( value ) {
+  value = JSON.parse( JSON.stringify( value ) )
+
   var data = value.__ds
   delete value.__ds
-  data._d = value
+
+  if( value.__dsList instanceof Array ) {
+    data._d = value.__dsList
+  } else {
+    data._d = value
+  }
+
   return data
 }

test/transform-dataSpec.js

@@ -0,0 +1,65 @@
+/*  global  describe,  expect,  it,  jasmine  */
+'use strict'
+
+const expect = require('chai').expect
+const TransformData = require( '../src/transform-data' )
+
+describe( 'Transforms outgoing data', () => {
+
+  it( 'Transforms objects', () => {
+    const result = TransformData.transformValueForStorage( {
+      _d: { firstname: "John", lastname: "Smith" },
+      _v: 12
+    } )
+    expect( result ).to.deep.equal( {
+      "__ds": {
+        "_v": 12
+      },
+      "firstname": "John",
+      "lastname": "Smith"
+    } )
+  } )
+
+  it( 'Transforms Lists', () => {
+    const result = TransformData.transformValueForStorage( {
+      _d: [ "John", "Smith" ],
+      _v: 12
+    } )
+    expect( result ).to.deep.equal( {
+      "__ds": {
+        "_v": 12
+      },
+      "__dsList": [ "John", "Smith" ]
+    } )
+  } )
+} )
+
+describe( 'Transforms incoming data', () => {
+
+  it( 'Transforms objects', () => {
+    const result = TransformData.transformValueFromStorage( {
+      "__ds": {
+        "_v": 12
+      },
+      "firstname": "John",
+      "lastname": "Smith"
+    } )
+    expect( result ).to.deep.equal( {
+      _d: { firstname: "John", lastname: "Smith" },
+      _v: 12
+    } )
+  } )
+
+  it( 'Transforms Lists', () => {
+    const result = TransformData.transformValueFromStorage( {
+      "__ds": {
+        "_v": 12
+      },
+      "__dsList": [ "John", "Smith" ]
+    } )
+    expect( result ).to.deep.equal( {
+      _d: [ "John", "Smith" ],
+      _v: 12
+    } )
+  } )
+} )