rugalytics 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.0.7. consolidated on US English spelling of pageviews for method names
+
 v0.0.6. fixed report date parsing bug reported by masolino
 
 v0.0.5. report names are now methods that can be called on profile, load_report is deprecated

data/README

@@ -18,24 +18,6 @@ Should be up at rubyforge, so to install:
  sudo gem install rugalytics
 
 
-== Changes in v0.0.5
-
-The load_report method has been deprecated, instead call the report name as
-a method, for example:
-
- # Instead of this
- report = profile.load_report('Pageviews', :from => '2007-01-01')
-
- # Do this
- report = profile.pageviews_report(:from => '2007-01-01')
-
- # Instead of this
- report = profile.load_report('TrafficSources')
-
- # Do this
- report = profile.traffic_sources_report
-
-
 == Authenticate
 
 Login with your Google Analytics user name and password:
@@ -58,6 +40,14 @@ If account name and profile name are the same:
  profile = Rugalytics.find_profile('your_site.com')
 
 
+== Change Language Settings to English
+
+At present your language setting for your Google Analytics account
+must be set to English for Rugalytics to work.
+
+ Google: Settings -> Language: choose UK English or US English
+
+
 == Get Profile Summary Statistics
 
 Obtaining page views:
@@ -73,15 +63,24 @@ Obtaining page views:
 
 The +pageviews+ method is doing this under the hood:
 
- report = profile.pageviews_report(:from=>'2007-01-01', :to=>'2007-01-02')
+ report = profile.pageviews_report :from=>'2007-01-01', :to=>'2007-01-02'
 
- report.page_views_total
- => 24980
+ report.pageviews_total
+ => 16600
 
-And under the hood, the +page_views_total+ method is actually calling:
+Using the report you can get +pageviews_by_day+:
+
+ report.pageviews_by_day
+ => [[Mon, 01 Jan 2007, 8200], [Tue, 02 Jan 2007, 8400]]
+
+In the report, there is a +pageviews_graph+ containing the points:
+
+ report.pageviews_graph.sum_of_points
+ => 16600
+
+ report.pageviews_graph.points_by_day
+ => [[Mon, 01 Jan 2007, 8200], [Tue, 02 Jan 2007, 8400]]
 
- report.page_views_graph.sum_of_points
- => 24980
 
 == Load a Report
 
@@ -156,7 +155,7 @@ automatically, e.g.:
 
  profile = Rugalytics.default_profile
  report = profile.top_content_report(:from=>(Date.today - 7) )
- top_items_over_week = report.items.sort_by{|i| i.unique_page_views.to_i}.reverse
+ top_items_over_week = report.items.sort_by{|i| i.unique_pageviews.to_i}.reverse
 
 
 ==Acknowledgements

data/README.rdoc

@@ -18,24 +18,6 @@ Should be up at rubyforge, so to install:
  sudo gem install rugalytics
 
 
-== Changes in v0.0.5
-
-The load_report method has been deprecated, instead call the report name as
-a method, for example:
-
- # Instead of this
- report = profile.load_report('Pageviews', :from => '2007-01-01')
-
- # Do this
- report = profile.pageviews_report(:from => '2007-01-01')
-
- # Instead of this
- report = profile.load_report('TrafficSources')
-
- # Do this
- report = profile.traffic_sources_report
-
-
 == Authenticate
 
 Login with your Google Analytics user name and password:
@@ -58,6 +40,14 @@ If account name and profile name are the same:
  profile = Rugalytics.find_profile('your_site.com')
 
 
+== Change Language Settings to English
+
+At present your language setting for your Google Analytics account
+must be set to English for Rugalytics to work.
+
+ Google: Settings -> Language: choose UK English or US English
+
+
 == Get Profile Summary Statistics
 
 Obtaining page views:
@@ -73,15 +63,24 @@ Obtaining page views:
 
 The +pageviews+ method is doing this under the hood:
 
- report = profile.pageviews_report(:from=>'2007-01-01', :to=>'2007-01-02')
+ report = profile.pageviews_report :from=>'2007-01-01', :to=>'2007-01-02'
 
- report.page_views_total
- => 24980
+ report.pageviews_total
+ => 16600
 
-And under the hood, the +page_views_total+ method is actually calling:
+Using the report you can get +pageviews_by_day+:
+
+ report.pageviews_by_day
+ => [[Mon, 01 Jan 2007, 8200], [Tue, 02 Jan 2007, 8400]]
+
+In the report, there is a +pageviews_graph+ containing the points:
+
+ report.pageviews_graph.sum_of_points
+ => 16600
+
+ report.pageviews_graph.points_by_day
+ => [[Mon, 01 Jan 2007, 8200], [Tue, 02 Jan 2007, 8400]]
 
- report.page_views_graph.sum_of_points
- => 24980
 
 == Load a Report
 
@@ -156,7 +155,7 @@ automatically, e.g.:
 
  profile = Rugalytics.default_profile
  report = profile.top_content_report(:from=>(Date.today - 7) )
- top_items_over_week = report.items.sort_by{|i| i.unique_page_views.to_i}.reverse
+ top_items_over_week = report.items.sort_by{|i| i.unique_pageviews.to_i}.reverse
 
 
 ==Acknowledgements

data/lib/rugalytics/graph.rb

@@ -25,8 +25,8 @@ module Rugalytics
 
     def with_dates_from_period period, list
       dates = period.split('-')
-      from = Date.parse(dates[0].strip)
-      to = Date.parse(dates[1].strip)
+      from = Date.i18n_parse(dates[0].strip)
+      to = Date.i18n_parse(dates[1].strip)
 
       index = 0
       from.upto(to) do |date|

data/lib/rugalytics/item.rb

@@ -8,6 +8,7 @@ module Rugalytics
         attribute.sub!('$','dollar')
         attribute.sub!('/',' per ')
         attribute.sub!('.',' ')
+        attribute.sub!(/page views/i,'pageviews')
         value = values[index]
         morph(attribute, value)
       end

data/lib/rugalytics/profile.rb

@@ -77,11 +77,11 @@ module Rugalytics
     end
 
     def pageviews(options={})
-      pageviews_report(options).page_views_total
+      pageviews_report(options).pageviews_total
     end
 
     def pageviews_by_day(options={})
-      pageviews_report(options).page_views_by_day
+      pageviews_report(options).pageviews_by_day
     end
 
     def visits(options={})

data/lib/rugalytics/report.rb

@@ -19,7 +19,6 @@ module Rugalytics
     end
 
     def method_missing symbol, *args
-
       if is_writer = symbol.to_s[/=$/]
         morph_method_missing(symbol, *args)
 
@@ -43,16 +42,8 @@ module Rugalytics
       @base_url = lines[1]
       @report_name = lines[2].chomp(',')
       dates = lines[3].include?('","') ? lines[3].split('","') : lines[3].split(',')
-      @start_date = parse_date(dates[0])
-      @end_date = parse_date(dates[1])
-    end
-
-    def parse_date text
-      begin
-        Date.parse(text)
-      rescue Exception => e
-        raise "#{e}: #{text}"
-      end
+      @start_date = Date.i18n_parse(dates[0])
+      @end_date = Date.i18n_parse(dates[1])
     end
 
     def handle_graphs lines
@@ -75,7 +66,7 @@ module Rugalytics
         end
 
         graph = Graph.new name, graph_period, points, start_date, end_date
-        morph("#{name} graph", graph)
+        morph("#{name.sub(/page views/i,'pageviews')} graph", graph)
       end
     end
 

data/lib/rugalytics.rb

@@ -11,7 +11,7 @@ require 'yaml'
 
 # See README for usage documentation.
 module Rugalytics
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   FORMAT_PDF = '0' unless defined? FORMAT_PDF
   FORMAT_XML = '1' unless defined? FORMAT_XML
@@ -81,5 +81,6 @@ require File.dirname(__FILE__) + '/rugalytics/profile'
 require File.dirname(__FILE__) + '/rugalytics/report'
 require File.dirname(__FILE__) + '/rugalytics/item'
 require File.dirname(__FILE__) + '/rugalytics/graph'
+require File.dirname(__FILE__) + '/rugalytics/date_extension'
 
 # Rugalytics.config_setup(RAILS_ROOT) if defined?(RAILS_ROOT) && RAILS_ROOT

data/rugalytics.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rugalytics-0.0.6
+# Gem::Specification for Rugalytics-0.0.7
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rugalytics
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Rob McKinnon
 autorequire: 
 bindir: bin
 
-date: 2008-08-04 00:00:00 +01:00
+date: 2008-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/spec/lib/rugalytics/graph_spec.rb

@@ -1,47 +1,59 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
+include Rugalytics
+
+shared_examples_for "graph created correctly" do
+  def graph_correct_for report_start, report_end, expected_points
+    graph = Graph.new 'Page Views', @period, @points, report_start, report_end
+    graph.from.should == report_start
+    graph.to.should == report_end
+    graph.points.should == expected_points
+    graph
+  end
 
-describe Rugalytics::Graph do
+  it "should set given points on graph" do
+    graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
+  end
 
-  describe 'when creating' do
+  it "should set appropriate point on graph when report start and end is the same date" do
+    graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-01'), [@points[0]]
+  end
 
-    before :all do
-      @period = '1 May 2008 - 3 May 2008'
-      @name = 'Page Views'
-      @points = [5360, 3330, 4330]
-    end
+  it "should set appropriate points on graph when report start and end is a subset of the graph period" do
+    graph_correct_for Date.parse('2008-05-02'), Date.parse('2008-05-03'), [@points[1],@points[2]]
+  end
 
-    def graph_correct_for report_start, report_end, expected_points
-      graph = Rugalytics::Graph.new @name, @period, @points, report_start, report_end
-      graph.from.should == report_start
-      graph.to.should == report_end
-      graph.points.should == expected_points
-      graph
-    end
+  it 'should set points by day' do
+    from = Date.parse('1 May 2008')
+    to = Date.parse('3 May 2008')
+    mid = Date.parse('2 May 2008')
+    graph = graph_correct_for from, to, @points
+    graph.points_by_day.should == [[from,5360],[mid,3330],[to,4330]]
+  end
 
-    it "should set given points on graph" do
-      graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
-    end
+  it 'should return sum of points' do
+    graph = graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
+    graph.sum_of_points.should == 5360 + 3330 + 4330
+  end
+end
 
-    it "should set appropriate point on graph when report start and end is the same date" do
-      graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-01'), [@points[0]]
-    end
+describe Graph do
 
-    it "should set appropriate points on graph when report start and end is a subset of the graph period" do
-      graph_correct_for Date.parse('2008-05-02'), Date.parse('2008-05-03'), [@points[1],@points[2]]
+  describe 'when creating with dates formatted Day Month Year' do
+    before :all do
+      @period = '1 May 2008 - 3 May 2008'
+      @points = [5360, 3330, 4330]
     end
 
-    it 'should set points by day' do
-      from = Date.parse('1 May 2008')
-      to = Date.parse('3 May 2008')
-      mid = Date.parse('2 May 2008')
-      graph = graph_correct_for from, to, @points
-      graph.points_by_day.should == [[from,5360],[mid,3330],[to,4330]]
-    end
+    it_should_behave_like "graph created correctly"
+  end
 
-    it 'should return sum of points' do
-      graph = graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
-      graph.sum_of_points.should == 5360 + 3330 + 4330
+  describe 'when creating with dates formatted "Month Day, Year"' do
+    before :all do
+      @period = %Q|"May 1, 2008 - May 3, 2008"|
+      @points = [5360, 3330, 4330]
     end
+
+    it_should_behave_like "graph created correctly"
   end
 
 end

data/spec/lib/rugalytics/item_spec.rb

@@ -13,8 +13,8 @@ describe Rugalytics::Item, 'when creating' do
 
     item.url.should == 'http://theyworkforyou.co.nz/'
     item.path.should == '/'
-    item.page_views.should == '189'
-    item.unique_page_views.should == '157'
+    item.pageviews.should == '189'
+    item.unique_pageviews.should == '157'
     item.time_on_page.should == '54.94957983193277'
     item.bounce_rate.should == '0.4862385392189026'
     item.percentage_exit.should == '0.37037035822868347'

data/spec/lib/rugalytics/profile_spec.rb

@@ -1,18 +1,19 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
+include Rugalytics
 
-describe Rugalytics::Profile do
+describe Profile do
 
   describe "being initialized" do
     it "should accept :name as key" do
-      profile = Rugalytics::Profile.new(:name => 'test', :profile_id => '12341234')
+      profile = Profile.new(:name => 'test', :profile_id => '12341234')
       profile.name.should == 'test'
     end
     it "should accept :account_id as key" do
-      profile = Rugalytics::Profile.new(:account_id => '12341234', :profile_id => '12341234')
+      profile = Profile.new(:account_id => '12341234', :profile_id => '12341234')
       profile.account_id.should == '12341234'
     end
     it "should accept :profile_id as key" do
-      profile = Rugalytics::Profile.new(:profile_id => '12341234')
+      profile = Profile.new(:profile_id => '12341234')
       profile.profile_id.should == '12341234'
     end
   end
@@ -24,33 +25,33 @@ describe Rugalytics::Profile do
       account = mock('account')
       profile = mock('profile')
 
-      Rugalytics::Account.should_receive(:find).with(1254221).and_return account
+      Account.should_receive(:find).with(1254221).and_return account
       account.should_receive(:find_profile).with(profile_id).and_return profile
-      Rugalytics::Profile.find(account_id, profile_id).should == profile
+      Profile.find(account_id, profile_id).should == profile
     end
   end
 
   describe 'finding pageviews' do
     before do
-      @profile = Rugalytics::Profile.new :profile_id=>123
-      @report = mock('report',:page_views_total=>100)
+      @profile = Profile.new :profile_id=>123
+      @report = mock('report',:pageviews_total=>100)
     end
     it 'should return total from loaded "Pageviews" report' do
       @profile.should_receive(:pageviews_report).with({}).and_return @report
-      @profile.pageviews.should == @report.page_views_total
+      @profile.pageviews.should == @report.pageviews_total
     end
     describe 'when from and to dates are specified' do
       it 'should return total from "Pageviews" report for given dates' do
         options = {:from=>'2008-05-01', :to=>'2008-05-03'}
         @profile.should_receive(:pageviews_report).with(options).and_return @report
-        @profile.pageviews(options).should == @report.page_views_total
+        @profile.pageviews(options).should == @report.pageviews_total
       end
     end
   end
 
   describe 'finding visits' do
     before do
-      @profile = Rugalytics::Profile.new :profile_id=>123
+      @profile = Profile.new :profile_id=>123
       @report = mock('report', :visits_total=>100)
     end
     it 'should return total from loaded "Visits" report' do
@@ -68,7 +69,7 @@ describe Rugalytics::Profile do
 
   describe 'finding report when called with method ending in _report' do
     before do
-      @profile = Rugalytics::Profile.new :profile_id=>123
+      @profile = Profile.new :profile_id=>123
       @report = mock('report', :visits_total=>100)
     end
     it 'should find report using create_report method' do
@@ -79,7 +80,7 @@ describe Rugalytics::Profile do
       csv = 'csv'
       @profile.should_receive(:get_report_csv).with({:report=>'Visits'}).and_return csv
       @report.stub!(:attribute_names).and_return ''
-      Rugalytics::Report.should_receive(:new).with(csv).and_return @report
+      Report.should_receive(:new).with(csv).and_return @report
       @profile.visits_report.should == @report
     end
     describe 'when report name is two words' do
@@ -99,8 +100,8 @@ describe Rugalytics::Profile do
 
   it "should be able to find all profiles for an account" do
     html = fixture('analytics_profile_find_all.html')
-    Rugalytics::Profile.should_receive(:get).and_return(html)
-    accounts = Rugalytics::Profile.find_all('1254221')
+    Profile.should_receive(:get).and_return(html)
+    accounts = Profile.find_all('1254221')
     accounts.collect(&:name).should ==  ["blog.your_site.com"]
   end
 
@@ -111,9 +112,9 @@ describe Rugalytics::Profile do
       account = mock('account')
       profile = mock('profile')
 
-      Rugalytics::Account.should_receive(:find).with(account_name).and_return account
+      Account.should_receive(:find).with(account_name).and_return account
       account.should_receive(:find_profile).with(profile_name).and_return profile
-      Rugalytics::Profile.find(account_name, profile_name).should == profile
+      Profile.find(account_name, profile_name).should == profile
     end
   end
 
@@ -123,9 +124,9 @@ describe Rugalytics::Profile do
       account = mock('account')
       profile = mock('profile')
 
-      Rugalytics::Account.should_receive(:find).with(name).and_return account
+      Account.should_receive(:find).with(name).and_return account
       account.should_receive(:find_profile).with(name).and_return profile
-      Rugalytics::Profile.find(name).should == profile
+      Profile.find(name).should == profile
     end
   end
 end

data/spec/lib/rugalytics/report_spec.rb

@@ -1,17 +1,18 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
+include Rugalytics
 
-describe Rugalytics::Report do
+describe Report do
 
   describe "creating report from csv" do
 
     describe "when setting report attributes" do
       before :all do
-        csv = %Q|# ----------------------------------------
-your_site.com
-Top Content,
-26 May 2008,31 May 2008
-# ----------------------------------------|
-        @report = Rugalytics::Report.new(csv)
+        csv = ['# ----------------------------------------',
+                'your_site.com',
+                'Top Content,',
+                '26 May 2008,31 May 2008',
+                '# ----------------------------------------']
+        @report = Report.new(csv.join("\n"))
       end
 
       it "should set base url from second line of text" do
@@ -34,12 +35,12 @@ Top Content,
     describe "when setting report dates" do
       describe "with source date format 'Month Day, Year'" do
         before :all do
-          csv = %Q|# ----------------------------------------
-your_site.com
-Top Content,
-"July 28, 2008","August 4, 2008"
-# ----------------------------------------|
-          @report = Rugalytics::Report.new(csv)
+          csv = ['# ----------------------------------------',
+                'your_site.com',
+                'Top Content,',
+                '"July 28, 2008","August 4, 2008"',
+                '# ----------------------------------------']
+          @report = Report.new(csv.join("\n"))
         end
         it "should set start date from fourth line of text" do
           @report.start_date.should == Date.parse('28 July 2008')
@@ -50,12 +51,12 @@ Top Content,
       end
       describe "with dates badly formatted" do
         it 'should raise an exception' do
-          csv = %Q|# ----------------------------------------
-your_site.com
-Top Content,
-random something
-# ----------------------------------------|
-          lambda { Rugalytics::Report.new(csv) }.should raise_error(Exception, 'invalid date: random something')
+          csv = ['# ----------------------------------------',
+                'your_site.com',
+                'Top Content,',
+                'random something',
+                '# ----------------------------------------']
+          lambda { Report.new(csv.join("\n")) }.should raise_error(Exception, 'invalid date: random something')
         end
       end
     end
@@ -66,28 +67,27 @@ random something
         @attributes = %Q|URL,Page Views,Unique Page Views,Time on Page,Bounce Rate,% Exit,$ Index|
         @values1 = %Q|/,189,157,54.94957983193277,0.4862385392189026,0.37037035822868347,0.0|
         @values2 = %Q|/bills,60,38,54.17307692307692,0.0,0.13333334028720856,0.0|
-        @csv = %Q|# ----------------------------------------
-#{@base_url}
-Top Content,
-26 May 2008,31 May 2008
-# ----------------------------------------
-# ----------------------------------------
-# Table
-# ----------------------------------------
-#{@attributes}
-#{@values1}
-#{@values2}
-# --------------------------------------------------------------------------------
-|
+        @csv = ['# ----------------------------------------',
+                @base_url,
+                'Top Content,',
+                '26 May 2008,31 May 2008',
+                '# ----------------------------------------',
+                '# ----------------------------------------',
+                '# Table',
+                '# ----------------------------------------',
+                @attributes,
+                @values1,
+                @values2,
+                '# --------------------------------------------------------------------------------']
       end
 
       it 'should create item for each data row in "Table"' do
         item1 = mock('item1')
         item2 = mock('item2')
-        Rugalytics::Item.should_receive(:new).with(@attributes.split(','), @values1.split(','), @base_url).and_return item1
-        Rugalytics::Item.should_receive(:new).with(@attributes.split(','), @values2.split(','), @base_url).and_return item2
+        Item.should_receive(:new).with(@attributes.split(','), @values1.split(','), @base_url).and_return item1
+        Item.should_receive(:new).with(@attributes.split(','), @values2.split(','), @base_url).and_return item2
 
-        report = Rugalytics::Report.new(@csv)
+        report = Report.new(@csv.join("\n"))
         report.items.should == [item1, item2]
       end
     end
@@ -99,31 +99,31 @@ Top Content,
         @browser_values = %Q|Firefox,1529,0.17185568809509277|
         @connection_speed_attributes = %Q|Connection Speed,Visits,% visits|
         @connection_speed_values = %Q|Unknown,3987,0.4481285810470581|
-        @csv = %Q|# ----------------------------------------
-#{@base_url}
-Visitors Overview,
-3 May 2008,2 June 2008
-# ----------------------------------------
-# ----------------------------------------
-# BrowserMiniTable
-# ----------------------------------------
-#{@browser_attributes}
-#{@browser_values}
-
-# ----------------------------------------
-# ConnectionSpeedMiniTable
-# ----------------------------------------
-#{@connection_speed_attributes}
-#{@connection_speed_values}
-# --------------------------------------------------------------------------------|
+        @csv = ['# ----------------------------------------',
+                @base_url,
+                'Visitors Overview',
+                '3 May 2008,2 June 2008',
+                '# ----------------------------------------',
+                '# ----------------------------------------',
+                '# BrowserMiniTable',
+                '# ----------------------------------------',
+                @browser_attributes,
+                @browser_values,
+                '',
+                '# ----------------------------------------',
+                '# ConnectionSpeedMiniTable',
+                '# ----------------------------------------',
+                @connection_speed_attributes,
+                @connection_speed_values,
+                '# --------------------------------------------------------------------------------']
       end
       it 'should create item for each data row in "XxxMiniTable"' do
         browser_item = mock('browser_item')
         connection_item = mock('item')
-        Rugalytics::Item.should_receive(:new).with(@browser_attributes.split(','), @browser_values.split(','), @base_url).and_return browser_item
-        Rugalytics::Item.should_receive(:new).with(@connection_speed_attributes.split(','), @connection_speed_values.split(','), @base_url).and_return connection_item
+        Item.should_receive(:new).with(@browser_attributes.split(','), @browser_values.split(','), @base_url).and_return browser_item
+        Item.should_receive(:new).with(@connection_speed_attributes.split(','), @connection_speed_values.split(','), @base_url).and_return connection_item
 
-        report = Rugalytics::Report.new(@csv)
+        report = Report.new(@csv.join("\n"))
         report.browser_items.should == [browser_item]
         report.connection_speed_items.should == [connection_item]
         report.attribute_names.should == ['browser_items', 'connection_speed_items']
@@ -131,40 +131,53 @@ Visitors Overview,
     end
 
     describe "when creating graph points from 'Graph'" do
-      before :all do
-        @period = %Q|1 May 2008 - 31 May 2008|
+      def graph_correct expected_start, expected_end
+        @start_end_dates = "#{@start},#{@end}"
         @name = %Q|Page Views|
-        @start = %Q|26 May 2008|
-        @end = %Q|31 May 2008|
-        @csv = %Q|# ----------------------------------------
-your_site.com
-Top Content,
-#{@start},#{@end}
-# ----------------------------------------
-
-# ----------------------------------------
-# Graph
-# ----------------------------------------
-#{@period}
-#{@name}
-"5,360"
-433|
+        @csv = ['# ----------------------------------------',
+                'your_site.com',
+                'Top Content,',
+                @start_end_dates,
+                '# ----------------------------------------',
+                '',
+                '# ----------------------------------------',
+                '# Graph',
+                '# ----------------------------------------',
+                @period,
+                @name,
+                '"5,360"',
+                '433']
+        graph = mock('graph')
+        Graph.should_receive(:new).with(@name, @period, [5360, 433], expected_start, expected_end).and_return graph
+
+        report = Report.new(@csv.join("\n"))
+        report.pageviews_graph.should == graph
+        report.attribute_names.should == ['pageviews_graph']
       end
 
-      it 'should create graph with data under "Graph"' do
-        graph = mock('graph')
-        Rugalytics::Graph.should_receive(:new).with(@name, @period, [5360, 433], Date.parse(@start), Date.parse(@end)).and_return graph
+      describe 'with source date format "Month Day, Year"' do
+        it 'should create graph with data under "Graph"' do
+          @start = %Q|"July 5, 2008"|
+          @end = %Q|"August 4, 2008"|
+          @period = %Q|"July 5, 2008 - August 4, 2008"|
+          graph_correct Date.new(2008,7,5), Date.new(2008,8,4)
+        end
+      end
 
-        report = Rugalytics::Report.new(@csv)
-        report.page_views_graph.should == graph
-        report.attribute_names.should == ['page_views_graph']
+      describe "with source date format 'Day Month Year'" do
+        it 'should create graph with data under "Graph"' do
+          @start = %Q|26 May 2008|
+          @end = %Q|31 May 2008|
+          @period = %Q|1 May 2008 - 31 May 2008|
+          graph_correct Date.parse(@start), Date.parse(@end)
+        end
       end
     end
   end
 
   describe 'when retrieving total using method not defined on class' do
     it 'should return total from graph named in method name' do
-      report = Rugalytics::Report.new
+      report = Report.new
       report.should_receive(:respond_to?).with(:page_views_graph).and_return true
       report.should_receive(:page_views_graph).and_return mock('graph', :sum_of_points=>100)
       report.method_missing(:page_views_total).should == 100
@@ -173,7 +186,7 @@ Top Content,
 
   describe 'when retrieving list by day using method not defined on class' do
     it 'should return by day list from graph named in method name' do
-      report = Rugalytics::Report.new
+      report = Report.new
       report.should_receive(:respond_to?).with(:page_views_graph).and_return true
       points_by_day = mock('points_by_day')
       report.should_receive(:page_views_graph).and_return mock('graph', :points_by_day=>points_by_day)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rugalytics
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-04 00:00:00 +01:00
+date: 2008-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency