ahoy_captain 0.11.1 → 0.76

data/app/decorators/ahoy_captain/city_decorator.rb

@@ -1,22 +1,10 @@
 module AhoyCaptain
   class CityDecorator < CountryDecorator
-    def self.csv_map(params = {})
-      {
-        "Country" => :country,
-        "City" => :city,
-        "Total" => :unit_amount
-      }
-    end
-
     def display_name
       search = search_query(country_eq: object.country, city_eq: object.city)
       frame_link("#{country_emoji(object.country)} #{object.city}", search)
     end
 
-    def country
-      "#{country_emoji(object.country)} #{object.country}"
-    end
-
     def unit_amount
       object.count
     end

data/app/decorators/ahoy_captain/country_decorator.rb

@@ -1,16 +1,6 @@
 module AhoyCaptain
   class CountryDecorator < ApplicationDecorator
     EMOJI_MAP = { "AD": "🇦🇩", "AE": "🇦🇪", "AF": "🇦🇫", "AG": "🇦🇬", "AI": "🇦🇮", "AL": "🇦🇱", "AM": "🇦🇲", "AO": "🇦🇴", "AQ": "🇦🇶", "AR": "🇦🇷", "AS": "🇦🇸", "AT": "🇦🇹", "AU": "🇦🇺", "AW": "🇦🇼", "AX": "🇦🇽", "AZ": "🇦🇿", "BA": "🇧🇦", "BB": "🇧🇧", "BD": "🇧🇩", "BE": "🇧🇪", "BF": "🇧🇫", "BG": "🇧🇬", "BH": "🇧🇭", "BI": "🇧🇮", "BJ": "🇧🇯", "BL": "🇧🇱", "BM": "🇧🇲", "BN": "🇧🇳", "BO": "🇧🇴", "BQ": "🇧🇶", "BR": "🇧🇷", "BS": "🇧🇸", "BT": "🇧🇹", "BV": "🇧🇻", "BW": "🇧🇼", "BY": "🇧🇾", "BZ": "🇧🇿", "CA": "🇨🇦", "CC": "🇨🇨", "CD": "🇨🇩", "CF": "🇨🇫", "CG": "🇨🇬", "CH": "🇨🇭", "CI": "🇨🇮", "CK": "🇨🇰", "CL": "🇨🇱", "CM": "🇨🇲", "CN": "🇨🇳", "CO": "🇨🇴", "CR": "🇨🇷", "CU": "🇨🇺", "CV": "🇨🇻", "CW": "🇨🇼", "CX": "🇨🇽", "CY": "🇨🇾", "CZ": "🇨🇿", "DE": "🇩🇪", "DJ": "🇩🇯", "DK": "🇩🇰", "DM": "🇩🇲", "DO": "🇩🇴", "DZ": "🇩🇿", "EC": "🇪🇨", "EE": "🇪🇪", "EG": "🇪🇬", "EH": "🇪🇭", "ER": "🇪🇷", "ES": "🇪🇸", "ET": "🇪🇹", "FI": "🇫🇮", "FJ": "🇫🇯", "FK": "🇫🇰", "FM": "🇫🇲", "FO": "🇫🇴", "FR": "🇫🇷", "GA": "🇬🇦", "GB": "🇬🇧", "GD": "🇬🇩", "GE": "🇬🇪", "GF": "🇬🇫", "GG": "🇬🇬", "GH": "🇬🇭", "GI": "🇬🇮", "GL": "🇬🇱", "GM": "🇬🇲", "GN": "🇬🇳", "GP": "🇬🇵", "GQ": "🇬🇶", "GR": "🇬🇷", "GS": "🇬🇸", "GT": "🇬🇹", "GU": "🇬🇺", "GW": "🇬🇼", "GY": "🇬🇾", "HK": "🇭🇰", "HM": "🇭🇲", "HN": "🇭🇳", "HR": "🇭🇷", "HT": "🇭🇹", "HU": "🇭🇺", "ID": "🇮🇩", "IE": "🇮🇪", "IL": "🇮🇱", "IM": "🇮🇲", "IN": "🇮🇳", "IO": "🇮🇴", "IQ": "🇮🇶", "IR": "🇮🇷", "IS": "🇮🇸", "IT": "🇮🇹", "JE": "🇯🇪", "JM": "🇯🇲", "JO": "🇯🇴", "JP": "🇯🇵", "KE": "🇰🇪", "KG": "🇰🇬", "KH": "🇰🇭", "KI": "🇰🇮", "KM": "🇰🇲", "KN": "🇰🇳", "KP": "🇰🇵", "KR": "🇰🇷", "KW": "🇰🇼", "KY": "🇰🇾", "KZ": "🇰🇿", "LA": "🇱🇦", "LB": "🇱🇧", "LC": "🇱🇨", "LI": "🇱🇮", "LK": "🇱🇰", "LR": "🇱🇷", "LS": "🇱🇸", "LT": "🇱🇹", "LU": "🇱🇺", "LV": "🇱🇻", "LY": "🇱🇾", "MA": "🇲🇦", "MC": "🇲🇨", "MD": "🇲🇩", "ME": "🇲🇪", "MF": "🇲🇫", "MG": "🇲🇬", "MH": "🇲🇭", "MK": "🇲🇰", "ML": "🇲🇱", "MM": "🇲🇲", "MN": "🇲🇳", "MO": "🇲🇴", "MP": "🇲🇵", "MQ": "🇲🇶", "MR": "🇲🇷", "MS": "🇲🇸", "MT": "🇲🇹", "MU": "🇲🇺", "MV": "🇲🇻", "MW": "🇲🇼", "MX": "🇲🇽", "MY": "🇲🇾", "MZ": "🇲🇿", "NA": "🇳🇦", "NC": "🇳🇨", "NE": "🇳🇪", "NF": "🇳🇫", "NG": "🇳🇬", "NI": "🇳🇮", "NL": "🇳🇱", "NO": "🇳🇴", "NP": "🇳🇵", "NR": "🇳🇷", "NU": "🇳🇺", "NZ": "🇳🇿", "OM": "🇴🇲", "PA": "🇵🇦", "PE": "🇵🇪", "PF": "🇵🇫", "PG": "🇵🇬", "PH": "🇵🇭", "PK": "🇵🇰", "PL": "🇵🇱", "PM": "🇵🇲", "PN": "🇵🇳", "PR": "🇵🇷", "PS": "🇵🇸", "PT": "🇵🇹", "PW": "🇵🇼", "PY": "🇵🇾", "QA": "🇶🇦", "RE": "🇷🇪", "RO": "🇷🇴", "RS": "🇷🇸", "RU": "🇷🇺", "RW": "🇷🇼", "SA": "🇸🇦", "SB": "🇸🇧", "SC": "🇸🇨", "SD": "🇸🇩", "SE": "🇸🇪", "SG": "🇸🇬", "SH": "🇸🇭", "SI": "🇸🇮", "SJ": "🇸🇯", "SK": "🇸🇰", "SL": "🇸🇱", "SM": "🇸🇲", "SN": "🇸🇳", "SO": "🇸🇴", "SR": "🇸🇷", "SS": "🇸🇸", "ST": "🇸🇹", "SV": "🇸🇻", "SX": "🇸🇽", "SY": "🇸🇾", "SZ": "🇸🇿", "TC": "🇹🇨", "TD": "🇹🇩", "TF": "🇹🇫", "TG": "🇹🇬", "TH": "🇹🇭", "TJ": "🇹🇯", "TK": "🇹🇰", "TL": "🇹🇱", "TM": "🇹🇲", "TN": "🇹🇳", "TO": "🇹🇴", "TR": "🇹🇷", "TT": "🇹🇹", "TV": "🇹🇻", "TW": "🇹🇼", "TZ": "🇹🇿", "UA": "🇺🇦", "UG": "🇺🇬", "UM": "🇺🇲", "US": "🇺🇸", "UY": "🇺🇾", "UZ": "🇺🇿", "VA": "🇻🇦", "VC": "🇻🇨", "VE": "🇻🇪", "VG": "🇻🇬", "VI": "🇻🇮", "VN": "🇻🇳", "VU": "🇻🇺", "WF": "🇼🇫", "WS": "🇼🇸", "YE": "🇾🇪", "YT": "🇾🇹", "ZA": "🇿🇦", "ZM": "🇿🇲", "ZW": "🇿🇼" }
