jzimmek-reportme 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/reportme/report.rb

@@ -4,6 +4,9 @@ module Reportme
     attr_reader :name
     
     def initialize(report_factory, name, temporary=false)
+      
+      name = name.to_sym
+      
       @report_factory = report_factory
       @name = name
       @periods = [:today, :day, :week, :calendar_week, :month, :calendar_month]
@@ -20,6 +23,7 @@ module Reportme
     end
     
     def depends_on(dependencies=[])
+      dependencies = dependencies.collect{|d| d.to_sym}
       @depends_on += dependencies
     end
     
@@ -28,6 +32,8 @@ module Reportme
     end
     
     def periods(wanted_periods=[])
+      wanted_periods = wanted_periods.collect{|p| p.to_sym}
+      
       unless wanted_periods.blank?
         @periods.clear
         wanted_periods.each do |period|

data/lib/reportme/report_factory.rb

@@ -11,6 +11,7 @@ module Reportme
   
     def initialize
       @report_exists_cache = []
+      @@report_creations = []
     end
     
     def self.connection(properties)
@@ -74,6 +75,10 @@ module Reportme
     def report_information_table_name
       "report_informations"
     end
+    
+    def remember_report_creation(report, period, von)
+      @@report_creations << {:report => report, :period => period, :von => von}
+    end
   
     def report_information_table_name_exist?
       select_value("show tables like '#{report_information_table_name}'") != nil
@@ -175,7 +180,7 @@ module Reportme
           exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());")
           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")}';")
 
-          self.class.notify_subscriber(report.name, period_name, _von)
+          remember_report_creation(report, period_name, _von)
         end
       end
     end
@@ -223,12 +228,12 @@ module Reportme
         # this will speed up generation of weekly and monthly reports.
       
         self.class.__sort_periods(periods_queue).each do |period|
-        
-          run_dependency_aware(@@reports) do |report|
+           run_dependency_aware(@@reports) do |report|
             __report_period(report, period)
           end
-        
         end
+        
+        self.class.__notify_subscriber
       ensure
         @@reports.each do |report|
           
@@ -269,9 +274,7 @@ module Reportme
           block.call(r)
 
           dependencies.each_pair do |key, values|
-
             if values.include?(r)
-              # puts "remove '#{r[:name]}' from '#{key}' list of dependencies"
               values.delete(r)
             end
           end
@@ -333,9 +336,12 @@ module Reportme
         table_exist   = r.table_exist?(period_name)
         sql           = r.sql(von, bis, period_name)
     
-        puts "report: #{r.table_name(period_name)} von: #{von}, bis: #{bis}"
         
         report_exists = report_exists?(table_name, von, bis)
+
+        unless report_exists
+          puts "running report: #{r.table_name(period_name)} von: #{von}, bis: #{bis}"
+        end
         
         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
@@ -355,7 +361,7 @@ module Reportme
           
             exec("insert into #{table_name} #{sql};")
             
-            self.class.notify_subscriber(r.name, period_name, _von)
+            remember_report_creation(r, period_name, _von)
           end
         end
 
@@ -450,13 +456,18 @@ module Reportme
       existing << block
     end
     
-    def self.notify_subscriber(report_name, period, von)
+    def self.__notify_subscriber
+      
       
-      (@@subscribtions[report_name] || []).each do |subscription|
-        begin
-          subscription.call(period, von)
-        rescue Exception => e
-          puts e
+      @@report_creations.each do |creation|
+
+        report_name = creation[:report].name
+        period = creation[:period]
+        von = creation[:von]
+
+        (@@subscribtions[report_name] || []).each do |subscription|
+          puts "notify subscriber of report '#{report_name}' - period: '#{period}', von: '#{von}'"
+          subscription.call(period, von, report_name)
         end
       end
       
@@ -464,8 +475,6 @@ module Reportme
   
     def self.report(name, temporary=false, &block)
       
-      name = name.to_sym
-      
       r = Report.new(self, name, temporary)
       r.instance_eval(&block)
     

data/test/reportme_test.rb

@@ -434,12 +434,21 @@ class ReportmeTest < Test::Unit::TestCase
   should "notify subscriptions" do
     notifed = false
   
-    rme = create_visit_report_factory
-    rme.class.subscribe :visits do
+    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.class.notify_subscriber(:visits, :day, '2009-01-01'.to_datetime)
+    rme.run
     
     assert notifed
   end

metadata

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