Code styled and logic improvement in convertShapeToPath

GreLI · GreLI · commit eecfabd5a9bc · 2015-02-23T23:06:18.000+03:00
diff --git a/lib/svgo/jsAPI.js b/lib/svgo/jsAPI.js
@@ -26,6 +26,21 @@ JSAPI.prototype.isElem = function(param) {
 
 };
 
+/**
+ * Renames an element
+ *
+ * @param {String} name new element name
+ * @return {Object} element
+ */
+JSAPI.prototype.renameElem = function(name) {
+
+    if (typeof name == 'string' && name != '')
+        this.elem = this.local = name;
+
+    return this;
+
+};
+
 /**
  * Determine if element is empty.
  *
@@ -97,17 +112,19 @@ JSAPI.prototype.isElem = function(param) {
 /**
  * Remove a specific attribute.
  *
- * @param {String} name attribute name
+ * @param {String|Array} name attribute name
  * @param {String} [val] attribute value
  * @return {Boolean}
  */
- JSAPI.prototype.removeAttr = function(name, val) {
+ JSAPI.prototype.removeAttr = function(name, val, recursive) {
 
     if (!arguments.length) return false;
 
+    if (Array.isArray(name)) name.forEach(this.removeAttr, this);
+
     if (!this.hasAttr(name)) return false;
 
-    if (val && this.attrs[name].value !== val) return false;
+    if (!recursive && val && this.attrs[name].value !== val) return false;
 
     delete this.attrs[name];
 
diff --git a/plugins/convertShapeToPath.js b/plugins/convertShapeToPath.js
@@ -4,8 +4,8 @@ exports.type = 'perItem';
 
 exports.active = true;
 
-var empty = { value: 0 },
-    regSeparator = /\s+,?\s*|,\s*/;
+var none = { value: 0 },
+    regNumber = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
 
 /**
  * Converts basic shape to more compact path.
@@ -30,8 +30,8 @@ exports.fn = function(item) {
         !item.hasAttr('ry')
     ) {
 
-        var x = +(item.attr('x') || empty).value,
-            y = +(item.attr('y') || empty).value,
+        var x = +(item.attr('x') || none).value,
+            y = +(item.attr('y') || none).value,
             width  = +item.attr('width').value,
             height = +item.attr('height').value;
 
@@ -54,15 +54,15 @@ exports.fn = function(item) {
                 local: 'd'
             });
 
-        ['x', 'y', 'width', 'height'].forEach(function(attr){ item.removeAttr(attr) });
-        item.elem = item.local = 'path';
+        item.renameElem('path')
+            .removeAttr(['x', 'y', 'width', 'height']);
 
     } else if (item.isElem('line')) {
 
-        var x1 = +(item.attr('x1') || empty).value,
-            y1 = +(item.attr('y1') || empty).value,
-            x2 = +(item.attr('x2') || empty).value,
-            y2 = +(item.attr('y2') || empty).value;
+        var x1 = +(item.attr('x1') || none).value,
+            y1 = +(item.attr('y1') || none).value,
+            x2 = +(item.attr('x2') || none).value,
+            y2 = +(item.attr('y2') || none).value;
         if (isNaN(x1 - y1 + x2 - y2)) return;
 
         item.addAttr({
@@ -72,8 +72,8 @@ exports.fn = function(item) {
                 local: 'd'
             });
 
-        ['x1', 'y1', 'x2', 'y2'].forEach(function(attr){ item.removeAttr(attr) });
-        item.elem = item.local = 'path';
+        item.renameElem('path')
+            .removeAttr(['x1', 'y1', 'x2', 'y2']);
 
     } else if ((
             item.isElem('polyline') ||
@@ -82,7 +82,12 @@ exports.fn = function(item) {
         item.hasAttr('points')
     ) {
 
-        var coords = item.attr('points').value.split(regSeparator);
+        var points = item.attr('points').value.trim(),
+            coords = [];
+
+        for (var num; num = regNumber.exec(points);)
+            coords.push(+num);
+
         if (coords.length < 4) return false;
 
         item.addAttr({
@@ -94,9 +99,8 @@ exports.fn = function(item) {
                 local: 'd'
             });
 
-        item.removeAttr('points');
-        item.elem = item.local = 'path';
-
+        item.renameElem('path')
+            .removeAttr('points');
     }
 
 };
diff --git a/test/plugins/convertShapeToPath.03.svg b/test/plugins/convertShapeToPath.03.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg">
     <polyline points="10,10 20"/>
     <polyline points="10,80 20,50 50,20 80,10"/>
-    <polyline points="20 ,10  50    40 30 , 20"/>
+    <polyline points="20 ,10  50    40 30.5-1e-1 , 20 10"/>
     <polyline stroke="#000" points="10,10 20,20 10,20"/>
     <polygon points="10,10 20"/>
     <polygon points="10,80 20,50 50,20 80,10"/>
@@ -13,7 +13,7 @@
 
 <svg xmlns="http://www.w3.org/2000/svg">
     <path d="M10 80L20 50 50 20 80 10"/>
-    <path d="M20 10L50 40 30 20"/>
+    <path d="M20 10L50 40 30.5 -0.1 20 10"/>
     <path stroke="#000" d="M10 10L20 20 10 20"/>
     <path d="M10 80L20 50 50 20 80 10z"/>
     <path d="M20 10L50 40 30 20z"/>
