ahoy_captain 0.8 → 0.10.0

data/app/components/ahoy_captain/tables/rows/row_component.rb

@@ -0,0 +1,40 @@
+module AhoyCaptain
+  module Tables
+    module Rows
+      class RowComponent < ViewComponent::Base
+        def initialize(table:, item:)
+          @table = table
+          @item = item
+        end
+
+        def progress_bar(value, max, label)
+          items = []
+          items << view_context.content_tag(:progress, "", class: "progress-primary bg-base-100 h-8 grow", value: value, max: max)
+          items << view_context.content_tag(:span, class: "grow text-elipsis overflow-hidden absolute left-4 bottom-3 h-8 text-primary-content") do
+            label
+          end
+
+          items.join.html_safe
+        end
+
+        def item(value = nil, &block)
+          view_context.content_tag(:span, class: "w-8 ml-8 text-right ") do
+            if value
+              value
+            else
+              capture(&block)
+            end
+          end
+        end
+
+        def percent_total(item)
+          '%.1f' % ((item.unit_amount.to_i * 1.0 / total)*100.0)
+        end
+
+        def tooltip(value)
+          AhoyCaptain::TooltipComponent.new(amount: value).render_in(self)
+        end
+      end
+    end
+  end
+end

data/app/components/ahoy_captain/tile_component.html.erb

@@ -1,12 +1,23 @@
-<div class='<%= 'lg:col-span-2' if wide %> col-span-1 p-4 bg-base-200 rounded-md p-8 mx-4 lg:mx-0'>
-  <div class="flex justify-between">
-    <h5 class='text-lg text-accent-content'><%= title %></h5>
-    <div class="flex self-center gap-3">
-      <%= display_links %>
+<div
+  data-controller="tile"
+  class="card card-compact <%= 'lg:col-span-2' if wide %> col-span-1 shadow-xl rounded-md lg:mx-0 bg-base-200 <%= @classes %>">
+  <% if title.present? || display_links.present? %>
+    <div class="flex justify-between">
+      <% if title.present? %>
+        <h2 class="card-title" data-tile-target="title"><%= title %></h2>
+      <% end %>
+      <% if display_links.present? %>
+        <div class="flex self-center lg:gap-3">
+          <%= display_links %>
+        </div>
+      <% end %>
     </div>
-  </div>
+  <% end %>
+
   <%= statistic_display %>
-  <div class="flex justify-center">
-    <%= details_cta %>
-  </div>
-</div>
+  <% if details_cta.present? %>
+    <div class="flex justify-center">
+      <%= details_cta %>
+    </div>
+  <% end %>
+</div>

data/app/components/ahoy_captain/tile_component.rb

@@ -5,7 +5,8 @@ class AhoyCaptain::TileComponent < ViewComponent::Base
   renders_one :display_links
   renders_one :details_cta
 
-  def initialize(title: nil, wide: false)
+  def initialize(title: nil, wide: false, classes: "p-8 mx-4")
+    @classes = classes
     @title = title
     @wide = wide
   end
@@ -13,4 +14,4 @@ class AhoyCaptain::TileComponent < ViewComponent::Base
   private
 
   attr_reader :title, :wide
-end
+end

data/app/components/ahoy_captain/tooltip_component.html.erb

@@ -1,3 +1,3 @@
-<div class="tooltip" data-tip=<%= amount %>>
+<div class="tooltip " data-tip=<%= amount %>>
     <p><%= abbreviate %></p>
-</div>
+</div>

data/app/controllers/ahoy_captain/application_controller.rb

@@ -1,40 +1,35 @@
-
-
 module AhoyCaptain
-  module Limitable
-    private
-
-    def limit
-      if request.variant.include?(:details)
-        nil
-      else
-        if params[:limit]
-          params[:limit].to_i
-        else
-          10
-        end
-      end
-    end
-  end
-
   class ApplicationController < ActionController::Base
     include Pagy::Backend
+    include CompareMode
+    include RangeOptions
+    include Rangeable
 
     layout 'ahoy_captain/layouts/application'
 
-    before_action do
-      Current.request = self
+    def period
+      params[:period] || AhoyCaptain.config.ranges.default
     end
 
     # show the details frame
-    before_action do
+    before_action :use_details_frame
+
+    # act like an spa without being an spa
+    before_action :act_like_an_spa
+
+    rescue_from Widget::WidgetDisabled do |e|
+      render template: 'ahoy_captain/shared/widget_disabled', locals: { frame: e.frame }
+    end
+
+    private
+
+    def use_details_frame
       if request.headers['Turbo-Frame'] == 'details'
         request.variant = :details
       end
     end
 