-    def self.csv_map(params = {})
-      {
-        "Country" => :label,
-        "Total" => :unit_amount
-      }
-    end
-
-    def label
-      "#{country_emoji(country)} #{country}"
-    end
 
     def display_name
       search = search_query(country_eq: object.label)

data/app/decorators/ahoy_captain/device_decorator.rb

@@ -1,19 +1,8 @@
 module AhoyCaptain
   class DeviceDecorator < ApplicationDecorator
-    def self.csv_map(params = {})
-      {
-        "#{params[:devices_type]}" => :label,
-        "Total" => :unit_amount
-      }
-    end
-
     def display_name
-      search = search_query("#{params[:devices_type]}_eq" => label)
-      frame_link(label, search)
-    end
-
-    def label
-      object.label
+      search = search_query("#{params[:devices_type]}_eq" => object.label)
+      frame_link(object.label, search)
     end
 
     def unit_amount

data/app/decorators/ahoy_captain/page_decorator.rb

@@ -1,16 +1,5 @@
 module AhoyCaptain
   class PageDecorator < ApplicationDecorator
-    def self.csv_map(params = {})
-      {
-        "URL" => :label,
-        "Total" => :unit_amount
-      }
-    end
-
-    def label
-      object.url
-    end
-
     def display_name
       search = search_query(type => object.url)
       frame_link(object.url, search)

data/app/decorators/ahoy_captain/region_decorator.rb

@@ -1,26 +1,10 @@
 module AhoyCaptain
   class RegionDecorator < CountryDecorator
-    def self.csv_map(params = {})
-      {
-        "Country" => :country,
-        "Region" => :region,
-        "Total" => :unit_amount
-      }
-    end
-
     def display_name
       search = search_query(region_eq: object.region, country_eq: object.country)
       frame_link("#{country_emoji(object.country)} #{object.region}", search)
     end
 
-    def country
-      "#{country_emoji(object.country)} #{object.country}"
-    end
-
-    def region
-      object.region
-    end
-
     def unit_amount
       object.count
     end

data/app/decorators/ahoy_captain/source_decorator.rb

@@ -1,12 +1,5 @@
 module AhoyCaptain
   class SourceDecorator < ApplicationDecorator
-    def self.csv_map(params = {})
-      {
-        "Domain" => :referring_domain,
-        "Total" => :unit_amount
-      }
-    end
-
     def display_name
       display = %Q(
         <div class='flex justify-start space-x-8 col-span-1 items-center'>

data/app/helpers/ahoy_captain/application_helper.rb

@@ -2,36 +2,7 @@ module AhoyCaptain
   module ApplicationHelper
     include Pagy::Frontend
 
-    def current_property_filter
-      return nil unless params[:q]
-
-      prop = params[:q].to_unsafe_h.detect { |key, _| key.starts_with?("properties.") }
-      if prop
-        key = prop[0].dup
-        Ransack::Predicate.detect_and_strip_from_string!(key)
-        { key: key, value: prop[1] }
-
-      else
-        nil
-      end
-    end
-
-    def stats_container(value, url, label, formatter, selected = false)
-      if value.is_a?(AhoyCaptain::ComparableQuery::Comparison)
-        ::AhoyCaptain::Stats::ComparableContainerComponent.new(url, label, value, formatter, selected, compare_mode?)
-      else
-        ::AhoyCaptain::Stats::ContainerComponent.new(url, label, value, formatter, selected)
-      end
-    end
-
-    def number_to_duration(duration)
-      if duration
-        "#{duration.in_minutes.to_i}M #{duration.parts[:seconds].to_i}S"
-      else
-        "0M 0S"
-      end
-    end
-
+    SPECIAL_PARAMS = [:campaigns_type, :devices_type]
     def ahoy_captain_importmap_tags(entry_point = "application", shim: true)
       safe_join [
         (javascript_importmap_shim_tag if shim),
@@ -46,36 +17,8 @@ module AhoyCaptain
       request.query_parameters
     end
 
-    # gets put into the form as a hidden field
-    #
-    def non_filter_ransack_params
-      other_params = {}
-      map = [
-        :start_date,
-        :end_date,
-        :period,
-        :interval,
-        :comparison,
-      ]
-
-      # properties stuff falls into current_property_filter
-      ransack = [:goal]
-
-      map.each do |key|
-        if params[key]
-          other_params[key] = params[key]
-        end
-      end
-
-      ransack.each do |key|
-        Ransack.predicates.keys.each do |predicate|
-          if value = params.dig(:q, "#{key}_#{predicate}")
-            other_params["q[#{key}_#{predicate}]"] = value
-          end
-        end
-      end
-
-      other_params
+    def special_params
+      params.to_unsafe_h.slice(*SPECIAL_PARAMS)
     end
 
     def render_pagination

data/app/models/ahoy_captain/current.rb

@@ -0,0 +1,9 @@
+module AhoyCaptain
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :request
+
+    after_reset do
+      self.request = nil
+    end
+  end
+end

data/app/models/ahoy_captain/rangeable.rb

@@ -1,7 +1,10 @@
 module AhoyCaptain
   module Rangeable
+    include AhoyCaptain::RangeOptions
+
     def period
       params[:period] || AhoyCaptain.config.ranges.default
     end
+
   end
 end

data/app/models/ahoy_captain/url_helpers.rb

@@ -0,0 +1,6 @@
+module AhoyCaptain
+  class UrlHelpers
+    include AhoyCaptain::Engine.routes.url_helpers
+    include Singleton
+  end
+end

data/app/models/concerns/ahoy_captain/range_options.rb

@@ -1,8 +1,21 @@
 module AhoyCaptain
   module RangeOptions
 
+    def period
+      raise NotImplementedError
+    end
+
     private def range
-      RangeFromParams.from_params(params)
+      if params[:start_date].present? && params[:end_date].present?
+        custom = [params[:start_date].to_datetime, params[:end_date].to_datetime].sort
+        duration = (custom[1].to_date -  custom[0].to_date)
+
+        if AhoyCaptain.config.ranges.max && (duration.days <= AhoyCaptain.config.ranges.max)
+          return custom
+        end
+      end
+
+      AhoyCaptain.config.ranges.for(period)
     end
   end
 end

data/app/presenters/ahoy_captain/dashboard_presenter.rb

@@ -1,8 +1,6 @@
 module AhoyCaptain
   class DashboardPresenter
-    include Rangeable
     include RangeOptions
-    include CompareMode
 
     attr_reader :params
 
@@ -11,43 +9,73 @@ module AhoyCaptain
     end
 
     def unique_visitors
-      Stats::UniqueVisitorsQuery.call(params).with_comparison(compare_mode?).count
+      cached(:unique_visitors) do
+        Stats::UniqueVisitorsQuery.call(params).count(:ip)
+      end
     end
 
     def total_visits
-      Stats::TotalVisitorsQuery.call(params).with_comparison(compare_mode?).count
+      cached(:total_visits) do
+        Stats::TotalVisitorsQuery.call(params).count
+      end
     end
 
     def total_pageviews
-      Stats::TotalPageviewsQuery.call(params).with_comparison(compare_mode?).count
+      cached(:total_pageviews) do
+        Stats::TotalPageviewsQuery.call(params).count
+      end
     end
 
     def views_per_visit
-      Stats::AverageViewsPerVisitQuery.call(params).with_comparison(compare_mode?).average("count")
+      cached(:views_per_visit) do
+        begin
+          result = Stats::AverageViewsPerVisitQuery.call(params).count
+          (result.values.sum.to_f / result.size).round(2)
+        rescue ::ActiveRecord::StatementInvalid => e
+          if e.message.include?("PG::DivisionByZero")
+            return "0"
+          else
+            raise e
+          end
+        end
+      end
+
     end
 
     def bounce_rate
-      query = Stats::BounceRatesQuery.call(params)
-      if compare_mode?
-        query.with_comparison(true)
-      else
-        query.average("bounce_rate").try(:round, 2) || 0
+      cached(:bounce_rate) do
+        begin
+        result = Stats::BounceRatesQuery.call(params)
+        result[0].bounce_rate.round(2)
+        rescue ::ActiveRecord::StatementInvalid => e
+        if e.message.include?("PG::DivisionByZero")
+          return "0"
+        else
+          raise e
+        end
+      end
+
       end
     end
 
     def visit_duration
-      query = Stats::AverageVisitDurationQuery.call(params)
-      if compare_mode?
-        query.with_comparison(true)
-      else
-        query[0].average_visit_duration
+      cached(:visit_duration) do
+        result = Stats::AverageVisitDurationQuery.call(params)
+        duration = result[0].average_visit_duration
+        if duration
+          "#{duration.parts[:minutes]}M #{duration.parts[:seconds].round}S"
+        else
+          "0M 0S"
+        end
       end
     end
 
     private
 
-    def compare_mode?
-      params[:comparison] != 'false'
+    def cached(*names)
+      AhoyCaptain.cache.fetch("ahoy_captain:#{names.join(":")}:#{params.permit!.except("controller", "action").to_unsafe_h.map { |k,v| "#{k}-#{v}" }.join(":")}", expire_in: AhoyCaptain.config.cache.ttl) do
+        yield
+      end
     end
   end
 end

data/app/presenters/ahoy_captain/funnel_presenter.rb

@@ -9,47 +9,44 @@ module AhoyCaptain
     end
 
     def build
-      if AhoyCaptain.config.goals.none?
-        @goals = []
-        return self
-      end
+      queries = {}
+      prev_goal = nil
+      prev_table = nil
+      selects = []
+      @funnel.goals.each do |goal|
+        if prev_goal
+          query = ::Ahoy::Event
+                    .select("distinct ahoy_events.visit_id")
+                    .from(prev_table.to_s)
+                    .joins("inner join ahoy_events on ahoy_events.visit_id = #{prev_table}.id")
+                    .where("ahoy_events.name = ?", goal.event_name.to_s).to_sql
+          prev_table = "#{goal.id}"
+          selects << ["SELECT '#{prev_goal.title} > #{goal.title}' as step, count(*) from #{prev_table}"]
+          queries[prev_table] = query
+        else
+          prev_table = :visitors
+          prev_goal = goal
 
-      queries = {
-        totals: @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '_internal_total_visits_' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, 0 as sort_order")
-      }
-      selects = ["SELECT unique_visits, name, total_events, sort_order from totals"]
-      last_goal = nil
-      map = {}.with_indifferent_access
+          query = @event_query
+                    .select("distinct(visit_id) as id, min(time) as min_time")
+                    .where(name: goal.event_name.to_s)
+                    .group("1").to_sql
+          selects << ["'#{goal.title}' as step, count(*) from #{prev_table}"]
 
-      AhoyCaptain.config.goals.each_with_index do |goal, index|
-        queries[goal.id] = @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '#{goal.id}' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, #{index + 1} as sort_order").merge(goal.event_query.call).group("#{AhoyCaptain.event.table_name}.name")
-        selects << ["SELECT unique_visits, name, total_events, sort_order from #{goal.id}"]
-        map[goal.id] = goal
-        last_goal = goal
+          queries[prev_table] = query
+        end
       end
 
-      # activerecord quirk / with bug
-      select = selects.join(" UNION ").delete_suffix(" from #{last_goal.id}")
-      select = select.delete_prefix("SELECT ")
-      steps = ::Ahoy::Event.with(
-        queries,
-        ).select(select).from("#{last_goal.id}").order("sort_order asc")
-
-      items = ::Ahoy::Event.with(steps: steps).select("total_events, unique_visits, name, round((total_events::numeric/lag(total_events, 1) over ()),2) as drop_off").from("steps").order("sort_order asc").index_by(&:name)
-      items.delete("_internal_total_visits_")
-      @steps = []
+      select = selects.join(" UNION ").delete_suffix(" from #{prev_table}")
 
-      items.values.each do |item|
-        if map[item.name]
-          item.name = map[item.name].title
-        end
-      end
+      steps = ::Ahoy::Event.with(
+        queries
+      ).select(select).from(prev_table).order("count desc")
 
-      @steps = items.values
+      @steps = ::Ahoy::Event.with(steps: steps).select("step, count, lag(count, 1) over () as lag, abs(count::numeric - lag(count, 1) over ())::integer as drop_off, round((1.0 - count::numeric/GREATEST(lag(count, 1) over (), 1)),2) as conversion_rate").from("steps")
       self
     end
 
-
     def total
       @event_query.distinct(:visitor_token).count
     end

data/app/presenters/ahoy_captain/goals_presenter.rb

@@ -6,54 +6,44 @@ module AhoyCaptain
       @goals = nil
     end
 
-    # this is a dumpster fire
     def build
       if AhoyCaptain.config.goals.none?
         @goals = []
         return self
       end
-
-      queries = {
-        totals: @event_query.select("count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits, '_internal_total_visits_' as name, count(distinct #{AhoyCaptain.event.table_name}.id) as total_events, 0 as sort_order")
-      }
-      selects = ["SELECT unique_visits, name, total_events, sort_order, 0 as cr, '' as goal_id from totals"]
+      queries = {}
+      selects = []
       last_goal = nil
-      map = {}.with_indifferent_access
-
-      AhoyCaptain.config.goals.each_with_index do |goal, index|
-        queries[goal.id] = @event_query.select(
-          [
-            "count(distinct(#{AhoyCaptain.event.table_name}.visit_id)) as unique_visits" ,
-            "'#{goal.id}' as name",
-            "count(distinct #{AhoyCaptain.event.table_name}.id) as total_events",
-            "#{index + 1} as sort_order",
-            "'#{goal.id}' as goal_id"
-          ]
-        ).merge(goal.event_query.call).group("#{AhoyCaptain.event.table_name}.name")
-        selects << ["SELECT unique_visits, name, total_events, sort_order, 0::decimal as cr, '#{goal.id}' as goal_id from #{goal.id}"]
-        map[goal.id] = goal
+      map = {}
+      AhoyCaptain.config.goals.each do |goal|
+        queries[goal.id] = @event_query.select("count(distinct(visit_id)) as uniques, count(name) as total, name").where(name: goal.event_name).group("name")
+        selects << ["SELECT total, uniques, name from #{goal.id}"]
+        map[goal.event_name] = goal
         last_goal = goal
       end
-
-      # activerecord quirk / with bug
       select = selects.join(" UNION ").delete_suffix(" from #{last_goal.id}")
       select = select.delete_prefix("SELECT ")
       steps = ::Ahoy::Event.with(
-        queries,
-        ).select(select).from("#{last_goal.id}").order("sort_order asc").index_by(&:name)
-      totals = steps.delete("_internal_total_visits_")
-
-      @goals = steps.keys.collect do |name|
-        step = steps[name]
-        step.name = map[name].title
-        step.cr = ((step.total_events.to_d / totals.total_events.to_d) * 100).round(2)
-        step
+        queries
+      ).select(select).from("#{last_goal.id}")
+
+      items = ::Ahoy::Event.with(steps: steps).select("total, uniques, name, 0 as conversion_rate").from("steps").index_by(&:name)
+      @goals = []
+      map.each do |name, _|
+        if items[name]
+          items[name].name = map[name].title
+          items[name].conversion_rate = ((items[name].total / total.to_d) * 100).round(2) * 100
+          @goals << items[name]
+        else
+          @goals << OpenStruct.new(name: map[name].title, uniques: 0, total: 0, conversion_rate: 0)
+        end
       end
+
       self
     end
 
-    def total_visitors
-      @total_visitors ||= @event_query.select(:visit_id).distinct.count
+    def total
+      @total ||= @event_query.distinct(:visitor_token).count
     end
 
     def as_json