Enable URLs with querystring

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+#### 0.6.x
+
+* Fix issue with URLs with querystring
+
 #### 0.6.17
 
 * Upgraded to node-srs@1.x and generic-pool2.4.x

lib/millstone.js

@@ -548,7 +548,7 @@ function resolve(options, callback) {
         function localizeCartoURIs(s,cb) {
             // Get all unique URIs in stylesheet
             // TODO - avoid finding non url( uris?
-            var matches = s.data.match(/[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/gi);
+            var matches = s.data.match(/[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi);
             var URIs = _.uniq(matches || []);
             var CartoURIs = [];
             // remove any matched urls that are not clearly

test/image-querystring/project-no-querystring.mml

@@ -0,0 +1,14 @@
+{
+    "Stylesheet": [
+        "style-no-querystring.mss"
+    ],
+    "Layer": [
+        {
+            "name": "background-image-no-querystring",
+            "Datasource": {
+                "type": "csv",
+                "inline": "x,y\n0,0"
+            }
+        }
+    ]
+}

test/image-querystring/project-querystring.mml

@@ -0,0 +1,14 @@
+{
+    "Stylesheet": [
+        "style-querystring.mss"
+    ],
+    "Layer": [
+        {
+            "name": "background-image-querystring",
+            "Datasource": {
+                "type": "csv",
+                "inline": "x,y\n0,0"
+            }
+        }
+    ]
+}

test/image-querystring/style-no-querystring.mss

@@ -0,0 +1 @@
+Map {background-image: url('http://i.imgur.com/yvRISk8.png');}

test/image-querystring/style-querystring.mss

@@ -0,0 +1 @@
+Map {background-image: url('http://i.imgur.com/yvRISk8.png?foo=bar');}

test/image-url-querystring.test.js

@@ -0,0 +1,59 @@
+var fs = require('fs');
+var path = require('path');
+var assert = require('assert');
+
+// switch to 'development' for more verbose logging
+process.env.NODE_ENV = 'production'
+var utils = require('../lib/util.js');
+var millstone = require('../lib/millstone');
+var tests = module.exports = {};
+var rm = require('./support.js').rm;
+
+var existsSync = require('fs').existsSync || require('path').existsSync;
+
+var cache = '/tmp/millstone-test';
+
+beforeEach(function(){
+    rm(path.join(__dirname, '/tmp/millstone-test'));
+
+    try {
+        fs.mkdirSync(options.cache, 0777);
+    } catch (e) {}
+});
+
+
+it('correctly handles images with no query string', function(done) {
+    var mml = JSON.parse(fs.readFileSync(path.join(__dirname, 'image-querystring/project-no-querystring.mml')));
+
+    var options = {
+        mml: mml,
+        base: path.join(__dirname, 'image-querystring'),
+        cache: cache
+    };
+
+    millstone.resolve(options, function(err, resolved) {
+        assert.equal(err,undefined,err);
+        assert.equal(resolved.Stylesheet[0].id, 'style-no-querystring.mss');
+        assert.equal(resolved.Stylesheet[0].data, "Map {background-image: url('/tmp/millstone-test/7b53c4b2-yvRISk8.png');}");
+        assert.ok(existsSync('/tmp/millstone-test/7b53c4b2-yvRISk8.png'));
+        done();
+    });
+});
+
+it('correctly handles images with query string', function(done) {
+    var mml = JSON.parse(fs.readFileSync(path.join(__dirname, 'image-querystring/project-querystring.mml')));
+
+    var options = {
+        mml: mml,
+        base: path.join(__dirname, 'image-querystring'),
+        cache: cache
+    };
+
+    millstone.resolve(options, function(err, resolved) {
+        assert.equal(err,undefined,err);
+        assert.equal(resolved.Stylesheet[0].id, 'style-querystring.mss');
+        assert.equal(resolved.Stylesheet[0].data, "Map {background-image: url('/tmp/millstone-test/d855a872-yvRISk8.png');}");
+        assert.ok(existsSync('/tmp/millstone-test/d855a872-yvRISk8.png'));
+        done();
+    });
+});