trackguard 0.17.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ebac148a49b2b6df9f280c3a8e8e624fa82910ccf0e3d4c608a04ac7f73ced
-  data.tar.gz: a0a0648dacb35df737e19413603d658b1c015f6e5fa60d0a6adc72da497082da
+  metadata.gz: 3e13b68029bc80d015c4f69531d17e5b362092d6df2d720dfb7c1563b5b4e24c
+  data.tar.gz: e676a88de14a04d1c42c0a78f7e895a7ef5011c7567e93a168e82e8f950bfeb1
 SHA512:
-  metadata.gz: 59d2f2a7dde041da4cc0acf29249c77d9f911a76c498f9381293c838a29bd6ac5fec3c875645c7be60b686d77cb99e4731032b45eb7a2a93464dadaac81b04cb
-  data.tar.gz: 5c1bf529774f1af5e8a7e83154e7e21b94e468c95702ac00bed7f0b133b85c092359e544e7f2f615d4e364d904e4512d16ad42d42e3c712d8f8dcb4b60cb81ae
+  metadata.gz: d4074d349ac565380d3365ef21ca99e61836601f51fe5822cff34a3184f93cea71dc0ab541b2a08f2f0ccb49fade36c89a97f8681a5609748088ecdb661f6f84
+  data.tar.gz: 1783d02fa8caedd5816efce4cca6faab7c305af260549de8ece369c22ff47b279725e9503dc5c3d8cade1f5069516faaee594fd362e16b92939317168f4d7dfc

data/app/assets/stylesheets/trackguard/admin.css

@@ -7,7 +7,7 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Inter", sans-serif;
   font-size: 16px;
   line-height: 1.5;
-  background-color: #07101f;
+  background-color: #0f0909;
   color: #e0e0e0;
   -webkit-font-smoothing: antialiased;
   min-height: 100vh;
@@ -22,8 +22,8 @@
 
 /* ── Header ────────────────────────────────────────────────────────── */
 .tg-header {
-  background: #0d1829;
-  border-bottom: 1px solid #1c2d4a;
+  background: #190e0e;
+  border-bottom: 1px solid #2e1515;
   padding: 0.875rem 0;
 }
 
@@ -40,16 +40,16 @@
   font-size: 0.9375rem;
   font-weight: 600;
   letter-spacing: 0.03em;
-  color: #60a5fa;
+  color: #f87171;
   text-decoration: none;
   flex: 1;
 }
 
 .tg-brand__logo {
   width: 20px;
-  height: 22px;
+  height: auto;
   flex-shrink: 0;
-  filter: drop-shadow(0 0 4px rgba(59, 130, 246, 0.35));
+  filter: drop-shadow(0 0 4px rgba(239, 68, 68, 0.4));
 }
 
 /* ── Back link ─────────────────────────────────────────────────────── */
@@ -76,8 +76,8 @@
 
 /* ── Nav ───────────────────────────────────────────────────────────── */
 .tg-nav {
-  background: #0d1829;
-  border-bottom: 1px solid #1c2d4a;
+  background: #190e0e;
+  border-bottom: 1px solid #2e1515;
 }
 
 .tg-nav > .tg-container {
@@ -97,8 +97,8 @@
 .tg-nav__link:hover { color: #e0e0e0; }
 
 .tg-nav__link--active {
-  color: #60a5fa;
-  border-bottom-color: #60a5fa;
+  color: #f87171;
+  border-bottom-color: #e53e3e;
 }
 
 /* ── Main ──────────────────────────────────────────────────────────── */
@@ -128,8 +128,8 @@
 }
 
 .tg-stat {
-  background: #0d1829;
-  border: 1px solid #1c2d4a;
+  background: #190e0e;
+  border: 1px solid #2e1515;
   border-radius: 8px;
   padding: 1.25rem;
 }
@@ -167,8 +167,8 @@
 }
 
 .tg-panel {
-  background: #0d1829;
-  border: 1px solid #1c2d4a;
+  background: #190e0e;
+  border: 1px solid #2e1515;
   border-radius: 8px;
   padding: 1rem;
   margin-bottom: 1rem;
@@ -211,14 +211,14 @@
   font-size: 0.8125rem;
   color: #e0e0e0;
   text-decoration: none;
-  background: #1c2d4a;
+  background: #2e1515;
 }
 
-.tg-pagination__link:hover { background: #243a5e; }
+.tg-pagination__link:hover { background: #3d1c1c; }
 
 .tg-pagination__link--active {
-  background: #60a5fa;
-  color: #07101f;
+  background: #e53e3e;
+  color: #ffffff;
   font-weight: 600;
 }
 
@@ -249,14 +249,14 @@
   text-transform: uppercase;
   letter-spacing: 0.08em;
   color: #666666;
-  border-bottom: 1px solid #1c2d4a;
+  border-bottom: 1px solid #2e1515;
 }
 
 .tg-th--right { text-align: right; }
 
 .tg-td {
   padding: 0.75rem 0.875rem;
-  border-bottom: 1px solid #1c2d4a;
+  border-bottom: 1px solid #2e1515;
   color: #f0f0f0;
   font-weight: 500;
 }
@@ -271,7 +271,7 @@
 
 .tg-td--bare {
   padding: 0;
-  border-bottom: 1px solid #1c2d4a;
+  border-bottom: 1px solid #2e1515;
 }
 
 /* ── Empty state ───────────────────────────────────────────────────── */
@@ -361,7 +361,7 @@
 /* ── Detail panel ──────────────────────────────────────────────────── */
 .tg-detail {
   padding: 0 1rem 1rem 1rem;
-  background: #0d1829;
+  background: #190e0e;
 }
 
 .tg-detail__grid {
@@ -423,7 +423,7 @@
   align-items: center;
   gap: 0.5rem;
   padding: 0.75rem 0 0;
-  border-top: 1px solid #1c2d4a;
+  border-top: 1px solid #2e1515;
   margin-top: 0.75rem;
 }
 
@@ -436,8 +436,8 @@
 
 .tg-input {
   flex: 1;
-  background: #07101f;
-  border: 1px solid #1c2d4a;
+  background: #0f0909;
+  border: 1px solid #2e1515;
   border-radius: 4px;
   color: #e0e0e0;
   font-size: 0.8125rem;
@@ -445,7 +445,7 @@
   outline: none;
 }
 
-.tg-input:focus { border-color: #60a5fa; }
+.tg-input:focus { border-color: #e53e3e; }
 .tg-input::placeholder { color: #444; }
 
 .tg-btn {
@@ -461,8 +461,8 @@
 .tg-btn--danger { background: #7f1d1d; color: #fca5a5; }
 .tg-btn--danger:hover { background: #991b1b; }
 
-.tg-btn--ghost { background: #1c2d4a; color: #e0e0e0; }
-.tg-btn--ghost:hover { background: #243a5e; }
+.tg-btn--ghost { background: #2e1515; color: #e0e0e0; }
+.tg-btn--ghost:hover { background: #3d1c1c; }
 
 .tg-btn--whitelist { background: #064e3b; color: #6ee7b7; }
 .tg-btn--whitelist:hover { background: #065f46; }
@@ -476,4 +476,4 @@
   .tg-stats { grid-template-columns: 1fr; }
   .tg-detail__grid { grid-template-columns: 1fr; }
   .tg-summary__ip { display: none; }
-}
+}

data/app/controllers/concerns/trackguard/admin/overridable.rb

@@ -0,0 +1,29 @@
+module Trackguard
+  module Admin
+    module Overridable
+      extend ActiveSupport::Concern
+
+      private
+
+      def visitor_scope
+        Visitor.all
+      end
+
+      def page_view_scope
+        PageView.all
+      end
+
+      def after_action_path
+        dashboard_path
+      end
+
+      def set_visitor
+        @visitor = if params[:ip].present?
+                     visitor_scope.find_by!(ip: params[:ip])
+                   else
+                     visitor_scope.find(params[:id])
+                   end
+      end
+    end
+  end
+end

data/app/controllers/trackguard/admin/analytics_controller.rb

@@ -1,46 +1,25 @@
 module Trackguard
   module Admin
     class AnalyticsController < BaseController
+      include Overridable
+
       skip_before_action :verify_authenticity_token, if: :valid_api_token?
 
-      # rubocop:disable Metrics/AbcSize
       def show
-        @total_today  = PageView.today.count
-        @total_week   = PageView.this_week.count
-        @total_month  = PageView.this_month.count
-
-        base = time_scope
-        @top_pages     = base.group(:path).order("count_all DESC").limit(10).count
-        @top_referrers = base.with_referrer.group(:referer).order("count_all DESC").limit(10).count
-        @top_sources   = base.with_source.group(:source).order("count_all DESC").limit(10).count
-
-        @recent = visitor_filtered(
-          time_scope(PageView.order(created_at: :desc).limit(20).includes(visitor: :whitelisted_ip))
+        query = AnalyticsQuery.call(
+          scope: page_view_scope,
+          time_scope: apply_time_scope(page_view_scope),
+          limit: 10
         )
 
         render json: {
-          totals: { today: @total_today, week: @total_week, month: @total_month },
-          top_pages: @top_pages,
-          top_referrers: @top_referrers,
-          top_sources: @top_sources,
-          recent: @recent.map do |pv|
-            {
-              path: pv.path,
-              ip: pv.visitor&.ip,
-              flagged_at: pv.visitor.flagged_at,
-              flagged_by: pv.visitor.flagged_by,
-              whitelisted: pv.visitor.whitelisted_ip&.active? || false,
-              user_agent: pv.user_agent,
-              session_id: pv.session_id,
-              trace_id: pv.trace_id,
-              referer: pv.referer,
-              source: pv.source,
-              created_at: pv.created_at
-            }
-          end
+          totals: query.totals,
+          top_pages: query.top_pages,
+          top_referrers: query.top_referrers,
+          top_sources: query.top_sources,
+          recent: visitor_filtered(apply_time_scope(query.recent)).map { |view| serialize_page_view(view) }
         }
       end
-      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -50,7 +29,7 @@ module Trackguard
         super
       end
 
-      def time_scope(base = PageView.all)
+      def apply_time_scope(base)
         params[:since].present? ? base.where(created_at: parsed_since..) : base.last_30
       end
 
@@ -64,8 +43,8 @@ module Trackguard
 
       def visitor_filtered(scope)
         if params.key?(:flagged)
-          visitor_scope = cast_bool(params[:flagged]) ? Visitor.flagged : Visitor.unflagged
-          scope = scope.joins(:visitor).merge(visitor_scope)
+          flagged_scope = cast_bool(params[:flagged]) ? Visitor.flagged : Visitor.unflagged
+          scope = scope.joins(:visitor).merge(flagged_scope)
         end
         if params.key?(:whitelisted)
           scope = if cast_bool(params[:whitelisted])
@@ -80,6 +59,22 @@ module Trackguard
       def cast_bool(val)
         ActiveRecord::Type::Boolean.new.cast(val)
       end
+
+      def serialize_page_view(view)
+        {
+          path: view.path,
+          ip: view.visitor&.ip,
+          flagged_at: view.visitor.flagged_at,
+          flagged_by: view.visitor.flagged_by,
+          whitelisted: view.visitor.whitelisted_ip&.active? || false,
+          user_agent: view.user_agent,
+          session_id: view.session_id,
+          trace_id: view.trace_id,
+          referer: view.referer,
+          source: view.source,
+          created_at: view.created_at
+        }
+      end
     end
   end
 end

data/app/controllers/trackguard/admin/blocked_user_agents_controller.rb

@@ -12,7 +12,7 @@ module Trackguard
         Rails.cache.delete(BlockedUserAgent::CACHE_KEY)
         render json: { status: "ok", pattern: record.pattern }
       rescue ActionController::ParameterMissing, ActiveRecord::RecordInvalid => e
-        render json: { status: "error", message: e.message }, status: :unprocessable_entity
+        render json: { status: "error", message: e.message }, status: :unprocessable_content
       end
 
       private

data/app/controllers/trackguard/admin/dashboards_controller.rb

@@ -1,16 +1,22 @@
 module Trackguard
   module Admin
     class DashboardsController < BaseController
-      def show
-        @total_today  = PageView.today.count
-        @total_week   = PageView.this_week.count
-        @total_month  = PageView.this_month.count
+      include Overridable
 
-        @top_pages     = PageView.last_30.group(:path).order("count_all DESC").limit(5).count
-        @top_referrers = PageView.last_30.with_referrer.group(:referer).order("count_all DESC").limit(5).count
-        @top_sources   = PageView.last_30.with_source.group(:source).order("count_all DESC").limit(5).count
+      def show
+        query = AnalyticsQuery.call(
+          scope: page_view_scope,
+          time_scope: page_view_scope.last_30,
+          limit: 5
+        )
 
-        @recent = PageView.order(created_at: :desc).limit(20).includes(visitor: :whitelisted_ip)
+        @total_today   = query.totals[:today]
+        @total_week    = query.totals[:week]
+        @total_month   = query.totals[:month]
+        @top_pages     = query.top_pages
+        @top_referrers = query.top_referrers
+        @top_sources   = query.top_sources
+        @recent        = query.recent
       end
     end
   end

data/app/controllers/trackguard/admin/visitors_controller.rb

@@ -1,12 +1,14 @@
 module Trackguard
   module Admin
     class VisitorsController < BaseController
+      include Overridable
+
       skip_before_action :verify_authenticity_token, if: :valid_api_token?
       before_action :set_visitor
 
       rescue_from ActiveRecord::RecordNotFound do
         respond_to do |format|
-          format.html { redirect_to dashboard_path, alert: "Visitor not found." }
+          format.html { redirect_to after_action_path, alert: "Visitor not found." }
           format.json { render json: { error: "Visitor not found" }, status: :not_found }
         end
       end
@@ -20,13 +22,13 @@ module Trackguard
           name: params[:name].presence || BlockedUserAgent.matching_pattern(@visitor.user_agent)
         )
           respond_to do |format|
-            format.html { redirect_back_or_to dashboard_path }
+            format.html { redirect_back_or_to after_action_path }
             format.json { render json: { status: "ok", ip: @visitor.ip, flagged_at: @visitor.flagged_at } }
           end
         else
           respond_to do |format|
-            format.html { redirect_back_or_to dashboard_path, alert: @visitor.errors.full_messages.join(", ") }
-            format.json { render json: { errors: @visitor.errors.full_messages }, status: :unprocessable_entity }
+            format.html { redirect_back_or_to after_action_path, alert: @visitor.errors.full_messages.join(", ") }
+            format.json { render json: { errors: @visitor.errors.full_messages }, status: :unprocessable_content }
           end
         end
       end
@@ -35,7 +37,7 @@ module Trackguard
       def unflag
         @visitor.update!(flagged_at: nil, flag_reason: nil, flagged_by: nil)
         respond_to do |format|
-          format.html { redirect_back_or_to dashboard_path }
+          format.html { redirect_back_or_to after_action_path }
           format.json { render json: { status: "ok", ip: @visitor.ip } }
         end
       end
@@ -47,14 +49,6 @@ module Trackguard
 
         super
       end
-
-      def set_visitor
-        @visitor = if params[:ip].present?
-                     Visitor.find_by!(ip: params[:ip])
-                   else
-                     Visitor.find(params[:id])
-                   end
-      end
     end
   end
 end

data/app/controllers/trackguard/admin/visits_controller.rb

@@ -1,16 +1,18 @@
 module Trackguard
   module Admin
     class VisitsController < BaseController
+      include Overridable
+
       PER_PAGE = 20
 
       def index
         @page   = [ (params[:page] || 1).to_i, 1 ].max
-        @total  = PageView.count
+        @total  = page_view_scope.count
         @pages  = (@total.to_f / PER_PAGE).ceil
-        @visits = PageView.order(created_at: :desc)
-                          .limit(PER_PAGE)
-                          .offset((@page - 1) * PER_PAGE)
-                          .includes(visitor: :whitelisted_ip)
+        @visits = page_view_scope.order(created_at: :desc)
+                                 .limit(PER_PAGE)
+                                 .offset((@page - 1) * PER_PAGE)
+                                 .includes(visitor: :whitelisted_ip)
       end
     end
   end

data/app/controllers/trackguard/admin/whitelisted_ips_controller.rb

@@ -1,12 +1,14 @@
 module Trackguard
   module Admin
     class WhitelistedIpsController < BaseController
+      include Overridable
+
       skip_before_action :verify_authenticity_token, if: :valid_api_token?
       before_action :set_visitor
 
       rescue_from ActiveRecord::RecordNotFound do
         respond_to do |format|
-          format.html { redirect_to dashboard_path, alert: "Visitor not found." }
+          format.html { redirect_to after_action_path, alert: "Visitor not found." }
           format.json { render json: { error: "Visitor not found" }, status: :not_found }
         end
       end
@@ -17,13 +19,13 @@ module Trackguard
         record.expires_at = params[:expires_at].presence || 7.days.from_now
         record.save!
         respond_to do |format|
-          format.html { redirect_back_or_to dashboard_path }
+          format.html { redirect_back_or_to after_action_path }
           format.json { render json: { status: "ok", ip: @visitor.ip, expires_at: record.expires_at } }
         end
       rescue ActiveRecord::RecordInvalid => e
         respond_to do |format|
-          format.html { redirect_back_or_to dashboard_path, alert: e.message }
-          format.json { render json: { status: "error", message: e.message }, status: :unprocessable_entity }
+          format.html { redirect_back_or_to after_action_path, alert: e.message }
+          format.json { render json: { status: "error", message: e.message }, status: :unprocessable_content }
         end
       end
 
@@ -33,12 +35,12 @@ module Trackguard
         if record
           record.destroy!
           respond_to do |format|
-            format.html { redirect_back_or_to dashboard_path }
+            format.html { redirect_back_or_to after_action_path }
             format.json { render json: { status: "ok", ip: @visitor.ip } }
           end
         else
           respond_to do |format|
-            format.html { redirect_back_or_to dashboard_path, alert: "No whitelist entry found." }
+            format.html { redirect_back_or_to after_action_path, alert: "No whitelist entry found." }
             format.json { render json: { error: "Not whitelisted" }, status: :not_found }
           end
         end
@@ -51,14 +53,6 @@ module Trackguard
 
         super
       end
-
-      def set_visitor
-        @visitor = if params[:ip].present?
-                     Visitor.find_by!(ip: params[:ip])
-                   else
-                     Visitor.find(params[:id])
-                   end
-      end
     end
   end
 end

data/app/services/trackguard/analytics_query.rb

@@ -0,0 +1,27 @@
+module Trackguard
+  class AnalyticsQuery < ApplicationService
+    attr_reader :totals, :top_pages, :top_referrers, :top_sources, :recent
+
+    def initialize(scope:, time_scope:, limit:)
+      @scope      = scope
+      @time_scope = time_scope
+      @limit      = limit
+    end
+
+    def call
+      @totals = {
+        today: @scope.today.count,
+        week: @scope.this_week.count,
+        month: @scope.this_month.count
+      }
+
+      @top_pages     = @time_scope.group(:path).order("count_all DESC").limit(@limit).count
+      @top_referrers = @time_scope.with_referrer.group(:referer).order("count_all DESC").limit(@limit).count
+      @top_sources   = @time_scope.with_source.group(:source).order("count_all DESC").limit(@limit).count
+
+      @recent = @scope.order(created_at: :desc).limit(20).includes(visitor: :whitelisted_ip)
+
+      self
+    end
+  end
+end

data/app/services/trackguard/page_view_recorder.rb

@@ -1,13 +1,5 @@
 module Trackguard
   class PageViewRecorder < ApplicationService
-    BOT_REGEX = /
-      Googlebot|Bingbot|Slurp|DuckDuckBot|Baidu|YandexBot|
-      facebookexternalhit|Twitterbot|LinkedInBot|
-      curl|wget|python-requests|python-urllib|
-      Go-http-client|libwww|Java|Ruby|
-      bot|crawl|spider
-    /ix
-
     def initialize(path:, ip:, user_agent:, referer:, session_id:, trace_id:, source: nil, initial: false,
                    http_method: nil)
       @path        = path.to_s
@@ -22,11 +14,11 @@ module Trackguard
     end
 
     def call
-      return if BOT_REGEX.match?(@user_agent)
-      return if BlockedUserAgent.blocked?(@user_agent)
+      adapter = Trackguard.adapter
+      return if adapter.blocked_user_agent?(@user_agent)
       return if @path.blank? || @path.start_with?("/admin")
 
-      TrackPageViewJob.perform_later(
+      adapter.track_page_view(
         path: @path,
         ip: @ip,
         user_agent: @user_agent,

data/app/views/layouts/trackguard/admin.html.erb

@@ -11,27 +11,7 @@
     <div class="tg-container">
       <div class="tg-header__inner">
         <span class="tg-brand">
-          <svg class="tg-brand__logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 22" aria-hidden="true">
-            <defs>
-              <linearGradient id="tg-shield-grad" x1="0" y1="0" x2="0" y2="1">
-                <stop offset="0%" stop-color="#1e3a5f"/>
-                <stop offset="100%" stop-color="#0d1f3c"/>
-              </linearGradient>
-            </defs>
-            <!-- Shield -->
-            <path d="M10 1L19 4.5V11.5C19 16.4 15 20.3 10 21.5C5 20.3 1 16.4 1 11.5V4.5Z"
-                  fill="url(#tg-shield-grad)" stroke="#3b82f6" stroke-width="1.25" stroke-linejoin="round"/>
-            <!-- Left rail -->
-            <line x1="7.5" y1="6" x2="7.5" y2="17" stroke="#60a5fa" stroke-width="1.6" stroke-linecap="round"/>
-            <!-- Right rail -->
-            <line x1="12.5" y1="6" x2="12.5" y2="17" stroke="#60a5fa" stroke-width="1.6" stroke-linecap="round"/>
-            <!-- Cross-tie 1 -->
-            <line x1="6.25" y1="8"    x2="13.75" y2="8"    stroke="#3b82f6" stroke-width="1.25" stroke-linecap="round"/>
-            <!-- Cross-tie 2 -->
-            <line x1="6.25" y1="11.5" x2="13.75" y2="11.5" stroke="#3b82f6" stroke-width="1.25" stroke-linecap="round"/>
-            <!-- Cross-tie 3 -->
-            <line x1="6.25" y1="15"   x2="13.75" y2="15"   stroke="#3b82f6" stroke-width="1.25" stroke-linecap="round"/>
-          </svg>
+          <%= image_tag "trackguard/logo.png", class: "tg-brand__logo", alt: "Trackguard" %>
           Trackguard
         </span>
 

data/lib/generators/trackguard/templates/create_trackguard_tables.rb

@@ -2,6 +2,7 @@ class CreateTrackguardTables < ActiveRecord::Migration[<%= ActiveRecord::Migrati
   def change
     create_table :trackguard_visitors do |t|
       t.string   :ip
+      t.string   :name
       t.string   :user_agent
       t.datetime :first_seen_at, null: false
       t.datetime :last_seen_at,  null: false

data/lib/trackguard/adapters/base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Trackguard
+  module Adapters
+    class Base
+      def blocked_user_agent?(user_agent) = raise NotImplementedError, "#{self.class}#blocked_user_agent?"
+      def whitelisted_ip?(ip)             = raise NotImplementedError, "#{self.class}#whitelisted_ip?"
+      def flagged_visitor?(ip)            = raise NotImplementedError, "#{self.class}#flagged_visitor?"
+
+      def track_page_view(path:, ip:, user_agent:, referer:, session_id:, trace_id:, source:, initial:, http_method:)
+        raise NotImplementedError, "#{self.class}#track_page_view"
+      end
+
+      def track_blocked_request(ip:, user_agent:, path:, http_method:, block_reason:)
+        raise NotImplementedError, "#{self.class}#track_blocked_request"
+      end
+    end
+  end
+end

data/lib/trackguard/adapters/local.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Trackguard
+  module Adapters
+    class Local < Base
+      def blocked_user_agent?(user_agent)
+        BlockedUserAgent.blocked?(user_agent)
+      end
+
+      def whitelisted_ip?(ip)
+        WhitelistedIp.whitelisted?(ip)
+      end
+
+      def flagged_visitor?(ip)
+        Visitor.flagged?(ip)
+      end
+
+      def track_page_view(path:, ip:, user_agent:, referer:, session_id:, trace_id:, source:, initial:, http_method:)
+        TrackPageViewJob.perform_later(
+          path: path,
+          ip: ip,
+          user_agent: user_agent,
+          referer: referer,
+          session_id: session_id,
+          trace_id: trace_id,
+          source: source,
+          initial: initial,
+          http_method: http_method
+        )
+      end
+
+      def track_blocked_request(ip:, user_agent:, path:, http_method:, block_reason:)
+        TrackBlockedRequestJob.perform_later(
+          ip: ip,
+          user_agent: user_agent,
+          path: path,
+          http_method: http_method,
+          block_reason: block_reason
+        )
+      end
+    end
+  end
+end

data/lib/trackguard/rack_attack.rb

@@ -5,20 +5,22 @@ require "rack/attack"
 module Trackguard
   module RackAttack
     def self.configure
+      adapter = Trackguard.adapter
+
       ::Rack::Attack.safelist("trackguard/allow local") do |req|
         [ "127.0.0.1", "::1" ].include?(req.ip)
       end
 
       ::Rack::Attack.safelist("trackguard/allow whitelisted ips") do |req|
-        Trackguard::WhitelistedIp.whitelisted?(req.ip)
+        adapter.whitelisted_ip?(req.ip)
       end
 
       ::Rack::Attack.blocklist("trackguard/block known scanners") do |req|
-        Trackguard::BlockedUserAgent.blocked?(req.user_agent)
+        adapter.blocked_user_agent?(req.user_agent)
       end
 
       ::Rack::Attack.blocklist("trackguard/flagged visitors") do |req|
-        Trackguard::Visitor.flagged?(req.ip)
+        adapter.flagged_visitor?(req.ip)
       end
 
       ::Rack::Attack.throttle(
@@ -27,15 +29,15 @@ module Trackguard
         period: Trackguard.throttle_period, &:ip
       )
 
-      subscribe_to_blocked_requests
+      subscribe_to_blocked_requests(adapter)
     end
 
-    def self.subscribe_to_blocked_requests
+    def self.subscribe_to_blocked_requests(adapter)
       @subscribe_to_blocked_requests ||= ActiveSupport::Notifications.subscribe("rack.attack") do |*, payload|
         req = payload[:request]
         next unless req.env["rack.attack.match_type"] == :blocklist
 
-        Trackguard::TrackBlockedRequestJob.perform_later(
+        adapter.track_blocked_request(
           ip: req.ip,
           user_agent: req.user_agent.to_s,
           path: req.path,

data/lib/trackguard/version.rb

@@ -1,3 +1,3 @@
 module Trackguard
-  VERSION = "0.17.0".freeze
+  VERSION = "0.20.0".freeze
 end

data/lib/trackguard.rb

@@ -3,6 +3,8 @@
 require "trackguard/version"
 require "trackguard/engine"
 require "trackguard/rack_attack"
+require "trackguard/adapters/base"
+require "trackguard/adapters/local"
 
 module Trackguard
   class << self
@@ -36,5 +38,23 @@ module Trackguard
     def throttle_period
       @throttle_period ||= 60
     end
+
+    def adapter
+      @adapter ||= Trackguard::Adapters::Local.new
+    end
+
+    def adapter=(value)
+      @adapter = resolve_adapter(value)
+    end
+
+    private
+
+    def resolve_adapter(value)
+      case value
+      when Symbol then Trackguard::Adapters.const_get(value.to_s.camelize).new
+      when Class  then value.new
+      else             value
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackguard
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Krzysztof Rygielski
@@ -43,8 +43,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/trackguard/logo.png
 - app/assets/javascripts/controllers/page_tracker_controller.js
 - app/assets/stylesheets/trackguard/admin.css
+- app/controllers/concerns/trackguard/admin/overridable.rb
 - app/controllers/concerns/trackguard/page_tracker.rb
 - app/controllers/trackguard/admin/analytics_controller.rb
 - app/controllers/trackguard/admin/base_controller.rb
@@ -64,6 +66,7 @@ files:
 - app/models/trackguard/visit.rb
 - app/models/trackguard/visitor.rb
 - app/models/trackguard/whitelisted_ip.rb
+- app/services/trackguard/analytics_query.rb
 - app/services/trackguard/application_service.rb
 - app/services/trackguard/page_view_recorder.rb
 - app/views/layouts/trackguard/admin.html.erb
@@ -80,6 +83,8 @@ files:
 - lib/generators/trackguard/upgrade_generator.rb
 - lib/tasks/trackguard.rake
 - lib/trackguard.rb
+- lib/trackguard/adapters/base.rb
+- lib/trackguard/adapters/local.rb
 - lib/trackguard/engine.rb
 - lib/trackguard/rack_attack.rb
 - lib/trackguard/version.rb