mountain-goat 0.0.10 → 0.0.11

data/lib/mountain-goat/metric_tracking.rb

@@ -36,6 +36,10 @@ module MetricTracking
     end
     
     def mv(metric_type, convert_type, default, opts = {}, opt = nil)
+      return get_metric_variant(metric_type, convert_type, default, opts, opt)[:value]
+    end
+    
+    def mv_detailed(metric_type, convert_type, default, opts = {}, opt = nil)
       return get_metric_variant(metric_type, convert_type, default, opts, opt)
     end
   
@@ -46,6 +50,8 @@ module MetricTracking
     
     def record_conversion(convert_type, options = {})
       
+      metrics = {} #for user-defined metrics
+      
       #We want some system for easy default parameter setting
       if options.include?(:refs) && options[:refs]
         options = options.merge( :ref_domain => session[:ref_domain], :ref_flyer => session[:ref_flyer], :ref_user => session[:ref_user] )
@@ -68,6 +74,13 @@ module MetricTracking
         options.delete(:invitees)
       end
       
+      options.each do |k, v|
+        if k.to_s =~ /^metric_(\w+)$/i
+          options.delete k
+          metrics.push $1, v
+        end
+      end
+      
       logger.warn "Recording conversion #{convert_type.to_s} with options #{options.inspect}"
       
       convert = Convert.first( :conditions => { :convert_type => convert_type.to_s } )
@@ -79,6 +92,25 @@ module MetricTracking
       #we need to see what meta information we should fill based on the conversion type
       Rally.create!( { :convert_id => convert.id } ).set_meta_data(options)
       
+      #User-defined metric tallies
+      metric.each do |metric_title, variant_id|
+        m = Metric.find_by_title(metric_title)
+        if m.nil?
+          logger.warn "Missing user-defined metric #{metric}"
+          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
+      end
+      
       if defined?(cookies)
         #we just converted, let's tally each of our metrics (from cookies)
         convert.metrics.each do |metric|
@@ -115,6 +147,7 @@ module MetricTracking
     
     private
     
+    #returns a map { :value => value, :variant_id => id }
     def get_metric_variant(metric_type, convert_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
@@ -132,7 +165,7 @@ module MetricTracking
           logger.warn "Serving metric #{metric_type} #{ opt.nil? ? "" : opt.to_s } without finding / tallying variant."
         end
         
-        return cookies[metric_sym] #it's the best we can do
+        return { :value => cookies[metric_sym], :variant_id => cookies[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, convert = get_metric_convert( metric_type, convert_type, false )
@@ -159,7 +192,7 @@ module MetricTracking
           cookies[metric_variant_sym] = { :value => metric_variant.id } #, :domain => WILD_DOMAIN
         end
         
-        return value
+        return { :value => value, :variant_id => metric_variant.id }
       end
     end
     
@@ -235,6 +268,10 @@ module MetricTracking
       @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

data/lib/mountain-goat/version.rb

@@ -1,3 +1,3 @@
 class MountainGoat
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/mountain-goat/views/mountain_goat/mountain_goat_converts/.tmp_index.html.erb.64368~

@@ -0,0 +1,49 @@
+
+
+<div id="container-main" class="mt-converts">
+	<div class="mountain-goat-panel centered">
+	
+		<h1>Conversion Goals</h1>
+		
+		<div class="conversions">
+			<div class="explanation">
+				<span class="inner">
+					Below are a list of conversion goals.  Each goal has a set of metrics designed to achieve that goal.  For each metric, there is a list of variants, each coupled with its conversation rate.</span>
+				</span>
+			</div>
+			
+			<div class="converts">
+				<% @converts.each do |convert| %>
+					<h2><a href="<%= mountain_goat_convert_url :id => convert.id %>"><%=h convert.name %></a></h2>
+					<% convert.metrics.each do |metric| %>
+						<div class="metric-category">
+							<span class="metric"><a href="<%= mountain_goat_metric_url :id => metric.id %>"><%= metric.title %></a></span>
+							<% if metric.metric_variants.count == 0 %>
+								<span class="none">No metric variants [<a href="<%= new_mountain_goat_metric_mountain_goat_metric_variant_url :mountain_goat_metric_id => metric.id %>">Add one</a>]</span>
+							<% else %>
+								<% metric.metric_variants.each do |mv| %>
+									<div class="item rate">
+										<span class="rate-holder">
+											<span class="title"><a href="<%= mountain_goat_metric_variant_url mv %>"><%=h mv.name %></a></span>
+											<span class="rates" style="width:<%= number_to_percentage(mv.conversion_rate, :precision => 0) %>"></span>
+										</span>
+										
+										<span class="percent-holder">
+											<span class="val"><%= number_to_percentage(mv.conversion_rate, :precision => 0) %></span>
+											(<span class="conversions"><%= mv.conversions %></span> /
+											<span class="served"><%= mv.served %></span>)
+										</span>
+									</div>
+								<% end %>
+							<% end %>
+						</div>
+					<% end %>
+				<% end %>
+			</div>
+		</div>
+	
+		<div class="actions">
+			<a class="button" href="<%= new_mountain_goat_convert_url %>">New Goal</a>
+		</div>
+	</div>
+</div>

data/test/ocelot_converts_controller_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class Ocelot::OcelotConvertsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index, {}, admin_user
+    assert_response :success
+    assert_not_nil assigns(:converts)
+  end
+
+  test "should get new" do
+    get :new, {}, admin_user
+    assert_response :success
+  end
+
+  test "should create convert" do
+    assert_difference('Convert.count') do
+      post :create, { :convert => { :name => 'my next convert', :convert_type => 'convert_type_3' } }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_convert_url assigns(:convert)
+  end
+
+  test "should show convert" do
+    get :show, { :id => converts(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, { :id => converts(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should update convert" do
+    put :update, { :id => converts(:one).to_param, :convert => { } }, admin_user
+    assert_redirected_to ocelot_ocelot_convert_url assigns(:convert)
+  end
+
+  test "should destroy convert" do
+    assert_difference('Convert.count', -1) do
+      delete :destroy, { :id => converts(:one).to_param }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_converts_url
+  end
+end

data/test/ocelot_metric_variants_controller_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class Ocelot::OcelotMetricVariantsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index, {}, admin_user
+    assert_response :success
+    assert_not_nil assigns(:metric_variants)
+  end
+
+  test "should get new" do
+    get :new, { :ocelot_metric_id => metrics(:two).id }, admin_user
+    assert_response :success
+  end
+
+  test "should create metric_variant" do
+    assert_difference('MetricVariant.count') do
+      post :create, { :metric_variant => { :metric_id => metrics(:two).id, :name => 'var', :value => 'cool' } }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_metric_url metrics(:two)
+  end
+
+  test "should show metric_variant" do
+    get :show, { :id => metric_variants(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, { :id => metric_variants(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should update metric_variant" do
+    put :update, { :id => metric_variants(:one).to_param, :metric_variant => { } }, admin_user
+    assert_redirected_to ocelot_ocelot_metric_url assigns(:metric_variant).metric
+  end
+
+  test "should destroy metric_variant" do
+    assert_difference('MetricVariant.count', -1) do
+      delete :destroy, { :id => metric_variants(:one).to_param }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_metric_variants_url
+  end
+end

data/test/ocelot_metrics_controller_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class Ocelot::OcelotMetricsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index, {}, admin_user
+    assert_response :success
+    assert_not_nil assigns(:metrics)
+  end
+
+  test "should get new" do
+    get :new, { :ocelot_convert_id => converts(:one).id }, admin_user
+    assert_response :success
+  end
+
+  test "should create metric" do
+    assert_difference('Metric.count') do
+      post :create, { :metric => { :metric_type => 'geoff', :title => 'hayes', :convert_id => converts(:two).id } }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_metric_url :id => assigns(:metric).id
+  end
+
+  test "should show metric" do
+    get :show, { :id => metrics(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, { :id => metrics(:one).to_param }, admin_user
+    assert_response :success
+  end
+
+  test "should update metric" do
+    put :update, { :id => metrics(:one).to_param, :metric => { } }, admin_user
+    assert_redirected_to ocelot_ocelot_metric_url :id => assigns(:metric).id
+  end
+
+  test "should destroy metric" do
+    assert_difference('Metric.count', -1) do
+      delete :destroy, { :id => metrics(:one).to_param }, admin_user
+    end
+
+    assert_redirected_to ocelot_ocelot_metrics_url
+  end
+end

data/test/ocelot_rallies_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class Ocelot::OcelotRalliesControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mountain-goat
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Geoffrey Hayes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
+date: 2011-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - lib/mountain-goat/views/mountain_goat/mountain_goat/.tmp_login.html.erb.27219~
 - lib/mountain-goat/views/mountain_goat/mountain_goat/login.html.erb
 - lib/mountain-goat/views/mountain_goat/mountain_goat_converts/.tmp_index.html.erb.22467~
+- lib/mountain-goat/views/mountain_goat/mountain_goat_converts/.tmp_index.html.erb.64368~
 - lib/mountain-goat/views/mountain_goat/mountain_goat_converts/_convert_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mountain_goat_converts/_convert_meta_type_form.html.erb
 - lib/mountain-goat/views/mountain_goat/mountain_goat_converts/edit.html.erb
@@ -120,6 +121,7 @@ files:
 - migrations/20090716093747_create_metric_tracking_tables.rb
 - migrations/20110710193220_mountain_goat_add_mg_options_table.rb
 - mountain-goat-0.0.1.gem
+- mountain-goat-0.0.10.gem
 - mountain-goat-0.0.2.gem
 - mountain-goat-0.0.3.gem
 - mountain-goat-0.0.4.gem
@@ -128,6 +130,10 @@ files:
 - mountain-goat-0.0.8.gem
 - mountain-goat-0.0.9.gem
 - mountain-goat.gemspec
+- test/ocelot_converts_controller_test.rb
+- test/ocelot_metric_variants_controller_test.rb
+- test/ocelot_metrics_controller_test.rb
+- test/ocelot_rallies_controller_test.rb
 has_rdoc: true
 homepage: http://github.com/hayesgm/mountain_goat
 licenses: []