metrify 0.3.1 → 0.3.2

data/README.rdoc

@@ -112,12 +112,10 @@ Example Controller:
 
   class DashboardController < ApplicationController
     include MetrifyController
-
-    private 
-    def metrified_class
-      @metrified_class || @metrified_class = MetricsClass.new
+  
+    def metrify_model
+      Dashboard     # Dashboard is the class using the Metrify module
     end
-
   end
   
 Example View for graph:

data/app/controllers/metrify_controller.rb

@@ -1,6 +1,9 @@
 module MetrifyController
   
   def self.included(base)
+    base.class_eval do
+      before_filter :set_metrify_class
+    end
     base.extend ClassMethods
     base.send :include, InstanceMethods
     base.helper MetrifyHelper
@@ -8,16 +11,19 @@ module MetrifyController
   
   module InstanceMethods
    def index
-     @metrify = metrified_class
      setup_historical_stats
-     @stat_names = metrified_class.stat_names
+     @stat_names = @metrified_class.stat_names
      @historical_site_stats.reverse!
    end
+   
+   def set_metrify_class
+     @metrified_class = metrify_model
+   end
 
    def setup_historical_stats
      @unit = unit
      @number_of_stats = number_of_stats
-     @historical_site_stats = metrified_class.historical_values(Time.now.beginning_of_week, number_of_stats, unit)
+     @historical_site_stats = @metrified_class.historical_values(Time.now.beginning_of_week, number_of_stats, unit)
    end
    
    def number_of_stats
@@ -35,19 +41,18 @@ module MetrifyController
    end
    
    def parsed_stat_names
-     !params[:stat_names].blank? ? params[:stat_names].split(',') : metrified_class.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(parsed_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
-    @historical_site_stats = metrified_class.historical_values(Time.now.beginning_of_week, number_of_stats, unit)
+    @historical_site_stats = @metrified_class.historical_values(Time.now.beginning_of_week, number_of_stats, unit)
 
-    json = @stat_names.map{|s| {:name => @template.pretty_col_name(s, @metrify), 
+    json = @stat_names.map{|s| {:name => @metrified_class.display_name(s), 
                                 :pointInterval => (1.send(@unit) * 1000), 
                                 :pointStart => (@number_of_stats.send(@unit).ago.to_i * 1000), 
                                 :data => @historical_site_stats.map{|h| h.send(s)}}}
@@ -55,7 +60,7 @@ module MetrifyController
     setup_historical_stats
     respond_to do |format|
       format.json {
-        render :layout => false , :json => @stat_names.map{|s| {:name => @template.pretty_col_name(s, @metrify), 
+        render :layout => false , :json => @stat_names.map{|s| {:name => @metrified_class.display_name(s), 
           :pointInterval => (1.send(@unit) * 1000), 
           :pointStart => (@number_of_stats.send(@unit).ago.to_i * 1000), 
           :data => @template.get_stat_arr(s, @historical_site_stats)}}.to_json
@@ -64,18 +69,19 @@ module MetrifyController
     
    end
    
+#   def set_metrify_model; end
+   
    private
    
    def prepare_for_graph
-     @metrify = metrified_class
      setup_historical_stats
-     set_classname
    end
    
   end
 
  
   module ClassMethods
+
   end
 end
 

data/app/helpers/metrify_helper.rb

@@ -1,14 +1,5 @@
 module MetrifyHelper
   
-  def pretty_col_name(name, metrify)
-    configured_name = metrify.send(name + "_name")
-    return configured_name if configured_name
-    s = ""
-    name = name.split('_')
-    name.each {|word| s << ' '<< word.capitalize}
-    s
-  end
-
   def get_stat_arr(stat, historical_stats = @historical_site_stats)
     stat_over_time = []
     historical_stats.each do |s|
@@ -19,19 +10,19 @@ module MetrifyHelper
     stat_over_time
   end
   
-  def sorted_stat_names(metrify)
-    metrify.sort_stat_names(@stat_names)
+  def sorted_stat_names
+    @metrified_class.sort_stat_names(@stat_names)
   end
   
-  def print_stat_value(stat, stat_name,  metrify, previous_stat = nil)
+  def print_stat_value(stat, stat_name, 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)
-    if metrify.value_type(stat_name) == "currency"
+    val = number_with_precision(val, :precision => @metrified_class.value_precision(stat_name)) if @metrified_class.value_precision(stat_name)
+    if @metrified_class.value_type(stat_name) == "currency"
       str = number_to_currency(val) 
     else
       str = val.to_s
     end   
-    str += colorized_percent_diff(previous_stat.send(stat_name).to_f, stat.send(stat_name).to_f) if metrify.show_variance(stat_name) && previous_stat && previous_stat.send(stat_name) != 0 && stat.send(stat_name) != 0 && previous_stat.send(stat_name) != stat.send(stat_name)
+    str += colorized_percent_diff(previous_stat.send(stat_name).to_f, stat.send(stat_name).to_f) if @metrified_class.show_variance(stat_name) && previous_stat && previous_stat.send(stat_name) != 0 && stat.send(stat_name) != 0 && previous_stat.send(stat_name) != stat.send(stat_name)
     str
   end
   

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

@@ -7,9 +7,9 @@
   <thead> 
     <tr>
       <td>Finish Date</td>
-      <% sorted_stat_names(@metrify).each do |s| %>
+      <% sorted_stat_names.each do |s| %>
         <td>
-          <%= link_to pretty_col_name(s, @metrify), :action => "graph_stats", :stat_names => s, :unit=>@unit %>
+          <%= link_to @metrified_class.display_name(s), :action => "graph_stats", :stat_names => s, :unit=>@unit %>
         </td>
       <% end %>  
     </tr>
@@ -18,9 +18,9 @@
     <% @historical_site_stats.each do |stat| %>
       <tr>
         <td><%= stat.finish_date %></td>
-        <% sorted_stat_names(@metrify).each do |s| %>
+        <% sorted_stat_names.each do |s| %>
           <% idx = @historical_site_stats.index(stat); last = @historical_site_stats.last == stat %>
-        <td><%= print_stat_value(stat, s, @metrify, last ? nil : @historical_site_stats[idx+1]) %></td>
+        <td><%= print_stat_value(stat, s, last ? nil : @historical_site_stats[idx+1]) %></td>
         <% end %>
       </tr>
     <% end %>

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

@@ -28,7 +28,7 @@
       },
       get_filter_values : function(){
         var paramStrings = ""; 
-        <% @metrify.filters.each_pair do |filter, subfilters| %>
+        <% @metrified_class.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);
@@ -69,7 +69,7 @@
 <% showDateRangeOptions = "" 
 showDateRangeOptions += "$(\'dateRangeOptions\').style.display = \'block\';\n" %>
 <div class="metrify_graph" id="stat_chart"></div>
-<% @metrify.filters.each_pair do |filter, subfilters| %>
+<% @metrified_class.filters.each_pair do |filter, subfilters| %>
 <div><br><%= filter %>
   <% subfilters.each_pair do |subfilter, attributes| %>
     <input type="checkbox" id="<%= 'filters[' + filter.to_s + '[' + subfilter.to_s + ']]' %>" name="<%= subfilter.to_s %>"  onClick="breakdown.create_new_chart();"/><%= subfilter.to_s %><br>

data/lib/metrify.rb

@@ -14,12 +14,19 @@ module Metrify
     raise MetrifyInclusionError, "The base class must be a descendent of active record." unless base.respond_to?(:descends_from_active_record?)
     base.class_eval do
       cattr_accessor :metrify_data
-      cattr_accessor :start_date
-      cattr_accessor :end_date
     end
     base.send :extend, ClassMethods
   end
 
+  module InstanceMethods
+    def method_missing(method, *args, &block)
+      self.class.stat_names.each do |name|
+        return stat_hash[name] if (name == method.to_s)
+      end
+      super
+    end
+  end
+      
   module ClassMethods
     
     def acts_as_metrify(file = self.name.underscore + '_metrify.yml', test = false)
@@ -31,13 +38,6 @@ module Metrify
         self.metrify_data = YAML.load_file(File.join(RAILS_ROOT, 'config', file))
       end
     end
-  end
-
-  module InstanceMethods
-      
-    def metrify_data
-      self.class.metrify_data
-    end
     
     def filters
       metrify_data['filters']
@@ -59,7 +59,12 @@ module Metrify
     end    
     
     def display_name(stat_name)
-      config_val(stat_name, 'display_name')
+      configured_name = config_val(stat_name, 'display_name')
+      return configured_name if configured_name
+      s = ""
+      name = stat_name.split('_')
+      name.each {|word| s << ' '<< word.capitalize}
+      s
     end
     
     def config_val(stat_name, val)
@@ -72,10 +77,8 @@ module Metrify
           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) 
-          return self.class.send(new_meth, *args, &block)
-        elsif (name == method.to_s)
-          return stat_hash[method.to_s]
+          raise MetrifyInclusionError, "Base class must implement method: #{new_meth}." if !self.respond_to?(new_meth) 
+          return self.send(new_meth, *args, &block)
         end
       end
       super
@@ -140,13 +143,13 @@ module Metrify
     end
     
     def lookup(end_date = Time.now.midnight, interval = 1)
-      self.class.find(:first, :conditions => {:finish_date => end_date, :number_of_days => interval})
+      find(:first, :conditions => {:finish_date => end_date, :number_of_days => interval})
     end
     
     def generate(end_date = Time.now.midnight, number_of_days = 1)
-      s = self.class.find_or_create_by_finish_date_and_number_of_days(:finish_date => end_date, :number_of_days => number_of_days)
-      self.start_date = end_date - number_of_days.days
-      self.end_date = end_date
+      s = find_or_create_by_finish_date_and_number_of_days(:finish_date => end_date, :number_of_days => number_of_days)
+      start_date = end_date - number_of_days.days
+      end_date = end_date
       s.stat_hash = {}
       stat_names.each do |stat_name|
 #        raise MetrifyInclusionError, "Base class must implement method: #{stat_name}." unless self.class.respond_to?(stat_name)
@@ -158,4 +161,9 @@ module Metrify
       s
     end
   end
+
+  module InstanceMethods
+      
+    
+  end
 end

metadata

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