mitamirri 0.13.8 → 2.0.8

data/public/stylesheets/mitamirri_print.css

@@ -0,0 +1,3 @@
+#header { display: none; }
+.link_block { display: none; }
+.page_break { display: block; text-align: center; margin-top: 2em; page-break-after: always; }

data/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/blueprints.rb

@@ -0,0 +1,13 @@
+require 'machinist/mongoid'
+require 'sham'
+require 'faker'
+
+TrackableStat.blueprint do
+  site { 'www.seologic.com' }
+end
+
+TrackableSession.blueprint do
+  ip_address { '192.1.1.5' }
+  initial_request_url { 'http://www.seologic.com/foo.htm?gclid=1234' }
+  referrer { 'http://www.foo.com/' }
+end

data/spec/helpers/application_helper_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'mitamirri'
-include Mitamirri::Helper
 
-describe "application helper methods" do
-  
+require 'lib/mitamirri'
+
+describe Mitamirri::Helper do
+
   describe 'track action' do
-  
+
     it 'creates a trackable action object from view tracking invocation' do
       request = Object.new
       request.stubs(:referrer).returns('/')
@@ -14,44 +14,32 @@ describe "application helper methods" do
       session = Object.new
       session.stubs(:session_id).returns('1234ab')
       lambda{
-        track_action('view', :label => 'Some Label')
+        helper.track_action('view', :label => 'Some Label')
       }.should change(TrackableAction, :count).by(1)
     end
 
     it 'returns track click code for click tracking invocation' do
-      request = Object.new
-      request.stubs(:referrer).returns('/')
-      request.stubs(:remote_ip).returns('123.123.123.123')
-      request.stubs(:url).returns('http://www.elizium.com/opiates')
+      @request = Object.new
+      @request.stubs(:referrer).returns('/')
+      @request.stubs(:remote_ip).returns('123.123.123.123')
+      @request.stubs(:url).returns('http://www.elizium.com/opiates')
       session = Object.new
       session.stubs(:session_id).returns('1234ab')
-      track_action('click').should_not be_nil      
+      helper.track_action('click').should_not be_nil
     end
-    
-    it 'needs more robust tests for this method'
-    
+
   end
-  
+
   it 'returns appropriate track_click_code' do
-    expected = %{<script type="text/javascript">
-          Event.observe(window, 'load', function() {
-            Event.observe('my_button', 'mousedown', track_mousedown_my_button_event);
-          });
-          function track_mousedown_my_button_event() {
-            new Ajax.Updater('tracking', '/trackable_actions/', {asynchronous:true, evalScripts:true, parameters:'action=create&kind=click&label=my_action&referrer=/&remote_ip=123.123.123.123&site=www.seologic.com&url=/&session_id=asdf&destination='})
-            Event.stopObserving('my_button', 'mousedown', track_mousedown_my_button_event);
-          }
-        </script>}
-    track_event_code('click', 'mousedown', 'my_button', 'my_action', '/', '123.123.123.123', 'www.seologic.com', '/', 'asdf').should == expected
+    results = track_event_code('click', 'mousedown', 'my_button', 'my_action', '/', '123.123.123.123', 'www.seologic.com', '/', 'asdf')
+    results =~ /kind=click/
+    results =~ /Event.observe('my_button', 'mousedown', track_mousedown_my_button_event);/
+    results =~ /label=my_action/
+    results =~ /referrer=\//
+    results =~ /remote_ip=123.123.123.123/
+    results =~ /site=www.seologic.com/
+    results =~ /url=\//
+    results =~ /destination=asdf/
   end
-  
-  it 'returns a legend tag' do
-    legend_tag('Foo', {:id => 'foo'}).should == %{<div id="foo" class="faux_legend">Foo</div>\r}
-  end
-  
-  it 'returns page break code' do
-    page_break.should == %{<div class="page_break" /><p>(Continued on next page)</p></div>}
-  end
-  
-  
+
 end

data/spec/{lib → models}/content_report_spec.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'mitamirri'
 
-describe "ContentReport" do
+describe ContentReport do
 
   before :all do
     @args = {
@@ -10,16 +9,21 @@ describe "ContentReport" do
       :visit_kind => 'search'
     }
     TrackableSession.stubs(:search).returns([])
-    @report = Mitamirri::ContentReport.new(@args)
-  
+    @report = ContentReport.new(@args)
+
   end