-    # act like an spa without being an spa
-    before_action do
+    def act_like_an_spa
       if request.format.html? && request.headers['Turbo-Frame'].blank?
         if request.path != root_path
           requested_params = Rails.application.routes.recognize_path(request.path).except(:controller, :action)
@@ -46,12 +41,6 @@ module AhoyCaptain
       end
     end
 
-    rescue_from Widget::WidgetDisabled do |e|
-      render template: 'ahoy_captain/shared/widget_disabled', locals: { frame: e.frame }
-    end
-
-    private
-
     def visit_query
       VisitQuery.call(params)
     end
@@ -60,6 +49,7 @@ module AhoyCaptain
       EventQuery.call(params)
     end
 
+    # Only paginate details requests requests
     def paginate(collection)
       if paginate?
         pagy, results = pagy(collection, page: params[:page])

data/app/controllers/ahoy_captain/campaigns_controller.rb

@@ -10,17 +10,9 @@ module AhoyCaptain
 
     def index
       results = cached(:campaigns, params[:campaigns_type]) do
-        visit_query
-                   .select(
-                     "COALESCE(#{params[:campaigns_type]}, 'Direct/None') as label",
-                     "count(COALESCE(#{params[:campaigns_type]}, 'Direct/None')) as count",
-                     "sum(count(COALESCE(#{params[:campaigns_type]}, 'Direct/None'))) OVER() as total_count"
-                   )
-                   .group("COALESCE(#{params[:campaigns_type]}, 'Direct/None')")
-                   .order(Arel.sql("count(COALESCE(#{params[:campaigns_type]}, 'Direct/None')) desc"))
-                   .limit(limit)
+        CampaignQuery.call(params).limit(limit)
       end
-      @campaigns = paginate(results).map { |campaign| CampaignDecorator.new(campaign) }
+      @campaigns = paginate(results).map { |campaign| CampaignDecorator.new(campaign, self) }
       @campaign_type = params[:campaigns_type]&.titleize&.gsub("Utm", "UTM")
     end
   end

data/app/controllers/ahoy_captain/cities_controller.rb

@@ -10,15 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:cities) do
-        visit_query
-          .select("city, country, count(concat(city, region, country)) as count, sum(count(concat(city, region, country))) over() as total_count")
-          .where.not(city: nil)
-          .group("city, region, country")
-          .order(Arel.sql "count(concat(city, region, country)) desc")
+        CityQuery.call(params)
           .limit(limit)
       end
 
