Merge branch 'release/1.1.4'

borodean · Feb 6, 2015 · aa5f4a4 · aa5f4a4
2 parents 42ea7f2 + 7d2a147
commit aa5f4a4
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.10"
+
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-PostCSS Assets
+PostCSS Assets [![Build Status](https://travis-ci.org/borodean/postcss-assets.svg?branch=develop)](https://travis-ci.org/borodean/postcss-assets)
 ==============
 
 PostCSS Assets is an asset manager for CSS. It isolates stylesheets from environmental changes, gets image sizes and inlines files.

diff --git a/index.js b/index.js
@@ -158,3 +158,7 @@ module.exports = function (options) {
     });
   };
 };
+
+module.exports.postcss = function (cssTree) {
+  module.exports()(cssTree);
+}
diff --git a/lib/mapFunctions.js b/lib/mapFunctions.js
@@ -13,6 +13,14 @@ function CSSString (str) {
 }
 
 CSSString.prototype.toString = function () {
+  if (!this.quotes && (this.value.indexOf("'") !== -1 || this.value.indexOf('"') !== -1)) {
+    this.quotes = "'";
+  }
+
+  if (this.quotes === '"') {
+    this.quotes = "'";
+  }
+
   return this.quotes + this.value + this.quotes;
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-assets",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "PostCSS plugin to manage assets",
   "author": "Vadim Borodean <[email protected]>",
   "license": "MIT",

diff --git a/test/fixtures/alpha/trapezium-mixed-quotes.svg b/test/fixtures/alpha/trapezium-mixed-quotes.svg
diff --git a/test/fixtures/cachebuster.expected.css b/test/fixtures/cachebuster.expected.css
@@ -1,5 +1,5 @@
 body {
-  background: url('/test/fixtures/alpha/kateryna.jpg?43');
-  background: url('/test/fixtures/alpha/kateryna.jpg?foo=bar&43');
-  background: url('/test/fixtures/alpha/kateryna.jpg?43');
+  background: url('/test/fixtures/alpha/kateryna.jpg?g');
+  background: url('/test/fixtures/alpha/kateryna.jpg?foo=bar&g');
+  background: url('/test/fixtures/alpha/kateryna.jpg?g');
 }
diff --git a/test/fixtures/inline.css b/test/fixtures/inline.css
@@ -1,6 +1,11 @@
 body {
   background: inline('alpha/blank.gif');
   background: inline(  'alpha/blank.gif' );
+  background: inline(alpha/trapezium.svg);
   background: inline('alpha/trapezium.svg');
+  background: inline(alpha/trapezium-single-quotes.svg);
   background: inline('alpha/trapezium-single-quotes.svg');
+  background: inline(alpha/trapezium-mixed-quotes.svg);
+  background: inline('alpha/trapezium-mixed-quotes.svg');
+  background: inline("alpha/trapezium-mixed-quotes.svg");
 }
diff --git a/test/fixtures/inline.expected.css b/test/fixtures/inline.expected.css
diff --git a/test/fixtures/resolve-spelling.expected.css b/test/fixtures/resolve-spelling.expected.css
@@ -8,7 +8,7 @@ body {
     url('/alpha/odalisque.jpg');
   background: url('/alpha/kateryna.jpg');
   background: url('/alpha/kateryna.jpg');
-  background: url("/alpha/kateryna.jpg");
+  background: url('/alpha/kateryna.jpg');
   background: url('/alpha/odalisque.jpg');
   background: url('/alpha/kateryna_(shevchenko).jpg');
   background: url('/alpha/kateryna.jpg');

diff --git a/test/index.js b/test/index.js
@@ -98,7 +98,7 @@ test('cachebuster', function (t) {
   t.notEqual(a, b, 'busts cache');
 
   options.cachebuster = function (path) {
-    return path.length.toString(16);
+    return path[path.length - 1];
   };
 
   compareFixtures(t, 'cachebuster', 'accepts buster function', options);
-Original file line number
+Diff line change
@@ Expand Up / @@ -158,3 +158,7 @@ module.exports = function (options) { @@
         });
       };
     };
+    module.exports.postcss = function (cssTree) {
+      module.exports()(cssTree);
+    }