-  
+
   it 'initializes with arguments' do
     @report.site.should == @args[:site]
     @report.time_period.should == @args[:time_period]
     @report.visit_kind.should == @args[:visit_kind]
   end
 
+  it 'requires a site, time period, and visit kind' do
+    @report.ready?.should be_true
+    ContentReport.new({}).ready?.should be_false
+  end
+
   it 'calculates its dates' do
     @report.dates.should == [
       (Time.zone.now - 2.months).beginning_of_month,
@@ -27,11 +31,11 @@ describe "ContentReport" do
       (Time.zone.now).end_of_month,
     ]
   end
-  
+
   it 'creates a ContentStat object from arguments' do
-    _stat = Mitamirri::ContentReport::ContentStat.new(:url => '/', :views => 3)
+    _stat = ContentStat.new(:url => '/', :views => 3)
     _stat.views.should == 3
     _stat.url.should == '/'
   end
-  
+
 end

data/spec/{lib → models}/intersite_traffic_report_spec.rb

@@ -10,7 +10,7 @@ describe "IntersiteTrafficReport" do
       :visit_kind => 'search'
     }
     TrackableSession.stubs(:search).returns([])
-    @report = Mitamirri::IntersiteTrafficReport.new(@args)
+    @report = IntersiteTrafficReport.new(@args)
   
   end
   
@@ -22,28 +22,25 @@ describe "IntersiteTrafficReport" do
 
   it 'calculates its dates' do
     @report.dates.should == [
-      (Time.zone.now - 4.weeks).end_of_week,
-      (Time.zone.now - 3.weeks).end_of_week,
-      (Time.zone.now - 2.weeks).end_of_week,
-      (Time.zone.now - 1.weeks).end_of_week,
-      (Time.zone.now).end_of_week,
+      (Time.zone.now - 1.month).beginning_of_month,
+      (Time.zone.now).end_of_month,
     ]
   end
   
   it 'creates a Destination object from arguments' do
-    _stat = Mitamirri::IntersiteTrafficReport::Destination.new(:site => 'www.foo.com', :clickthroughs => 3)
+    _stat = Destination.new(:site => 'www.foo.com', :clickthroughs => 3)
     _stat.clickthroughs.should == 3
     _stat.site.should == 'www.foo.com'
   end
   
   it 'creates a Visit object from arguments' do
-    _stat = Mitamirri::IntersiteTrafficReport::Visit.new(:site => 'www.foo.com', :stats => [])
+    _stat = Visit.new(:site => 'www.foo.com', :stats => [])
     _stat.site.should == 'www.foo.com'
     _stat.stats.should == []
   end
   
   it 'creates a VisitStat object from arguments' do
-    _stat = Mitamirri::IntersiteTrafficReport::VisitStat.new(:date => Time.zone.now.beginning_of_month, :clickthroughs => 3)
+    _stat = VisitStat.new(:date => Time.zone.now.beginning_of_month, :clickthroughs => 3)
     _stat.clickthroughs.should == 3
     _stat.date.should == Time.zone.now.beginning_of_month
   end

data/spec/{lib → models}/leads_report_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'mitamirri'
 
 describe "LeadsReport" do
 
@@ -9,34 +8,34 @@ describe "LeadsReport" do
       :time_period => 'past month',
     }
     TrackableSession.stubs(:search).returns([])
-    @report = Mitamirri::LeadsReport.new(@args)
+    @report = LeadsReport.new(@args)
   
   end
   
   it 'initializes with arguments' do
     @report.site.should == @args[:site]
     @report.time_period.should == @args[:time_period]
-    @report.start_date.should == (Time.zone.now - 4.weeks).beginning_of_week
-    @report.end_date.to_s(:concise).should == Time.zone.now.to_s(:concise)
+    @report.start_date.should == (Time.zone.now - 1.month).beginning_of_month
+    @report.end_date.to_s(:concise).should == Time.zone.now.end_of_month.to_s(:concise)
   end
 
   it 'calculates its dates' do
-    @report.dates.map{|d| d.to_s(:concise)}.should == [
-      (Time.zone.now - 4.weeks).beginning_of_week.to_s(:concise),
-      (Time.zone.now - 3.weeks).beginning_of_week.to_s(:concise),
-      (Time.zone.now - 2.weeks).beginning_of_week.to_s(:concise),
-      (Time.zone.now - 1.weeks).beginning_of_week.to_s(:concise),
-      Time.zone.now.to_s(:concise),
+    @report.dates_by_week.map{|d| d.to_s(:concise)}.should == [
+      (Time.zone.now - 4.weeks).end_of_week.to_s(:concise),
+      (Time.zone.now - 3.weeks).end_of_week.to_s(:concise),
+      (Time.zone.now - 2.weeks).end_of_week.to_s(:concise),
+      (Time.zone.now - 1.weeks).end_of_week.to_s(:concise),
+      Time.zone.now.end_of_week.to_s(:concise),
     ]
   end
   
   it 'creates a Lead object from arguments' do
-    _lead = Mitamirri::LeadsReport::Lead.new(:stats => ['foo'])
+    _lead = Lead.new(:stats => ['foo'])
     _lead.stats.should == ['foo']
   end
   
   it 'creates a LeadStats object from arguments' do
-    _stat = Mitamirri::LeadsReport::LeadStat.new(:date => Time.zone.now.end_of_week, :leads => 3, :conversion_rate => 50.0)
+    _stat = LeadStat.new(:date => Time.zone.now.end_of_week, :leads => 3, :conversion_rate => 50.0)
     _stat.date.should == Time.zone.now.end_of_week
     _stat.leads.should == 3
     _stat.conversion_rate.should == 50.0

data/spec/models/location_stat_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "LocationStat" do
+
+  before :all do
+    LocationStat.any_instance.stubs(:geocode).returns(false)
+  end
+
+  it 'determines if it has been geocoded' do
+    LocationStat.new({}).geocoded?.should be_false
+    LocationStat.new(:latitude => 90.0, :longitude => 90.0).geocoded?.should be_true
+  end
+
+  it 'removes apostrophes from its name' do
+    LocationStat.new(:name => "Grover's Corners").sanitized_name.should == "Grover\\'s Corners"
+  end
+
+end

data/spec/models/trackable_action_spec.rb

@@ -1,14 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'mitamirri'
 
-describe "TrackableAction" do
-  
+describe TrackableAction do
+
+  it 'returns a list of tracked actions' do
+    TrackableAction.delete_all
+    TrackableAction.create(:kind => 'clicks')
+    TrackableAction.create(:kind => 'conversion')
+    TrackableAction.kinds.include?('clicks').should be_true
+    TrackableAction.kinds.include?('conversion').should be_true
+    TrackableAction.kinds.should have(2).items
+  end
+
+  it 'returns a histogram of pages' do
+    TrackableAction.delete_all
+    ts = TrackableSession.make(:views_count => 3)
+    ts.trackable_actions.create!(:kind => 'view', :url => 'http://www.seologic.com/foo')
+    ts.trackable_actions.create!(:kind => 'view', :url => 'http://www.seologic.com/bar')
+    ts.trackable_actions.create!(:kind => 'view', :url => 'http://www.seologic.com/bar')
+    h = TrackableAction.pages_histogram({})
+    hash = Hash[*h.flatten]
+    hash['/foo'].should == 1.0
+    hash['/bar'].should == 2.0
+  end
+
   describe 'creates a new object from parameters' do
-  
+
     before :all do
       @new = TrackableAction.create_from_params(
         :session_id => 123456,
-        :referrer => '/',
+        :referrer => 'http://www.cnn.com/',
         :ip_address => '123.123.123.1',
         :site => 'www.seologic.com',
         :kind => 'click',
@@ -16,27 +36,39 @@ describe "TrackableAction" do
         :url => 'http://www.seologic.com/foo/bar/'
       )
     end
-    
+
     it 'with a kind' do
       @new.kind.should == 'click'
     end
-    
-    it 'with a label' do 
+
+    it 'with a label' do
       @new.label.should == 'Some Random Click'
     end
-    
+
     it 'with a referrer' do
-      @new.referrer.should == '/'
+      @new.referrer.should == 'http://www.cnn.com/'
     end
-    
+
     it 'with a URL' do
       @new.url.should == 'http://www.seologic.com/foo/bar/'
     end
-    
+
     it 'with an associated trackable session' do
       @new.trackable_session_id.should_not be_nil
     end
-    
+
+    it 'rejects an unparsable referrer URL' do
+      TrackableAction.create_from_params(
+              :session_id => 123456,
+              :referrer => '/foo/bar',
+              :ip_address => '123.123.123.1',
+              :site => 'www.seologic.com',
+              :kind => 'click',
+              :label => 'Some Random Click',
+              :url => 'http://www.seologic.com/foo/bar/'
+            ).referrer.should == '/foo/bar'
+    end
+
   end
-  
+
 end

data/spec/models/trackable_base_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe TrackableBase do
+
+  describe 'extracts start and end dates from a provided range' do
+
+    it 'that encompasses the past 3 months' do
+      start_date, end_date = TrackableBase.dates_from_time_period('past 3 months')
+      start_date.should == (Time.zone.now - 2.months).beginning_of_month
+      end_date.should == Time.zone.now.end_of_month
+    end
+
+    it 'that encompasses the past 6 months' do
+      start_date, end_date = TrackableBase.dates_from_time_period('past 6 months')
+      start_date.should == (Time.zone.now - 5.months).beginning_of_month
+      end_date.should == Time.zone.now.end_of_month
+    end
+
+    it 'that encompasses the past 12 months' do
+      start_date, end_date = TrackableBase.dates_from_time_period('past 12 months')
+      start_date.should == (Time.zone.now - 11.months).beginning_of_month
+      end_date.should == Time.zone.now.end_of_month
+    end
+
+  end
+
+end

data/spec/models/trackable_session_spec.rb

@@ -3,152 +3,276 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "TrackableSession" do
 
   describe 'class methods' do
-  
+
     it 'calculates conversion rates' do
-      TrackableSession.stubs(:search).returns(TrackableSession.new)
-      TrackableSession.any_instance.stubs(:with_conversions).returns(TrackableSession.new(:has_conversions => true))
+      TrackableSession.stubs(:search).returns(TrackableSession.new(:ip_address => '192.1.1.5'))
+      TrackableSession.any_instance.stubs(:with_conversions).returns(TrackableSession.new(:ip_address => '192.1.1.5', :has_conversions => true))
       TrackableSession.any_instance.stubs(:count).returns(1)
-      
+
       TrackableSession.conversion_rate({}).should == 100
     end
-    
+
     it 'returns kinds suitably formatted for a select' do
       TrackableSession.kinds_for_select.should == [["All", "all"], ["Direct", "direct"], ["Natural", "natural"], ["Paid", "paid"], ["Search", "search"]]
-        
+
+    end
+
+  end
+
+  describe 'histograms' do
+
+    it 'generates a histogram of clickthroughs' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:clickthrough_destination => 'seologic.com')
+      TrackableSession.make(:clickthrough_destination => 'seologic.com')
+      TrackableSession.make(:clickthrough_destination => 'internetmadeeasy.com')
+      h = TrackableSession.clickthroughs_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      h['seologic.com'].should == 2.0
+      h['internetmadeeasy.com'].should == 1.0
+    end
+
+    it 'generates a histogram of entrance pages' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:entrance_page => '/')
+      TrackableSession.make(:entrance_page => '/')
+      TrackableSession.make(:entrance_page => '/index.htm')
+      h = TrackableSession.entrance_pages_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      hash = Hash[*h.flatten]
+      hash['/'].should == 2.0
+      hash['/index.htm'].should == 1.0
+    end
+
+    it 'generates a histogram of exit pages' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:exit_page => '/')
+      TrackableSession.make(:exit_page => '/')
+      TrackableSession.make(:exit_page => '/index.htm')
+      h = TrackableSession.exit_pages_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      hash = Hash[*h.flatten]
+      hash['/'].should == 2.0
+      hash['/index.htm'].should == 1.0
+    end
+
+    it 'generates a histogram of keywords' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:referring_keywords => 'foo bar')
+      TrackableSession.make(:referring_keywords => 'foo bar')
+      TrackableSession.make(:referring_keywords => 'bat')
+      h = TrackableSession.keywords_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      h['foo bar'].should == 2.0
+      h['bat'].should == 1.0
+    end
+
+    it 'generates a histogram of locations' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:location => 'Claremont, VA')
+      TrackableSession.make(:location => 'Claremont, VA')
+      TrackableSession.make(:location => 'Richmond, VA')
+      h = TrackableSession.locations_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      h['Claremont, VA'].should == 2.0
+      h['Richmond, VA'].should == 1.0
+    end
+
+    it 'generates a histogram of referrers' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:referrer => 'http://www.google.com/')
+      TrackableSession.make(:referrer => 'http://www.google.com/')
+      TrackableSession.make(:referrer => 'http://www.bing.com/')
+      h = TrackableSession.referrers_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      h['http://www.google.com/'].should == 2.0
+      h['http://www.bing.com/'].should == 1.0
+    end
+
+    it 'generates a histogram of user agents' do
+      TrackableSession.destroy_all
+      TrackableSession.make(:user_agent => 'Firefox 2.0 (Mac OS X)')
+      TrackableSession.make(:user_agent => 'Firefox 2.0 (Mac OS X)')
+      TrackableSession.make(:user_agent => 'Firefox 1.0 (Mac OS X)')
+      h = TrackableSession.user_agents_histogram({:time_period => 'past 3 months', :site => 'all sites'})
+      h['Firefox 2.0 (Unknown)'].should == 2.0
+      h['Firefox 1.0 (Unknown)'].should == 1.0
     end
-  
+
   end
 
   describe 'instance methods' do
-  
+
+    before :all do
+      TrackableSession.destroy_all
+    end
+
     describe 'initializes' do
-    
+
       it 'defaulting its new_visit flag to true' do
-        TrackableSession.stubs(:find_by_ip_address).returns(nil)
+        TrackableSession.stubs(:where).returns(nil)
         _new_session = TrackableSession.new(:ip_address => '192.1.1.5')
         _new_session.init
         _new_session.new_visit.should be_true
       end
-      
+
       it 'detecting a return visit' do
-        TrackableSession.stubs(:find_by_ip_address).returns(['a record'])
+        TrackableSession.stubs(:where).returns(['a record'])
         _new_session = TrackableSession.new(:ip_address => '192.1.1.5')
         _new_session.init
         _new_session.new_visit.should be_false
       end
-      
+
       it 'detecting a visit from a spider' do
         # Human user agents
         [
-          "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0", 
+          "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0",
           "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)",
           "Opera/9.20 (Windows NT 6.0; U; en)",
           "Macintosh; U; Intel Mac OS X 10_6_4; en-us) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8"
-        ].each do |ua| 
-          _session = TrackableSession.new(:user_agent => ua)
+        ].each do |ua|
+          _session = TrackableSession.new(:ip_address => '192.1.1.5', :user_agent => ua)
           _session.init
           _session.spider?.should be_false
         end
         # Bots
         [
-          "Googlebot/2.1 ( http://www.googlebot.com/bot.html) ", 
-          "msnbot-Products/1.0 (+http://search.msn.com/msnbot.htm)", 
-        ].each do |ua| 
-          _session = TrackableSession.new(:user_agent => ua)
+          "Googlebot/2.1 ( http://www.googlebot.com/bot.html) ",
+          "msnbot-Products/1.0 (+http://search.msn.com/msnbot.htm)",
+        ].each do |ua|
+          _session = TrackableSession.new(:ip_address => '192.1.1.5', :user_agent => ua)
           _session.init
           _session.spider?.should be_true
         end
       end
-      
+
       it 'setting its kind' do
-        _new_session = TrackableSession.new
+        _new_session = TrackableSession.new(:ip_address => '192.1.1.5')
         _new_session.init
         _new_session.kind.should_not be_nil
       end
-  
+
     end
-    
+
     it 'calculates its duration in seconds' do
-      TrackableSession.new(:duration => 30).hr_duration.should == '30.0 seconds'
+      TrackableSession.new(:ip_address => '192.1.1.5', :duration => 30).hr_duration.should == '30.0 seconds'
     end
-    
+
     it 'calculates its duration in minutes' do
-      TrackableSession.new(:duration => 90).hr_duration.should == '1.5 minutes'
+      TrackableSession.new(:ip_address => '192.1.1.5', :duration => 90).hr_duration.should == '1.5 minutes'
     end
-    
+
     it 'it sanitizes referring keywords' do
-      _session = TrackableSession.new(:referring_keywords => 'some+keywords+here')
+      _session = TrackableSession.new(:ip_address => '192.1.1.5', :referring_keywords => 'some+keywords+here')
       _session.sanitize_referring_keywords.should == 'some keywords here'
     end
-    
+
     it 'returns the date of the last previous visit' do
-      _first = TrackableSession.create(:ip_address => '90.1.2.3', :created_at => Time.zone.now - 2.months)
-      _second = TrackableSession.create(:ip_address => '90.1.2.3', :created_at => Time.zone.now - 1.months)
-      _third = TrackableSession.create(:ip_address => '90.1.2.3', :created_at => Time.zone.now)
-      _third.last_visit_date.should == _second.created_at.to_s(:concise)
+      _first = TrackableSession.create(:ip_address => '72.32.210.44', :created_at => Time.zone.now - 2.months)
+      _second = TrackableSession.create(:ip_address => '72.32.210.44', :created_at => Time.zone.now - 1.months)
+      _third = TrackableSession.create(:ip_address => '72.32.210.44', :created_at => Time.zone.now)
+      _third.last_visit_date.to_s(:concise).should == _second.created_at.to_s(:concise)
     end
-    
+
     it 'updates its timestamp' do
       _then = Time.zone.now - 30.seconds
-      _session = TrackableSession.new(:created_at => _then)
+      _session = TrackableSession.new(:ip_address => '192.1.1.5', :created_at => _then)
       _session.stubs(:save).returns(true)
       _session.stubs(:touch_stat).returns(true)
       sleep(1)
       _session.touch
       (_session.updated_at > _then).should be_true
     end
-    
+
     it "returns visit_type of 'New' if it's a new visit" do
-      TrackableSession.new(:new_visit => true).visit_type.should == 'New'
+      TrackableSession.new(:ip_address => '192.1.1.5', :new_visit => true).visit_type.should == 'New'
     end
-    
+
     it "returns visit_type of 'Returning' if it's not a new visit" do
-      TrackableSession.new(:new_visit => nil).visit_type.should == 'Returning'
+      TrackableSession.new(:ip_address => '192.1.1.5', :new_visit => nil).visit_type.should == 'Returning'
     end
-    
+
     describe 'sets its kind by referrer' do
-    
+
       it 'with a search engine referrer' do
-        TrackableSession.new(:referrer => 'http://www.google.com/search/').kind_by_referrer.should == 'search'
+        TrackableSession.new(:ip_address => '192.1.1.5', :referrer => 'http://www.google.com/search/').kind_by_referrer.should == 'search'
       end
-      
+
       it 'with an organic referrer' do
-        TrackableSession.new(:referrer => 'http://www.seologic.com/foo.htm').kind_by_referrer.should == 'natural'
+        TrackableSession.new(:ip_address => '192.1.1.5', :referrer => 'http://www.seologic.com/foo.htm').kind_by_referrer.should == 'natural'
       end
-      
+
       it 'with a PPC referrer' do
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?gclid=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?gclid=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?keyword=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?keyword=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?adid=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?adid=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?matchtype=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?matchtype=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?ppc=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?ppc=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
         TrackableSession.new(
-          :initial_request_url => 'http://www.seologic.com/foo.htm?cpc=1234', 
+          :ip_address => '192.1.1.5',
+          :initial_request_url => 'http://www.seologic.com/foo.htm?cpc=1234',
           :referrer => 'http://www.foo.com/'
         ).kind_by_referrer.should == 'paid'
       end
-      
+
       it 'with no referrer' do
-        TrackableSession.new(:referrer => nil).kind_by_referrer.should == 'direct'
+        TrackableSession.new(:ip_address => '192.1.1.5', :referrer => nil).kind_by_referrer.should == 'direct'
       end
-    
+
     end
-    
+
+    describe 'updates its stats' do
+
+      before :all do
+        @session = TrackableSession.make
+        @session.touch('scroll', '/foo', '/')
+        @session = TrackableSession.last
+        @session.touch('click', '/foo', '/')
+        @session.touch('clickthrough', '/foo', '/')
+        @session.touch('mouseover', '/foo', '/')
+        @session.touch('conversion', '/foo', '/')
+      end
+
+      it 'with a scroll action' do
+        @session.has_scrolls.should be_true
+      end
+
+      it 'with a click action' do
+        @session.has_clicks.should be_true
+      end
+
+      it 'with a clickthrough action' do
+        @session.has_clickthroughs.should be_true
+      end
+
+      it 'with a mouseover action' do
+        @session.has_mouseovers.should be_true
+      end
+
+      it 'with a conversion action' do
+        @session.has_conversions.should be_true
+      end
+
+      it 'sets its duration' do
+        @session.duration.class.should == Float
+      end
+
+    end
+
   end
-  
+
 end