rails_local_analytics 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb7ca6534efc3666a302a04271092906ec9b2fc65a316d82b7811e2dd962668
-  data.tar.gz: 2cc17d06cf61d6b4b7fd2c559079965fa6c250b12d901b05a3317389e2d5b69d
+  metadata.gz: 6c1dffba4cbead6faa6192e3c1df830aa749f6f653bdc8f0eef6e9dbd3a2650b
+  data.tar.gz: b0b6a574e09786c7888c4e6194fff36616f9d0634d99773955e762417ee3c828
 SHA512:
-  metadata.gz: 8d9e8dea022bb79486a8bc6395106841a4f9d056accf68f3534072bac1e205f40df426664ed071abd54715d38b0a00ef879aaa080b4a0a51f6ba3e31b207101e
-  data.tar.gz: e249aa1fb3f83ccaf75ffdb774192de6549889b8fb38b3537f5a99cc5edc6aab7da7d1b01caccb6012ffa4c4695739f2a15107ecbc49804db9e3e61c856ea13f
+  metadata.gz: 021fcb8b029ce1d842415eb5a4a3ed39a433726851988891455f2aa1ec510a1f56acc9563bad3003b799624384a8ff74ef40183e0a81746df82bb1d3b68d2e24
+  data.tar.gz: 6c9d8b537f1de5f9b28b1b6e6baac6135a389a1ba65bb5dbc19a4ebdd7b73e1efaf855e6daaaa81b8b06b0a2d1913e0d0cdc97fd31635c794d545238751820c6

data/app/controllers/rails_local_analytics/dashboard_controller.rb

@@ -3,6 +3,7 @@ module RailsLocalAnalytics
     PER_PAGE_LIMIT = 1000
 
     helper_method :pagination_page_number
+    helper_method :display_columns
 
     def index
       params[:type] ||= "page"
@@ -17,17 +18,13 @@ module RailsLocalAnalytics
         return
       end
 
-      if params[:group_by].present? && !@klass.display_columns.include?(params[:group_by])
-        raise ArgumentError
-      end
-
       if params[:start_date].present?
         @start_date = Date.parse(params[:start_date])
       else
         @start_date = Date.today
       end
 
-      if params[:end_date]
+      if params[:end_date].present?
         @end_date = Date.parse(params[:end_date])
       else
         @end_date = Date.today
@@ -63,20 +60,18 @@ module RailsLocalAnalytics
 
       prev_start_date, prev_end_date = get_prev_dates(start_date, end_date)
 
-      where_conditions = params.require(:conditions).permit(*@klass.display_columns)
+      difference_where_conditions = params.require(:conditions).permit(*display_columns)
 
       current_total = fetch_records(
         start_date,
         end_date,
-        where_conditions: where_conditions,
-        pluck_columns: ["SUM(total)"],
+        difference_where_conditions: difference_where_conditions,
       ).first
 
       prev_total = fetch_records(
         prev_start_date,
         prev_end_date,
-        where_conditions: where_conditions,
-        pluck_columns: ["SUM(total)"],
+        difference_where_conditions: difference_where_conditions,
       ).first
 
       if prev_total
@@ -90,13 +85,17 @@ module RailsLocalAnalytics
 
     private
 
-    def fetch_records(start_date, end_date, where_conditions: nil, pluck_columns: nil)
+    def fetch_records(start_date, end_date, difference_where_conditions: nil)
+      aggregate_sql_field = "SUM(total)"
+
       tracked_requests = @klass
         .where("day >= ?", start_date)
         .where("day <= ?", end_date)
-        .order(total: :desc)
+        .order("#{aggregate_sql_field} DESC")
 
-      if where_conditions.nil? && pluck_columns.nil?
+      if difference_where_conditions
+        tracked_requests = tracked_requests.where(difference_where_conditions)
+      else
         tracked_requests = tracked_requests
           .limit(PER_PAGE_LIMIT)
           .offset(PER_PAGE_LIMIT * (pagination_page_number-1))
@@ -104,7 +103,7 @@ module RailsLocalAnalytics
         if params[:filter].present?
           col, val = params[:filter].split("==")
 
-          if @klass.display_columns.include?(col)
+          if display_columns.include?(col)
             tracked_requests = tracked_requests.where(col => val)
           else
             raise ArgumentError
@@ -112,24 +111,43 @@ module RailsLocalAnalytics
         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
 
-      if params[:group_by].present?
-        group_by_columns = [params[:group_by]]
-        pluck_columns = [params[:group_by], "SUM(total)"]
+      if params[:group_by].blank?
+        pluck_columns = display_columns.dup
       else
-        group_by_columns = @klass.display_columns
-        pluck_columns ||= @klass.display_columns + ["SUM(total)"]
+        case params[:group_by]
+        when "url_hostname_and_path"
+          if display_columns.include?("url_hostname") && display_columns.include?("url_path")
+            pluck_columns = [:url_hostname, :url_path]
+          else
+            raise ArgumentError
+          end
+        when "referrer_hostname_and_path"
+          if display_columns.include?("referrer_hostname") && display_columns.include?("referrer_path")
+            pluck_columns = [:referrer_hostname, :referrer_path]
+          else
+            raise ArgumentError
+          end
+        when *display_columns
+          pluck_columns = [params[:group_by]]
+        else
+          raise ArgumentError
+        end
+      end
+
+      group_by = pluck_columns.dup
+
+      if difference_where_conditions
+        pluck_columns = [aggregate_sql_field]
+      else
+        pluck_columns << aggregate_sql_field
       end
 
       tracked_requests
-        .group(*group_by_columns)
+        .group(*group_by)
         .pluck(*pluck_columns)
     end
 
@@ -151,5 +169,9 @@ module RailsLocalAnalytics
       return [prev_start_date, prev_end_date]
     end
 
+    def display_columns
+      @display_columns ||= @klass.display_columns
+    end
+
   end
 end

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

@@ -1,9 +1,41 @@
-<% data_columns = params[:group_by].present? ? [params[:group_by]] : @klass.display_columns %>
+<%
+  data_columns = params[:group_by].present? ? [params[:group_by]] : display_columns
+
+  if data_columns.first == "url_hostname_and_path"
+    data_columns = ["URL Hostname", "URL Path"]
+  elsif data_columns.first == "referrer_hostname_and_path"
+    data_columns = ["Referrer Hostname", "Referrer Path"]
+  end
+%>
+
+<%
+  group_by_opts = [
+    ["All", nil],
+  ]
+
+  group_by_opts += display_columns.map{|x| [x.titleize.sub("Url ", "URL "), x] }
+
+  if display_columns.include?("url_hostname") && display_columns.include?("url_path")
+    index = group_by_opts.index(["URL Hostname", "url_hostname"])
+    group_by_opts.insert(
+      index,
+      ["URL Hostname and Path", "url_hostname_and_path"],
+    )
+  end
+
+  if display_columns.include?("referrer_hostname") && display_columns.include?("referrer_path")
+    index = group_by_opts.index(["Referrer Hostname", "referrer_hostname"])
+    group_by_opts.insert(
+      index,
+      ["Referrer Hostname and Path", "referrer_hostname_and_path"],
+    )
+  end
+%>
 
 <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(group_by_opts, params[:group_by]) %></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>

data/lib/rails_local_analytics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_local_analytics
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement