jzimmek-reportme 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/reportme/report.rb

@@ -12,10 +12,10 @@ module Reportme
       @source = block
     end
     
-    def periods(*args)
-      unless args.blank?
+    def periods(wanted_periods=[])
+      unless wanted_periods.blank?
         @periods.clear
-        args.each do |period|
+        wanted_periods.each do |period|
           @periods << period
         end
       end

data/test/reportme_test.rb

@@ -17,14 +17,23 @@ class ReportmeTest < Test::Unit::TestCase
     SQL
   end
   
-  def create_visit_report_factory
+  def create_visit_report_factory(opts={})
     
-    @rme = Reportme::ReportFactory.create do
+    defaults = {
+      :periods => [],
+      :since => DateTime.now
+    }
+    
+    opts = defaults.merge(opts)
+    
+    @rme = Reportme::ReportFactory.create opts[:since] do
       report :visits do
+        periods opts[:periods]
         source do |von, bis|
           <<-SQL
           select
-            date('#{von}') as datum,
+            '#{von}' as von,
+            date(created_at) as datum,
             channel,
             count(1) as cnt
           from
@@ -38,7 +47,6 @@ class ReportmeTest < Test::Unit::TestCase
         end
       end
     end
-    
     @rme
   end
   
@@ -51,8 +59,10 @@ class ReportmeTest < Test::Unit::TestCase
   end
 
   def teardown
-    @rme.reset
-    exec("truncate visits;");
+    unless @debug
+      @rme.reset if @rme
+      exec("truncate visits;");
+    end
   end
 
   should "create one visitor in the today report for channel sem" do
@@ -85,11 +95,75 @@ class ReportmeTest < Test::Unit::TestCase
     exec("insert into visits values (null, 'seo', date_sub(curdate(), interval 1 day));");
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
     exec("insert into visits values (null, 'seo', date_sub(curdate(), interval 1 day));");
-    create_visit_report_factory.run
+    create_visit_report_factory(:periods => [:today, :day]).run
     assert_equal 2, one("select cnt from visits_day where channel = 'seo' and datum = date_sub(curdate(), interval 1 day)")["cnt"].to_i
     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 "report a week as 7 days since yesterday ignoring days before or after this" do
+  
+    # today should be ignored
+    exec("insert into visits values (null, 'sem', curdate());");
+  
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 2 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 3 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 4 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 5 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 6 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 7 day));");
+    
+    # 8 days ago should be ignored
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 8 day));");
+    
+    create_visit_report_factory(:periods => [:week]).run
+    assert_equal 7, one("select count(1) as cnt from visits_week where channel = 'sem' and von = date_sub(curdate(), interval 7 day)")["cnt"].to_i
+  end
+  
+  should "create a daily report for the previous 3 days" do
+  
+    #should be ignored
+    exec("insert into visits values (null, 'sem', curdate());");
+  
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 2 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 3 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 4 day));");
+  
+    # should be ignored
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 5 day));");
+  
+    create_visit_report_factory(:since => 3.days.ago,:periods => [:day]).run
+    assert_equal 4, one("select count(1) as cnt from visits_day where von between date_sub(curdate(), interval 4 day) and date_sub(curdate(), interval 1 day)")["cnt"].to_i
+  end
+  
+  should "create the weekly report by using 7 daily reports" do
+    
+    # should be ignored in weekly
+    exec("insert into visits values (null, 'sem', curdate());");
+  
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 1 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 2 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 3 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 4 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 5 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 6 day));");
+    exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 7 day));");
+    
+    # should be ignored in weekly
+    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
+    
+    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
+  end
+  
   # should "handle today and day periods but nothing else" do
   # end
   

metadata

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