jzimmek-report_me 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/report_me/report_factory.rb

@@ -56,11 +56,20 @@ module ReportMe
     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
     end
-  
+    
+    def reset
+      exec("drop table if exists #{report_information_table_name};")
+      
+      periods.each do |period|
+        @reports.each do |r|
+          exec("drop table if exists #{r.table_name(period[:name])};")
+        end
+      end
+    end
   
     def run
     
-      debug = true
+      debug = false
     
       unless report_information_table_name_exist?
         ddl = <<-SQL
@@ -75,12 +84,12 @@ module ReportMe
             )
             ENGINE=InnoDB default CHARSET=utf8;
         SQL
-        ActiveRecord::Base.connection.execute(ddl)
+        exec(ddl)
       end
     
       if debug
         # just for testing
-        ActiveRecord::Base.connection.execute("truncate #{report_information_table_name};")
+        exec("truncate #{report_information_table_name};")
       end
     
       periods.each do |period|
@@ -94,7 +103,7 @@ module ReportMe
 
           if debug
             # drop and create table while in testing mode
-            ActiveRecord::Base.connection.execute("drop table if exists #{table_name};")
+            exec("drop table if exists #{table_name};")
           end
 
           table_exist   = r.table_exist?(period[:name])
@@ -105,10 +114,10 @@ module ReportMe
         
         
           unless table_exist
-            ActiveRecord::Base.connection.execute("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
+            exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
           end
         
-          puts sql
+          # puts sql
         
           if !report_exist || period[:name] == :today
             ActiveRecord::Base.transaction do

data/report_me.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{report_me}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Zimmek"]

data/test/report_me_test.rb

@@ -3,45 +3,91 @@ require 'test_helper'
 class ReportMeTest < Test::Unit::TestCase
 
   def setup
-    
-    ActiveRecord::Base.connection.execute "drop table if exists employees"
-    ActiveRecord::Base.connection.execute <<-SQL
+    exec("use report_me_test")
+    exec "drop table if exists visits"
+    exec <<-SQL
       create
-        table employees
+        table visits
         (
           id bigint auto_increment,
-          name varchar(255),
-          age bigint,
+          channel varchar(255),
           created_at datetime,
           primary key (id)
         )
     SQL
   end
   
-  def create_employee_report_factory
+  def create_visit_report_factory
     
-    ReportMe::ReportFactory.create do
-      report :employees do
+    rme = ReportMe::ReportFactory.create do
+      report :visits do
         source do |von, bis|
           <<-SQL
           select
-            date(created_at) as datum,
-            count(1) as anzahl
+            date('#{von}') as datum,
+            channel,
+            count(1) as cnt
           from
-            employees
+            visits
           where
             created_at between '#{von}' and '#{bis}'
           group by
-            date(created_at)
+            date(created_at),
+            channel
           SQL
         end
       end
     end
-        
-    ActiveRecord::Base.connection.execute "truncate #{f.table_name(:number_of_employees)}"
+    
+    rme.reset
+    rme
+  end
+  
+  def exec(sql)
+    ActiveRecord::Base.connection.execute(sql)
+  end
+
+  def one(sql)
+    ActiveRecord::Base.connection.select_one(sql)
+  end
+
+  def teardown
+    exec("truncate visits;");
+  end
+
+  should "create one visitor in the today report for channel sem" do
+    exec("insert into visits values (null, 'sem', now())");
+    create_visit_report_factory.run
+    assert_equal 1, one("select count(1) as cnt from visits_today where channel = 'sem' and datum = curdate()")["cnt"].to_i
   end
   
+  should "create two visitors in the today report for channel sem" do
+    exec("insert into visits values (null, 'sem', now())");
+    exec("insert into visits values (null, 'sem', now())");
+    create_visit_report_factory.run
+    assert_equal 2, one("select cnt from visits_today where channel = 'sem' and datum = curdate()")["cnt"].to_i
+  end
+  
+  should "create visitors in the today report for channel sem and seo" do
+    exec("insert into visits values (null, 'sem', now())");
+    exec("insert into visits values (null, 'sem', now())");
+    exec("insert into visits values (null, 'seo', now())");
+    exec("insert into visits values (null, 'sem', now())");
+    exec("insert into visits values (null, 'seo', now())");
+    create_visit_report_factory.run
+    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 "probably rename this file and start testing for real" do
+  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));");
+    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
+    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
+  
 end

data/test/test_helper.rb

@@ -12,5 +12,6 @@ end
 
 ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "mysql", :username => "root", :password => "root", :host => "localhost", :port => 3306)
 
-ActiveRecord::Base.connection.execute "drop database if exists report_me_test"
-ActiveRecord::Base.connection.execute "create database report_me_test"
+ActiveRecord::Base.connection.execute "drop database if exists report_me_test;"
+ActiveRecord::Base.connection.execute "create database report_me_test;"
+ActiveRecord::Base.connection.execute "use report_me_test;"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-report_me
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jan Zimmek