bin/lint

Author: Job Hammer

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_cms (0.1.2)
+    ruby_cms (0.1.3.1)
       actiontext (>= 7.1)
       ahoy_matey (>= 5.0)
       rails (>= 7.1)
@@ -520,7 +520,7 @@ CHECKSUMS
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  ruby_cms (0.1.2)
+  ruby_cms (0.1.3.1)
   rugged (1.9.0) sha256=7faaa912c5888d6e348d20fa31209b6409f1574346b1b80e309dbc7e8d63efac
   safely_block (0.5.0) sha256=782c342bc400a79c1233c40cf8c379da6116c6cfd1d7c1f17f0ef2ef11090103
   sawyer (0.9.3) sha256=0d0f19298408047037638639fe62f4794483fb04320269169bd41af2bdcf5e41

app/services/ruby_cms/analytics/report.rb

@@ -25,33 +25,7 @@ def initialize(start_date:, end_date:, period: nil)
 
       def dashboard_stats
         Rails.cache.fetch(cache_key("dashboard"), expires_in: cache_duration) do
-          total_views = page_view_events.count
-          total_sessions = visits.distinct.count(:visit_token)
-          unique_visitors = visits.distinct.count(:visitor_token)
-
-          {
-            total_page_views: total_views,
-            unique_visitors: unique_visitors,
-            total_sessions: total_sessions,
-            pages_per_session: total_sessions.positive? ? (total_views.to_f / total_sessions).round(1) : 0,
-            bounce_rate: compute_bounce_rate,
-            new_visitor_percentage: compute_new_visitor_percentage,
-            avg_daily_views: days_in_range.positive? ? (total_views.to_f / days_in_range).round(0).to_i : 0,
-            popular_pages: popular_pages_data,
-            top_visitors: top_visitors_data,
-            hourly_activity: hourly_activity_data,
-            daily_activity: daily_activity_data,
-            daily_visitors: daily_visitors_data,
-            top_referrers: referrer_data,
-            landing_pages: landing_pages_data,
-            utm_sources: utm_sources_data,
-            browser_stats: visits.where.not(browser: [nil, ""]).group(:browser).count,
-            device_stats: visits.where.not(device_type: [nil, ""]).group(:device_type).count,
-            os_stats: visits.where.not(os: [nil, ""]).group(:os).count,
-            suspicious_activity: suspicious_activity_data,
-            recent_page_views: page_view_events.order(time: :desc).limit(recent_page_views_limit),
-            extra_cards: extra_cards_data
-          }
+          dashboard_stats_payload
         end
       end
 
@@ -352,7 +326,7 @@ def compute_bounce_rate
         return 0 unless total.positive?
 
         event_counts = page_view_events.group(:visit_id).count
-        single_page = event_counts.count { |_, c| c == 1 }
+        single_page = event_counts.count {|_, c| c == 1 }
         ((single_page.to_f / total) * 100).round(1)
       rescue StandardError
         0
@@ -363,9 +337,9 @@ def compute_new_visitor_percentage
         return 0 unless total.positive?
 
         returning_tokens = Ahoy::Visit
-          .where("started_at < ?", @start_date)
-          .distinct
-          .pluck(:visitor_token)
+                           .where(started_at: ...@start_date)
+                           .distinct
+                           .pluck(:visitor_token)
 
         new_count = visits.where.not(visitor_token: returning_tokens).distinct.count(:visitor_token)
         ((new_count.to_f / total) * 100).round(0).to_i
@@ -391,6 +365,36 @@ def visitor_details_limit
         RubyCms::Settings.get(:analytics_visitor_details_limit,
                               default: DEFAULT_VISITOR_DETAILS_LIMIT).to_i
       end
+
+      def dashboard_stats_payload
+        total_views = page_view_events.count
+        total_sessions = visits.distinct.count(:visit_token)
+        unique_visitors = visits.distinct.count(:visitor_token)
+
+        {
+          total_page_views: total_views,
+          unique_visitors: unique_visitors,
+          total_sessions: total_sessions,
+          pages_per_session: total_sessions.positive? ? (total_views.to_f / total_sessions).round(1) : 0,
+          bounce_rate: compute_bounce_rate,
+          new_visitor_percentage: compute_new_visitor_percentage,
+          avg_daily_views: days_in_range.positive? ? (total_views.to_f / days_in_range).round(0).to_i : 0,
+          popular_pages: popular_pages_data,
+          top_visitors: top_visitors_data,
+          hourly_activity: hourly_activity_data,
+          daily_activity: daily_activity_data,
+          daily_visitors: daily_visitors_data,
+          top_referrers: referrer_data,
+          landing_pages: landing_pages_data,
+          utm_sources: utm_sources_data,
+          browser_stats: visits.where.not(browser: [nil, ""]).group(:browser).count,
+          device_stats: visits.where.not(device_type: [nil, ""]).group(:device_type).count,
+          os_stats: visits.where.not(os: [nil, ""]).group(:os).count,
+          suspicious_activity: suspicious_activity_data,
+          recent_page_views: page_view_events.order(time: :desc).limit(recent_page_views_limit),
+          extra_cards: extra_cards_data
+        }
+      end
     end
   end
 end

lib/tasks/admin.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-namespace :admin do
+namespace :admin do # rubocop:disable Metrics/BlockLength
   def ruby_cms_user_class
     Object.const_get(Rails.application.config.ruby_cms.user_class_name.presence ||
                         "User")
@@ -118,3 +118,5 @@ namespace :admin do
     puts "Logged out #{count} session(s)"
   end
 end
+
+# rubocop:enable Metrics/BlockLength