best_boy 1.0.3 → 1.1.0

data/app/controllers/best_boy/best_boy_events_controller.rb

@@ -7,25 +7,115 @@ module BestBoy
 
     layout 'best_boy_backend'
 
-    helper_method :available_owner_types, :available_events, :available_event_sources, :available_years, :current_owner_type,
-                  :current_event, :current_event_source, :current_year, :collection, :statistics, :stats_by_event_and_month,
-                  :stats_by_event_source_and_month, :render_chart, :event_source_details, :month_name_array, :detail_count,
-                  :current_month, :stats_by_event_source_and_day
+    helper_method :available_owner_types, :available_events, :available_event_sources, :available_years,
+                  :current_owner_type, :current_event, :current_event_source, :current_month, :current_year, :collection,
+                  :render_chart, :month_name_array, :detail_count
+
+
+    def stats
+      counter_scope = BestBoyEvent.select("COUNT(*) as counter, event").where(:owner_type => current_owner_type).group('event')
+
+      # Custom hash for current event stats - current_year, current_month, current_week, current_day (with given current_owner_type)
+      # We fire 5 database queries, one for each group, to keep it database acnostic.
+      # Before we had 5 * n events queries
+      @event_counts_per_group = {}
+      overall_hash = counter_scope.inject({}){ |hash, element| hash[element.event] = element.counter; hash}
+      current_year_hash = counter_scope.per_year(Time.zone.now).inject({}){ |hash, element| hash[element.event] = element.counter; hash }
+      current_month_hash = counter_scope.per_month(Time.zone.now).inject({}){ |hash, element| hash[element.event] = element.counter; hash }
+      current_week_hash = counter_scope.per_week(Time.zone.now).inject({}){ |hash, element| hash[element.event] = element.counter; hash }
+      current_day_hash = counter_scope.per_day(Time.zone.now).inject({}){ |hash, element| hash[element.event] = element.counter; hash }
+
+      available_events.each do |event|
+        @event_counts_per_group[event] ||= {}
+        @event_counts_per_group[event]['overall'] = overall_hash[event] || 0
+        @event_counts_per_group[event]['year'] = current_year_hash[event] || 0
+        @event_counts_per_group[event]['month'] = current_month_hash[event] || 0
+        @event_counts_per_group[event]['week'] = current_week_hash[event] || 0
+        @event_counts_per_group[event]['day'] = current_day_hash[event] || 0
+      end
+
+      # Custom hash for current event stats per month (with given current_owner_type)
+      # We fire 12 database queries, one for each month, to keep it database acnostic.
+      # Before we had 12 * n events queries
+      @event_counts_per_month = {}
+      %w(1 2 3 4 5 6 7 8 9 10 11 12).each do |month|
+        month_hash = counter_scope.per_month("1-#{month}-#{current_year}".to_time).inject({}){ |hash, element| hash[element.event] = element.counter; hash}
+
+        available_events.each do |event|
+          @event_counts_per_month[event] ||= {}
+          @event_counts_per_month[event][month] = month_hash[event] || 0
+        end
+      end
+    end
+
+
+    def details
+      counter_scope = BestBoyEvent.select("COUNT(*) as counter, event_source").where(owner_type: current_owner_type, event: current_event).group('event_source')
+
+      # Custom hash for current event_source stats - current_year, current_month, current_week, current_day (with given current_owner_type)
+      # We fire 5 database queries, one for each group, to keep it database acnostic.
+      # Before we had 5 * n event_sources queries
+      @event_source_counts_per_group = {}
+      overall_hash = counter_scope.inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+      current_year_hash = counter_scope.per_year(Time.zone.now).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+      current_month_hash = counter_scope.per_month(Time.zone.now).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+      current_week_hash = counter_scope.per_week(Time.zone.now).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+      current_day_hash = counter_scope.per_day(Time.zone.now).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+
+      available_event_sources.each do |event_source|
+        @event_source_counts_per_group[event_source] ||= {}
+        @event_source_counts_per_group[event_source]['overall'] = overall_hash[event_source] || 0
+        @event_source_counts_per_group[event_source]['year'] = current_year_hash[event_source] || 0
+        @event_source_counts_per_group[event_source]['month'] = current_month_hash[event_source] || 0
+        @event_source_counts_per_group[event_source]['week'] = current_week_hash[event_source] || 0
+        @event_source_counts_per_group[event_source]['day'] = current_day_hash[event_source] || 0
+      end
+
+      # Custom hash for current event_sources stats per month (with given current_owner_type and given event)
+      # We fire 12 database queries, one for each month, to keep it database acnostic.
+      # Before we had 12 * n event_sources queries
+      @event_sources_counts_per_month = {}
+      %w(1 2 3 4 5 6 7 8 9 10 11 12).each do |month|
+        month_hash = counter_scope.per_month("1-#{month}-#{current_year}".to_time).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+
+        available_event_sources.each do |event_source|
+          @event_sources_counts_per_month[event_source] ||= {}
+          @event_sources_counts_per_month[event_source][month] = month_hash[event_source] || 0
+        end
+      end
+    end
+
 
     def monthly_details
