rails_local_analytics 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43724c92d8b23ef42ba4b5334f39f500d69075ea86e732ec405a3c5157200058
-  data.tar.gz: e1572a460c8bbee78956a431c55afdc208d2cbbc952562b6982a07cc2c24a9c3
+  metadata.gz: fbb7ca6534efc3666a302a04271092906ec9b2fc65a316d82b7811e2dd962668
+  data.tar.gz: 2cc17d06cf61d6b4b7fd2c559079965fa6c250b12d901b05a3317389e2d5b69d
 SHA512:
-  metadata.gz: ba528aae30b5ba1b5bdf814f78ca87d0b4d6bea70e15b2a5fc036a2ac9f27c529af5d59ea66595e15436edb025c71b10af308546fd38bf32155150175d158599
-  data.tar.gz: 11575f750a08aaafcf066fb9719209c3e5d3a8dd1447210bee1476786d5e48a88b3a070e350de04eaffcfee04fcfe1e56365483b6c28cc94f91d0a90e81ffe4e
+  metadata.gz: 8d9e8dea022bb79486a8bc6395106841a4f9d056accf68f3534072bac1e205f40df426664ed071abd54715d38b0a00ef879aaa080b4a0a51f6ba3e31b207101e
+  data.tar.gz: e249aa1fb3f83ccaf75ffdb774192de6549889b8fb38b3537f5a99cc5edc6aab7da7d1b01caccb6012ffa4c4695739f2a15107ecbc49804db9e3e61c856ea13f

data/README.md

@@ -27,6 +27,8 @@ It is fully customizable to store more details if desired.
 
 ![Screenshot 3](/screenshot_3.png)
 
+![Screenshot 4](/screenshot_4.png)
+
 ## Installation
 
 ```ruby
@@ -118,8 +120,8 @@ class ApplicationController < ActionController::Base
     RailsLocalAnalytics.record_request(
       request: request,
       custom_attributes: { # optional
-        TrackedRequestsByDaySite.name => site_based_attrs,
-        #TrackedRequestsByDayPage.name => {},
+        site: site_based_attrs,
+        page: {},
       },
     )
   end
@@ -136,6 +138,9 @@ Some examples of additional things you may want to track:
   * You may not need to store this in a new column, one example pattern could be to store this data in the existing `platform` database field
 - Country detection
   * Country detection is difficult. As such we dont try to include it by default.
+  * Consider using language detection instead
+- Language detection
+  * You can gather the language from the `request.env["HTTP_ACCEPT_LANGUAGE"]` or `browser.accept_language.first.full`
 - Users or organizations
   * You may want to track your users or another model which is a core tenant to your particular application
 
@@ -183,8 +188,8 @@ class ApplicationController
   def record_page_view
     # perform other logic and call RailsLocalAnalytics.record_request
 
-    TrackedRequestsByDayPage.where("date < ?", 3.months.ago).delete_all
-    TrackedRequestsByDaySite.where("date < ?", 3.months.ago).delete_all
+    TrackedRequestsByDayPage.where("day < ?", 3.months.ago).delete_all
+    TrackedRequestsByDaySite.where("day < ?", 3.months.ago).delete_all
   end
 end
 ```

data/app/assets/stylesheets/rails_local_analytics/application.css

