visage-app 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/visage-app.rb

@@ -79,9 +79,9 @@ module Visage
 
     # /data/:host/:plugin/:optional_plugin_instance
     get %r{/data/([^/]+)/([^/]+)((/[^/]+)*)} do
-      host = params[:captures][0]
-      plugin = params[:captures][1]
-      plugin_instances = params[:captures][2]
+      host = params[:captures][0].gsub("\0", "")
+      plugin = params[:captures][1].gsub("\0", "")
+      plugin_instances = params[:captures][2].gsub("\0", "")
 
       collectd = CollectdJSON.new(:rrddir => Visage::Config.rrddir,
                                   :fallback_colors => Visage::Config.fallback_colors)
@@ -96,7 +96,7 @@ module Visage
     end
 
     get %r{/data/([^/]+)} do
-      host = params[:captures][0]
+      host = params[:captures][0].gsub("\0", "")
       metrics = Visage::Collectd::RRDs.metrics(:host => host)
 
       json = { host => metrics }.to_json

data/lib/visage/collectd/json.rb

@@ -72,7 +72,7 @@ class CollectdJSON
         end
 
         # Sometimes the last value from the RRD is ridiculously large.
-        metric[-1] = 0
+        metric.slice!(-1)
 
         color = color_for(:host => data[:host],
                           :plugin => data[:plugin],

data/lib/visage/public/javascripts/graph.js

@@ -30,6 +30,14 @@ var visageBase = new Class({
         this.buildGraphHeader();
         this.buildGraphContainer();
         this.canvas = Raphael(this.graphContainer, this.options.width, this.options.height);
+        data = new Hash()
+        if($chk(this.options.start)) {
+            data.set('start', this.options.start)
+        }
+        if($chk(this.options.finish)) {
+            data.set('finish', this.options.finish)
+        }
+        this.requestData = data
         this.getData(); // calls graphData
     },
     dataURL: function() {
@@ -46,15 +54,7 @@ var visageBase = new Class({
         if (!url[0].match(/http\:\/\//)) {
             url[0] = '/' + url[0]
         }
-        var timeRange = []
-        // If a start time has been given
-        if ($chk(this.options.start)) {
-            timeRange.push('start=' + this.options.start)
-        }
-        if ($chk(this.options.finish)) {
-            timeRange.push('finish=' + this.options.finish)
-        }
-        return [url.join('/'), timeRange.join('&')].join('?')
+        return url.join('/')
     },
     getData: function() {
         this.request = new Request.JSONP({
@@ -384,7 +384,6 @@ var visageGraph = new Class({
 
             var container = $(this.timescaleContainer);
             var form = new Element('form', {
-                    'action': this.dataURL(),
                     'method': 'get',
                     'events': {
                         'submit': function(e, foo) {

data/lib/visage/public/javascripts/raphael.js

@@ -506,7 +506,6 @@ Raphael = (function () {
                 mx = 0,
                 my = 0,
                 start = 0;
-                console.log(pathArray)
             if (pathArray[0][0] == "M") {
                 x = +pathArray[0][1];
                 y = +pathArray[0][2];

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +10:00
+date: 2010-07-19 00:00:00 +10:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency