mountain-goat 1.0.3 → 1.0.4

data/README.md

@@ -40,13 +40,13 @@ For more information, read my blog post on how mountain goat quickly accomplishe
 
 ## Upgrade from < 1.0.0
 
-If you are upgrading from Mountain Goat < 1.0.3, please run the following command (please overwrite mountain-goat.yml when prompted):
+If you are upgrading from Mountain Goat < 1.0.4, please run the following command (please overwrite mountain-goat.yml when prompted):
 
-     ./script/generate mg --update=1.0.0,1.0.3
+     ./script/generate mg --update=1.0.0,1.0.4
 
      rake db:migrate
      
-This will install new migrations necessary for version 1.0.3.  Leave out the 1.0.0 from the command if you are upgrading from version 1.0.0.
+This will install new migrations necessary for version 1.0.4.  Leave out the 1.0.0 from the command if you are upgrading from version 1.0.0.
  
 ## Install
 
@@ -267,6 +267,7 @@ As mountain goat is a suite that is added into your project dynamically, the fol
   * mg_reports
   
 ## Change log
+  1.0.4 - More Bug-fixes / Remove Flot Graphs Entirely
   1.0.3 - Some overall bug-fixes and start to use Raphael Graphs
   1.0.2 - Big UI overhaul ~ Robert
         - Renamed objects to reflect real-world thinking (e.g. metric => test)

data/generators/mg/mg_generator.rb

@@ -2,7 +2,7 @@ class MgGenerator < Rails::Generator::Base
   def add_options!(opt)
     opt.on('-p', '--password=password', String, "Your password to access Mountain Goat") { |v| options[:password] = v}
     opt.on('-w', '--wkhtmltopdf=/path/to/dir', String, "Path to installation of wkhtmltopdf (optional)") { |v| options[:wkhtmltopdf] = v}
-    opt.on('-u', '--update=1.0.0,1.0.3', String, "If you have previously installed Mountain Goat, use to generate *update* tables.") { |v| options[:update] = v}
+    opt.on('-u', '--update=1.0.0,1.0.4', String, "If you have previously installed Mountain Goat, use to generate *update* tables.") { |v| options[:update] = v}
     puts <<-HELPFUL_INSTRUCTIONS
 
       Mountain Goat is your home for in-house bandit testing.
@@ -42,7 +42,7 @@ class MgGenerator < Rails::Generator::Base
         m.migration_template 'update_mountain_goat_tables.rb', 'db/migrate', { :migration_file_name => "update_mountain_goat_tables" }
       end
       
-      if update.include?("1.0.3") || update.include?("1.0.2") || update.include?("1.0.1")
+      if update.include?("1.0.4") || update.include?("1.0.3") || update.include?("1.0.2") || update.include?("1.0.1")
         m.migration_template 'update_mountain_goat_tables_v2.rb', 'db/migrate', { :migration_file_name => "update_mountain_goat_tables_v2" }
       end
       

data/init.rb

@@ -1,5 +1,4 @@
 
-require File.join([File.dirname(__FILE__), 'lib/mgflotilla'])
 require File.join([File.dirname(__FILE__), 'lib/mountain-goat'])
 
 #ActionView::Helpers

data/lib/mountain-goat.rb

@@ -4,8 +4,6 @@ require 'active_support'
 require 'action_controller'
 require 'action_controller/routing'
 
-require File.join([File.dirname(__FILE__), 'mgflotilla'])
-
 require File.join([File.dirname(__FILE__), 'mountain-goat/controllers/mg/mg'])
 require File.join([File.dirname(__FILE__), 'mountain-goat/controllers/mg/mountain_goat_controller'])
 require File.join([File.dirname(__FILE__), 'mountain-goat/controllers/mg/tests_controller'])

data/lib/mountain-goat/controllers/mg/report_items_controller.rb

@@ -22,7 +22,7 @@ class Mg::ReportItemsController < Mg
     raise ArgumentError, "Invalid report" if @report.nil?
     
     @report_item = @report.mg_report_items.new(params[:report_item].clone.delete_if { |k, v| k.intern == :reportable || k.intern == :pivot } )
-    @report_item.order = @report.mg_report_items.maximum(:order) + 1 # @report.mg_report_items.to_a.map { |ri| ri.order }.push(0).max + 1# -- weird sqlite3 bugs
+    @report_item.order = ( @report.mg_report_items.maximum(:order) || 0 ) + 1 # @report.mg_report_items.to_a.map { |ri| ri.order }.push(0).max + 1# -- weird sqlite3 bugs
     
     if !params[:report_item][:reportable].blank?
       id, model = params[:report_item][:reportable].split('-')

data/lib/mountain-goat/controllers/mg/tests_controller.rb

@@ -18,22 +18,6 @@ class Mg::TestsController < Mg
   # GET /mg/tests/1.xml
   def show
     @test = Mg::Test.find(params[:id])
-
-    @rates = {}
-    @rates[:served] = []
-    @rates[:reward_count] = []
-    @rates[:reward_rates] = []
-    @rates[:titles] = {}
-    i = 0
-    @test.mg_choices.each do |mv|
-      @rates[:served].push( { :choice_type => i, :value => mv.served } )
-      @rates[:reward_count].push( { :choice_type => i, :value => mv.reward_count } )
-      @rates[:reward_rates].push( { :choice_type => i, :value => mv.reward_rate } )
-      @rates[:titles].merge!({i => mv.name})
-      i += 1
-    end
-    
-    logger.warn @rates[:titles].inspect
     
     respond_to do |format|
       format.html # show.html.erb

data/lib/mountain-goat/m_g.rb

@@ -1,23 +1,4 @@
 
-################
-# Setup PDFKit #
-################
-
-begin
-  require 'pdfkit'
-rescue LoadError
-  raise "Mountain Goat Reports will not work without the 'pdfkit' gem (please run `gem install pdfkit`)"
-end
-
-######################
-# Setup svg-graph    #
-######################
-
-begin
-  require 'SVG/Graph/TimeSeries'
-rescue LoadError
-  raise "Mountain Goat Reports will not work without the 'svg-graph' gem (please run `gem install svg-graph`)"
-end
 
 ############################
 # TODO: Verify Email Setup #
@@ -25,6 +6,26 @@ end
 
 class MG
   def self.deliver(delivery_set = nil)
+    ################
+    # Setup PDFKit #
+    ################
+    
+    begin
+      require 'pdfkit'
+    rescue LoadError
+      raise "Mountain Goat Reports will not work without the 'pdfkit' gem (please run `gem install pdfkit`)"
+    end
+    
+    ######################
+    # Setup svg-graph    #
+    ######################
+    
+    begin
+      require 'SVG/Graph/TimeSeries'
+    rescue LoadError
+      raise "Mountain Goat Reports will not work without the 'svg-graph' gem (please run `gem install svg-graph`)"
+    end
+    
     mg_yml = YAML::load(File.open("#{RAILS_ROOT}/config/mountain-goat.yml"))
     
     if mg_yml.blank? || mg_yml[RAILS_ENV].blank? || mg_yml[RAILS_ENV]['wkhtmltopdf'].blank?

data/lib/mountain-goat/models/mg/choice.rb

@@ -47,4 +47,10 @@ class Mg::Choice < ActiveRecord::Base
     return nil if self.reward_count == 0 || self.reward_count.nil? || self.reward.nil?
     return self.reward / self.reward_count.to_f
   end
+  
+  # What is the average reward given to this choice
+  def avg_points_per_serve
+    return nil if self.served == 0 || self.served.nil? || self.reward.nil?
+    return self.reward / self.served.to_f
+  end
 end

data/lib/mountain-goat/public/g-funnel.js

@@ -58,7 +58,7 @@ Raphael.fn.g.funnelchart = function (cx, cy, cw, ch, values, opts) {
 		var path = trap(sx0, sy0, w0, w1, sh);
 		var p = this.path(path).attr({fill: opts.colors && opts.colors[i] || this.g.colors[i] || "#666", stroke: opts.stroke || "#fff", "stroke-width": (opts.strokewidth == null ? 1 : opts.strokewidth), "stroke-linejoin": "round"});
 		if (values[i].labeltext)
-			p.insetLabel = this.text(sx0 + w0 / 2.0, sy0 + sh / 3.0, values[i].labeltext + ( i > 0 ? ( " " + ( ( values[i] - values[i - 1] ) / values[i - 1] ) + "%" ) : "")).attr({font: "20px Helvetica", stroke: "#fff", fill: "#eee", "fill-opacity": 0.95, "stroke-opacity": 0 });
+			p.insetLabel = this.text(sx0 + w0 / 2.0, sy0 + sh / 3.0, values[i].labeltext + ( i > 0 ? ( " " + ( ( values[i] * 100 / values[i - 1] ).toFixed(2) ) + "%" ) : "")).attr({font: "20px Helvetica", stroke: "#fff", fill: "#bbb", "fill-opacity": 0.95, "stroke-opacity": 0 });
 			
     	p.value = values[i];
     	sectors.push(p);

data/lib/mountain-goat/version.rb

@@ -1,3 +1,3 @@
 class MountainGoat
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/mountain-goat/views/mountain_goat/mg/records/_records.html.erb

@@ -1,5 +1,5 @@
 <%# locals => records %>
 
 <% records.each do |record| %>
-	<%= render 'record', :locals => { :record => record } %>
+	<%= render 'record', :record => record %>
 <% end %>

data/lib/mountain-goat/views/mountain_goat/mg/records/index.html.erb

@@ -2,7 +2,6 @@
 	<h1><% if @goal %><%=h @goal.name %><% else %>Comprehensive<% end %> Records</h1>
 	<div class="container-content">
 		<div class="recent-record" data-reload="true" data-record-id="<%= @records.count > 0 ? @records.first.id : -1 %>" data-goal-id="<%= @goal ? @goal.id : '' %>"></div>
-		<a class="button" href="javascript:void(0)" class="reload">Reload</a>
 		
 		<% if @records.count > 0 %>
 			<ul class="record-list">

data/lib/mountain-goat/views/mountain_goat/mg/reports/_report.html.erb

@@ -15,7 +15,7 @@
 
 <h4><%=h report.description %></h4>
 
-<% report.report_items.each do |report_item| %>
+<% report.mg_report_items.each do |report_item| %>
 	<div class="svg-chart">
 		<%= render 'mg/report_items/svg_chart', :report_item => report_item %>
 	</div>

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

@@ -8,21 +8,24 @@
 			<% else %>
 				<div class="statboard">
 					<div class="flyer-analysis statpad">
-						<div class="title">Records</div>
+						<div class="title">Serves</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 id="chart_item_mg_test_#{@test.id}_served %>" data-raphael="pie"
+								data-x="<%= @test.mg_choices.map { |c| "'#{c.name}'" }.join(',') %>"
+								data-y="<%= @test.mg_choices.map { |c| c.served }.join(',') %>"
+								style="width: 425px; height: 260px;" />
+						</div>
 						
 						</div>
 					</div>
 					<div class="flyer-analysis statpad">
-						<div class="title">Reward Rates</div>
+						<div class="title">Avg. Rewards</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 id="chart_item_mg_test_#{@test.id}_avg_reward %>" data-raphael="pie"
+								data-x="<%= @test.mg_choices.map { |c| "'#{c.name}'" }.join(',') %>"
+								data-y="<%= @test.mg_choices.map { |c| c.reward / c.served unless c.reward.blank? || c.served.blank? || c.served == 0 }.join(',') %>"
+								style="width: 425px; height: 260px;" />
+						</div>
 						
 						</div>
 					</div>
@@ -46,8 +49,8 @@
 									<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>
+									<span class="category hit-points-avg"><%=h choice.avg_points_per_serve || "N/A" %></span>
+									<span class="category actions"><a href="<%= edit_mg_choice_url choice %>">Edit</a></span>
 								</li>
 							<% end %>
 						</ul>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mountain-goat
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Geoffrey Hayes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 -07:00
+date: 2011-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,6 @@ files:
 - 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
@@ -118,7 +117,6 @@ files:
 - lib/mountain-goat/public/g-raphael-min.js
 - lib/mountain-goat/public/jqModel.css
 - lib/mountain-goat/public/jqModel.js
-- lib/mountain-goat/public/jquery.flot.js
 - lib/mountain-goat/public/jquery.raphael.js
 - lib/mountain-goat/public/jquery.timeago.js
 - lib/mountain-goat/public/mg.css
@@ -137,7 +135,6 @@ files:
 - 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_show.html.erb.86489~
 - 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
@@ -153,8 +150,6 @@ files:
 - 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.73596~
-- lib/mountain-goat/views/mountain_goat/mg/report_items/.tmp__show.html.erb.52502~
 - 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
@@ -164,10 +159,6 @@ 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.42949~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp__report_report_items.html.erb.96264~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_edit.html.erb.39909~
-- lib/mountain-goat/views/mountain_goat/mg/reports/.tmp_show.html.erb.37905~
 - 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
@@ -175,7 +166,6 @@ 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/.tmp_show.html.erb.19989~
 - 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
@@ -235,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mountain-goat
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A/B Testing to the edge

data/lib/mgflotilla.rb

@@ -1,170 +0,0 @@
-#begin
-#  require 'json'
-#rescue LoadError
-#  p "Flotilla will not work without the 'json' gem"
-#end
-
-module MGFlotilla
-  module Helpers
-      
-    # Insert a flot chart into the page.  <tt>placeholder</tt> should be the 
-    # name of the div that will hold the chart, <tt>collections</tt> is a hash 
-    # of legends (as strings) and datasets with options as hashes, <tt>options</tt>
-    # contains graph-wide options.
-    # 
-    # Example usage:
-    #   
-    #  chart("graph_div", { 
-    #   "January" => { :collection => @january, :x => :day, :y => :sales, :options => { :lines => {:show =>true}} }, 
-    #   "February" => { :collection => @february, :x => :day, :y => :sales, :options => { :points => {:show =>true} } },
-    #   :grid => { :backgroundColor => "#fffaff" })
-    # 
-    # Options:
-    #   :js_includes - includes flot library inline
-    #   :js_tags - wraps resulting javascript in javascript tags if true.  Defaults to true.
-    #   :placeholder_tag - appends a placeholder div for graph
-    #   :placeholder_size - specifys the size of the placeholder div
-    def mg_chart(placeholder, series, options = {}, html_options = {})
-      html_options.reverse_merge!({ :js_includes => true, :js_tags => true, :placeholder_tag => true, :placeholder_size => "800x300", :pie_hover => false, :pie_hover_absolute => false })
-      width, height = html_options[:placeholder_size].split("x") if html_options[:placeholder_size].respond_to?(:split)
-      additional_js = mg_get_additional_js(placeholder, html_options)
-      
-      data, x_is_date, y_is_date = mg_series_to_json(series)
-      if x_is_date
-        options[:xaxis] ||= {}
-        options[:xaxis].merge!({ :mode => 'time' })
-      end
-      if y_is_date
-        options[:yaxis] ||= {}
-        options[:yaxis].merge!({ :mode => 'time' })
-      end
-
-      if html_options[:js_includes]
-        chart_js = <<-EOF
-        <script type="text/javascript">
-          (function () {
-            if (typeof(jQuery) == 'undefined') {
-              alert("Please include jQuery to view flot");
-            } else {
-              if (typeof(jQuery.plot) == 'undefined') {
-                $('##{placeholder}').html("<span class='flot-error'>Please include jQuery.plot to view flot</span>");
-              } else {
-                var plot = jQuery.plot($('##{placeholder}'), #{data}, #{options.to_json});
-                #{additional_js}
-              }
-            }
-          })();
-        </script>
-        EOF
-      else
-        chart_js = <<-EOF
-        (function () {
-          if (typeof(jQuery) == 'undefined') {
-            alert("Please include jQuery to view flot");
-          } else {
-            if (typeof(jQuery.plot) == 'undefined') {
-              $('##{placeholder}').html("<span class='flot-error'>Please include jQuery.plot to view flot</span>");
-            } else {
-              var plot = jQuery.plot($('##{placeholder}'), #{data}, #{options.to_json});
-              #{additional_js}
-            }
-          }
-        })();
-        EOF
-      end        
-      
-      html_options[:js_tags] ? javascript_tag(chart_js) : chart_js
-      output = html_options[:placeholder_tag] ? content_tag(:div, nil, :id => placeholder, :style => "width:#{width}px;height:#{height}px;", :class => "chart") + chart_js : chart_js
-      output.html_safe
-    end
-
-    private
-    def mg_series_to_json(series)
-      data_sets = []
-      x_is_date, y_is_date = false, false
-      series.each do |name, values|
-        set, data = {}, []
-        set[:label] = name
-        first = values[:collection].first
-        logger.warn "Collection is: #{values[:collection].inspect}"
-        if first #&& !values[:collection].is_a?(Array)
-          if first.is_a?(Hash)
-            x_is_date = first[values[:x]].acts_like?(:date) || first[values[:x]].acts_like?(:time)
-            y_is_date = first[values[:y]].acts_like?(:date) || first[values[:y]].acts_like?(:time)
-          else
-            x_is_date = first.send(values[:x]).acts_like?(:date) || first.send(values[:x]).acts_like?(:time)
-            y_is_date = first.send(values[:y]).acts_like?(:date) || first.send(values[:y]).acts_like?(:time)
-          end
-        end
-        values[:collection].each do |object|
-          if values[:collection].is_a?(Hash) || object.is_a?(Hash)
-            x_value, y_value = object[values[:x]], object[values[:y]]
-            #logger.warn "A: Object is: #{object}, x,y: #{[x_value, y_value]} from #{[values[:x], values[:y]]}"
-          else
-            x_value, y_value = object.send(values[:x]), object.send(values[:y])
-            #logger.warn "B: Object is: #{object}, x,y: #{[x_value, y_value]}"
-          end
-          x = x_is_date ? x_value.to_time.to_i * 1000 : x_value.to_f
-          y = y_is_date ? y_value.to_time.to_i * 1000 : y_value.to_f
-          #logger.warn "Tally x,y: #{[x, y]}"
-          data << [x,y]
-        end
-        set[:data] = data
-        values[:options].each {|option, parameters| set[option] = parameters } if values[:options]
-        data_sets << set
-      end
-      return data_sets.to_json, x_is_date, y_is_date
-    end
-
-    def mg_get_additional_js(placeholder, options)
-      res = ""
-      if options[:pie_hover]
-        res << <<-EOF
-           function showTooltip(x, y, contents) {
-              $('<div id="tooltip">' + contents + '</div>').css( {
-                  position: 'absolute',
-                  //display: 'none',
-                  top: y + 5,
-                  left: x + 5,
-                  border: '1px solid #fdd',
-                  padding: '2px',
-                  'background-color': '#fee',
-                  opacity: 0.80
-              }).appendTo("body");//.fadeIn(200);
-          }
-       
-          var previousPoint = null;
-          $('##{placeholder}').bind('mouseout', function() {
-            plot.unhighlight();
-            $("#tooltip").remove();
-            $(this).data('previous-post', -1);
-          });
-          
-          $('##{placeholder}').bind('plothover', function(event, pos, item) {
-            if (item) {
-              if ($(this).data('previous-post') != item.seriesIndex) {
-                plot.unhighlight();
-                plot.highlight(item.series, item.datapoint);
-                $(this).data('previous-post', item.seriesIndex);
-              }
-              $("#tooltip").remove();
-              #{ options[:line_hover_absolute] ? "y = 'on ' + (new Date(item.datapoint[0])).toDateString() + ': ' + item.datapoint[1] + ' #{options[:item_title] || ''}'" : !options[:pie_hover_absolute] ? "y = item.datapoint[0].toFixed(0) + '%';" : "y = item.datapoint[1][0][1] + ' #{options[:item_title] || ''}'" } 
-              showTooltip(pos.pageX, pos.pageY, item.series.label + " " + y);
-            } else {
-              //console.log('unhighlight (3)');
-              plot.unhighlight();
-              $("#tooltip").remove();
-              previousPost = $(this).data('previous-post', -1);
-            }
-          });
-        EOF
-      end
-      
-      res
-    end
-  end
-end
-
-class ActionView::Base
-  include MGFlotilla::Helpers
-end