From 539da292da77902fd554af2ad6e16619c61bde8e Mon Sep 17 00:00:00 2001
From: Alexandre Gigliotti <alex@panosoft.com>
Date: Mon, 27 Jul 2015 13:15:45 -0700
Subject: [PATCH] Switched to postcss.

---
 lib/inline-css-url.js  | 24 +++++++++++++-----------
 lib/inline-style.js    |  2 +-
 package.json           |  4 ++--
 test/inline-css-url.js |  4 ++--
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/inline-css-url.js b/lib/inline-css-url.js
index 42a236f..894feaa 100644
--- a/lib/inline-css-url.js
+++ b/lib/inline-css-url.js
@@ -1,24 +1,26 @@
 var datauri = require('datauri');
 var isLocalPath = require('is-local-path');
 var path = require('path');
-var rework = require('rework');
-var url = require('rework-plugin-url');
+var postcss = require('postcss');
+var url = require('postcss-url');
 
 var inline = function (css, filename) {
 	var files = [];
 	var basePath = path.dirname(filename);
-	css = rework(css)
-		.use(url(function (url) {
-			if (isLocalPath(url)) {
-				url = path.resolve(basePath, url);
-				files.push(url);
-				url = datauri(url);
+	var result = postcss()
+		.use(url({
+			url: function (url) {
+				if (isLocalPath(url)) {
+					url = path.resolve(basePath, url);
+					files.push(url);
+					url = datauri(url);
+				}
+				return url;
 			}
-			return url;
 		}))
-		.toString();
+		.process(css);
 	return {
-		css: css,
+		css: result.css,
 		files: files
 	};
 };
diff --git a/lib/inline-style.js b/lib/inline-style.js
index 5a2734b..6fd7d25 100644
--- a/lib/inline-style.js
+++ b/lib/inline-style.js
@@ -8,7 +8,7 @@ var wrap = function (value) {
 	return prefix + value + suffix;
 };
 var unwrap = function (value) {
-	var regexp = new RegExp('^' + prefix + '\\s*(.*)\\s+' + suffix + '$');
+	var regexp = new RegExp('^' + prefix + '\\s*(.*)\\s*' + suffix + '$');
 	return value.replace(regexp, '$1');
 };
 var inline = function (html, filename) {
diff --git a/package.json b/package.json
index 43c7800..7c3fc40 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "less": "^2.5.1",
     "lodash": "^3.10.0",
     "mz": "^2.0.0",
-    "rework": "^1.0.1",
-    "rework-plugin-url": "^1.0.1",
+    "postcss": "^4.1.16",
+    "postcss-url": "^4.0.0",
     "string": "^3.3.0"
   }
 }
diff --git a/test/inline-css-url.js b/test/inline-css-url.js
index e7b4aee..0fbed5e 100644
--- a/test/inline-css-url.js
+++ b/test/inline-css-url.js
@@ -3,5 +3,5 @@ var fs = require('fs');
 
 var filePath = './fixtures/assets/imported.css';
 var css = fs.readFileSync(filePath, 'utf8');
-css = inline(css, filePath);
-console.log(css);
+var result = inline(css, filePath);
+console.log(result.css);