metrify 0.3.0 → 0.3.1

data/README.rdoc

@@ -116,10 +116,6 @@ Example Controller:
     private 
     def metrified_class
       @metrified_class || @metrified_class = MetricsClass.new
-    end 
-
-    def set_classname
-      @classname || @classname = Dashboard.name.downcase
     end
 
   end
@@ -131,6 +127,33 @@ Example View for graph:
 
   </style>
   <%= render :partial => "metrify/graph" %>
+
+Depending on the jscript framework you are using, you will also want to define an new instance of Breakdown, defining the Ajax method appropriately:
+
+Prototype:
+  <script type="text/javascript" charset="utf-8">
+    window.breakdown = new Breakdown(function(url, complete_fn){
+
+      new Ajax.Request(url, {evalJSON : 'force', onComplete : function(text){	 	
+        complete_fn(text.responseJSON); 
+        }})
+    });
+
+    document.observe("dom:loaded", function(){window.breakdown.create_new_chart();});
+
+  </script>
+  
+Mootools:
+
+  <script type="text/javascript" charset="utf-8">
+    window.breakdown = new Breakdown(function(url, complete_fn){
+      new Request({url : url, onSuccess : function(text){
+        complete_fn(text);
+      }}).get();
+    });
+
+    window.addEvent('domready', function(){window.breakdown.create_new_chart();});
+  </script>
   
 Example View for chart:
 

data/app/controllers/metrify_controller.rb

@@ -31,13 +31,17 @@ module MetrifyController
    def graph_stats
      prepare_for_graph
 
-     @stat_names = params[:stat_names] || metrified_class.stat_names
+     @stat_names = parsed_stat_names
    end
    
+   def parsed_stat_names
+     !params[:stat_names].blank? ? params[:stat_names].split(',') : metrified_class.stat_names
+  end
+   
    # chart_data.json?filters[type][]=letters&filters[type][]=animals&filters[furriness][]=not_furry
    def chart_data
     @metrify = metrified_class
-    @stat_names = metrified_class.stat_names(params[:filters])
+    @stat_names = metrified_class.stat_names(parsed_stat_names, params[:filters])
     @unit = params[:unit] || unit
 
     @number_of_stats = params[:number_of_stats] || number_of_stats

data/app/helpers/metrify_helper.rb

@@ -25,7 +25,7 @@ module MetrifyHelper
   
   def print_stat_value(stat, stat_name,  metrify, previous_stat = nil)
     val = stat.send(stat_name)
-    val = number_with_precision(val, :precision => metrify.value_precision(stat_name)) if (metrify.value_precision(stat_name))
+    val = number_with_precision(val, :precision => metrify.value_precision(stat_name)) if metrify.value_precision(stat_name)
     if metrify.value_type(stat_name) == "currency"
       str = number_to_currency(val) 
     else

data/app/views/metrify/_graph.html.erb

@@ -1,41 +1,69 @@
 <script type="text/javascript" charset="utf-8">
-  Breakdown = Class.create({
-    initialize : function(series_data){
-     this.get_chart(series_data);
-    },
-    get_chart : function(data){
-      if(this.chart){ return this.chart; }
-      this.chart = new Highcharts.Chart({
-  	    chart: {
-  	      renderTo: "stat_chart"
-        },
-        title: {
-          text: "All Stats"
-        },
-        xAxis: {
-         type: "datetime" 
-        },
-        yAxis: {
+  Breakdown = function(ajax_fn){
+    var ajax_fn = ajax_fn;                             
+
+    return {
+      get_chart : function(data){
+        this.chart = new Highcharts.Chart({
+    	    chart: {
+    	      renderTo: "stat_chart",
+    	      zoomType : 'x'
+          },
           title: {
-            text: "Value"
-          }
-        },
-        series: data
-      });
-    },
-    create_new_chart : function(stat_names){  
-      var filters = get_filter_values();
-      // var params = $H({names : stat_names || [], filters : filters || []}).toQueryString();
-      params = filters;
-      var url = ["/<%= @classname %>/chart_data.json", params].join('?');
-      new Ajax.Request(url, {onSuccess : function(trans){
-        this.chart = null;
-        this.get_chart(eval(trans.responseText));
-      }.bind(this)})
-    }
-  });
+            text: "All Stats"
+          },
+          xAxis: {
+           type: "datetime",
+           title : {
+             text : 'Date'
+           }
+          },
+          yAxis: {
+            title: {
+              text: "Value"
+            }
+          },
+          series: data
+        });
+      },
+      get_filter_values : function(){
+        var paramStrings = ""; 
+        <% @metrify.filters.each_pair do |filter, subfilters| %>
+          <% subfilters.each_pair do |subfilter, attributes| %>
+            var param = "<%= 'filters[' + filter.to_s + '[' + subfilter.to_s + ']]' %>";
+            e = document.getElementById(param);
+            var value = e.value;
+            var k = e.name;
+            if (value != null && value != '') {
+              if (paramStrings != "") {
+                paramStrings = paramStrings + '&';
+              }
+              paramStrings = paramStrings + 'filters[<%= filter.to_s %>][]=' + k;
+            }
+          <% end %>
+        <% end %>
+        <% if @unit %>
+          paramStrings = paramStrings + '&unit=<%= @unit %>';
+        <% end %>
+        <% if @stat_names %>
+          paramStrings = paramStrings + '&stat_names=<%= (@stat_names || []).join(",") %>'
+        <% end %>
+        return paramStrings;
+      },
+      create_new_chart : function(){  
+        var filters = this.get_filter_values();
+        params = filters;
+        var url = '<%= url_for(:action => 'chart_data', :format => 'json') %>' + '&' + params;
+        var self = this;
+        console.log("ajax function is " + ajax_fn);
+        ajax_fn.apply(this, [url, function(response_text){
+          //self.chart = null;
+          self.get_chart(eval(response_text));
+        }]);
+      }
+    };
+  };
 </script>
