jzimmek-reportme 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/reportme/report.rb

@@ -1,7 +1,7 @@
 module Reportme
   class Report
   
-    attr_reader :name
+    attr_accessor :name
     
     def initialize(report_factory, name, temporary=false)
       
@@ -10,6 +10,7 @@ module Reportme
       @report_factory = report_factory
       @name = name
       @depends_on = []
+      @histories = []
       @temporary = temporary
     end
   
@@ -21,6 +22,14 @@ module Reportme
       @source = block
     end
     
+    def histories(histories=[])
+      @histories = histories
+    end
+    
+    def historice?(history)
+      @histories.include?(history)
+    end
+    
     def depends_on(dependencies=[])
       dependencies = dependencies.collect{|d| d.to_sym}
       @depends_on += dependencies

data/lib/reportme/report_factory.rb

@@ -78,8 +78,8 @@ module Reportme
         exec("alter table #{table_name} add index(von);")
 
         if period_name != :day
-          exec("alter table #{table_name} add day date after von;") 
-          exec("alter table #{table_name} add index(day);")
+          exec("alter table #{table_name} add _day date after von;") 
+          exec("alter table #{table_name} add index(_day);")
         end
       end
       
@@ -113,52 +113,68 @@ module Reportme
       end
     end
     
-    def historice(since=Date.today)
+    def __opts(opts={})
+      opts = {
+        :since => Date.today,
+        :init => false,
+        :notify_subscribers => true
+      }.merge(opts)      
+    end
+    
+    def historice(opts={})
+
+      opts = __opts(opts)
+
+      since = opts[:since]
+
       raise "since cannot be in the future" if since.future?
 
-      __do_and_clean :calendar_week do
+      __do_and_clean(:calendar_week, opts) do |period_name|
       
         loop do
           
           run_dependency_aware(@@reports) do |report|
+            
             next if report.temporary?
-            __report_period(report, Period.calc(since, [:calendar_week]).first)
+            next unless report.historice?(period_name)
+            
+            __report_period(report, Period.calc(since, [period_name]).first)
           end
 
           since += 1.day
           break if since.future?
         end 
 
-        self.class.__notify_subscriber
       end
     end
     
-    def run(since=Date.today)
+    def run(opts={})
+
+      opts = __opts(opts)
+
+      opts[:init] = true
+
+      since = opts[:since]
     
       raise "since cannot be in the future" if since.future?
 
-      __do_and_clean :day, :init => true do
+      __do_and_clean(:day, opts) do |period_name|
         
         loop do
           
           run_dependency_aware(@@reports) do |report|
-            __report_period(report, Period.calc(since, [:day]).first)
+            __report_period(report, Period.calc(since, [period_name]).first)
           end
 
           since += 1.day
           break if since.future?
         end 
 
-        self.class.__notify_subscriber
       end
       
     end
     
-    def __do_and_clean(period_name, opts={}, &block)
-      
-      opts = {
-        :init => false
-      }.merge(opts)
+    def __do_and_clean(period_name, opts, &block)
       
       begin
         @@report_creations.clear
@@ -170,11 +186,18 @@ module Reportme
         @@init.call if @@init && opts[:init]
 
         run_dependency_aware(@@reports) do |report|
+          
+          if period_name != :day
+            next unless report.historice?(period_name)
+          end
+          
           ensure_report_tables_exist(report, period_name)
         end
 
-
-        block.call
+        block.call(period_name)
+        
+        self.class.__notify_subscriber if opts[:notify_subscribers]
+        
       ensure
         @@reports.each do |report|
           
@@ -243,6 +266,26 @@ module Reportme
       end
       
     end
+    
+    def self.print_dependency_tree(level=0, reports=@@reports)
+      
+      reports.each do |r|
+
+        if level > 0
+          (level + 1).times do
+            print " "
+          end
+        end
+
+        print "|-"
+        
+        puts r.name
+        
+        print_dependency_tree(level + 1, r.dependencies.collect{|d| report_by_name(d)})
+        
+      end
+      
+    end
 
     def __dependency_hash
       dependencies = {}
@@ -286,13 +329,13 @@ module Reportme
             sql = <<-SQL
               select
                 '#{von}' as von,
-                #{(column_names + ['date(von) as day']).join("\n,")}
+                #{(['date(von) as _day'] + column_names).join("\n,")}
               from
                 #{table_name_day}
               where
                 von between '#{von}' and '#{bis}'
               group by
-                #{(column_names + ['date(von)']).join("\n,")}
+                #{(['date(von)'] + column_names).join("\n,")}
             SQL
             
           end

data/test/reportme_test.rb

@@ -159,7 +159,7 @@ class ReportmeTest < Test::Unit::TestCase
     # should be ignored
     exec("insert into visits values (null, 'sem', date_sub(curdate(), interval 5 day));");
   
-    create_visit_report_factory(:periods => [:day]).run(3.days.ago)
+    create_visit_report_factory(:periods => [:day]).run(:since => 3.days.ago)
     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
   
@@ -457,6 +457,28 @@ class ReportmeTest < Test::Unit::TestCase
     assert notifed
   end
   
+  should "not notify subscribers" do
+    notifed = false
+  
+    now = DateTime.now
+    _now = now.strftime("%Y-%m-%d 00:00:00")
+    _yesterday = (now - 1.day).strftime("%Y-%m-%d 00:00:00")
+    
+    exec("insert into visits values (null, 'sem', '#{now}')");
+    rme = create_visit_report_factory(:periods => [:day])
+    rme.class.subscribe :visits do |period, von, report_name|
+      
+      assert_equal :day, period
+      assert_equal :visits, report_name
+      assert_equal _yesterday, von.strftime("%Y-%m-%d 00:00:00")
+      
+      notifed = true
+    end
+    rme.run(:notify_subscribers => false)
+    
+    assert !notifed
+  end
+  
   should "call initializer before running reports" do
     initialized = false
   
@@ -583,5 +605,5 @@ class ReportmeTest < Test::Unit::TestCase
     
     assert "tmp_report1_day", ReportTemporaryTestReport.report_by_name(:report1).table_name(:day)
   end
-  
+
 end

metadata

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