+      counter_scope = BestBoyEvent.select("COUNT(*) as counter, event_source").where(owner_type: current_owner_type, event: current_event).group('event_source')
+      days = 1..(Time.days_in_month("1-#{current_month}-#{current_year}".to_time.month))
+      # Custom hash for current event_sources stats per month (with given current_owner_type and given event)
+      # We fire a max of 31 database queries, one for each day, to keep it database acnostic.
+      # Before we had 31 * n event_sources queries
+      @event_sources_counts_per_day = {}
+      days.each do |day|
+        day_hash = counter_scope.per_day("#{day}-#{current_month}-#{current_year}".to_time).inject({}){ |hash, element| hash[element.event_source] = element.counter; hash}
+
+        available_event_sources.each do |event_source|
+          @event_sources_counts_per_day[event_source] ||= {}
+          @event_sources_counts_per_day[event_source][day] = day_hash[event_source] || 0
+        end
+      end
+
       data_table = GoogleVisualr::DataTable.new
       data_table.new_column('string', 'time')
       available_event_sources.each do |source|
         data_table.new_column('number', source.to_s)
       end
 
-      (1..(Time.days_in_month("1-#{current_month}-#{current_year}".to_time.month))).each do |periode|
-        time = "#{periode}-#{current_month}-#{current_year}".to_time
-        data_table.add_row( [ periode.to_s] + available_event_sources.map{ |source| custom_data_count(source, time)})
+      days.each do |day|
+        time = "#{day}-#{current_month}-#{current_year}".to_time
+        data_table.add_row( [ day.to_s] + available_event_sources.map{ |event_source| @event_sources_counts_per_day[event_source][day].to_i })
       end
       @chart = GoogleVisualr::Interactive::AreaChart.new(data_table, { width: 900, height: 240, title: "" })
     end
 
+
     private
 
     def render_chart(chart, dom)
@@ -51,9 +141,9 @@ module BestBoy
     end
 
     def custom_data_count(source, time)
-      scope = BestBoyEvent.where("best_boy_events.owner_type = ?", current_owner_type)
-      scope = scope.where("best_boy_events.event = ?", current_event) if current_event.present?
-      scope = scope.where("best_boy_events.event_source = ?", source) if source.present?
+      scope = BestBoyEvent.where(owner_type: current_owner_type)
+      scope = scope.where(event: current_event) if current_event.present?
+      scope = scope.where(event_source: source) if source.present?
       scope = scope.send("per_#{ current_time_interval == "year" ? "month" : "day" }", time)
       scope.count
     end
@@ -91,31 +181,6 @@ module BestBoy
       end
     end
 
