- some progress

canonic-epicure · Oct 6, 2010 · 8b0c126 · 8b0c126
1 parent 66cf5f3
commit 8b0c126
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/lib/KiokuJS/Backend/Hash.js b/lib/KiokuJS/Backend/Hash.js
@@ -39,27 +39,27 @@ Class('KiokuJS.Backend.Hash', {
 
 
             insert  : function (entries, mode) {
-                var docs                = this.docs
-                var stringifiedEntries  = this.serialize(entries)
+                var docs        = this.docs
+                var strings     = this.serialize(entries)
 
                 var ids = Joose.A.map(entries, function (entry, index) {
 
                     var ID  = entry.ID
 
                     if (mode == 'insert' && docs[ ID ]) 
                         throw new KiokuJS.Exception.Overwrite({
-                            id          : id,
+                            id          : ID,
                             oldValue    : docs[ ID ],
-                            newValue    : stringifiedEntries[ index ]
+                            newValue    : strings[ index ]
                         })
 
                     if (mode == 'update' && !docs[ ID ]) 
                         throw new KiokuJS.Exception.Update({
-                            message : "Attempt to update entry with ID = [" + ID + "], value = [" + stringifiedEntries[ index ] + "], but no such entry in storage"
+                            message : "Attempt to update entry with ID = [" + ID + "], value = [" + strings[ index ] + "], but no such entry in storage"
                         })
 
 
-                    docs[ ID ] = stringifiedEntries[ index ]
+                    docs[ ID ] = strings[ index ]
 
                     return ID
                 })

diff --git a/lib/KiokuJS/Scope.js b/lib/KiokuJS/Scope.js
@@ -338,10 +338,10 @@ Class('KiokuJS.Scope', {
             remove : function () {
                 var me          = this
 
-                var nodesOrIds  = Joose.A.map(arguments, function (arg) {
+                var entriesOrIds  = Joose.A.map(arguments, function (arg) {
                     // id
-                    // trying to replace an ID with Node where possible, as it has more information attached
-                    if (typeof arg == 'string') return me.idPinned(arg) ? me.idToNode(arg) : arg
+                    // trying to replace an ID with entry where possible, as it has more information attached
+                    if (typeof arg == 'string') return me.idPinned(arg) ? me.idToNode(arg).getEntry() : arg
 
                     // object
                     if (!me.objectPinned(arg)) 
@@ -355,15 +355,11 @@ Class('KiokuJS.Scope', {
 
                 var backend  = this.getBackend()
 
-                backend.remove(nodesOrIds).andThen(function () {
-
-                    Joose.A.each(nodesOrIds, function (nodeOrId) {
-                        // id
-                        if (typeof nodeOrId == 'string')
-                            me.unpinID(nodeOrId)
-                        // node
-                        else
-                            me.unpinNode(nodeOrId)
+                backend.remove(entriesOrIds).andThen(function () {
+
+                    Joose.A.each(entriesOrIds, function (entryOrId) {
+
+                        me.unpinID(typeof entryOrId == 'string' ? entryOrId : entryOrId.ID)
                     })
 
                     this.CONTINUE()
@@ -376,7 +372,7 @@ Class('KiokuJS.Scope', {
 
                 var nodes       = {}
 
-                Joose.A.each(this.backend.decodeEntries(packet.entries), function (node) {
+                Joose.A.each(this.decodeEntries(packet.entries), function (node) {
                     nodes[ node.ID ] = node
                 })