-      @cities = paginate(results).map { |city| CityDecorator.new(city) }
+      @cities = paginate(results).map { |city| CityDecorator.new(city, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/countries_controller.rb

@@ -1,7 +1,6 @@
 module AhoyCaptain
   class CountriesController < ApplicationController
     include Limitable
-    include Rangeable
 
     before_action do
       if Widget.disabled?(:locations, :countries)
@@ -11,14 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:countries) do
-        visit_query
-          .reselect("country as label, count(country) as count, sum(count(country)) OVER() as total_count")
-          .group("country")
-          .order("count(country) desc")
+        CountryQuery.call(params)
           .limit(limit)
       end
 
-      @countries = paginate(results).map { |country| CountryDecorator.new(country) }
+      @countries = paginate(results).map { |country| CountryDecorator.new(country, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/devices_controller.rb

@@ -10,14 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:devices, params[:devices_type]) do
-          visit_query
-          .select("#{params[:devices_type]} as label", "count(#{params[:devices_type]}) as count", "sum(count(#{params[:devices_type]})) over() as total_count")
-          .group(params[:devices_type])
-          .order("count(#{params[:devices_type]}) desc")
-          .limit(limit)
+        DeviceQuery.call(params)
+                   .limit(limit)
       end
 
-      @devices = results.map { |device| DeviceDecorator.new(device) }
+      @devices = results.map { |device| DeviceDecorator.new(device, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/entry_pages_controller.rb

@@ -10,12 +10,10 @@ module AhoyCaptain
 
     def index
       results = cached(:entry_pages) do
-        EntryPagesQuery.call(params, event_query)
-                      .order(Arel.sql "count(#{AhoyCaptain.config.event[:url_column]}) desc")
-                      .limit(limit)
+        EntryPagesQuery.call(params).limit(limit)
       end
 
-      @pages = paginate(results).map { |page| EntryPageDecorator.new(page) }
+      @pages = paginate(results).map { |page| EntryPageDecorator.new(page, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/exit_pages_controller.rb

@@ -10,11 +10,10 @@ module AhoyCaptain
 
     def index
       results = cached(:exit_pages) do
-        ExitPagesQuery.call(params, event_query)
-                      .order(Arel.sql "count(#{AhoyCaptain.config.event[:url_column]}) desc")
-                              .limit(limit)
+        ExitPagesQuery.call(params)
+                      .limit(limit)
       end
-      @pages = paginate(results).map { |page| ExitPageDecorator.new(page) }
+      @pages = paginate(results).map { |page| ExitPageDecorator.new(page, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/exports_controller.rb

@@ -0,0 +1,14 @@
+module AhoyCaptain
+  class ExportsController < ApplicationController
+    skip_before_action :act_like_an_spa
+
+    def show
+      export = Export.new(params, self).build
+      file = export.to_zip
+      send_data file.read,
+                type: 'application/zip',
+                disposition: 'attachment',
+                filename: "AhoyCaptain export #{request.host} #{range[0].to_date} to #{(range[1] || Time.current).to_date}.zip"
+    end
+  end
+end

data/app/controllers/ahoy_captain/filters/base_controller.rb

@@ -1,12 +1,10 @@
 module AhoyCaptain
   module Filters
     class BaseController < ApplicationController
-      include Rangeable
-
       private
 
       def serialize(value)
-        { text: value }
+        { text: (value.presence || AhoyCaptain.none.text), value: (value.presence || AhoyCaptain.none.value) }
       end
 
       def visit_query

data/app/controllers/ahoy_captain/filters/goals_controller.rb

@@ -0,0 +1,9 @@
+module AhoyCaptain
+  module Filters
+    class GoalsController < BaseController
+      def index
+        render json: AhoyCaptain.configuration.goals.map { |goal| { text: goal.title, value: goal.id } }
+      end
+    end
+  end
+end

data/app/controllers/ahoy_captain/filters/pages/actions_controller.rb

@@ -5,7 +5,7 @@ module AhoyCaptain
         def index
           query = event_query.all.with_url.distinct_url
 
-          render json: query.map { |row| { text: row.url } }
+          render json: query.map { |row| serialize(row.url) }
         end
       end
     end

data/app/controllers/ahoy_captain/filters/pages/entry_pages_controller.rb

@@ -1,11 +1,11 @@
 module AhoyCaptain
   module Filters
     module Pages
-      # TODO: ACCOMODATE EXIT_PAGES
       class EntryPagesController < BaseController
         def index
-          query = event_query.all.with_url.distinct_url
-          render json: query.map { |row| { text: row.url } }
+          query = event_query.all.distinct("entry_pages.url").select("entry_pages.url as url")
+
+          render json: query.map { |row| serialize(row.url) }
         end
 
       end

data/app/controllers/ahoy_captain/filters/pages/exit_pages_controller.rb

@@ -1,12 +1,11 @@
 module AhoyCaptain
   module Filters
     module Pages
-      # TODO: ACCOMODATE ENTRY_PAGES
       class ExitPagesController < BaseController
         def index
-          query = event_query.with_url.distinct_url
+          query = event_query.distinct("exit_pages.url").select("exit_pages.url as url")
 
-          render json: query.map { |row| { text: row.url } }
+          render json: query.map { |row| serialize(row.url) }
         end
 
       end

data/app/controllers/ahoy_captain/filters/properties/names_controller.rb

@@ -0,0 +1,11 @@
+module AhoyCaptain
+  module Filters
+    module Properties
+      class NamesController < BaseController
+        def index
+          render json: ::Ahoy::Event.select("jsonb_object_keys(properties) as keys").distinct("jsonb_object_keys(properties)").map(&:keys).map { |key| serialize(key) }
+        end
+      end
+    end
+  end
+end

data/app/controllers/ahoy_captain/filters/properties/values_controller.rb

@@ -0,0 +1,15 @@
+module AhoyCaptain
+  module Filters
+    module Properties
+      class ValuesController < BaseController
+        def index
+          param_key = params[:q].to_unsafe_h.detect { |k,v| k.ends_with?("_i_cont") && k.starts_with?("properties.") }[0]
+          key = param_key.delete_prefix("properties.").delete_suffix("_i_cont")
+          query = event_query.all.distinct.select("properties->>'#{key}'").pluck(Arel.sql "properties->>'#{key}'")
+
+          render json: query.map { |element| serialize(element) }
+        end
+      end
+    end
+  end
+end

data/app/controllers/ahoy_captain/filters/sources_controller.rb

@@ -4,7 +4,7 @@ module AhoyCaptain
       def index
         query = visit_query.all
 
-        render json: query.result.select("distinct referring_domain").where.not(referring_domain: nil).group(:referring_domain).order(Arel.sql "count(*) desc").pluck(:referring_domain).map { |city| serialize(city) }
+        render json: query.select("distinct referring_domain").where.not(referring_domain: nil).group(:referring_domain).order(Arel.sql "count(*) desc").pluck(:referring_domain).map { |city| serialize(city) }
       end
     end
   end

data/app/controllers/ahoy_captain/filters/utms_controller.rb

@@ -2,7 +2,7 @@ module AhoyCaptain
   module Filters
     class UtmsController < BaseController
       def index
-        query = visit_query.select("#{params[:type]}", "count(#{params[:type]}) as total").group(params[:type]).order(Arel.sql "count(#{params[:type]}) desc").pluck(params[:type]).map { |city| serialize(city || "Direct/none") }
+        query = visit_query.select("#{params[:type]}", "count(#{params[:type]}) as total").group(params[:type]).order(Arel.sql "count(#{params[:type]}) desc").pluck(params[:type]).map { |city| serialize(city) }
         render json: query
       end
     end

data/app/controllers/ahoy_captain/properties_controller.rb

@@ -0,0 +1,41 @@
+module AhoyCaptain
+  class PropertiesController < ApplicationController
+    before_action do
+      @options = ::Ahoy::Event.select("jsonb_object_keys(properties) as keys").distinct("jsonb_object_keys(properties)").map(&:keys).map { |key| [Base64.urlsafe_encode64(key), key]}.to_h
+    end
+
+    def index
+    end
+
+    def show
+      value = Base64.urlsafe_decode64(params[:id])
+
+      @properties = event_query
+        .select(
+          "COALESCE(properties->>'#{value}', '(none)') AS label",
+          "COUNT(*) AS events_count",
+          "COUNT(DISTINCT visit_id) AS unique_visitors_count",
+          "(COUNT(DISTINCT visit_id)/COUNT(*)::numeric) * 100 as percentage"
+        )
+        .group("COALESCE(properties->>'#{value}', '(none)')")
+        .order(Arel.sql "COUNT(*) desc")
+    end
+
+    private
+
+    helper_method :has_property?
+    def has_property?(value)
+      searching_properties[value]
+    end
+
+    helper_method :selected_property?
+    def selected_property?(value)
+      encoded = Base64.urlsafe_encode64(value, padding: false)
+      encoded == params[:id]
+    end
+
+    def searching_properties
+      JSON.parse(params.dig("q", "properties_json_cont") || '{}')
+    end
+  end
+end

data/app/controllers/ahoy_captain/regions_controller.rb

@@ -10,15 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:regions) do
-        visit_query
-          .reselect("region, country, count(concat(region, country)) as count, sum(count(region)) over() as total_count")
-          .where.not(region: nil)
-          .group("region, country")
-          .order(Arel.sql "count(concat(region, country)) desc")
-          .limit(limit)
+        RegionQuery.call(params)
+                   .limit(limit)
       end
 
-      @regions = paginate(results).map { |region| RegionDecorator.new(region) }
+      @regions = paginate(results).map { |region| RegionDecorator.new(region, self) }
     end
   end
 end

data/app/controllers/ahoy_captain/sources_controller.rb

@@ -10,14 +10,11 @@ module AhoyCaptain
 
     def index
       results = cached(:sources) do
-        visit_query.select("substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)') as referring_domain, count(substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)')) as count, sum(count(substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)'))) OVER() as total_count")
-                   .where.not(referring_domain: nil)
-                   .group("substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)')")
-                   .order(Arel.sql "count(substring(referring_domain from '(?:.*://)?(?:www\.)?([^/?]*)')) desc")
+        SourceQuery.call(params)
                    .limit(limit)
       end
 
-      @sources = paginate(results).map { |source| AhoyCaptain::SourceDecorator.new(source) }
+      @sources = paginate(results).map { |source| AhoyCaptain::SourceDecorator.new(source, self) }
     end
   end
 

data/app/controllers/ahoy_captain/stats/base_controller.rb

@@ -1,7 +1,6 @@
 module AhoyCaptain
   module Stats
     class BaseController < ApplicationController
-      include Rangeable
 
       INTERVAL_PERIOD = {
         "realtime" => ["minute"],
@@ -12,8 +11,18 @@ module AhoyCaptain
       }
 
       INTERVALS = ["minute", "hour", "day", "week", "month"]
+
       private
 
+      helper_method :metric_type
+      def metric_type(stats)
+        if compare_mode?
+          stats.current.values.first.try(:class) || stats.compared_to.values.first.try(:class)
+        else
+          stats.values.first.class
+        end
+      end
+
       helper_method :selected_interval
       def selected_interval
         if params[:interval].in?(INTERVALS)
@@ -32,11 +41,13 @@ module AhoyCaptain
           # assume we're in a realtime
           return INTERVAL_PERIOD["realtime"][0]
         end
-        diff = (range[1] - range[0]).seconds
-        if diff.in_months > 1
+        diff = (range[1] - range[0]).seconds.in_days
+        if diff >= 31
           "month"
-        elsif diff.in_days > 0
+        elsif diff > 1
           "day"
+        elsif diff == 1
+          "hour"
         else
           "hour"
         end
@@ -49,7 +60,7 @@ module AhoyCaptain
 
           diff = (range[1] - range[0]).seconds.in_days
 
-          if diff == 0
+          if diff < 1
             INTERVAL_PERIOD["day"]
           elsif diff <= 7
             INTERVAL_PERIOD["7d"]
@@ -62,6 +73,76 @@ module AhoyCaptain
           INTERVAL_PERIOD["month"]
         end
       end
+
+      def lazy_window(result, value = 0, base = nil)
+        if result.is_a?(AhoyCaptain::LazyComparableQuery::LazyComparison)
+          result.result.current = lazy_window(result.result.current, value, range)
+          result.result.compared_to = lazy_window(result.result.compared_to, value, result.compare_range)
+          return result.result
+        end
+
+        base ||= range
+        window = window_for(selected_interval, result.keys[0].class, base.numeric)
+
+        window.each do |item|
+          if result.key?(item)
+            next
+          end
+
+          result[item] ||= value
+        end
+
+        transform = interval_label_transformation(selected_interval)
+
+        if transform
+          result.transform_keys! { |key| key.strftime(transform) }
+        end
+
+        result
+      end
+
+      def interval_label_transformation(interval)
+        return nil
+        if interval == 'hour'
+          return '%H:%M %p'
+        end
+
+        nil
+      end
+
+      # base should be a range
+      def window_for(interval, type, base = nil)
+        function = case type.to_s
+                    when 'Date', 'NilClass'
+                      ->(value) {
+                        date = Time.at(value).utc
+                        if interval == 'month'
+                          date.change(day: 1)
+                        elsif interval == 'week'
+                          date.beginning_of_week
+                        elsif interval == 'day'
+                          date.beginning_of_day
+                        elsif interval == 'hour'
+                          date.beginning_of_hour
+                        elsif interval == 'minute'
+                          date.beginning_of_minute
+                        else
+                          abort
+                        end.to_date
+                      }
+                    when 'DateTime'
+                      ->(value) { Time.at(value).utc.change(sec: 0) }
+                   when 'ActiveSupport::TimeWithZone'
+                     ->(value) { Time.at(value).utc }
+                   else
+                        raise ArgumentError
+                    end
+
+        base
+             .step(1.send(interval))
+             .to_a
+             .map { |value| function.call(value) }
+      end
     end
   end
 end

data/app/controllers/ahoy_captain/stats/bounce_rates_controller.rb

@@ -4,7 +4,8 @@ module AhoyCaptain
       # @todo: this is lazy
       def index
         @stats = AhoyCaptain::Stats::BounceRatesQuery.call(params)
-        @stats = @stats.group_by_period(selected_interval, "daily_bounce_rate.date").average("bounce_rate")
+        @stats = lazy_window(@stats.with_lazy_comparison(compare_mode?).group_by_period(selected_interval, "daily_bounce_rate.date").average("bounce_rate"))
+        @label = "Bounce Rate"
       end
     end
   end

data/app/controllers/ahoy_captain/stats/total_pageviews_controller.rb

@@ -2,7 +2,8 @@ module AhoyCaptain
   module Stats
     class TotalPageviewsController < BaseController
       def index
-        @stats = AhoyCaptain::Stats::TotalPageviewsQuery.call(params).group_by_period(selected_interval, :time).count
+        @stats = lazy_window(AhoyCaptain::Stats::TotalPageviewsQuery.call(params).with_lazy_comparison(compare_mode?).group_by_period(selected_interval, :time).count, 0)
+        @label = "Visitors"
       end
     end
   end