-    def stats_by_event_and_month(event, month)
-      date = "1-#{month}-#{current_year}".to_time
-      BestBoyEvent.where("best_boy_events.owner_type = ? AND best_boy_events.event = ?", current_owner_type, event).per_month(date).count
-    end
-
-    def stats_by_owner_and_event_and_event_source(source)
-      if source.present?
-        scope = BestBoyEvent.where("best_boy_events.owner_type = ? AND best_boy_events.event = ? AND best_boy_events.event_source = ?", current_owner_type, current_event, source)
-      else
-        scope = BestBoyEvent.where("best_boy_events.owner_type = ? AND best_boy_events.event = ? AND best_boy_events.event_source IS NULL", current_owner_type, current_event)
-      end
-    end
-
-    def stats_by_event_source_and_month(source, month)
-      date = "1-#{month}-#{current_year}".to_time
-      scope = stats_by_owner_and_event_and_event_source(source)
-      scope.per_month(date).count
-    end
-
-    def stats_by_event_source_and_day(source, day)
-      date = "#{day}-#{current_month}-#{current_year}".to_time
-      scope = stats_by_owner_and_event_and_event_source(source)
-      scope.per_day(date).count
-    end
-
     def current_date
       @current_date ||= Date.strptime(params[:date], "%d-%m-%Y") if params[:date] rescue nil
     end
@@ -145,27 +210,21 @@ module BestBoy
     end
 
     def available_events
-      @available_events ||= (
-        scope = BestBoyEvent.where("best_boy_events.owner_type = ?", current_owner_type)
-        scope = scope.select("best_boy_events.event").order("best_boy_events.event ASC")
-        scope = scope.group("best_boy_events.event").map(&:event)
-      )
+      @available_events ||= BestBoyEvent.select('DISTINCT event').where(owner_type: current_owner_type).order(:event).map(&:event)
     end
 
     def available_event_sources
       @available_event_sources ||= (
-        scope = BestBoyEvent.where("best_boy_events.owner_type = ? AND best_boy_events.event = ?", current_owner_type, current_event)
-        scope = scope.select("best_boy_events.event_source").order("best_boy_events.event_source ASC")
-        scope = scope.group("best_boy_events.event_source").map(&:event_source)
+        BestBoyEvent.select("DISTINCT event_source").where(owner_type: current_owner_type, event: current_event).order(:event_source).map(&:event_source)
       )
     end
 
     def available_years
-      @available_years = (BestBoyEvent.where("best_boy_events.owner_type = ?", current_owner_type).order("best_boy_events.created_at ASC").first.created_at.to_date.year..Time.zone.now.year).map{ |year| year.to_s } rescue [Time.zone.now.year]
+      @available_years = (BestBoyEvent.where(owner_type: current_owner_type).order(:created_at).first.created_at.to_date.year..Time.zone.now.year).map{ |year| year.to_s } rescue [Time.zone.now.year]
     end
 
     def available_owner_types
-      @available_owner_types ||= BestBoyEvent.select("DISTINCT best_boy_events.owner_type").order("best_boy_events.owner_type ASC").map(&:owner_type)
+      @available_owner_types ||= BestBoyEvent.select("DISTINCT owner_type").order(:owner_type).map(&:owner_type)
     end
 
     def detail_count
@@ -179,37 +238,19 @@ module BestBoy
       end
 
       scope = BestBoyEvent
-      scope = scope.where("best_boy_events.owner_type = ?", @owner_type) if @owner_type.present?
-      scope = scope.where("best_boy_events.event = ?", @event) if @event.present?
-      scope = scope.where("best_boy_events.event_source = ?", @event_source) if @event_source.present?
+      scope = scope.where(owner_type: @owner_type) if @owner_type.present?
+      scope = scope.where(event: @event) if @event.present?
+      scope = scope.where(event_source: @event_source) if @event_source.present?
       scope = scope.per_day(@date) if @date.present?
       scope
     end
 
-    def prepare_details(base_collection, key, options = {})
-      array = Array.new
-      base_collection.each do |item|
-        scope = current_scope(options.to_a + [[key.to_sym, item]])
-        array.push([item, scope.count] + %w(year month week day).map{ |delimiter| scope.send("per_#{delimiter}", Time.zone.now).count })
-      end
-      array
-    end
-
     def collection
       @best_boy_events ||= (
-        scope = current_scope({:owner_type => params[:owner_type], :event_source => current_event, :date =>  current_date})
-        scope = scope.order("best_boy_events.created_at DESC, best_boy_events.event ASC")
-        scope.page(params[:page]).per(50)
+        scope = current_scope({owner_type: params[:owner_type], event_source: current_event, date: current_date})
+        scope.order("created_at DESC, event ASC").page(params[:page]).per(50)
       )
     end
 
-    def statistics
-      @statistics = prepare_details(available_events, "event", {:owner_type => current_owner_type})
-    end
-
-    def event_source_details
-      @event_source_details = prepare_details(available_event_sources, "event_source", {:owner_type => current_owner_type, :event => current_event})
-    end
-
   end
 end

data/app/views/best_boy/best_boy_events/details.html.erb

@@ -19,17 +19,31 @@
         </tr>
       </thead>
       <tbody>
-        <% event_source_details.each do |best_boy_event_source| %>
+        <% @event_source_counts_per_group.each do |event_source_string, group_hash| %>
           <tr>
-            <% (0..5).each do |key| %>
-              <td><%= best_boy_event_source[key].present? ? best_boy_event_source[key] : "n.a." %></td>
-              <% if key != 0 %>
-                <td><%= number_with_precision((best_boy_event_source[key].to_f / detail_count) * 100, :precision => 2) %> %</td>
-              <% end %>
+            <td><%= event_source_string %></td>
+            <% group_hash.each do |group, counter| %>
+              <td><%= counter %></td>
+              <td><%= number_to_percentage(counter.to_f / detail_count * 100, :precision => 2) %></td>
             <% end %>
           </tr>
         <% end %>
       </tbody>
+      <tfoot>
+        <tr>
+          <th>Total</th>
+          <th><%= result = @event_source_counts_per_group.values.inject(0){|sum, hash| sum += hash['overall'].to_i; sum} %></th>
+          <th><%= number_to_percentage(result.to_f / detail_count * 100, :precision => 2) %></th>
+          <th><%= result = @event_source_counts_per_group.values.inject(0){|sum, hash| sum += hash['year'].to_i; sum} %></th>
+          <th><%= number_to_percentage(result.to_f / detail_count * 100, :precision => 2) %></th>
+          <th><%= result = @event_source_counts_per_group.values.inject(0){|sum, hash| sum += hash['month'].to_i; sum} %></th>
+          <th><%= number_to_percentage(result.to_f / detail_count * 100, :precision => 2) %></th>
+          <th><%= result = @event_source_counts_per_group.values.inject(0){|sum, hash| sum += hash['week'].to_i; sum} %></th>
+          <th><%= number_to_percentage(result.to_f / detail_count * 100, :precision => 2) %></th>
+          <th><%= result = @event_source_counts_per_group.values.inject(0){|sum, hash| sum += hash['day'].to_i; sum} %></th>
+          <th><%= number_to_percentage(result.to_f / detail_count * 100, :precision => 2) %></th>
+        </tr>
+      </tfoot>
     </table>
   </div>
 </div>
@@ -47,18 +61,18 @@
     <table class="table table-striped table-bordered">
       <thead>
         <tr>
-          <th>Event</th>
+          <th>Event Source</th>
           <% month_name_array.each do |month| %>
             <th><%= link_to month, best_boy_admin_monthly_details_path(:owner_type => current_owner_type, :event => current_event, :month => month, :year => current_year, :time_interval => "month") %></th>
           <% end %>
         </tr>
       </thead>
       <tbody>
-        <% available_event_sources.each do |source| %>
+        <% @event_sources_counts_per_month.each do |event_source_string, month_hash| %>
           <tr>
-            <td><%= source.present? ? source : "n.a." %></td>
-            <% %w(1 2 3 4 5 6 7 8 9 10 11 12).each do |month| %>
-              <td><%= stats_by_event_source_and_month source, month %></td>
+            <td><%= event_source_string %></td>
+            <% month_hash.each do |month, counter| %>
+              <td><%= counter %></td>
             <% end %>
           </tr>
         <% end %>

data/app/views/best_boy/best_boy_events/monthly_details.html.erb

@@ -23,18 +23,18 @@
     <table class="table table-striped table-bordered small-font">
       <thead>
         <tr>
-          <th>Event</th>
+          <th>Event Source</th>
           <% (1..(Time.days_in_month("1-#{current_month}-#{current_year}".to_time.month))).each do |day| %>
             <td><%= day %></td>
           <% end %>
         </tr>
       </thead>
       <tbody>
-        <% available_event_sources.each do |source| %>
+        <% @event_sources_counts_per_day.each do |event_source_string, day_hash| %>
           <tr>
-            <td><%= source.present? ? source : "n.a." %></td>
-            <% (1..(Time.days_in_month("1-#{current_month}-#{current_year}".to_time.month))).each do |day| %>
-              <td><%= stats_by_event_source_and_day source, day %></td>
+            <td><%= event_source_string %></td>
+            <% day_hash.each do |day, counter| %>
+              <td><%= counter %></td>
             <% end %>
           </tr>
         <% end %>

data/app/views/best_boy/best_boy_events/stats.html.erb

@@ -15,22 +15,32 @@
         </tr>
       </thead>
       <tbody>
-        <% statistics.each do |best_boy_event| %>
+        <% @event_counts_per_group.each do |event_string, group_hash| %>
           <tr>
-            <td><%= link_to best_boy_event[0], best_boy_admin_details_path(:event => best_boy_event[0], :owner_type => current_owner_type) %>
-            <% (1..5).each do |key| %>
-              <td><%= best_boy_event[key] %></td>
+            <td><%= link_to event_string, best_boy_admin_details_path(:event => event_string, :owner_type => current_owner_type) %></td>
+            <% group_hash.each do |group, counter| %>
+              <td><%= counter %></td>
             <% end %>
           </tr>
         <% end %>
       </tbody>
+      <tfoot>
+        <tr>
+          <th>Total</th>
+          <th><%= @event_counts_per_group.values.inject(0){|sum, hash| sum += hash['overall'].to_i; sum} %></th>
+          <th><%= @event_counts_per_group.values.inject(0){|sum, hash| sum += hash['year'].to_i; sum} %></th>
+          <th><%= @event_counts_per_group.values.inject(0){|sum, hash| sum += hash['month'].to_i; sum} %></th>
+          <th><%= @event_counts_per_group.values.inject(0){|sum, hash| sum += hash['week'].to_i; sum} %></th>
+          <th><%= @event_counts_per_group.values.inject(0){|sum, hash| sum += hash['day'].to_i; sum} %></th>
+        </tr>
+      </tfoot>
     </table>
   </div>
 </div>
 
 <div class="span12">
   <div class="well">
-    <h3 class="pull-left">Statistics for <%= current_year %> per month</h3> 
+    <h3 class="pull-left">Statistics for <%= current_year %> per month</h3>
     <div class="pull-right">
       <%= form_tag best_boy_admin_stats_path, :method => :get do %>
         <%= hidden_field_tag :owner_type, current_owner_type %>
@@ -47,15 +57,23 @@
         </tr>
       </thead>
       <tbody>
-        <% available_events.each do |event| %>
+        <% @event_counts_per_month.each do |event_string, month_hash| %>
           <tr>
-            <td><%= event %></td>
-            <% %w(1 2 3 4 5 6 7 8 9 10 11 12).each do |month| %>
-              <td><%= stats_by_event_and_month event, month %></td>
+            <td><%= event_string %></td>
+            <% month_hash.each do |month, counter| %>
+              <td><%= counter %></td>
             <% end %>
           </tr>
         <% end %>
       </tbody>
+      <tfoot>
+        <tr>
+          <th>Total</th>
+          <% (1..12).to_a.map(&:to_s).each do |month_no| %>
+            <th><%= @event_counts_per_month.values.inject(0){|sum, hash| sum += hash[month_no].to_i; sum} %></th>
+          <% end %>
+        </tr>
+      </tfoot>
     </table>
   </div>
 </div>

data/best_boy.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency('kaminari')
   s.add_dependency('google_visualr')
 
-  s.add_development_dependency('activerecord')
-  s.add_development_dependency('activesupport')
+  s.add_development_dependency('activerecord', '~> 3.2.13')
+  s.add_development_dependency('activesupport', '~> 3.2.13')
   s.add_development_dependency('sqlite3', '~> 1.3.6')
   s.add_development_dependency('rake', '~> 10.0.3')
   s.add_development_dependency('rspec', '~> 2.13.0')

data/lib/best_boy/version.rb

@@ -1,3 +1,3 @@
 module BestBoy
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_boy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -48,33 +48,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement