Merge branch 'release/4.0.1'

index.js

@@ -8,6 +8,12 @@ var unquote = require('./lib/unquote');
 var util = require('util');
 
 module.exports = postcss.plugin('postcss-assets', function (options) {
+  options = options || {};
+
+  if (options.relative === undefined) {
+    options.relative = false;
+  }
+
   var resolver = Assets(options);
 
   function measure(path, density) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-assets",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "PostCSS plugin to manage assets",
   "keywords": [
     "assets",
@@ -14,7 +14,14 @@
     "url"
   ],
   "license": "MIT",
-  "author": "Vadym Borodin <[email protected]>",
+  "author": "Vadym Borodin <[email protected]> (http://borodean.com)",
+  "contributors": [
+    "Alexey Plutalov <[email protected]> (https://twitter.com/demiazz)",
+    "Andrey Sitnik <[email protected]> (http://sitnik.ru)",
+    "Dave Clayton <[email protected]> (http://www.dave78.com)",
+    "Ivan Vlasenko (https://github.com/avanes)",
+    "Pascal Duez (http://pascalduez.me)"
+  ],
   "repository": "assetsjs/postcss-assets",
   "scripts": {
     "coveralls": "nyc report --reporter=text-lcov | coveralls",

test/assets.js

@@ -6,8 +6,10 @@ var plugin = require('..');
 var postcss = require('postcss');
 var test = require('ava');
 
-function process(css, options, postcssOptions) {
-  return postcss().use(plugin(options)).process(css, postcssOptions);
+function process(css, options) {
+  return postcss().use(plugin(options)).process(css, {
+    from: path.resolve('fixtures/images/style.css')
+  });
 }
 
 test('resolves urls', function (t) {
@@ -25,8 +27,6 @@ test('resolves urls from the current path', function (t) {
   return process("a { b: resolve('picture.png') }", {
     basePath: 'fixtures',
     baseUrl: 'http://example.com/wp-content/themes'
-  }, {
-    from: path.resolve('fixtures/images/style.css')
   })
     .then(function (result) {
       t.is(result.css, "a { b: url('http://example.com/wp-content/themes/images/picture.png') }");
@@ -37,8 +37,6 @@ test('resolves relative urls from the current path', function (t) {
   return process("a { b: resolve('fonts/empty-sans.woff') }", {
     basePath: 'fixtures',
     relative: true
-  }, {
-    from: path.resolve('fixtures/images/style.css')
   })
     .then(function (result) {
       t.is(result.css, "a { b: url('../fonts/empty-sans.woff') }");