jzimmek-reportme 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/reportme/report_factory.rb

@@ -6,6 +6,7 @@ module Reportme
     def self.create(since=Date.today, &block)
       rme = ReportFactory.new(since)
       rme.instance_eval(&block)
+      rme.connect
       rme.run
       rme
     end
@@ -16,10 +17,19 @@ module Reportme
       @reports = []
       @since = since.to_date
     end
+    
+    def connect
+      puts "connection: #{@properties}"
+      ActiveRecord::Base.establish_connection(@properties)
+    end
+    
+    def connection(properties)
+      @properties = properties
+    end
   
-    def periods(today = Date.today)
+    def self.periods(today = Date.today)
 
-      periods = []
+      r = []
 
       [:today, :day, :week, :calendar_week, :month, :calendar_month].each do |period|
       
@@ -29,24 +39,26 @@ module Reportme
           when :day
             [today - 1.day, today - 1.day]
           when :week
-            # [today - 1.day - 1.week, today - 1.day]
             [today - 1.week, today - 1.day]
           when :calendar_week
-            n = today - 1.day
-            [n - n.cwday + 1, n - n.cwday + 7]
+            day_lastweek = today.to_date - 7.days
+            monday = day_lastweek - (day_lastweek.cwday - 1).days
+            [monday, monday + 6.days]
           when :month
-            # [today - 1.day - 1.month, today - 1.day]
-            [today - 1.month, today - 1.day]
+            [today - 1.day - 30.days, today - 1.day]
           when :calendar_month
             n = today - 1.month
             [n.beginning_of_month, n.end_of_month]
         end
       
-        periods << {:name => period, :von => von, :bis => bis}
+        von = von.to_datetime
+        bis = bis.to_datetime + 23.hours + 59.minutes + 59.seconds
+      
+        r << {:name => period, :von => von, :bis => bis}
 
       end
     
-      periods
+      r
     end
   
     def report_information_table_name
@@ -61,10 +73,30 @@ module Reportme
       select_value("select 1 from #{report_information_table_name} where report = '#{name}' and von = '#{von}' and bis = '#{bis}'") != nil
     end
     
+    def schema_name
+      schema = @properties[:database]
+      raise "missing :database in connection properties" unless schema
+      schema
+    end
+    
+    def columns(table_name)
+      sql = <<-SQL
+      select
+        column_name
+      from
+        information_schema.columns
+      where
+        table_schema = '#{schema_name}'
+        and table_name = '#{table_name}'
+      ;
+      SQL
+      select_values(sql)
+    end
+    
     def reset
       exec("drop table if exists #{report_information_table_name};")
       
-      periods.each do |period|
+      ReportFactory.periods.each do |period|
         @reports.each do |r|
           exec("drop table if exists #{r.table_name(period[:name])};")
         end
@@ -102,12 +134,11 @@ module Reportme
       end
     end
     
-    def try_weekly_report_by_daily_reports(report, _von, _bis)
-
-      table_name = report.table_name(:week)
+    def try_report_by_daily_reports(report, period_name, _von, num_days, num_days_required)
+      table_name = report.table_name(period_name)
 
       von = _von.strftime("%Y-%m-%d 00:00:00")
-      bis = _bis.strftime("%Y-%m-%d 23:59:59")
+      bis = (_von + num_days.days).strftime("%Y-%m-%d 23:59:59")
       
       existing_daily_reports = select_value(<<-SQL
         select
@@ -116,27 +147,31 @@ module Reportme
           #{report_information_table_name}
         where
           report = '#{report.table_name(:day)}'
-          and von between '#{von}' and '#{(_von + 6.days).strftime("%Y-%m-%d 23:59:59")}'
+          and von between '#{von}' and '#{(_von + num_days.days).strftime("%Y-%m-%d 00:00:00")}'
       SQL
       ).to_i
       
-      puts "weekly report depends on 7 daily reports ... #{existing_daily_reports} daily found"
+      puts "#{period_name}ly report depends on #{num_days_required} daily reports ... #{existing_daily_reports} daily found"
       
-      if existing_daily_reports == 7
+      if existing_daily_reports == num_days_required
+        
+        column_names = ["'#{von}' as von"]
+        column_names += columns(table_name).find_all{|c|c != "von"}.collect{|c|"d.#{c} as #{c}"}
+
         ActiveRecord::Base.transaction do
           exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());")
-          exec("insert into #{table_name} select * from #{report.table_name(:day)} where von between '#{von}' and '#{(_von + 6.days).strftime("%Y-%m-%d 00:00:00")}';")
+          exec("insert into #{table_name} select #{column_names.join(',')} from #{report.table_name(:day)} as d where d.von between '#{von}' and '#{(_von + num_days.days).strftime("%Y-%m-%d 00:00:00")}';")
         end
       end
     end
-
+    
     def run
     
       ensure_report_informations_table_exist
     
       while !@since.future?
         
-        periods(@since).each do |period|
+        ReportFactory.periods(@since).each do |period|
       
           @reports.each do |r|
           
@@ -155,13 +190,19 @@ module Reportme
             table_exist   = r.table_exist?(period_name)
             sql           = r.sql(von, bis, period_name)
         
-            puts "report: #{r.table_name(period_name)} exist: #{table_exist}"
+            puts "report: #{r.table_name(period_name)} von: #{von}, bis: #{bis}"
 
             ensure_report_table_exist(r, period_name)
             
             report_exists = report_exists?(table_name, von, bis)
             
-            try_weekly_report_by_daily_reports(r, _von, _bis) if period_name == :week && !report_exists
+            try_report_by_daily_reports(r, :week, _von, 6, 7)                                     if period_name == :week && !report_exists
+            try_report_by_daily_reports(r, :calendar_week, _von, 6, 7)                            if period_name == :calendar_week && !report_exists
+            
+            # TODO: implement monat by daily reports
+            # try_report_by_daily_reports(r, :month, _von, 29 + (_von.end_of_month.day == 31 ? 1 : 0), 30)  if period_name == :month && !report_exists
+            
+            try_report_by_daily_reports(r, :calendar_month, _von, _bis.day - _von.day, _bis.day)  if period_name == :calendar_month && !report_exists
 
             report_exists = report_exists?(table_name, von, bis)
             
@@ -199,6 +240,13 @@ module Reportme
       puts "------------------------ //"
       ActiveRecord::Base.connection.select_value(sql)
     end
+
+    def select_values(sql)
+      puts "// ------------------------"
+      puts "select_values: #{sql}"
+      puts "------------------------ //"
+      ActiveRecord::Base.connection.select_values(sql)
+    end
   
     def report(name, &block)
       

data/test/reportme_test.rb

@@ -27,6 +27,9 @@ class ReportmeTest < Test::Unit::TestCase
     opts = defaults.merge(opts)
     
     @rme = Reportme::ReportFactory.create opts[:since] do
+      
+      connection :adapter => "mysql", :database => "report_me_test", :username => "root", :password => "root", :host => "localhost", :port => 3306
+      
       report :visits do
         periods opts[:periods]
         source do |von, bis|
@@ -64,7 +67,7 @@ class ReportmeTest < Test::Unit::TestCase
       exec("truncate visits;");
     end
   end
-
+  
   should "create one visitor in the today report for channel sem" do
     exec("insert into visits values (null, 'sem', now())");
     create_visit_report_factory.run
@@ -154,17 +157,201 @@ class ReportmeTest < Test::Unit::TestCase
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 8 day));");
     # should be ignored in weekly
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 9 day));");
-
-    create_visit_report_factory(:since => 10.days.ago,:periods => [:day]).run
+  
+    create_visit_report_factory(:since => 10.days.ago, :periods => [:day]).run
     
     exec("truncate visits;")
-
+  
     create_visit_report_factory(:periods => [:week]).run
-
-    assert_equal 7, one("select count(1) as cnt from visits_week where von between date_sub(curdate(), interval 7 day) and date_sub(curdate(), interval 1 day)")["cnt"].to_i
+  
+    assert_equal 7, one("select count(1) as cnt from visits_week where date(von) between date_sub(curdate(), interval 7 day) and date_sub(curdate(), interval 1 day)")["cnt"].to_i
   end
   
-  # should "handle today and day periods but nothing else" do
-  # end
+  should "generate the von/bis range for the periods" do
+  
+    ##
+    # anfang monat - 30 tage
+    ##
+    
+    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-05-31 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-05-25 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-05-25 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:month][:bis]
+  
+    assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:calendar_month][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:calendar_month][:bis]
+    
+    
+    ##
+    # mitten monat - 30 tage
+    ##
+    
+    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-23 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-06-23 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-06-17 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-06-23 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-06-15 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-06-21 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-05-24 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-06-23 23:59:59'.to_datetime, periods[:month][:bis]
   
+    assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:calendar_month][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:calendar_month][:bis]
+  
+    ##
+    # ende monat - 30 tage
+    ##
+    
+    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-29 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-06-29 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-06-23 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-06-29 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-06-22 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-06-28 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-05-30 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-06-29 23:59:59'.to_datetime, periods[:month][:bis]
+  
+    assert_equal '2009-05-01 00:00:00'.to_datetime, periods[:calendar_month][:von]
+    assert_equal '2009-05-31 23:59:59'.to_datetime, periods[:calendar_month][:bis]
+  
+    ##
+    # anfang monat - 31 tage
+    ##
+    
+    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-04-30 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-04-30 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-04-24 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-04-30 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-04-20 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-04-26 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-03-31 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-04-30 23:59:59'.to_datetime, periods[:month][:bis]
+  
+    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]
+  
+    ##
+    # mitte monat - 31 tage
+    ##
+    
+    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-14 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-05-14 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-05-08 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-05-14 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-05-04 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-05-10 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-04-14 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-05-14 23:59:59'.to_datetime, periods[:month][:bis]
+  
+    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]
+  
+    ##
+    # ende monat - 31 tage
+    ##
+    
+    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-30 00:00:00'.to_datetime, periods[:day][:von]
+    assert_equal '2009-05-30 23:59:59'.to_datetime, periods[:day][:bis]
+    
+    assert_equal '2009-05-24 00:00:00'.to_datetime, periods[:week][:von]
+    assert_equal '2009-05-30 23:59:59'.to_datetime, periods[:week][:bis]
+    
+    assert_equal '2009-05-18 00:00:00'.to_datetime, periods[:calendar_week][:von]
+    assert_equal '2009-05-24 23:59:59'.to_datetime, periods[:calendar_week][:bis]
+  
+    assert_equal '2009-04-30 00:00:00'.to_datetime, periods[:month][:von]
+    assert_equal '2009-05-30 23:59:59'.to_datetime, periods[:month][:bis]
+  
+    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]
+  
+    
+  end
+
+  should "create the calendar_weekly report by using 7 daily reports" do
+    
+    today = '2009-06-24'
+    
+    # should be ignored in weekly
+    exec("insert into visits values (null, 'sem', '#{today}');");
+    # should be ignored in weekly
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 1 day));");
+    # should be ignored in weekly
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 2 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 3 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 4 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 5 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 6 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 7 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 8 day));");
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 9 day));");
+    # should be ignored in weekly
+    exec("insert into visits values (null, 'sem', date_sub('#{today}', interval 10 day));");
+
+    create_visit_report_factory(:since => 15.days.ago, :periods => [:day]).run
+
+    exec("truncate visits;")
+  
+    create_visit_report_factory(:periods => [:calendar_week]).run
+  
+    assert_equal 7, one("select count(1) as cnt from visits_calendar_week where von between '2009-06-15 00:00:00' and '2009-06-21 00:00:00'")["cnt"].to_i
+    
+  end
+
+    
 end

data/test/test_helper.rb

@@ -10,8 +10,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 class Test::Unit::TestCase
 end
 
-ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "mysql", :username => "root", :password => "root", :host => "localhost", :port => 3306)
+ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "report_me_test", :username => "root", :password => "root", :host => "localhost", :port => 3306)
 
-ActiveRecord::Base.connection.execute "drop database if exists report_me_test;"
-ActiveRecord::Base.connection.execute "create database report_me_test;"
-ActiveRecord::Base.connection.execute "use report_me_test;"
+# ActiveRecord::Base.connection.execute "drop database if exists report_me_test;"
+# ActiveRecord::Base.connection.execute "create database report_me_test;"
+# ActiveRecord::Base.connection.execute "use report_me_test;"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-reportme
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Jan Zimmek