rugalytics 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,5 @@
-v0.1.0. initial release
+v0.0.2. only use graph points that fall within given report dates
+
+v0.0.1. initial release
 
 v0.0.0. forked from Statwhore http://github.com/jnunemaker/statwhore

data/lib/rugalytics.rb

@@ -10,7 +10,7 @@ require 'morph'
 
 # See README for usage documentation.
 module Rugalytics
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   FORMAT_PDF = '0' unless defined? FORMAT_PDF
   FORMAT_XML = '1' unless defined? FORMAT_XML

data/lib/rugalytics/graph.rb

@@ -1,31 +1,39 @@
 module Rugalytics
   class Graph
 
-    attr_reader :name, :points, :from, :to
+    attr_reader :name, :points, :points_by_day, :from, :to
 
-    def initialize name, period, points
+    def initialize name, graph_period, points, report_start, report_end
       @name = name
-      @period = period
-      dates = @period.split('-')
-      unless dates.empty?
-        @from = Date.parse(dates[0].strip)
-        @to = Date.parse(dates[1].strip)
-      end
-      @points = points
+      @from = report_start
+      @to = report_end
+      @points_by_day = create_points_by_day points, graph_period, report_start, report_end
+      @points = points_by_day.collect{|by_day| by_day[1]}
     end
 
     def sum_of_points
       points.sum
     end
 
-    def points_by_day
-      by_day = []
+    private
+
+    def create_points_by_day points, graph_period, report_start, report_end
+      with_dates_from_period(graph_period, []) 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 = Date.parse(dates[0].strip)
+      to = Date.parse(dates[1].strip)
+
       index = 0
       from.upto(to) do |date|
-        by_day << [date, points[index] ]
+        yield date, index, list
         index = index.next
       end
-      by_day
+      list
     end
   end
 end

data/lib/rugalytics/report.rb

@@ -23,7 +23,7 @@ module Rugalytics
       if is_writer = symbol.to_s[/=$/]
         morph_method_missing(symbol, *args)
 
-      elsif symbol.to_s.match /(.*)_(total|by_day)/
+      elsif symbol.to_s.match(/(.*)_(total|by_day)/)
         graph = "#{$1}_graph".to_sym
 
         if respond_to?(graph)
@@ -43,8 +43,8 @@ module Rugalytics
       @base_url = lines[1]
       @report_name = lines[2].chomp(',')
       dates = lines[3].split(',')
-      @start_date = dates[0]
-      @end_date = dates[1]
+      @start_date = Date.parse(dates[0])
+      @end_date = Date.parse(dates[1])
     end
 
     def handle_graphs lines
@@ -55,7 +55,7 @@ module Rugalytics
           return if index == lines.size
         end
         index = index + 2
-        period = lines[index]
+        graph_period = lines[index]
         index = index.next
         name = lines[index]
         index = index.next
@@ -66,7 +66,7 @@ module Rugalytics
           index = index.next
         end
 
-        graph = Graph.new name, period, points
+        graph = Graph.new name, graph_period, points, start_date, end_date
         morph("#{name} graph", graph)
       end
     end

data/rugalytics.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Rugalytics-0.0.1
+# Gem::Specification for Rugalytics-0.0.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{rugalytics}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = %q{2008-06-06}
+  s.date = %q{2008-06-07}
   s.description = %q{Rugalytics is a Ruby API for Google Analytics.}
   s.email = ["rob ~@nospam@~ rubyforge.org"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README"]

data/spec/lib/rugalytics/graph_spec.rb

@@ -10,34 +10,38 @@ describe Rugalytics::Graph do
       @points = [5360, 3330, 4330]
     end
 
-    it "should create fields for attributes and values" do
-      graph = Rugalytics::Graph.new @name, @period, @points
-
-      graph.from.should == Date.parse('2008-05-01')
-      graph.to.should == Date.parse('2008-05-03')
+    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
 
-      graph.points.should == @points
+    it "should set given points on graph" do
+      graph_correct_for Date.parse('2008-05-01'), Date.parse('2008-05-03'), @points
     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 'when counting total of points' do
-    it 'should sum points in graph' do
-      graph = Rugalytics::Graph.new '','',[5360, 3330, 4330]
-      graph.sum_of_points.should == 5360 + 3330 + 4330
+    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
-  end
 
-  describe 'when counting total of points' do
-    it 'should sum points in graph' do
-      graph = Rugalytics::Graph.new '','',[5360, 3330, 4330]
-      from = Date.parse('1 May 2003')
-      mid = Date.parse('2 May 2003')
-      to = Date.parse('3 May 2003')
-      graph.stub!(:from).and_return from
-      graph.stub!(:to).and_return to
+    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 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
 
 end

data/spec/lib/rugalytics/report_spec.rb

@@ -23,11 +23,11 @@ Top Content,
       end
 
       it "should set start date from fourth line of text" do
-        @report.start_date.should == '26 May 2008'
+        @report.start_date.should == Date.parse('26 May 2008')
       end
 
       it "should set end date from fourth line of text" do
-        @report.end_date.should == '31 May 2008'
+        @report.end_date.should == Date.parse('31 May 2008')
       end
     end
 
@@ -105,10 +105,12 @@ Visitors Overview,
       before :all do
         @period = %Q|1 May 2008 - 31 May 2008|
         @name = %Q|Page Views|
+        @start = %Q|26 May 2008|
+        @end = %Q|31 May 2008|
         @csv = %Q|# ----------------------------------------
 theyworkforyou.co.nz
 Top Content,
-26 May 2008,31 May 2008
+#{@start},#{@end}
 # ----------------------------------------
 
 # ----------------------------------------
@@ -122,7 +124,7 @@ Top Content,
 
       it 'should create graph with data under "Graph"' do
         graph = mock('graph')
-        Rugalytics::Graph.should_receive(:new).with(@name, @period, [5360, 433]).and_return graph
+        Rugalytics::Graph.should_receive(:new).with(@name, @period, [5360, 433], Date.parse(@start), Date.parse(@end)).and_return graph
 
         report = Rugalytics::Report.new(@csv)
         report.page_views_graph.should == graph

metadata

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