Don't use 'embedurl' in function or file name #148 #149

Stylus 0.54.0 introduces new embedurl() bif
So, we need to avoid same-named function in our code (renamed to 'data-uri')
Also, don't use 'embedurl' in any dir/file name or object key (renamed to 'urlfunc')

Gruntfile.js

@@ -77,43 +77,43 @@ module.exports = function(grunt) {
  ]
  }
  },
- embedurl: {
+ urlfunc: {
  files: {
- 'tmp/embedurl.css': 'test/fixtures/embedurl/embedurl.styl'
+ 'tmp/urlfunc.css': 'test/fixtures/urlfunc/urlfunc.styl'
  },
  options: {
- urlfunc: 'embedurl'
+ urlfunc: 'data-uri'
  }
  },
- embedurlObj: {
+ urlfuncObj: {
  files: {
- 'tmp/embedurlObj.css': 'test/fixtures/embedurl/embedurl.styl'
+ 'tmp/urlfuncObj.css': 'test/fixtures/urlfunc/urlfunc.styl'
  },
  options: {
  urlfunc: {
- name: 'embedurl'
+ name: 'data-uri'
  }
  }
  },
  urlfuncOpts: {
  files: {
- 'tmp/embedurlOpts.css': 'test/fixtures/embedurl/embedurlOpts.styl'
+ 'tmp/urlfuncOpts.css': 'test/fixtures/urlfunc/urlfuncOpts.styl'
  },
  options: {
  urlfunc: {
- name: 'embedurl',
+ name: 'data-uri',
  limit: 10,
  paths: []
  }
  }
  },
  urlfuncLimitFalse: {
  files: {
- 'tmp/urlfuncLimitFalse.css': 'test/fixtures/embedurl/urlfuncLimitFalse.styl'
+ 'tmp/urlfuncLimitFalse.css': 'test/fixtures/urlfunc/urlfuncLimitFalse.styl'
  },
  options: {
  urlfunc: {
- name: 'embedurl',
+ name: 'data-uri',
  limit: false,
  paths: []
  }

README.md

@@ -148,7 +148,7 @@ stylus: {
  paths: ['path/to/import', 'another/to/import'],
  relativeDest: '../out', //path to be joined and resolved with each file dest to get new one.
  //mostly useful for files specified using wildcards
- urlfunc: 'embedurl', // use embedurl('test.png') in our code to trigger Data URI embedding
+ urlfunc: 'data-uri', // use data-uri('test.png') in our code to trigger Data URI embedding
  use: [
  function () {
  return testPlugin('yep'); // plugin with options

docs/stylus-examples.md

@@ -7,7 +7,7 @@ stylus: {
  paths: ['path/to/import', 'another/to/import'],
  relativeDest: '../out', //path to be joined and resolved with each file dest to get new one.
  //mostly useful for files specified using wildcards
- urlfunc: 'embedurl', // use embedurl('test.png') in our code to trigger Data URI embedding
+ urlfunc: 'data-uri', // use data-uri('test.png') in our code to trigger Data URI embedding
  use: [
  function () {
  return testPlugin('yep'); // plugin with options

test/fixtures/embedurl/embedurl.styl → test/fixtures/urlfunc/urlfunc.styl

@@ -1,4 +1,4 @@
 .normal
  background-image:url('test.png');
 .base64
- background-image:embedurl('test.png');
+ background-image:data-uri('test.png');

test/fixtures/embedurl/urlfuncLimitFalse.styl → test/fixtures/urlfunc/urlfuncLimitFalse.styl

@@ -1,4 +1,4 @@
 .normal
  background-image:url('testLimit.jpg');
 .base64not
- background-image:embedurl('testLimit.jpg');
+ background-image:data-uri('testLimit.jpg');

test/fixtures/embedurl/embedurlOpts.styl → test/fixtures/urlfunc/urlfuncOpts.styl

@@ -1,4 +1,4 @@
 .normal
  background-image:url('test.png');
 .base64not
- background-image:embedurl('test.png');
+ background-image:data-uri('test.png');

test/stylus_test.js

@@ -53,23 +53,23 @@ exports.stylus = {
 
  test.done();
  },
- embedurl: function(test) {
+ urlfunc: function(test) {
  test.expect(4);
 
- var actual = readFile('tmp/embedurl.css');
- var expected = readFile('test/expected/embedurl/embedurl.css');
- test.equal(expected, actual, '`embedurl` mixin should embed image as Data URI');
+ var actual = readFile('tmp/urlfunc.css');
+ var expected = readFile('test/expected/urlfunc/urlfunc.css');
+ test.equal(expected, actual, '`urlfunc` mixin should embed image as Data URI');
 
- var actual2 = readFile('tmp/embedurlObj.css');
- var expected2 = readFile('test/expected/embedurl/embedurl.css');
- test.equal(actual2, expected2, '`embedurl` mixin should embed image as Data URI');
+ var actual2 = readFile('tmp/urlfuncObj.css');
+ var expected2 = readFile('test/expected/urlfunc/urlfunc.css');
+ test.equal(actual2, expected2, '`urlfunc` mixin should embed image as Data URI');
 
- var actual3 = readFile('tmp/embedurlOpts.css');
- var expected3 = readFile('test/expected/embedurl/embedurlOpts.css');
- test.equal(actual3, expected3, '`embedurlOpts` limit should prevent Data URI embed');
+ var actual3 = readFile('tmp/urlfuncOpts.css');
+ var expected3 = readFile('test/expected/urlfunc/urlfuncOpts.css');
+ test.equal(actual3, expected3, '`urlfuncOpts` limit should prevent Data URI embed');
 
  var actual4 = readFile('tmp/urlfuncLimitFalse.css');
- var expected4 = readFile('test/expected/embedurl/urlfuncLimitFalse.css');
+ var expected4 = readFile('test/expected/urlfunc/urlfuncLimitFalse.css');
  test.equal(actual4, expected4, '`urlfuncLimitFalse` no limit url function');
 
  test.done();