metrify 0.5.0 → 0.6.0

data/spec/spec_helper.rb

@@ -1,8 +1,15 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'metrify'
-require 'spec'
-require 'spec/autorun'
+if Rails::VERSION::MAJOR == 3
+  require 'rspec'
+  require 'rspec/autorun'
+
+else
+  require 'spec'
+  require 'spec/autorun'
+end  
+
 require 'rubygems'
 require 'active_record'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metrify
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Stephen Abrams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id001
 description: Framework to aggregate and display data over time. Assumes highcharts installation.
@@ -45,8 +44,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - README.rdoc
-- app/controllers/metrify_controller.rb
-- app/helpers/metrify_helper.rb
+- app/controllers/metrify/metrify_controller.rb
+- app/helpers/metrify/metrify_helper.rb
 - app/views/metrify/_chart.html.erb
 - app/views/metrify/_graph.html.erb
 - app/views/metrify/_mailer_charts_summary.html.erb
@@ -66,8 +65,8 @@ homepage: http://github.com/sabrams/metrify
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/app/controllers/metrify_controller.rb

@@ -1,94 +0,0 @@
-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
-  end
-  
-  module InstanceMethods
-   def index
-     setup_historical_stats
-     @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.zone.now.beginning_of_week, number_of_stats, unit)
-   end
-   
-   def number_of_stats
-
-    number = case unit.to_sym
-      when :month then 12
-      when :week then 52
-      when :day then 30
-      else 48 #hour
-    end
-    
-   end
-
-   def unit
-     params[:unit] || :week
-   end
-
-   def graph_stats
-     prepare_for_graph
-
-     @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
-    @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.zone.now.beginning_of_week, number_of_stats, unit)
-
-    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)}}}
-
-    setup_historical_stats
-    respond_to do |format|
-      format.json {
-        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
-          }
-    end
-    
-   end
-   
-#   def set_metrify_model; end
-   
-   private
-   
-   def prepare_for_graph
-     setup_historical_stats
-   end
-   
-  end
-
- 
-  module ClassMethods
-
-  end
-end
-

data/app/helpers/metrify_helper.rb

@@ -1,40 +0,0 @@
-module MetrifyHelper
-  
-  def get_stat_arr(stat, historical_stats = @historical_site_stats)
-    stat_over_time = []
-    historical_stats.each do |s|
-      value = s.send(stat)
-      value = 0 if !value
-      stat_over_time << value
-    end
-    stat_over_time
-  end
-  
-  def sorted_stat_names
-    @metrified_class.sorted_stat_names(@stat_names)
-  end
-  
-  def print_stat_value(stat, stat_name, previous_stat = nil)  
-    val = stat.send(stat_name)
-    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 @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
-  
-  def colorized_percent_diff(prev, cur)
-    val = percent_diff(prev, cur)
-    str = "<span class="
-    str += val >= 0 ? "stat_increase" : "stat_decrease"
-    str += "> (" + number_to_percentage(val, :precision => 2)  + ")</span>"
-  end
-  
-  def percent_diff(prev, cur)
-    (cur-prev)*100/prev
-  end
-  
-end