jzimmek-reportme 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/reportme/report_factory.rb

@@ -3,18 +3,21 @@ require 'reportme/report'
 module Reportme
   class ReportFactory
   
-    def self.create(&block)
-      rme = ReportFactory.new
+    def self.create(since=Date.today, &block)
+      rme = ReportFactory.new(since)
       rme.instance_eval(&block)
       rme.run
       rme
     end
   
-    def initialize
+    def initialize(since)
+      raise "since cannot be in the future" if since.future?
+      
       @reports = []
+      @since = since.to_date
     end
   
-    def periods(today = DateTime.now)
+    def periods(today = Date.today)
 
       periods = []
 
@@ -79,7 +82,7 @@ module Reportme
               von datetime not null,
               bis datetime not null,
               created_at datetime not null,
-              primary key (report)
+              primary key (report, von, bis)
             )
             ENGINE=InnoDB default CHARSET=utf8;
         SQL
@@ -90,52 +93,57 @@ module Reportme
         # just for testing
         exec("truncate #{report_information_table_name};")
       end
-    
-      periods.each do |period|
+
+      while !@since.future?
+        
+        periods(@since).each do |period|
       
-        @reports.each do |r|
+          @reports.each do |r|
           
-          period_name = period[:name]
+            period_name = period[:name]
           
-          next unless r.wants_period?(period_name)
+            next unless r.wants_period?(period_name)
           
-          von = period[:von].strftime("%Y-%m-%d 00:00:00")
-          bis = period[:bis].strftime("%Y-%m-%d 23:59:59")
+            von = period[:von].strftime("%Y-%m-%d 00:00:00")
+            bis = period[:bis].strftime("%Y-%m-%d 23:59:59")
 
-          table_name = r.table_name(period_name)
+            table_name = r.table_name(period_name)
 
-          if debug
-            # drop and create table while in testing mode
-            exec("drop table if exists #{table_name};")
-          end
+            # if debug
+            #   # drop and create table while in testing mode
+            #   exec("drop table if exists #{table_name};")
+            # end
 
-          table_exist   = r.table_exist?(period_name)
-          sql           = r.sql(von, bis, period_name)
-          report_exist  = report_exists?(table_name, von, bis)
-        
-          puts "report: #{r.name}_#{period_name}"
-        
+            table_exist   = r.table_exist?(period_name)
+            sql           = r.sql(von, bis, period_name)
+            report_exist  = report_exists?(table_name, von, bis)
         
-          unless table_exist
-            exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
-          end
+            puts "report: #{r.table_name(period_name)} exist: #{table_exist}"
         
         
-          if !report_exist || period_name == :today
-            ActiveRecord::Base.transaction do
-              exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());") unless report_exist
-          
-              if period_name == :today
-                exec("truncate #{table_name};")
-              end
+            unless table_exist
+              exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
+            end
+                    
+            if !report_exist || period_name == :today
+              ActiveRecord::Base.transaction do
+                exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());") unless report_exist
             
-              exec("insert into #{table_name} #{sql};")
+                if period_name == :today
+                  exec("truncate #{table_name};")
+                end
+              
+                exec("insert into #{table_name} #{sql};")
+              end
             end
-          end
 
         
+          end
         end
+        
+        @since += 1.day
       end
+      
     end
   
     def exec(sql)

data/test/{report_me_test.rb → reportme_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ReportMeTest < Test::Unit::TestCase
+class ReportmeTest < Test::Unit::TestCase
 
   def setup
     exec("use report_me_test")
@@ -19,7 +19,7 @@ class ReportMeTest < Test::Unit::TestCase
   
   def create_visit_report_factory
     
-    rme = ReportMe::ReportFactory.create do
+    @rme = Reportme::ReportFactory.create do
       report :visits do
         source do |von, bis|
           <<-SQL
@@ -39,8 +39,7 @@ class ReportMeTest < Test::Unit::TestCase
       end
     end
     
-    rme.reset
-    rme
+    @rme
   end
   
   def exec(sql)
@@ -52,6 +51,7 @@ class ReportMeTest < Test::Unit::TestCase
   end
 
   def teardown
+    @rme.reset
     exec("truncate visits;");
   end
 
@@ -78,7 +78,7 @@ class ReportMeTest < Test::Unit::TestCase
     assert_equal 2, one("select cnt from visits_today where channel = 'seo' and datum = curdate()")["cnt"].to_i
     assert_equal 3, one("select cnt from visits_today where channel = 'sem' and datum = curdate()")["cnt"].to_i
   end
-
+  
   should "create visitors in the day report for channel sem and seo" do
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
@@ -90,7 +90,7 @@ class ReportMeTest < Test::Unit::TestCase
     assert_equal 3, one("select cnt from visits_day where channel = 'sem' and datum = date_sub(curdate(), interval 1 day)")["cnt"].to_i
   end
   
-  should "handle today and day periods but nothing else" do
-  end
+  # should "handle today and day periods but nothing else" do
+  # end
   
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'report_me'
+require 'reportme'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-reportme
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -30,7 +30,7 @@ files:
 - lib/reportme.rb
 - lib/reportme/report.rb
 - lib/reportme/report_factory.rb
-- test/report_me_test.rb
+- test/reportme_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/jzimmek/reportme/tree/master
@@ -59,5 +59,5 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper to automate sql reports
 test_files: 
-- test/report_me_test.rb
+- test/reportme_test.rb
 - test/test_helper.rb