refactor according to coverage analysis, added tests, versioning

vardars · Dec 16, 2016 · 8ae0d97 · 8ae0d97
1 parent 8acade5
commit 8ae0d97
Show file tree

Hide file tree

Showing 7 changed files with 328 additions and 287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
-bower_components/
+bower_components/
+coverage/
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,4 @@ before_script:
   - npm install -g mocha
 script: mocha test/test.js
 after_success:
-  - npm install istanbul -g
-  - istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec
-  - npm install -g codecov
-  - codecov
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/bower.json b/bower.json
@@ -7,7 +7,7 @@
     "dotize"
   ],
   "authors": [
-    "Vardar <https://twitter.com/vardars>"
+    "Suleyman Vardar <https://twitter.com/vardars>"
   ],
   "license": "MIT",
   "ignore": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dotize",
-  "version": "0.1.28",
+  "version": "0.2.0",
   "description": "Convert complex Js object to dot notation Js object",
   "main": "src/dotize.js",
   "directories": {

diff --git a/src/dotize.js b/src/dotize.js
@@ -25,14 +25,6 @@ dotize.convert = function(obj, prefix) {
             if (Object.hasOwnProperty.call(obj, prop))
                 return false;
         }
-
-        return true;
-    }
-
-    function isEmptyArray(o) {
-        if (Array.isArray(o) && o.length === 0)
-            return true;
-        return false;
     }
 
     function getFieldName(field, prefix, isRoot, isArrayItem, isArray) {
@@ -47,43 +39,28 @@ dotize.convert = function(obj, prefix) {
     return function recurse(o, p, isRoot) {
         var isArrayItem = Array.isArray(o);
         for (var f in o) {
-            if (o.hasOwnProperty(f)) {
-                var currentProp = o[f];
-                if (currentProp && typeof currentProp === "object") {
-                    if (Array.isArray(currentProp)) {
-                        if (isEmptyArray(currentProp)) {
-                            newObj[getFieldName(f, p, isRoot, true)] = currentProp; // empty array
-                        } else {
-                            newObj = recurse(currentProp, getFieldName(f, p, isRoot, false, true), isArrayItem); // array
-                        }
-                    } else {
-                        if (isArrayItem) {
-                            if (isEmptyObj(currentProp)) {
-                                newObj[getFieldName(f, p, isRoot, true)] = currentProp; // empty object
-                            } else {
-                                newObj = recurse(currentProp, getFieldName(f, p, isRoot, true)); // array item object
-                            }
-                        } else {
-                            if (isEmptyObj(currentProp)) {
-                                newObj[getFieldName(f, p, isRoot)] = currentProp; // empty object
-                            } else {
-                                newObj = recurse(currentProp, getFieldName(f, p, isRoot)); // object
-                            }
-                        }
-                    }
+            var currentProp = o[f];
+            if (currentProp && typeof currentProp === "object") {
+                if (Array.isArray(currentProp)) {
+                    newObj = recurse(currentProp, getFieldName(f, p, isRoot, false, true), isArrayItem); // array
                 } else {
-                    if (isArrayItem || isNumber(f)) {
-                        newObj[getFieldName(f, p, isRoot, true)] = currentProp; // array item primitive
+                    if (isArrayItem && isEmptyObj(currentProp) == false) {
+                        newObj = recurse(currentProp, getFieldName(f, p, isRoot, true)); // array item object
+                    } else if (isEmptyObj(currentProp) == false) {
+                        newObj = recurse(currentProp, getFieldName(f, p, isRoot)); // object
                     } else {
-                        newObj[getFieldName(f, p, isRoot)] = currentProp; // primitive
+                        //
                     }
                 }
+            } else {
+                if (isArrayItem || isNumber(f)) {
+                    newObj[getFieldName(f, p, isRoot, true)] = currentProp; // array item primitive
+                } else {
+                    newObj[getFieldName(f, p, isRoot)] = currentProp; // primitive
+                }
             }
         }
 
-        if (isEmptyObj(newObj))
-            return obj;
-
         return newObj;
     }(obj, prefix, true);
 };

diff --git a/test/test-results.txt b/test/test-results.txt
@@ -15,7 +15,10 @@
     √ with prefix
 
   object
+    √ empty
     √ basic
+    √ basic with empty object field
+    √ basic with empty array field
     √ complex with child
     √ complex with Array
 
@@ -34,6 +37,10 @@
     √ #6 - weird array
     √ #10 - Keys prefixed with dot when used with arrays
 
+  json.org examples
+    √ example 1
+    √ example 2
+
 
-  20 passing (16ms)
+  25 passing (15ms)