improved merge processor

Author: elmasse

lib/processor/annotation/Merge.js

@@ -8,7 +8,6 @@
 var sequence = require('../sequence');
 var Merge;
 
-
 /**
  * @constructor
  */
@@ -46,29 +45,33 @@ Merge.prototype = {
         return this._parameter;
     },
 
-    /**
-     * mine merge strategy: mine params over their. If params is already defined it gets overriden.
-     */
-    _mergeMine : function (mine, their) {
+    _doMerge : function (mine, their, method) {
         var key;
 
         for (key in their) {
             if (their.hasOwnProperty(key)) {
-                mine[key] = their[key];
+                method.call(this, key);
             }
         }
+    },
+
+    /**
+     * mine merge strategy: mine params over their. If params is already defined it gets overriden.
+     */
+    _mergeMine : function (mine, their) {
+        this._doMerge(mine, their, function(k){
+            mine[k] = their[k];
+        });
 
         return mine;
     },
 
     _mergeOnlyProperties : function (mine, their) {
-        var key;
-
-        for (key in their) {
-            if (their.hasOwnProperty(key) && typeof their[key] !== 'function') {
-                mine[key] = their[key];
+        this._doMerge(mine, their, function(k){
+            if (typeof their[k] !== 'function'){
+                mine[k] = their[k];
             }
-        }
+        });
 
         return mine;
     },
@@ -80,20 +83,18 @@ Merge.prototype = {
      * otherwise it gets overriden with mine.
      */
      _mergeDeepMine : function (mine, their) {
-        return this._mergeDeep(mine, their, this._mergeMine);
+        return this._mergeDeep(mine, their, '_mergeMine');
     },
 
     /**
      * their merge strategy: their params over mine. If params is already defined it doesn't get overriden.
      */
     _mergeTheir : function (mine, their) {
-        var key;
-
-        for (key in their) {
-            if (their.hasOwnProperty(key) && mine[key] === undefined ) {
-                mine[key] = their[key];
+        this._doMerge(mine, their, function(k){
+            if (mine[k] === undefined) {
+                mine[k] = their[k];
             }
-        }
+        });
 
         return mine;
     },
@@ -106,28 +107,25 @@ Merge.prototype = {
      * otherwise it gets overriden with mine.
      */
      _mergeDeepTheir : function (mine, their) {
-        return this._mergeDeep(mine, their, this._mergeTheir);
+        return this._mergeDeep(mine, their, '_mergeTheir');
     },
 
     /**
      * runs the deep merge using the given strategy
      */
     _mergeDeep: function (mine, their, strategy) {
-        var key;
-
-        for (key in their) {
-            if (their.hasOwnProperty(key)) {
-                if (typeof their[key] === 'object') {
-                    if (their[key] instanceof Array) {
-                        mine[key] = [].concat(mine[key], their[key]);
-                    } else {
-                        mine[key] = strategy(mine[key], their[key]);
-                    }
-                }else if (mine[key] === undefined ) {
-                    mine[key] = their[key];
+        this._doMerge(mine, their, function(key){
+            if (typeof their[key] === 'object') {
+                if (their[key] instanceof Array) {
+                    mine[key] = [].concat(mine[key], their[key]);
+                } else {
+                    mine[key] = this[strategy](mine[key], their[key]);
                 }
+            }else if (mine[key] === undefined ) {
+                mine[key] = their[key];
             }
-        }
+        });
+
         return mine;
     },