@@ -1,3 +1,11 @@
+body{
+  padding-bottom: 20px;
+}
+
+table td{
+  overflow-wrap: anywhere;
+}
+
 input, select {
   border-radius: 5px;
   border: 1px solid #333;
@@ -5,6 +13,10 @@ input, select {
   padding: 2px 5px;
 }
 
-.tablesorter-header{
-  background-image: none !important;
+button.is-link{
+  border: none;
+  background: none;
+  color: #2780e3;
+  text-decoration: underline;
+  cursor: pointer;
 }

data/app/controllers/rails_local_analytics/application_controller.rb

@@ -1,5 +1,9 @@
 module RailsLocalAnalytics
   class ApplicationController < ActionController::Base
 
+    def root
+      redirect_to tracked_requests_path(type: :page)
+    end
+
   end
 end

data/app/controllers/rails_local_analytics/dashboard_controller.rb

@@ -1,22 +1,24 @@
 module RailsLocalAnalytics
   class DashboardController < ApplicationController
+    PER_PAGE_LIMIT = 1000
+
+    helper_method :pagination_page_number
 
     def index
-      params[:type] ||= "Site"
+      params[:type] ||= "page"
 
       case params[:type]
-      when "Site"
+      when "site"
         @klass = TrackedRequestsByDaySite
-      when "Page"
+      when "page"
         @klass = TrackedRequestsByDayPage
       else
-        raise ArgumentError
+        head 404
+        return
       end
 
       if params[:group_by].present? && !@klass.display_columns.include?(params[:group_by])
-        params[:group_by] = "All"
-      else
-        params[:group_by] ||= "All"
+        raise ArgumentError
       end
 
       if params[:start_date].present?
@@ -35,27 +37,119 @@ module RailsLocalAnalytics
         @end_date = @start_date
       end
 
-      @tracked_requests = fetch_records(@start_date, @end_date)
+      @results = fetch_records(@start_date, @end_date)
+
+      if @results.size < PER_PAGE_LIMIT
+        prev_start_date, prev_end_date = get_prev_dates(@start_date, @end_date)
+
+        @prev_period_results = fetch_records(prev_start_date, prev_end_date)
+
+        if @prev_period_results.size >= PER_PAGE_LIMIT
+          @prev_period_results = nil
+        end
+      end
+    end
+
+    def difference
+      case params.require(:type)
+      when "site"
+        @klass = TrackedRequestsByDaySite
+      when "page"
+        @klass = TrackedRequestsByDayPage
+      end
+
+      start_date = Date.parse(params.require(:start_date))
+      end_date = Date.parse(params.require(:end_date))
+
+      prev_start_date, prev_end_date = get_prev_dates(start_date, end_date)
+
+      where_conditions = params.require(:conditions).permit(*@klass.display_columns)
+
+      current_total = fetch_records(
+        start_date,
+        end_date,
+        where_conditions: where_conditions,
+        pluck_columns: ["SUM(total)"],
+      ).first
+
+      prev_total = fetch_records(
+        prev_start_date,
+        prev_end_date,
+        where_conditions: where_conditions,
+        pluck_columns: ["SUM(total)"],
+      ).first
 
-      prev_start_date = @start_date - (@end_date - @start_date)
-      prev_end_date = @end_date - (@end_date - @start_date)
+      if prev_total
+        diff = current_total - prev_total
+      else
+        diff = current_total
+      end
 
-      @prev_period_tracked_requests = fetch_records(prev_start_date, prev_end_date)
+      render json: {difference: diff}
     end
 
     private
 
-    def fetch_records(start_date, end_date)
+    def fetch_records(start_date, end_date, where_conditions: nil, pluck_columns: nil)
       tracked_requests = @klass
-        .where("day >= ?", @start_date)
-        .where("day <= ?", @end_date)
+        .where("day >= ?", start_date)
+        .where("day <= ?", end_date)
         .order(total: :desc)
 
+      if where_conditions.nil? && pluck_columns.nil?
+        tracked_requests = tracked_requests
+          .limit(PER_PAGE_LIMIT)
+          .offset(PER_PAGE_LIMIT * (pagination_page_number-1))
+
+        if params[:filter].present?
+          col, val = params[:filter].split("==")
+
+          if @klass.display_columns.include?(col)
+            tracked_requests = tracked_requests.where(col => val)
+          else
+            raise ArgumentError
+          end
+        end
+      end
+
+      if where_conditions
+        tracked_requests = tracked_requests.where(where_conditions)
+      end
+
       if params[:search].present?
         tracked_requests = tracked_requests.multi_search(params[:search])
       end
 
-      return tracked_requests
+      if params[:group_by].present?
+        group_by_columns = [params[:group_by]]
+        pluck_columns = [params[:group_by], "SUM(total)"]
+      else
+        group_by_columns = @klass.display_columns
+        pluck_columns ||= @klass.display_columns + ["SUM(total)"]
+      end
+
+      tracked_requests
+        .group(*group_by_columns)
+        .pluck(*pluck_columns)
     end
+
+    def pagination_page_number
+      page = params[:page].presence.to_i || 1
+      page = 1 if page.zero?
+      page
+    end
+
+    def get_prev_dates(start_date, end_date)
+      if start_date == end_date
+        prev_start_date = start_date - 1.day
+        prev_end_date = prev_start_date
+      else
+        duration = end_date - start_date
+        prev_start_date = start_date - duration
+        prev_end_date = end_date - duration
+      end
+      return [prev_start_date, prev_end_date]
+    end
+
   end
 end

data/app/jobs/rails_local_analytics/record_request_job.rb

@@ -1,6 +1,5 @@
 module RailsLocalAnalytics
   class RecordRequestJob < ApplicationJob
-    MODELS = [TrackedRequestsByDaySite, TrackedRequestsByDayPage].freeze
     def perform(json)
       if json.is_a?(String)
         json = JSON.parse(json)
@@ -8,49 +7,56 @@ module RailsLocalAnalytics
 
       request_hash = json.fetch("request_hash")
 
-      custom_attributes_by_model = json.fetch("custom_attributes")
+      custom_attributes_by_type = json.fetch("custom_attributes")
 
-      MODELS.each do |model|
-        custom_attrs = custom_attributes_by_model && custom_attributes_by_model[model.name]
+      ["site", "page"].each do |type|
+        case type
+        when "site"
+          klass = TrackedRequestsByDaySite
+        when "page"
+          klass = TrackedRequestsByDayPage
+        end
+
+        custom_attrs = custom_attributes_by_type && custom_attributes_by_type[type]
 
-        attrs = build_attrs(model, custom_attrs, request_hash)
+        attrs = build_attrs(klass, custom_attrs, request_hash)
 
         attrs["day"] = json.fetch("day")
 
-        existing_record = model.find_by(attrs)
+        existing_record = klass.find_by(attrs)
 
         if existing_record
           existing_record.increment!(:total, 1)
         else
-          model.create!(attrs)
+          klass.create!(attrs)
         end
       end
     end
 
     private
 
-    def build_attrs(model, attrs, request_hash)
+    def build_attrs(klass, attrs, request_hash)
       attrs ||= {}
 
       field = "url_hostname"
-      if !skip_field?(field, attrs, model)
-        attrs[field] = request_hash.fetch("host").downcase
+      if !skip_field?(field, attrs, klass)
+        attrs[field] = request_hash.fetch("host")
       end
 
       field = "url_path"
-      if !skip_field?(field, attrs, model)
-        attrs[field] = request_hash.fetch("path").downcase
+      if !skip_field?(field, attrs, klass)
+        attrs[field] = request_hash.fetch("path")
       end
 
       if request_hash.fetch("referrer").present?
         field = "referrer_hostname"
-        if !skip_field?(field,attrs, model)
+        if !skip_field?(field,attrs, klass)
           referrer_hostname, referrer_path = split_referrer(request_hash.fetch("referrer"))
           attrs[field] = referrer_hostname
         end
 
         field = "referrer_path"
-        if !skip_field?(field, attrs, model)
+        if !skip_field?(field, attrs, klass)
           if referrer_path.nil?
             referrer_hostname, referrer_path = split_referrer(request_hash.fetch("referrer"))
           end
@@ -60,13 +66,13 @@ module RailsLocalAnalytics
 
       if request_hash.fetch("user_agent").present?
         field = "platform"
-        if !skip_field?(field, attrs, model)
+        if !skip_field?(field, attrs, klass)
           browser ||= create_browser_object(request_hash)
           attrs[field] = browser.platform.name
         end
 
         field = "browser_engine"
-        if !skip_field?(field, attrs, model)
+        if !skip_field?(field, attrs, klass)
           browser ||= create_browser_object(request_hash)
           attrs[field] = get_browser_engine(browser)
         end
@@ -76,8 +82,6 @@ module RailsLocalAnalytics
     end
 
     def split_referrer(referrer)
-      referrer = referrer.downcase
-
       uri = URI(referrer)
 
       if uri.host.present?
@@ -114,8 +118,8 @@ module RailsLocalAnalytics
       )
     end
 
-    def skip_field?(field, attrs, model)
-      attrs&.has_key?(field) || !model.column_names.include?(field)
+    def skip_field?(field, attrs, klass)
+      attrs&.has_key?(field) || !klass.column_names.include?(field)
     end
 
   end

data/app/models/rails_local_analytics/application_record.rb

@@ -15,7 +15,7 @@ module RailsLocalAnalytics
             sql_conditions << "(#{col} #{like} :search)"
           end
 
-          relation = self.where(sql_conditions.join(" OR "), search: "%#{str}%")
+          relation = relation.where(sql_conditions.join(" OR "), search: "%#{sanitize_sql_like(str)}%")
         end
 
         next relation
@@ -26,9 +26,5 @@ module RailsLocalAnalytics
       column_names - ["id", "created_at", "updated_at", "total", "day"]
     end
 
-    def matches?(other_record)
-      day == other_record.day && self.class.display_columns.all?{|col_name| self.send(col_name) == other_record.send(col_name) }
-    end
-
   end
 end

data/app/views/layouts/rails_local_analytics/application.html.erb

@@ -9,12 +9,7 @@
     <%= csp_meta_tag %>
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cosmo/bootstrap.min.css" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.32.0/css/theme.default.min.css" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <%= stylesheet_link_tag "rails_local_analytics/application" %>
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.0/js/jquery.tablesorter.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <%= javascript_include_tag "rails_local_analytics/application" %>
   </head>
 
   <body>
@@ -23,6 +18,16 @@
         <div class="navbar-header">
           <%= link_to title , root_path, class: "navbar-brand" %>
         </h1>
+
+        <ul class="nav navbar-nav navbar-right">
+          <li class="<%= 'active' if params[:type] == "page" %>">
+            <%= link_to "Requests By Page", tracked_requests_path(type: "page") %>
+          </li>
+
+          <li class="<%= 'active' if params[:type] == "site" %>">
+            <%= link_to "Requests By Site", tracked_requests_path(type: "site") %>
+          </li>
+        </ul>
       </div>
     </nav>
 

data/app/views/rails_local_analytics/dashboard/index.html.erb

@@ -1,81 +1,117 @@
-<% page_group_by_options = options_for_select([["All", "All"]] + TrackedRequestsByDayPage.display_columns.map{|x| [x.titleize.sub("Url ", "URL "), x]}) %>
-<% site_group_by_options = options_for_select([["All", "All"]] + TrackedRequestsByDaySite.display_columns.map{|x| [x.titleize.sub("Url ", "URL "), x]}) %>
+<% data_columns = params[:group_by].present? ? [params[:group_by]] : @klass.display_columns %>
 
-<%= form_tag url_for(params.except(:start_date, :to).to_unsafe_hash), method: "get", class: "well well-sm" do %>
-  <div>
-    <label style="margin-right: 10px;">Type: <%= select_tag :type, options_for_select(["Site", "Page"], params[:type]) %></label>
+<div class="well well-sm">
+  <%= form_tag url_for(params.except(:start_date, :to).to_unsafe_hash), method: "get", id: "search-form" do %>
+    <div>
+      <label style="margin-right: 10px;">Group By: <%= select_tag :group_by, options_for_select([["All", nil]] + @klass.display_columns.map{|x| [x.titleize.sub("Url ", "URL "), x]} , params[:group_by]) %></label>
 
-    <label style="margin-right: 10px;">Group By: <%= select_tag :group_by, options_for_select([["All", "All"]] + @klass.display_columns.map{|x| [x.titleize.sub("Url ", "URL "), x]} , params[:group_by]) %></label>
-    <label style="margin-right: 10px;">Search: <%= text_field_tag :search, params[:search] %></label>
+      <label style="margin-right: 10px;">From: <%= date_field_tag :start_date, @start_date %></label>
+      <label style="margin-right: 10px;">To: <%= date_field_tag :end_date, @end_date %></label>
 
-    <label style="margin-right: 10px;">From: <%= date_field_tag :start_date, @start_date %></label>
-    <label style="margin-right: 10px;">To: <%= date_field_tag :end_date, @end_date %></label>
-    <button type="submit">Filter</button>
-  </div>
+      <label style="margin-right: 10px;">Search: <%= text_field_tag :search, params[:search] %></label>
+  <% end %>
+
+  <% if params[:filter] %>
+    <div>
+      <label>Active Filter:</label>
+      <div class="badge badge-primary" style="margin-top: 5px; margin-bottom: 10px;">
+        <% filter_col, filter_val = params[:filter].split("==") %>
+        <%= filter_col.titleize.sub("Url ", "URL ") %> = "<%= filter_val %>"
+      </div>
+      <%= link_to "Remove Filter", url_for(params.to_unsafe_h.merge(filter: nil)) %>
+    </div>
+  <% end %>
 
   <div>
-    <%= link_to "Today", url_for(params.merge(start_date: Date.today, end_date: Date.today).to_unsafe_hash) %>
+    <%= link_to "Today", url_for(params.merge(start_date: Date.today, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == Date.today && @end_date == Date.today) %>
+    |
+    <% yesterday = Date.today - 1.day %>
+    <%= link_to "Yesterday", url_for(params.merge(start_date: yesterday, end_date: yesterday).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == yesterday && @end_date == yesterday) %>
     |
-    <%= link_to "Yesterday", url_for(params.merge(start_date: (Date.today - 1.day), end_date: (Date.today - 1.day)).to_unsafe_hash) %>
+    <%= link_to "Last 7 days", url_for(params.merge(start_date: 7.days.ago.to_date, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == 7.days.ago.to_date && @end_date == Date.today) %>
     |
-    <%= link_to "Last 7 days", url_for(params.merge(start_date: 7.days.ago.to_date, end_date: Date.today).to_unsafe_hash) %>
+    <%= link_to "Last 30 days", url_for(params.merge(start_date: 30.days.ago.to_date, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == 30.days.ago.to_date && @end_date == Date.today) %>
     |
-    <%= link_to "Last 30 days", url_for(params.merge(start_date: 30.days.ago.to_date, end_date: Date.today).to_unsafe_hash) %>
+    <%= link_to "Last 3 Months", url_for(params.merge(start_date: 3.months.ago.to_date, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == 3.months.ago.to_date && @end_date == Date.today) %>
+    |
+    <%= link_to "Last 6 Months", url_for(params.merge(start_date: 6.months.ago.to_date, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == 6.months.ago.to_date && @end_date == Date.today) %>
+    |
+    <%= link_to "Last Year", url_for(params.merge(start_date: 1.year.ago.to_date, end_date: Date.today).to_unsafe_hash), style: ("font-weight: bold;" if @start_date == 1.year.ago.to_date && @end_date == Date.today) %>
   </div>
-<% end %>
+</div>
 
-<h2>Tracked Requests - <%= @klass.name.titleize.split(" ").last %></h2>
+<h2>Requests by <%= params[:type].titleize %></h2>
 
-<table class="table table-striped table-condensed table-sortable">
+<table class="table table-striped table-condensed">
   <thead>
-    <% if params[:group_by] == "All" %>
-      <% @klass.display_columns.each do |col_name| %>
-        <th>
-          <%= col_name.titleize.sub("Url ", "URL ") %>
-          <span title="Sort column">&varr;</span>
-        </th>
-      <% end %>
-    <% else %>
-      <td>
-        <%= params[:group_by].titleize.sub("Url ", "URL ") %>
-        <span title="Sort column">&varr;</span>
-      </td>
+    <% data_columns.each do |header| %>
+      <th>
+        <%= header.titleize.sub("Url ", "URL ") %>
+      </th>
     <% end %>
 
     <th>
-      Total <span title="Difference compared to previous period">(Difference)</span>
-      <span title="Sort column">&varr;</span>
+      Total
+    </th>
+
+    <th>
+      Prev Period Difference
     </th>
   </thead>
 
   <tbody>
-    <% @tracked_requests.group_by{|x| params[:group_by] != "All" ? x.send(params[:group_by]) : @klass.display_columns.map{|col| x.send(col)}}.each do |_grouping, records| %>
-      <% first_record = records.first %>
-
+    <% @results.each_with_index do |row, row_index| %>
       <tr>
-        <% if params[:group_by] == "All" %>
-          <% @klass.display_columns.each do |col_name| %>
-            <td>
-              <%= first_record.send(col_name) %>
-            </td>
-          <% end %>
-        <% else %>
+        <% row[0..-2].each_with_index do |value, col_index| %>
           <td>
-            <%= first_record.send(params[:group_by]) %>
+            <% filter_param = "#{data_columns[col_index]}==#{value}" %>
+            <%= link_to (value || ""), url_for(params.to_unsafe_h.merge(filter: filter_param)), title: "Filter" %>
           </td>
         <% end %>
 
         <td>
-          <% total = records.sum(&:total) %>
-          <%= total %>
+          <% total = row.last %>
+          <%= number_with_delimiter(total) %>
+        </td>
+
+        <td>
+          <% if @prev_period_results.nil? %>
+            <%
+              diff_params = {
+                format: :json,
+                type: params[:type],
+                start_date: @start_date,
+                end_date: @end_date,
+                conditions: {},
+              }
+
+              data_columns.each_with_index do |col, col_index|
+                diff_params[:conditions][col] = row[col_index]
+              end
+
+              placeholder_id = "diff-placeholder-#{row_index}"
+            %>
 
-          <% _grouping, prev_period_records = @prev_period_tracked_requests.select{|x| first_record.matches?(x) }.group_by{|x| params[:group_by] != "All" ? x.send(params[:group_by]) : @klass.display_columns.map{|col| x.send(col)}}.first %>
-          <% diff = total - prev_period_records.sum(&:total) %>
+            <button type="button" class="load-difference is-link" data-url="<%= difference_tracked_requests_path(diff_params) %>" data-placeholder-id="<%= placeholder_id %>">Load Difference</button>
 
-          <% if diff >= 0 %>
-            (+<%= diff %>)
+            <div id="<%= placeholder_id %>"></div>
           <% else %>
-            (<%= diff %>)
+            <% prev_period_row_index = @prev_period_results.index{|prev_period_row| row[0..-2] == prev_period_row[0..-2] } %>
+
+            <% if prev_period_row_index.nil? %>
+              +<%= number_with_delimiter(total) %>
+            <% else %>
+              <% prev_period_row = @prev_period_results.delete_at(prev_period_row_index) %>
+
+              <% prev_period_total = prev_period_row.last %>
+              <% diff = total - prev_period_total %>
+
+              <% if diff >= 0 %>
+                +<%= number_with_delimiter(diff) %>
+              <% else %>
+                <%= number_with_delimiter(diff) %>
+              <% end %>
+            <% end %>
           <% end %>
         </td>
       </tr>
@@ -83,19 +119,62 @@
   </tbody>
 </table>
 
+<div style="text-align: center;">
+  <% if params[:page].present? && params[:page].to_i > 1 %>
+    <%= link_to "Prev", url_for(params.to_unsafe_h.merge(page: pagination_page_number-1)) %>
+    |
+  <% end %>
+
+  <% if @results.size >= RailsLocalAnalytics::DashboardController::PER_PAGE_LIMIT %>
+    <%= link_to "Next", url_for(params.to_unsafe_h.merge(page: pagination_page_number+1)) %>
+  <% end %>
+</div>
+
 <script>
-  $(function(){
-    var siteGroupByOptions = "<%= j site_group_by_options %>";
-    var pageGroupByOptions = "<%= j page_group_by_options %>";
-
-    $(document).on("change", "select[name='type']", function(){
-      var group_by_select = $("select[name='group_by']");
-
-      if($(this).val() == "Site"){
-        group_by_select.html(siteGroupByOptions);
-      }else{
-        group_by_select.html(pageGroupByOptions);
-      }
+  document.addEventListener("DOMContentLoaded", function(){
+    var form = document.querySelector("form#search-form")
+
+    document.querySelectorAll("form#search-form select, form#search-form input").forEach(function(el){
+      el.addEventListener("change", function(){
+        form.submit();
+      });
+    });
+
+    document.querySelectorAll("button.load-difference").forEach(function(el){
+      el.addEventListener("click", async function(){
+        el.disabled = true;
+
+        var csrf_token = document.querySelector('meta[name="csrf-token"]').content;
+
+        var request = new Request(
+          el.getAttribute("data-url"),
+          {
+            method: "GET",
+            headers: {
+              "Content-Type": "application/json",
+              Accept: "application/json",
+              "X-CSRF-Token": csrf_token,
+            },
+          },
+        );
+
+        var response = await fetch(request)
+          .then(function(response){
+            response.json().then(function(parsed_response){
+              el.style.display = "none";
+
+              var placeholderEl = document.querySelector("#" + el.getAttribute("data-placeholder-id"));
+
+              if(parsed_response.difference >= 1){
+                placeholderEl.innerHTML = "+" + parsed_response.difference.toLocaleString();
+              }else{
+                placeholderEl.innerHTML = "" + parsed_response.difference.toLocaleString();
+              }
+            });
+
+          });
+
+      });
     });
   });
 </script>

data/config/initializers/browser_monkey_patches.rb

@@ -0,0 +1,19 @@
+if Browser::VERSION.to_f < 6.0
+  Browser::Base.class_eval do
+    def chromium_based?
+      false
+    end
+  end
+
+  Browser::Chrome.class_eval do
+    def chromium_based?
+      true
+    end
+  end
+
+  Browser::Edge.class_eval do
+    def chromium_based?
+      match? && ua.match?(/\bEdg\b/)
+    end
+  end
+end

data/config/routes.rb

@@ -1,5 +1,6 @@
 RailsLocalAnalytics::Engine.routes.draw do
-  get "/tracked_requests", to: "dashboard#index"
+  get "/tracked_requests/:type", to: "dashboard#index", as: :tracked_requests
+  get "/tracked_requests/:type/difference", to: "dashboard#difference", as: :difference_tracked_requests, constraints: {format: :json}
 
-  root to: "dashboard#index"
+  root to: "application#root"
 end

data/lib/rails_local_analytics/version.rb

@@ -1,3 +1,3 @@
 module RailsLocalAnalytics
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_local_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,18 +92,17 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/rails_local_analytics_manifest.js
-- app/assets/javascripts/rails_local_analytics/application.js
 - app/assets/stylesheets/rails_local_analytics/application.css
 - app/controllers/rails_local_analytics/application_controller.rb
 - app/controllers/rails_local_analytics/dashboard_controller.rb
 - app/jobs/rails_local_analytics/application_job.rb
 - app/jobs/rails_local_analytics/record_request_job.rb
-- app/lib/rails_local_analytics/histogram.rb
 - app/models/rails_local_analytics/application_record.rb
 - app/models/tracked_requests_by_day_page.rb
 - app/models/tracked_requests_by_day_site.rb
 - app/views/layouts/rails_local_analytics/application.html.erb
 - app/views/rails_local_analytics/dashboard/index.html.erb
+- config/initializers/browser_monkey_patches.rb
 - config/routes.rb
 - lib/rails_local_analytics.rb
 - lib/rails_local_analytics/engine.rb

data/app/assets/javascripts/rails_local_analytics/application.js

@@ -1,7 +0,0 @@
-$(function(){
-  $('table.table-sortable').tablesorter();
-
-  $(document).on("click", "tr[data-url]", function(){
-    window.location = $(this).data("url");
-  });
-});

data/app/lib/rails_local_analytics/histogram.rb

@@ -1,47 +0,0 @@
-module RailsLocalAnalytics
-  class Histogram
-    attr_reader :bars, :from_date, :to_date
-
-    def initialize(scope, from_date, to_date)
-      @scope = scope
-      @from_date, @to_date = from_date, to_date
-      @bars = scope.map { |record| Bar.new(record.date, record.total, self) }
-      fill_missing_days(@bars, @from_date, @to_date)
-    end
-
-    def fill_missing_days(bars, from, to)
-      i = 0
-      while (day = from + i) <= to
-        if !@bars[i] || @bars[i].label != day
-          @bars.insert(i, Bar.new(day, 0, self))
-        end
-        i += 1
-      end
-      @bars
-    end
-
-    def max_value
-      @max_total ||= bars.map(&:value).max
-    end
-
-    def total
-      @bars.reduce(0) { |sum, bar| sum += bar.value }
-    end
-
-    class Bar
-      attr_reader :label, :value, :histogram
-
-      def initialize(label, value, histogram)
-        @label, @value, @histogram = label, value, histogram
-      end
-
-      def height
-        if histogram.max_value > 0
-          (value.to_f / histogram.max_value).round(2)
-        else
-          0
-        end
-      end
-    end
-  end
-end