Merge branch 'dev'

Author: maltsev

.npmignore

@@ -1,5 +1,6 @@
 .gitignore
 .eslintrc
+.travis.yml
 node_modules/
 npm-debug.log
 /lib/*.es6

lib/helpers.es6

@@ -1,15 +1,13 @@
 import objectAssign from 'object-assign';
 import specificity from 'specificity';
+import parseAttrs from 'posthtml-attrs-parser';
 
 
 export function extendStyle(htmlNode, cssNode) {
-    htmlNode.attrs = htmlNode.attrs || {};
-    htmlNode.attrs.style = htmlNode.attrs.style || '';
-
-    const htmlNodeCss = parseCssFromStyle(htmlNode.attrs.style);
+    var attrs = parseAttrs(htmlNode.attrs);
     const cssNodeCss = parseCssFromNode(cssNode);
-    const newCss = objectAssign({}, htmlNodeCss, cssNodeCss);
-    htmlNode.attrs.style = stringifyCss(newCss);
+    attrs.style = objectAssign(attrs.style || {}, cssNodeCss);
+    htmlNode.attrs = attrs.compose();
 
     return htmlNode;
 }
@@ -63,30 +61,6 @@ function getSpecificity(selector) {
 }
 
 
-function stringifyCss(css) {
-    const styles = Object.keys(css).map(prop => prop + ': ' + css[prop]);
-    return styles.join('; ');
-}
-
-
-function parseCssFromStyle(style) {
-    var css = {};
-    style.split(';').forEach(cssRule => {
-        const cssRuleParts = cssRule.split(':');
-        if (cssRuleParts.length < 2) {
-            return;
-        }
-
-        const cssRuleProp = cssRuleParts[0].trim();
-        const cssRuleValue = cssRuleParts.slice(1).join(':').trim();
-
-        css[cssRuleProp] = cssRuleValue;
-    });
-
-    return css;
-}
-
-
 function parseCssFromNode(cssNode) {
     var css = {};
     cssNode.nodes.forEach(node => {

package.json

@@ -8,8 +8,8 @@
   "scripts": {
     "compile": "rm -f lib/*.js && node_modules/.bin/babel -d lib/ lib/",
     "lint": "node_modules/.bin/eslint *.js lib/*.es6 test/",
-    "pretest": "npm run lint",
-    "test": "node_modules/.bin/_mocha --compilers js:babel-core/register",
+    "pretest": "npm run lint && npm run compile",
+    "test": "node_modules/.bin/_mocha --compilers js:babel-core/register --check-leaks",
     "prepublish": "npm run compile"
   },
   "keywords": [
@@ -30,6 +30,7 @@
   "dependencies": {
     "object-assign": "^4.0.1",
     "postcss": "^5.0.12",
+    "posthtml-attrs-parser": "^0.1.0",
     "posthtml-match-helper": "^1.0.1",
     "specificity": "^0.1.4"
   },
@@ -42,7 +43,7 @@
     "expect": "^1.13.0",
     "lodash": "^3.10.1",
     "mocha": "^2.3.4",
-    "posthtml": "^0.7.0"
+    "posthtml": "^0.8.0"
   },
   "repository": {
     "type": "git",