rugalytics 0.0.9 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.0. fixed bug due to change in google's graph csv; removed deprecated load_report method
+
 v0.0.9. allowed setting of :url and :page_title options for drilldown and content reports; merged masolino's changes
 
 v0.0.8. moved i18n date parse method to Rugalytics module

data/README

@@ -3,7 +3,9 @@ Rugalytics is a Ruby API for Google Analytics.
 = Warning - API under development
 
 The Rugalytics API is in early development so it may change slightly over time.
-It should be in working order, so please give it a test spin!
+It should be in working order, so please give it a test spin! Sometimes
+Google changes it's CSV export format, which can break Rugalytics. It's usually
+fixed within a week of such occurrences.
 
 The source code is hosted at github. Feel free to fork the code if you have
 something to contribute:

data/README.rdoc

@@ -3,7 +3,9 @@ Rugalytics is a Ruby API for Google Analytics.
 = Warning - API under development
 
 The Rugalytics API is in early development so it may change slightly over time.
-It should be in working order, so please give it a test spin!
+It should be in working order, so please give it a test spin! Sometimes
+Google changes it's CSV export format, which can break Rugalytics. It's usually
+fixed within a week of such occurrences.
 
 The source code is hosted at github. Feel free to fork the code if you have
 something to contribute:

data/lib/rugalytics/graph.rb

@@ -3,11 +3,11 @@ module Rugalytics
 
     attr_reader :name, :points, :points_by_day, :from, :to
 
-    def initialize name, graph_period, points, report_start, report_end
+    def initialize name, points, report_start, report_end
       @name = name
       @from = report_start
       @to = report_end
-      @points_by_day = create_points_by_day points, graph_period, report_start, report_end
+      @points_by_day = create_points_by_day points, report_start, report_end
       @points = points_by_day.collect{|by_day| by_day[1]}
     end
 
@@ -17,16 +17,15 @@ module Rugalytics
 
     private
 
-    def create_points_by_day points, graph_period, report_start, report_end
-      with_dates_from_period(graph_period, []) do |date, index, list|
+    def create_points_by_day points, report_start, report_end
+      with_dates_from_period(report_start, report_end, []) do |date, index, list|
         list << [date, points[index] ] if date >= report_start && date <= report_end
       end
     end
 
-    def with_dates_from_period period, list
-      dates = period.split('-')
-      from = Rugalytics.i18n_date_parse(dates[0].strip)
-      to = Rugalytics.i18n_date_parse(dates[1].strip)
+    def with_dates_from_period report_start, report_end, list
+      from = report_start
+      to = report_end
 
       index = 0
       from.upto(to) do |date|

data/lib/rugalytics/profile.rb

@@ -36,15 +36,6 @@ module Rugalytics
       end
     end
 
-    def load_report(name, options={})
-      if options=={}
-        ActiveSupport::Deprecation.warn "Profile#load_report('#{name}') has been deprecated, use Profile##{name.tableize}_report instead"
-      else
-        ActiveSupport::Deprecation.warn "Profile#load_report('#{name}',options) has been deprecated, use Profile##{name.tableize}_report(options) instead"
-      end
-      create_report(name, options={})
-    end
-
     def get_report_csv(options={})
       options = set_default_options(options)
       params = convert_options_to_uri_params(options)

data/lib/rugalytics/report.rb

@@ -36,11 +36,6 @@ module Rugalytics
       end
     end
 
-    def report_name
-      ActiveSupport::Deprecation.warn "Report#report_name has been deprecated, use Report#name instead"
-      name
-    end
-
     private
 
     def set_attributes lines
@@ -61,18 +56,18 @@ module Rugalytics
           return if index == lines.size
         end
         index = index + 2
-        graph_period = lines[index]
-        index = index.next
-        name = lines[index]
+        column_names = lines[index]
+        name = column_names.split(',').last
         index = index.next
 
         points = []
-        while (point = lines[index]) && point.strip.size > 0
+        while (date_point = lines[index]) && (date = date_point[/^\d\d\d\d\d\d\d\d,/])
+          point = date_point.sub(date,'')
           points << point.tr('",','').to_i
           index = index.next
         end
 
-        graph = Graph.new name, graph_period, points, start_date, end_date
+        graph = Graph.new name, points, start_date, end_date
         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.9"
+  VERSION = "0.1.0"
 
   FORMAT_PDF = '0' unless defined? FORMAT_PDF
   FORMAT_XML = '1' unless defined? FORMAT_XML

data/rugalytics.gemspec

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

data/spec/lib/rugalytics/graph_spec.rb

@@ -3,7 +3,7 @@ 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 = Graph.new 'Page Views', @points, report_start, report_end
     graph.from.should == report_start
     graph.to.should == report_end
     graph.points.should == expected_points
@@ -14,14 +14,6 @@ shared_examples_for "graph created correctly" do
     graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
   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
-
-  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
-
   it 'should set points by day' do
     from = Date.parse('1 May 2008')
     to = Date.parse('3 May 2008')
@@ -40,7 +32,6 @@ describe Graph do
 
   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
 
@@ -49,7 +40,6 @@ describe Graph do
 
   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
 

data/spec/lib/rugalytics/report_spec.rb

@@ -20,7 +20,6 @@ describe Report do
       end
 
       it "should set report name from third line of text" do
-        @report.report_name.should == 'Top Content'
         @report.name.should == 'Top Content'
       end
 
@@ -45,7 +44,6 @@ describe Report do
           @report.base_url.should == 'your_site.com/portfolios/health'
         end
         it 'should set report name including path' do
-          @report.report_name.should == 'Content Drilldown,/portfolios/health/'
           @report.name.should == 'Content Drilldown,/portfolios/health/'
         end
       end
@@ -170,6 +168,7 @@ describe Report do
       def graph_correct expected_start, expected_end
         @start_end_dates = "#{@start},#{@end}"
         @name = %Q|Page Views|
+        @column_names = "Day,#{@name}"
         @csv = ['# ----------------------------------------',
                 'your_site.com',
                 'Top Content,',
@@ -179,12 +178,13 @@ describe Report do
                 '# ----------------------------------------',
                 '# Graph',
                 '# ----------------------------------------',
-                @period,
-                @name,
-                '"5,360"',
-                '433']
+                @column_names,
+                '20080828,"5,360"',
+                '20080829,575',
+                '# ----------------------------------------']
         graph = mock('graph')
-        Graph.should_receive(:new).with(@name, @period, [5360, 433], expected_start, expected_end).and_return graph
+
+        Graph.should_receive(:new).with(@name, [5360, 575], expected_start, expected_end).and_return graph
 
         report = Report.new(@csv.join("\n"))
         report.pageviews_graph.should == graph
@@ -193,18 +193,16 @@ describe Report do
 
       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)
+          @start = %Q|"August 28, 2008"|
+          @end = %Q|"August 29, 2008"|
+          graph_correct Date.new(2008,8,28), Date.new(2008,8,29)
         end
       end
 
       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|
+          @start = %Q|28 August 2008|
+          @end = %Q|29 August 2008|
           graph_correct Date.parse(@start), Date.parse(@end)
         end
       end

metadata

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