visage-app 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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

@@ -1,8 +1,8 @@
-/* 
+/*
  * visageBase()
  *
  * Base class for fetching data and setting graph options.
- * Should be used by other classes to build specialised graphing behaviour. 
+ * Should be used by other classes to build specialised graphing behaviour.
  *
  */
 var visageBase = new Class({
@@ -20,7 +20,7 @@ var visageBase = new Class({
         shade: false,
         secureJSON: false,
         httpMethod: 'get',
-        axis: "0 0 1 1" 
+        axis: "0 0 1 1"
     },
     initialize: function(element, host, plugin, options) {
         this.parentElement = element;
@@ -70,8 +70,6 @@ var visageBase = new Class({
             'class': 'graph-title',
             'html': header
         });
-        console.log(this);
-        console.log(this.parentElement);
         $(this.parentElement).grab(this.graphHeader);
     },
     buildGraphContainer: function() {
@@ -88,7 +86,7 @@ var visageBase = new Class({
 });
 
 
-/* 
+/*
  * visageGraph()
  *
  * General purpose graph for rendering data from a single plugin
@@ -145,7 +143,7 @@ var visageGraph = new Class({
 
         while (counter < finish) {
             x.push(counter)
-            counter += interval 
+            counter += interval
         }
         return x
     },
@@ -157,17 +155,17 @@ var visageGraph = new Class({
         var width  = this.options.gridWidth
         var height = this.options.gridHeight
         var x      = this.x  // x axis
-        var ys     = this.ys // y axes 
+        var ys     = this.ys // y axes
         var xstep  = x.length / 20
         var shade  = this.options.shade
         var axis   = this.options.axis
 
         this.canvas.g.txtattr.font = "11px 'sans-serif'";
         this.graph = this.canvas.g.linechart(left, top, width, height, x, ys, {
-                            nostroke: false, 
+                            nostroke: false,
                             width: 1.5,
                             axis: axis,
-                            colors: colors, 
+                            colors: colors,
                             axisxstep: xstep,
                             shade: shade
         });
@@ -179,7 +177,7 @@ var visageGraph = new Class({
         /* clean up graph labels */
         this.graph.axis[0].text.items.getLast().hide()
         $each(this.graph.axis[0].text.items, function (time) {
-            
+
             var unixTime = time.attr('text')
             var d = new Date(time.attr('text') * 1000);
             time.attr({'text': d.strftime("%H:%M")});
@@ -238,7 +236,7 @@ var visageGraph = new Class({
         this.embedderContainer.grab(pre);
 
         var slider = new Fx.Slide(pre, {
-            duration: 200 
+            duration: 200
         });
 
         slider.hide();
@@ -337,7 +335,7 @@ var visageGraph = new Class({
             }
         });
         $(this.parentElement).grab(this.timescaleContainer, 'top')
-        
+
         this.labelsContainer = new Element('div', {
             'class': 'labels container',
             'title': 'click to hide',
@@ -348,7 +346,7 @@ var visageGraph = new Class({
             }
         });
         $(this.parentElement).grab(this.labelsContainer)
-        
+
         this.embedderContainer = new Element('div', {
             'class': 'embedder container',
             'styles': {
@@ -361,13 +359,13 @@ var visageGraph = new Class({
         $(this.parentElement).grab(this.embedderContainer)
     },
     buildDateSelector: function() {
-            /* 
+            /*
              * container
              *   \
              *    - form
              *        \
              *         - select
-             *         |   \ 
+             *         |   \
              *         |    - option
              *         |    |
              *         |    - option
@@ -376,17 +374,17 @@ var visageGraph = new Class({
              */
             var currentDate = new Date;
             var currentUnixTime = parseInt(currentDate.getTime() / 1000);
-            
+
             var container = $(this.timescaleContainer);
-            var form = new Element('form', { 
-                    'action': this.dataURL(), 
+            var form = new Element('form', {
+                    'action': this.dataURL(),
                     'method': 'get',
                     'events': {
                         'submit': function(e, foo) {
                             e.stop();
-                          
+
                             /*
-                             * Get the selected option, turn it into a hash for 
+                             * Get the selected option, turn it into a hash for
                              * getData() to use.
                              */
                             data = new Hash()
@@ -419,13 +417,13 @@ var visageGraph = new Class({
             });
 
             var select = new Element('select', { 'class': 'date timescale' });
-            var timescales = new Hash({ 'hour': 1, '2 hours': 2, '6 hours': 6, '12 hours': 12, 
-                                        'day': 24, '2 days': 48, '3 days': 72, 
+            var timescales = new Hash({ 'hour': 1, '2 hours': 2, '6 hours': 6, '12 hours': 12,
+                                        'day': 24, '2 days': 48, '3 days': 72,
                                         'week': 168, '2 weeks': 336, 'month': 672 });
             timescales.each(function(hour, label) {
                 var current = this.currentTimePeriod == 'last {label}'.substitute({'label': label });
                 var value = "start={start}".substitute({'start': currentUnixTime - (hour * 3600)});
-                var html = 'last {label}'.substitute({'label': label }); 
+                var html = 'last {label}'.substitute({'label': label });
 
                 var option = new Element('option', {
                     html: html,
@@ -435,9 +433,9 @@ var visageGraph = new Class({
                 });
                 select.grab(option)
             });
-            
+
             var submit = new Element('input', { 'type': 'submit', 'value': 'show' });
-            
+
             form.grab(select);
             form.grab(submit);
             container.grab(form);
@@ -481,7 +479,7 @@ var visageGraph = new Class({
             var box = new Element('div', {
                 'class': 'label plugin box ' + metric,
                 'html': '&nbsp;',
-                'styles': { 
+                'styles': {
                       'background-color': color,
                       'width': '48px',
                       'height': '18px',
@@ -489,7 +487,7 @@ var visageGraph = new Class({
                       'margin-right': '0.5em'
                 }
             });
-     
+
             // plugin/instance/metrics names can be unmeaningful. make them pretty
             var name;
             name = instance.replace(plugin, '');
@@ -527,7 +525,7 @@ var visageSparkline = new Class({
         shade: false,
         secureJSON: false,
         httpMethod: 'get',
-        axis: "0 0 0 0" 
+        axis: "0 0 0 0"
     },
     graphData: function(data) {
 
@@ -551,10 +549,6 @@ var visageSparkline = new Class({
             }, this);
         }, this);
 
-        console.log(this.metrics)
-            console.log(this.instances)
-            console.log(this.ys)
-
         this.drawGraph();
     }
 });

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +10:00
+date: 2010-07-06 00:00:00 +10:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency