jzimmek-reportme 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/reportme/report_factory.rb

@@ -4,30 +4,21 @@ require 'reportme/mailer'
 module Reportme
   class ReportFactory
   
-    def self.create(since=Date.today, &block)
-      rme = ReportFactory.new(since)
+    def self.create(&block)
+      rme = ReportFactory.new
       rme.instance_eval(&block)
-      rme.connect
-      rme.run
       rme
     end
   
-    def initialize(since)
-      raise "since cannot be in the future" if since.future?
-      
+    def initialize
       @reports = []
-      @since = since.to_date
       @subscribtions = {}
       @report_exists_cache = []
-      @mailserver = nil
-    end
-    
-    def connect
-      ActiveRecord::Base.establish_connection(@properties)
     end
     
     def connection(properties)
       @properties = properties
+      ActiveRecord::Base.establish_connection(@properties)
     end
     
     def smtp(settings)
@@ -38,18 +29,28 @@ module Reportme
       Mailer.deliver_message(from, recipients, subject, body, attachments)
     end
   
-    def init(&block)
+    def since(since)
+      raise "since has already been set to '#{@since}' and cannot be changed to: '#{since}'"  if @since
+      raise "since cannot be in the future"                                                   if since.future?
       
+      @since = since.to_date
+    end
+  
+    def init(&block)
       raise "only one init block allowed" if @init
-      
       @init = block;
     end
   
-    def self.periods(today = Date.today)
+    def self.periods(today)
 
       r = []
+      p = []
+
+      # period "today" will never be generated for previous days
+      p << :today if today.to_date == Date.today
+      p += [:day, :week, :calendar_week, :month, :calendar_month]
 
-      [:today, :day, :week, :calendar_week, :month, :calendar_month].each do |period|
+      p.each do |period|
       
         von, bis = case period
           when :today
@@ -123,7 +124,7 @@ module Reportme
       @report_exists_cache.clear
       exec("drop table if exists #{report_information_table_name};")
       
-      ReportFactory.periods.each do |period|
+      ReportFactory.periods(@since).each do |period|
         @reports.each do |r|
           exec("drop table if exists #{r.table_name(period[:name])};")
         end
@@ -192,7 +193,8 @@ module Reportme
     
     def run
     
-      @init.call if @init
+      @init.call              if @init
+      @since = Date.today     unless @since
     
       ensure_report_informations_table_exist
       
@@ -205,7 +207,6 @@ module Reportme
         @since += 1.day
       end
       
-      
       # we will generate all daily reports first.
       # this will speed up generation of weekly and monthly reports.
       

data/test/reportme_test.rb

@@ -26,8 +26,9 @@ class ReportmeTest < Test::Unit::TestCase
     
     opts = defaults.merge(opts)
     
-    @rme = Reportme::ReportFactory.create opts[:since] do
+    @rme = Reportme::ReportFactory.create do
       
+      since  opts[:since]
       connection :adapter => "mysql", :database => "report_me_test", :username => "root", :password => "root", :host => "localhost", :port => 3306
       
       report :visits do
@@ -176,8 +177,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods = {}
     Reportme::ReportFactory.periods('2009-06-01'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-06-01 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-06-01 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-06-01 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-06-01 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-05-31 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:day][:bis]
@@ -202,8 +203,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods.clear
     Reportme::ReportFactory.periods('2009-06-24'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-06-24 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-06-24 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-06-24 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-06-24 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-06-23 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-06-23 23:59:59'.to_datetime, periods[:day][:bis]
@@ -227,8 +228,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods.clear
     Reportme::ReportFactory.periods('2009-06-30'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-06-30 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-06-30 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-06-30 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-06-30 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-06-29 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-06-29 23:59:59'.to_datetime, periods[:day][:bis]
@@ -252,8 +253,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods.clear
     Reportme::ReportFactory.periods('2009-05-01'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-05-01 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-05-01 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-04-30 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-04-30 23:59:59'.to_datetime, periods[:day][:bis]
@@ -277,8 +278,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods.clear
     Reportme::ReportFactory.periods('2009-05-15'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-05-15 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-05-15 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-05-15 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-05-15 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-05-14 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-05-14 23:59:59'.to_datetime, periods[:day][:bis]
@@ -302,8 +303,8 @@ class ReportmeTest < Test::Unit::TestCase
     periods.clear
     Reportme::ReportFactory.periods('2009-05-31'.to_date).each{|p| periods[p[:name]] = p}
     
-    assert_equal '2009-05-31 00:00:00'.to_datetime, periods[:today][:von]
-    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:today][:bis]
+    # assert_equal '2009-05-31 00:00:00'.to_datetime, periods[:today][:von]
+    # assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:today][:bis]
     
     assert_equal '2009-05-30 00:00:00'.to_datetime, periods[:day][:von]
     assert_equal '2009-05-30 23:59:59'.to_datetime, periods[:day][:bis]
@@ -319,7 +320,17 @@ class ReportmeTest < Test::Unit::TestCase
   
     assert_equal '2009-04-01 00:00:00'.to_datetime, periods[:calendar_month][:von]
     assert_equal '2009-04-30 23:59:59'.to_datetime, periods[:calendar_month][:bis]
+
+    ##
+    # today
+    ##
   
+    periods.clear
+    today = Date.today
+    Reportme::ReportFactory.periods(today).each{|p| periods[p[:name]] = p}
+    
+    assert_equal "#{today.strftime('%Y-%m-%d')} 00:00:00".to_datetime, periods[:today][:von]
+    assert_equal "#{today.strftime('%Y-%m-%d')} 23:59:59".to_datetime, periods[:today][:bis]
     
   end
 
@@ -411,4 +422,16 @@ class ReportmeTest < Test::Unit::TestCase
       end
     end
   end
+  
+  should "fail on multiple since calls" do
+    
+    rme = create_visit_report_factory
+    # 'since' will be implicitly called by ower testing factory method above
+    # any further call should fails
+
+    assert_raise RuntimeError do
+      rme.since 20.days.ago
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-reportme
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 -07:00
+date: 2009-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: []