Merge pull request #48 from raykyri/master

Handle relative paths correctly

lib/charted.js

@@ -10,15 +10,16 @@ module.exports = function(app, charted_root) {
 
   app.use(charted_root + 'get', function (req, res, next) {
     var get_url = url.parse(req.url, true).query.url
-
     if (!get_url) {
       res.statusCode = 400
       res.end('Bad Request: no url provided')
-      next()
       return
     }
 
-    request(decodeURIComponent(get_url), function (err, resp, body) {
+    var get_url_full = url.parse(get_url).host ? get_url :
+        ('http://' + req.headers.host + '/' + get_url.replace(/^\//, ''))
+
+    request(get_url_full, function (err, resp, body) {
       if (err) {
         res.statusCode = 400
         res.end('Bad Request: ' + err)
@@ -32,8 +33,6 @@ module.exports = function(app, charted_root) {
         res.statusCode = 200
         res.end(body)
       }
-
-      next()
     })
   })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chartedjs",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "A charting library originally created by the Product Science team at Medium",
   "main": "lib/charted.js",
   "scripts": {
@@ -22,9 +22,10 @@
     "url": "https://github.com/mikesall/charted/issues"
   },
   "dependencies": {
-    "less": "1.7.x",
+    "connect": "^3.3.5",
     "express": "4.10.x",
     "jshint": "2.5.x",
+    "less": "1.7.x",
     "request": "2.47.x",
     "serve-static": "~1.7.2"
   },

pub/example.csv

@@ -0,0 +1,23 @@
+"month","example_one","example_two"
+"2013-07","2023","5247"
+"2013-08","3343","2357"
+"2013-09","1222","4395"
+"2013-10","1827","2586"
+"2013-11","2110","4179"
+"2013-12","3344","4450"
+"2014-01","18026","4428"
+"2014-02","12388","11877"
+"2014-03","4374","5214"
+"2014-04","3713","4522"
+"2014-05","3412","5542"
+"2014-06","4847","4832"
+"2014-07","7181","6812"
+"2014-08","2124","5681"
+"2014-09","2165","2332"
+"2014-10","1691","1062"
+"2014-11","1239","6015"
+"2014-12","7706","1421"
+"2015-01","5228","4402"
+"2015-02","2918","8130"
+"2015-03","5067","3160"
+"2015-04","8682","4728"

pub/scripts/PageController.js

@@ -238,7 +238,9 @@ PageController.prototype.getFullParams = function (chartIndex) {
 
 PageController.prototype.getDefaultTitle = function (chartIndex) {
   var series = this.parameters.charts[chartIndex].series
-  if (series.length === 1) {
+  if (!series) {
+    return 'Charted'
+  } else if (series.length === 1) {
     return this.getSeriesName(series[0])
   }
   var earlierCharts = this.parameters.charts.filter(function (chart, i) {