mountain-goat 1.0.1 → 1.0.2

data/lib/mountain-goat/views/mountain_goat/mg/tests/show.html.erb

@@ -0,0 +1,63 @@
+<div id="container-main" class="mg-tests">
+	<h1><%=h @test.title.capitalize %> Test</h1>
+	<div class="container-content">
+
+		<div class="choices">
+			<% if @test.mg_choices.count == 0 %>
+				<span class="none">No choices</span>
+			<% else %>
+				<div class="statboard">
+					<div class="flyer-analysis statpad">
+						<div class="title">Records</div>
+						<div class="statbody">
+							<%= mg_chart("analysis_graph#{@test.id}",
+												{ "Served" => { :collection => @rates[:served], :x => :choice_type, :y => :value },
+													"Reward Count" => { :collection => @rates[:reward_count], :x => :choice_type, :y => :value } },
+													{ :xaxis => { :ticks => @rates[:titles].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :show => false, :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "record(s)") %>
+						
+						</div>
+					</div>
+					<div class="flyer-analysis statpad">
+						<div class="title">Reward Rates</div>
+						<div class="statbody">
+							<%= mg_chart("analysis_conv_graph#{@test.id}",
+												{ "Reward Rate" => { :collection => @rates[:reward_rates], :x => :choice_type, :y => :value } },
+													{ :xaxis => { :ticks => @rates[:titles].map { |i,t| [i + 0.5, t] }.sort }, :yaxis => { :min => 0, :minTickSize => 1 }, :bars => { :show => true }, :legend => { :show => false, :position => "ne" }, :grid => { :hoverable => true, :clickable => true }, :inline => false }, :placeholder_size => "420x260", :pie_hover => true, :line_hover_absolute => true, :item_title => "") %>
+						
+						</div>
+					</div>
+				</div>
+		
+						
+				<div class="choices">
+					<% if @test.mg_choices.count == 0 %>
+						<span class="none">No choices [<a href="<%= new_mg_test_choice_url :test_id => @test.id %>">Add one</a>]</span>
+					<% else %>
+						<div class="title-bar">
+							<span class="category choice">Choice</span>
+							<span class="category served">Served</span>
+							<span class="category hit-points">Points</span>
+							<span class="category hit-points-avg">Avg. Points</span>
+							<span class="category actions">Actions</span>
+						</div>
+						<ul class="listed">
+							<% @test.mg_choices.each do |choice| %>
+								<li class="choice">
+									<span class="category choice"><%=h choice.name %></span>
+									<span class="category served"><%= choice.served %></span>
+									<span class="category hit-points"><%= choice.reward || "None" %></span>
+									<span class="category hit-points-avg"><%=h choice.reward_rate || "N/A" %></span>
+									<span class="category actions"><a href="<%= mg_choice_url choice %>">Edit</a></span>
+								</li>
+							<% end %>
+						</ul>
+					<% end %>
+				</div>
+			<% end %>
+		</div>
+		
+		<div class="action-bar">
+			<a class="button" href="<%= new_mg_test_choice_url :test_id => @test.id %>">New Choice</a>
+		</div>
+	</div>
+</div>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mountain-goat
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Geoffrey Hayes
@@ -22,9 +23,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -36,9 +39,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 5
@@ -56,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - History.md
@@ -70,29 +76,42 @@ files:
 - generators/mg/templates/mountain-goat.yml
 - generators/mg/templates/mountain_goat_reports.rake
 - generators/mg/templates/update_mountain_goat_tables.rb
+- generators/mg/templates/update_mountain_goat_tables_v2.rb
 - init.rb
 - install.rb
 - lib/mgflotilla.rb
 - lib/mountain-goat.rb
 - lib/mountain-goat/analytics.rb
+- lib/mountain-goat/controllers/mg/choices_controller.rb
 - lib/mountain-goat/controllers/mg/converts_controller.rb
+- lib/mountain-goat/controllers/mg/goals_controller.rb
 - lib/mountain-goat/controllers/mg/mg.rb
 - lib/mountain-goat/controllers/mg/mountain_goat_controller.rb
 - lib/mountain-goat/controllers/mg/playground_controller.rb
+- lib/mountain-goat/controllers/mg/records_controller.rb
 - lib/mountain-goat/controllers/mg/report_items_controller.rb
 - lib/mountain-goat/controllers/mg/reports_controller.rb
+- lib/mountain-goat/controllers/mg/tests_controller.rb
 - lib/mountain-goat/m_g.rb
-- lib/mountain-goat/metric_tracking.rb
+- lib/mountain-goat/mg_core.rb
+- lib/mountain-goat/models/mg/choice.rb
+- lib/mountain-goat/models/mg/gi_meta.rb
+- lib/mountain-goat/models/mg/goal.rb
+- lib/mountain-goat/models/mg/goal_meta_type.rb
+- lib/mountain-goat/models/mg/gs_meta.rb
 - lib/mountain-goat/models/mg/mountain_goat.rb
+- lib/mountain-goat/models/mg/record.rb
 - lib/mountain-goat/models/mg/report.rb
 - lib/mountain-goat/models/mg/report_item.rb
 - lib/mountain-goat/models/mg/report_mailer.rb
+- lib/mountain-goat/models/mg/test.rb
 - lib/mountain-goat/public/containerbg.png
 - lib/mountain-goat/public/dirtyred.png
 - lib/mountain-goat/public/dottedblack.png
 - lib/mountain-goat/public/dottedblue.png
 - lib/mountain-goat/public/g-bar-min.js
 - lib/mountain-goat/public/g-dot-min.js
+- lib/mountain-goat/public/g-funnel.js
 - lib/mountain-goat/public/g-line-min.js
 - lib/mountain-goat/public/g-pie-min.js
 - lib/mountain-goat/public/g-raphael-min.js
@@ -107,14 +126,44 @@ files:
 - lib/mountain-goat/public/raphael-min.js
 - lib/mountain-goat/public/raster.png
 - lib/mountain-goat/public/utils.js
-- lib/mountain-goat/switch_variant.rb
+- lib/mountain-goat/switch_choice.rb
 - lib/mountain-goat/version.rb
+- lib/mountain-goat/views/mountain_goat/layouts/.tmp_mountain_goat.html.erb.50680~
 - lib/mountain-goat/views/mountain_goat/layouts/_pdf.html.erb
 - lib/mountain-goat/views/mountain_goat/layouts/mountain_goat.html.erb
 - lib/mountain-goat/views/mountain_goat/layouts/xhr.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/choices/_choice_form.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/choices/edit.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/choices/index.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/choices/new.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/choices/show.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp__goal_form.html.erb.5027~
+- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp__goal_meta_type_form.html.erb.39992~
+- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_edit.html.erb.55874~
+- lib/mountain-goat/views/mountain_goat/mg/goals/.tmp_index.html.erb.97274~
+- lib/mountain-goat/views/mountain_goat/mg/goals/_goal_form.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/_goal_meta_type_form.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/edit.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/index.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/new.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/goals/show.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/mountain_goat/login.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/playground/test.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/_record.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/_records.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/_records_form.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/edit.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/index.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/new.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/records/show.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__chart.html.erb.13419~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__funnel.html.erb.60493~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_form.html.erb.87420~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__report_item_pivot_form.html.erb.77056~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_edit.html.erb.31048~
+- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp_new.html.erb.36371~
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_chart.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/report_items/_funnel.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_report_item_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_report_item_pivot_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/_show.html.erb
@@ -122,6 +171,11 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/report_items/edit.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_items/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/report_mailer/report.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_form.html.erb.76535~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_report_items.html.erb.26030~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.78064~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_index.html.erb.74591~
+- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.58427~
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/_report_report_items.html.erb
@@ -129,6 +183,11 @@ files:
 - lib/mountain-goat/views/mountain_goat/mg/reports/index.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/new.html.erb
 - lib/mountain-goat/views/mountain_goat/mg/reports/show.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/_test_form.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/edit.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/index.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/new.html.erb
+- lib/mountain-goat/views/mountain_goat/mg/tests/show.html.erb
 - mountain-goat.gemspec
 - test/fixtures/mg_ci_metas.yml
 - test/fixtures/mg_convert_meta_types.yml
@@ -163,23 +222,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: mountain-goat
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A/B Testing to the edge

data/lib/mountain-goat/metric_tracking.rb

@@ -1,401 +0,0 @@
-require File.join([File.dirname(__FILE__), 'switch_variant'])
-
-module MetricTracking
-  
-  #Metric Tracking routes
-  class << ActionController::Routing::Routes;self;end.class_eval do
-    define_method :clear!, lambda {}
-  end
-  
-  Mime::Type.register "application/xhtml+xml", :xhtml
-  
-  ActionController::Routing::Routes.draw do |map|
-    map.namespace :mg do |mg|
-      mg.mg '/mg', :controller => :converts, :action => :index, :path_prefix => ""
-      mg.login '/login', :controller => :mountain_goat, :action => :login
-      mg.login_create '/login/create', :controller => :mountain_goat, :action => :login_create
-      mg.resources :metric_variants
-      mg.resources :converts, :has_many => [ :rallies ]
-      mg.resources :metrics, :has_many => :metric_variants
-      mg.resources :rallies, :collection => { :new_rallies => :get }
-      mg.resources :reports, :has_many => :report_items, :member => { :show_svg => :get }
-      mg.resources :report_items, :member => { :destroy => :get, :update => :post }, :collection => { :get_extra => :get }
-      mg.resources :playground, :collection => { :test => :get }
-      mg.new_rallies '/rallies/new', :controller => :rallies, :action => :new_rallies 
-      mg.fresh_metrics '/fresh-metrics', :controller => :metrics, :action => :fresh_metrics
-      mg.connect '/public/:file', :controller => :mountain_goat, :action => :fetch
-    end
-  end
-  
-  module Controller
-  
-    #This is just for testing
-    def mg_rand
-      return "(SELECT #{@mg_i.nil? ? 1 : @mg_i.to_f})" if defined?(MOUNTAIN_GOAT_TEST) && MOUNTAIN_GOAT_TEST
-      "RAND()"
-    end
-    
-    def mg_epsilon
-      if @mg_epsilon.nil?
-        @mg_epsilon = 0.1 #default
-        mg_yml = nil
-        begin
-          mg_yml = YAML::load(File.open("#{RAILS_ROOT}/config/mountain-goat.yml"))
-        rescue
-        end
-        if mg_yml
-          if mg_yml.has_key?(RAILS_ENV) && mg_yml[RAILS_ENV].has_key?('epsilon')
-            @mg_epsilon = mg_yml[RAILS_ENV]['epsilon'].to_f
-          elsif mg_yml.has_key?('settings') && mg_yml['settings'].has_key?('epsilon')
-            @mg_epsilon = mg_yml['settings']['epsilon'].to_f
-          end
-        end
-      end
-      return @mg_epsilon
-    end
-    
-    def mg_strategy 
-      if @mg_strategy.nil?
-        @mg_strategy = 'e-greedy' #default
-        mg_yml = nil
-        begin
-          mg_yml = YAML::load(File.open("#{RAILS_ROOT}/config/mountain-goat.yml"))
-        rescue
-        end
-        if mg_yml
-          if mg_yml.has_key?(RAILS_ENV) && mg_yml[RAILS_ENV].has_key?('strategy')
-            @mg_strategy = mg_yml[RAILS_ENV]['strategy']
-          elsif mg_yml.has_key?('settings') && mg_yml['settings'].has_key?('strategy')
-            @mg_strategy = mg_yml['settings']['strategy']
-          end
-        end
-      end
-      return @mg_strategy
-    end
-    
-    def mg_apply_strategy(metric)
-      case mg_strategy.downcase
-        when 'e-greedy'
-          logger.warn Mg::MetricVariant.all(:order => "CASE WHEN served = 0 THEN 1 ELSE 0 END DESC, CASE WHEN #{rand.to_f} < #{mg_epsilon.to_f} THEN #{mg_rand} ELSE CASE WHEN served = 0 THEN -1 ELSE reward / served END END DESC, #{mg_rand} DESC", :conditions => { :metric_id => metric.id } )
-          return Mg::MetricVariant.first(:order => "CASE WHEN served = 0 THEN 1 ELSE 0 END DESC, CASE WHEN #{rand.to_f} < #{mg_epsilon.to_f} THEN #{mg_rand} ELSE CASE WHEN served = 0 THEN -1 ELSE reward / served END END DESC, #{mg_rand} DESC", :conditions => { :metric_id => metric.id } )
-        when 'e-greedy-decreasing'
-          return Mg::MetricVariant.first(:order => "CASE WHEN served = 0 THEN 1 ELSE 0 END DESC,
-                                                    CASE WHEN #{rand.to_f} < #{mg_epsilon.to_f} / ( select sum(served) from mg_metric_variants where metric_id = #{ metric.id.to_i } ) THEN #{mg_rand} ELSE CASE WHEN served = 0 THEN -1 ELSE reward / served END END DESC,
-                                                    #{mg_rand} DESC", :conditions => { :metric_id => metric.id } ) # * log( ( select sum(served) from mg_metric_variants where metric_id = #{ metric.id.to_i } ) )
-        when 'a/b'
-          return Mg::MetricVariant.first(:order => "#{rand.to_f} DESC", :conditions => { :metric_id => metric.id } )
-        else
-          raise "Invalid strategy #{mg_strategy}"
-      end
-    end
-    
-    def mg_storage 
-      if @mg_storage.nil?
-        @mg_storage = defined?(cookies) ? cookies : nil
-        
-        mg_yml = nil
-        begin
-          mg_yml = YAML::load(File.open("#{RAILS_ROOT}/config/mountain-goat.yml"))
-        rescue
-        end
-        if mg_yml
-          if mg_yml.has_key?(RAILS_ENV) && mg_yml[RAILS_ENV].has_key?('storage')
-            uc = mg_yml[RAILS_ENV]['storage'].strip
-            @mg_storage = ( uc == "cookies" && defined?(cookies) ) ? cookies : ( uc == "session" && defined?(session) ) ? session : nil
-          elsif mg_yml.has_key?('settings') && mg_yml['settings'].has_key?('storage')
-            uc = mg_yml['settings']['storage'].strip
-            @mg_storage = ( uc == "cookies" && defined?(cookies) ) ? cookies : ( uc == "session" && defined?(session) ) ? session : nil
-          end
-        end
-      end
-      @mg_storage = {} if @mg_storage.nil? #'none'
-      return @mg_storage
-    end
-    
-    ######################
-    #   Metric Tracking  #
-    ######################
-  
-    def bds(metric_type, &block)
-      raise ArgumentError, "Switch variant needs block" if !block_given?
-      metric = get_metric( metric_type, true )
-      block.call(SwitchVariant.new( logger, metric, nil ) )
-      
-      var = get_switch_metric_variant( metric_type )
-      block.call(SwitchVariant.new( logger, metric, var ) )
-    end
-    
-    def bd(metric_type, default, opts = {}, opt = nil)
-      return get_metric_variant(metric_type, default, opts, opt)[:value]
-    end
-    
-    def bdd(metric_type, default, opts = {}, opt = nil)
-      return get_metric_variant(metric_type, default, opts, opt)
-    end
-    
-    #Legacy
-    def sv(metric_type, convert_type, &block)
-      bds(metric_type, &block)
-    end
-    
-    def mv(metric_type, convert_type, default, opts = {}, opt = nil)
-      bd(metric_type, default, opts, opt)
-    end
-    
-    def mv_detailed(metric_type, convert_type, default, opts = {}, opt = nil)
-      bdd(metric_type, default, opts, opt)  
-    end
-    
-    #shorthand
-    def rw(convert_type, reward, options = {})
-      self.bandit_reward(convert_type, reward, options)
-    end
-    
-    def rc(convert_type, options = {})
-      self.bandit_reward(convert_type, 1, options)
-    end
-    
-    def record_conversion(convert_type, options = {})
-      self.bandit_reward(convert_type, 1, options)
-    end
-    
-    #allows bandit_reward(convert, options)
-    def bandit_reward(convert_type, reward, options = {})
-      
-      if reward.is_a?(Hash) #allow arguments bandit_reward(convert, options)
-        options = reward
-        reward = 0
-      end
-      
-      metrics = {} #for user-defined metrics
-      options = options.with_indifferent_access
-      
-      MountainGoat.get_meta_options.each do |k, v|
-        if options.include?(k) && options[k]
-          options.delete(k)
-          res = v.call(self)
-          options.merge!( res ) if !res.nil? && res.instance_of?(Hash)
-        end
-      end
-      
-      options.each do |k, v|
-        if k.to_s =~ /^metric_(\w+)$/i
-          options.delete k
-          metrics.merge!({ $1, v })
-        end
-      end
-      
-      logger.warn "Recording conversion #{convert_type.to_s} with options #{options.inspect}"
-      
-      convert = Mg::Convert.first( :conditions => { :convert_type => convert_type.to_s } )
-      
-      #now, we just create the convert if we don't have one
-      convert = Mg::Convert.create!( :convert_type => convert_type.to_s, :name => convert_type.to_s, :reward => reward ) if convert.nil?
-        
-      #first, let's tally for the conversion itself
-      #we need to see what meta information we should fill based on the conversion type
-      Mg::Rally.create!( { :convert_id => convert.id } ).set_meta_data(options)
-      
-      #User-defined metric tallies
-      metrics.each do |metric_type, variant_id|
-        m = Mg::Metric.find_by_metric_type(metric_type)
-        if m.nil?
-          logger.warn "Missing user-defined metric #{metric_type}"
-          next
-        end
-        
-        v = m.metric_variants.first( :conditions => { :id => variant_id } ) #make sure everything matches up
-        
-        if v.nil?
-          logger.warn "Variant #{variant_id} not in metric variants for #{m.title}"
-          next
-        end
-        
-        logger.warn "Tallying conversion #{convert.name} for #{m.title} - #{v.name} (#{v.value} - #{v.id})"
-        v.tally_convert(convert, reward)
-      end
-      
-      if !mg_storage.nil?
-        #we just converted, let's tally each of our metrics (from cookies or session)
-        Mg::Metric.all.each do |metric|
-          metric_sym = "metric_#{metric.metric_type}".to_sym
-          metric_variant_sym = "metric_#{metric.metric_type}_variant".to_sym
-          
-          value = mg_storage[metric_sym]
-          variant_id = mg_storage[metric_variant_sym]
-          
-          #logger.warn "Value: #{metric_sym} - #{value}"
-          #logger.warn "Value: #{metric_variant_sym} - #{variant_id}"
-          
-          if variant_id.blank? #the user just doesn't have this set
-            #This is now common-case
-            next
-          end
-          
-          variant = Mg::MetricVariant.first(:conditions => { :id => variant_id.to_i } )
-          
-          if variant.nil?
-            logger.error "Variant #{variant_id} not in metric variants for #{metric.title}"
-            next
-          end
-          
-          if variant.value != value
-            logger.warn "Variant #{variant.name} values differ for metric #{metric.title}.  '#{variant.value}' != '#{value}'!"
-          end
-          
-          logger.warn "Tallying conversion #{convert.name} for #{metric.title} - #{variant.name} (#{variant.value} - #{variant.id})"
-          variant.tally_convert(convert, reward)
-        end
-      end
-    end
-    
-    private
-    
-    #returns a map { :value => value, :variant_id => id }
-    def get_metric_variant(metric_type, default, opts = {}, opt = nil)
-      metric_sym = "metric_#{metric_type}#{ opt.nil? ? "" : '_' + opt.to_s }".to_sym
-      metric_variant_sym = "metric_#{metric_type}_variant".to_sym
-      
-      #first, we'll check for a cookie value
-      if !mg_storage.nil? && mg_storage[metric_sym] && !mg_storage[metric_sym].blank?
-        #we have the cookie  
-        variant_id = mg_storage[metric_variant_sym]
-        variant = Mg::MetricVariant.first(:conditions => { :id => variant_id.to_i } )
-        if !variant.nil?
-          if variant.metric.tally_each_serve
-            variant.tally_serve
-          end
-        else
-          logger.warn "Serving metric #{metric_type} #{ opt.nil? ? "" : opt.to_s } without finding / tallying variant."
-        end
-        
-        return { :value => mg_storage[metric_sym], :variant_id => mg_storage[metric_variant_sym] } #it's the best we can do
-      else
-        #we don't have the cookie, let's find a value to set
-        metric = get_metric( metric_type, false )
-        
-        metric_variant = mg_apply_strategy(metric)
-        
-        if metric_variant.nil?
-          logger.warn "Missing metric variants for #{metric_type}"
-          metric_variant = Mg::MetricVariant.create!( { :metric_id => metric.id, :value => default, :name => default }.merge(opts) )
-        end
-        
-        if metric_variant.metric.tally_each_serve
-          metric_variant.tally_serve #donate we served this to a user
-        end
-        
-        value = metric_variant.read_attribute( opt.nil? ? :value : opt )
-        logger.debug "Serving #{metric_variant.name} (#{value}) for #{metric_sym}"
-        #good, we have a variant, let's store it in session
-        
-        if !mg_storage.nil?
-          mg_storage[metric_sym] = value #, :domain => WILD_DOMAIN
-          mg_storage[metric_variant_sym] = metric_variant.id #, :domain => WILD_DOMAIN
-        end
-        
-        return { :value => value, :variant_id => metric_variant.id }
-      end
-    end
-    
-    def get_switch_metric_variant(metric_type)
-      metric_variant_sym = "metric_#{metric_type}_variant".to_sym
-      
-      #first, we'll check for a cookie selection
-      if !mg_storage.nil? && mg_storage[metric_variant_sym] && !mg_storage[metric_variant_sym].blank?
-        #we have the cookie
-        
-        variant_id = mg_storage[metric_variant_sym]
-        variant = Mg::MetricVariant.first(:conditions => { :id => variant_id.to_i } )
-        if !variant.nil?
-        
-          if variant.metric.tally_each_serve
-            variant.tally_serve
-          end
-          
-          return variant
-          
-        end
-        
-        #otherwise, it's a big wtf? let's just move on
-        logger.warn "Missing metric variant for #{metric_type} (switch-type), reassigning..."
-      end
-        
-      #we don't have the cookie, let's find a value to set
-      metric = get_metric( metric_type, true )
-      
-      metric_variant = mg_apply_strategy(metric)
-      
-      if metric_variant.nil?
-        logger.warn "Missing metric variants for #{metric_type}"
-        raise ArgumentError, "Missing variants for switch-type #{metric_type}"
-      end
-      
-      if metric_variant.metric.tally_each_serve
-        metric_variant.tally_serve #donate we served this to a user
-      end
-      
-      logger.debug "Serving #{metric_variant.name} (#{metric_variant.switch_type}) for #{metric.title} (switch-type)"
-      #good, we have a variant, let's store it in session (not the value, just the selection)
-      if !mg_storage.nil?
-        mg_storage[metric_variant_sym] = metric_variant.id #, :domain => WILD_DOMAIN
-      end
-      
-      return metric_variant
-    end
-    
-    def get_metric(metric_type, is_switch = false)
-      
-      metric = Mg::Metric.first(:conditions => { :metric_type => metric_type.to_s } )
-      
-      if metric.nil? #we don't have a metric of this type
-        logger.warn "Missing metric type #{metric_type.to_s} -- creating"
-        metric = Mg::Metric.create( :metric_type => metric_type.to_s, :title => metric_type.to_s, :is_switch => is_switch )
-      end
-      
-      return metric
-    end
-  end
-  
-  module View
-    def mv(*args, &block)
-      @controller.send(:mv, *args, &block)
-    end
-    
-    def mv_detailed(*args, &block)
-      @controller.send(:mv_detailed, *args, &block)
-    end
-    
-    def sv(*args, &block)
-      @controller.send(:sv, *args, &block)
-    end
-    
-    def bd(*args, &block)
-      @controller.send(:bd, *args, &block)
-    end
-    
-    def bdd(*args, &block)
-      @controller.send(:bdd, *args, &block)
-    end
-    
-    def bds(*args, &block)
-      @controller.send(:bds, *args, &block)
-    end
-  end
-end
-
-class ActionController::Base
-  include MetricTracking::Controller
-end
-
-class ActionView::Base
-  include MetricTracking::View
-end
-
-class ActionMailer::Base
-  include MetricTracking::Controller  
-end
-
-class ActiveRecord::Base
-  include MetricTracking::Controller  
-end