v 1.0.1 fully redone

Sergey Dolin · Sergey Dolin · commit d02b48841cbf · 2016-11-02T12:42:40.000+05:00
diff --git a/README.md b/README.md
@@ -31,15 +31,26 @@ approverSchema = new mongoose.Schema({
     localeN: {type:String},
 	}
 });
-approverSchema.virtual('localized.name').get(function () {
+approverSchema.virtual('name._').get(function () {
 // return name in the current locale
   ...
-});
+}).set(function (v) {
+// set name of the current locale to v
+  ...
+})
+;
 ```
-The "localize" attribute will be removed from source Scheme. It's nor a bug neither a feature, it is "by design".  
 
 While the module must be required and setLocales must be called before the first Schema added the current locale may be set and changed in any moment. 
 
 ```javascript
-mongoose_localize.setLocale('locale2');
+mongoose_localize.setCurrenLocale('locale2');
 ```
+
+Locales and current locales may be retrieved with 
+
+```javascript
+mongoose_localize.locales();
+mongoose_localize.currentLocale();
+```
+
diff --git a/index.js b/index.js
@@ -3,93 +3,103 @@
 var mongoose = require('mongoose');
 
 var locales=['en','ru'];
-var locale='en';
+var locale=locales[0];
+
+function currentLocale(){
+	return locale?locale:((locales.length>0)?locales[0]:undefined);
+}
 
 var prototype_mongoose=function(){
-    var ma = mongoose.Schema.prototype.add;
-    var addI18n=function(schema,obj){
-        var keys = Object.keys(obj);
-
-        if (keys.length==1 && keys=='_id') return obj;
-
-        var ret={};
-
-        for (var i = 0; i < keys.length; ++i) {
-            var key = keys[i];
-            var val = obj[key];
-
-            if (key==='type'){
-                ret[key]=val;
-                continue;
-            }
-
-            if (typeof val != "object") {
-                ret[key]=val;
-                continue;
-            };
-
-            if (val instanceof Array) {
-                ret[key]=val;
-                continue;
-            };
-
-            var kkeys=Object.keys(val);
-            var localize=false;
-            for (var ii=0; ii<kkeys.length;++ii){
-                var kkey=kkeys[ii];
-                var vval=val[kkey];
-                if (typeof vval==="object"){
-                    val[kkey]=addI18n(schema,vval)
-                }else{
-                    if (vval && kkey=="localize"){
-                        localize=true;
-                    }
-                }
-            }
-            if (localize){
-                delete(val.localize);
-                var nval={};
-                for (var j=0;j<locales.length;j++){
-                    nval[locales[j]]=val;// Note: must live without copy JSON.parse(JSON.stringify(va)) because of [Function];
-                    //nval[locales[j]]=JSON.parse(JSON.stringify(val));
-                }
-                //ret['_localized_'+key]=nval;
-                ret[key]=nval;
-                schema.virtual('localized.'+key)
-                    .get(function(value,virtual){
-                        var n=virtual.path.substring(10);
-                        return this[n][locale];
-                    })/*
-                    .set(function(value,virtual){
-                        var n=virtual.path.substring(10);
-                        this[n]=value;
-                    });*/
-            }else{
-                ret[key]=val;
-            }
-        };
-        return ret;
-    }
-
-    mongoose.Schema.prototype.add = function add (obj, prefix) {
-        var oobj=addI18n(this,obj);
-        ma.call(this,oobj,prefix);
-    };
+	var ma = mongoose.Schema.prototype.add;
+	if (mongoose.Schema.protection.localized) return;
+	mongoose.Schema.protection.localized=()=>true;
+
+	//traverse over all fields and modify the objects having "localize" attribute
+	var addI18n=function(schema,obj,prefix){
+		var keys = Object.keys(obj);
+
+		if (keys.length==1 && keys=='_id') return obj;
+
+		var ret={};
+
+		for (var i = 0; i < keys.length; i++) {
+			//keys of fields
+			var key = keys[i];
+			var field = obj[key];
+
+			if (key==='type'){
+				ret[key]=field;
+				continue;
+			}
+
+			if (typeof field != "object") {
+				ret[key]=field;
+				continue;
+			};
+
+			if (field instanceof Array) {
+				//TODO: Should traverse? Than a problem with virtual name path
+				ret[key]=field.slice();
+				continue;
+			};
+
+			//now we are sure "field" is an object
+			//field=addI18n(schema,field,path+(path==''?'':'.')+key);
+
+			if (field.localize){
+				if ((locales instanceof Array) && locales.length>0){
+					var nfield={};
+					for (var li=0;li<locales.length;li++){
+					//TODO: remove ES6
+						nfield[locales[li]]=Object.assign({},field);
+						delete(nfield[locales[li]].localize);
+					}
+					ret[key]=nfield;
+					var vpath=(prefix?prefix:'')+key;
+					schema.virtual(vpath+'._')
+					.get(function(){
+						var l=currentLocale();
+						if (l) return this.get(vpath+'.'+l);
+						return undefined;
+					}).set(function(value,virtual){
+						if (currentLocale(value))
+							this.set((prefix?prefix:'')+key+'.'+l,value);
+					});
+				}else{
+					ret[key]=Object.assign({},field);
+					delete(ret[key].localize);
+				}
+			}else{
+				ret[key]=field;
+			}
+		};
+		return ret;
+	}
+
+	mongoose.Schema.prototype.add = function add (obj, prefix) {
+		console.log({in:obj});
+		var oobj=addI18n(this,obj,prefix);
+		console.log({out:oobj});
+		ma.call(this,oobj,prefix);
+	};
 };
 
 prototype_mongoose();
 
+
 module.exports = {
-locale:function(){
-    return locale;
-},
-setLocale:function(sLocale){
-    locale=sLocale;
-},
-locales:function(){
-    return locales;
-},
-setLocales:function(sLocales){
-    locales=sLocales;
-}
+	currentLocale:currentLocale,
+	setCurrentLocale:function(sLocale){
+		locale=sLocale;
+	},
+	locales:function(){
+		return locales;
+	},
+	setLocales:function(sLocales){
+		locales=sLocales;
+	},
+	activate:prototype_mongoose;
+	active:()=>!!mongoose.Schema.protection.localized
 }
+
+
diff --git a/package.json b/package.json
@@ -1,10 +1,18 @@
 {
   "author": "S4Y Solution <e@s4y.solutions>",
-  "contributors": ["Sergey Dolin <e@sergey.email>"],
+  "contributors": [
+    "Sergey Dolin <e@sergey.email>"
+  ],
   "name": "mongoose-localize",
   "description": "A module to conver mongoose model property to set of localized properties.",
-  "version": "0.1.0",
-  "keywords": ["mongoose","localize","l10n","i19n"],
+  "version": "1.0.1",
+  "keywords": [
+    "mongoose",
+    "localize",
+    "translation",
+    "l10n",
+    "i19n"
+  ],
   "license": "ISC",
   "repository": {
     "url": "git://github.com/dsame/mongoose-localize.git"
@@ -14,6 +22,13 @@
     "node": "*"
   },
   "scripts": {
-        "test": "mocha test"
-   }
+    "test": "mocha test"
+  },
+  "devDependencies": {
+    "chai": "3.5.0",
+    "mocha": "3.1.2"
+  },
+  "dependencies": {
+    "mongoose": "4.6.5"
+  }
 }
diff --git a/test/model.js b/test/model.js