-
 <%= render :partial => 'metrify/time_links', :locals => {:unit => @unit, :action => 'graph_stats', :stat_names => @stat_names} %>
 <%= link_to "Metrics Home", 'index' %>
 <% showDateRangeOptions = "" 
@@ -47,36 +75,4 @@ showDateRangeOptions += "$(\'dateRangeOptions\').style.display = \'block\';\n" %
     <input type="checkbox" id="<%= 'filters[' + filter.to_s + '[' + subfilter.to_s + ']]' %>" name="<%= subfilter.to_s %>"  onClick="breakdown.create_new_chart();"/><%= subfilter.to_s %><br>
   <% end %>
 <% end %>
-<input type="button" value="Click Here" onUnclick="dashboard.create_new_chart();">
-<!-- this to controller and replace this with ajax also -->
-<script type="text/javascript" charset="utf-8"> 
-  var data = <%= @stat_names.map{|s| {:name => pretty_col_name(s, @metrify), 
-                                  :pointInterval => (1.send(@unit) * 1000), 
-                                  :pointStart => (@number_of_stats.send(@unit).ago.to_i * 1000), 
-                                  :data => get_stat_arr(s)}}.to_json %>;
-  window.breakdown = new Breakdown(data);
-
-  function get_filter_values()
-  {
-    var paramStrings = ""; 
-    <% @metrify.filters.each_pair do |filter, subfilters| %>
-      <% subfilters.each_pair do |subfilter, attributes| %>
-        var param = "<%= 'filters[' + filter.to_s + '[' + subfilter.to_s + ']]' %>";
-        e = document.getElementById(param);
-        var value = e.value;
-        var k = e.name;
-        if (value != null && value != '') {
-          if (paramStrings != "") {
-            paramStrings = paramStrings + '&';
-          }
-          paramStrings = paramStrings + 'filters[<%= filter.to_s %>][]=' + k;
-        }
-      <% end %>
-    <% end %>
-    <% if @unit %>
-      paramStrings = paramStrings + '&unit=<%= @unit %>';
-    <% end %>
-    return paramStrings;
-  }
-
-</script>
+<input type="button" value="Click Here" onUnclick="breakdown.create_new_chart();">

data/lib/metrify.rb

@@ -45,24 +45,31 @@ module Metrify
     
     # currency
     def value_type(stat_name)
-      metrify_data['stats'][stat_name]['value_type']
+      config_val(stat_name, 'value_type')
     end
     
     # int
     def value_precision(stat_name)
-      metrify_data['stats'][stat_name]['precision']
+      config_val(stat_name, 'precision')
     end
     
     # if stat should also have % +/- over previous time period
     def show_variance(stat_name)
-      metrify_data['stats'][stat_name]['show_variance']
+      config_val(stat_name, 'show_variance')
     end    
     
+    def display_name(stat_name)
+      config_val(stat_name, 'display_name')
+    end
+    
+    def config_val(stat_name, val)
+      metrify_data['stats'][stat_name] == nil ? nil : metrify_data['stats'][stat_name][val]
+    end
+    
     def method_missing(method, *args, &block)
       stat_names.each do |name|
         if (name + NAME == method.to_s)
-          obj = metrify_data['stats'][name]
-          return obj['display_name']
+          return display_name(name)
         elsif (CALC + name == method.to_s)
           new_meth = method.to_s[CALC.length,method.to_s.length]
           raise MetrifyInclusionError, "Base class must implement method: #{new_meth}." if !self.class.respond_to?(new_meth) 
@@ -91,30 +98,29 @@ module Metrify
       end
     end
     
-    def stat_names(my_filters = nil)
+    def stat_names(names = nil, my_filters = nil)
       #filters = ['type' => ['numbers', 'letters'], 'furriness' => ['furry', 'not_furry']]
       if my_filters
-        col_names =  metrify_data['stats'].keys
-        final_col_names =  metrify_data['stats'].keys
-
-        my_filters.each do |filter_type, filter_set|
+        col_names = names || metrify_data['stats'].keys
+        final_col_names = col_names.clone
+        my_filters.each do |filter_type, filter_subtypes|
           filter_col_names = []
           filters.keys.each do |filter_type_from_config|
             if (filter_type_from_config == filter_type)
-              filter_set.each do |filter|
-                filters[filter_type_from_config][filter]['set'].each do |col|
+              filter_subtypes.each do |subtype|
+                filters[filter_type_from_config][subtype]['set'].each do |col|
                   filter_col_names << col
                 end
               end
             end
           end
-          col_names.each do |col|
-              final_col_names.delete(col) if !filter_col_names.include?(col)
+          col_names.each do |ycol|
+              final_col_names.delete(ycol.to_s) if !filter_col_names.include?(ycol) 
           end
         end
         final_col_names
       else
-        metrify_data['stats'].keys
+        names || metrify_data['stats'].keys
       end
       
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metrify
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Stephen Abrams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -05:00
+date: 2010-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency