jzimmek-reportme 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/reportme/report.rb

@@ -25,12 +25,8 @@ module Reportme
       @periods.include?(period)
     end
     
-    def periods
-      
-    end
-    
-    def sql(von, bis)
-      @source.call(von, bis)
+    def sql(von, bis, period_name)
+      @source.call(von, bis, period_name)
     end
   
     def table_name(period)

data/lib/reportme/report_factory.rb

@@ -49,11 +49,11 @@ module Reportme
     end
   
     def report_information_table_name_exist?
-      ActiveRecord::Base.connection.select_value("show tables like '#{report_information_table_name}'") != nil
+      select_value("show tables like '#{report_information_table_name}'") != nil
     end
 
     def report_exists?(name, von, bis)
-      ActiveRecord::Base.connection.select_value("select 1 from #{report_information_table_name} where report = '#{name}' and von = '#{von}' and bis = '#{bis}'") != nil
+      select_value("select 1 from #{report_information_table_name} where report = '#{name}' and von = '#{von}' and bis = '#{bis}'") != nil
     end
     
     def reset
@@ -95,42 +95,43 @@ module Reportme
       
         @reports.each do |r|
           
-          next unless r.wants_period?(period[:name])
+          period_name = 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")
 
-          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
 
-          table_exist   = r.table_exist?(period[:name])
-          sql           = r.sql(von, bis)
+          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]} :: #{report_exist}"
+          puts "report: #{r.name}_#{period_name}"
         
         
           unless table_exist
             exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
           end
         
-          puts sql
         
-          # 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
-          #   
-          #     exec("insert into #{table_name} #{sql};")
-          #   end
-          # 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
+          
+              if period_name == :today
+                exec("truncate #{table_name};")
+              end
+            
+              exec("insert into #{table_name} #{sql};")
+            end
+          end
 
         
         end
@@ -138,10 +139,23 @@ module Reportme
     end
   
     def exec(sql)
+      puts "// ------------------------"
+      puts "exec: #{sql}"
+      puts "------------------------ //"
       ActiveRecord::Base.connection.execute(sql)
     end
+    
+    def select_value(sql)
+      puts "// ------------------------"
+      puts "select_value: #{sql}"
+      puts "------------------------ //"
+      ActiveRecord::Base.connection.select_value(sql)
+    end
   
     def report(name, &block)
+      
+      name = name.to_sym
+      
       r = Report.new(name)
       r.instance_eval(&block)
     

metadata

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