ahoy_captain 0.11.1 → 0.76

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,35 +1,40 @@
+
+
 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'
 
-    def period
-      params[:period] || AhoyCaptain.config.ranges.default
+    before_action do
+      Current.request = self
     end
 
     # show the details frame
-    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
+    before_action do
       if request.headers['Turbo-Frame'] == 'details'
         request.variant = :details
       end
     end
 
-    def act_like_an_spa
+    # act like an spa without being an spa
+    before_action do
       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)
@@ -41,6 +46,12 @@ 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
@@ -49,7 +60,6 @@ module AhoyCaptain
       EventQuery.call(params)
     end
 
-    # Only paginate details requests requests
     def paginate(collection)
       if paginate?
         pagy, results = pagy(collection, page: params[:page])
@@ -65,10 +75,7 @@ module AhoyCaptain
     end
 
     def cached(*names)
-      if AhoyCaptain.cache.class == ActiveSupport::Cache::NullStore
-        return yield
-      end
-      AhoyCaptain.cache.fetch("ahoy_captain:#{names.join(":")}:#{request.query_parameters.sort.map { |k,v| "#{k}-#{v}" }.join(":")}", expire_in: AhoyCaptain.config.cache[:ttl]) do
+      AhoyCaptain.cache.fetch("ahoy_captain:#{names.join(":")}:#{request.query_parameters.sort.map { |k,v| "#{k}-#{v}" }.join(":")}", expire_in: AhoyCaptain.config.cache.ttl) do
         yield
       end
     end

data/app/controllers/ahoy_captain/campaigns_controller.rb

@@ -10,9 +10,17 @@ module AhoyCaptain
 
     def index
       results = cached(:campaigns, params[:campaigns_type]) do
-        CampaignQuery.call(params).limit(limit)
+        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)
       end
-      @campaigns = paginate(results).map { |campaign| CampaignDecorator.new(campaign, self) }
+      @campaigns = paginate(results).map { |campaign| CampaignDecorator.new(campaign) }
       @campaign_type = params[:campaigns_type]&.titleize&.gsub("Utm", "UTM")
     end
   end

data/app/controllers/ahoy_captain/cities_controller.rb

@@ -0,0 +1,24 @@
+module AhoyCaptain
+  class CitiesController < ApplicationController
+    include AhoyCaptain::Limitable
+
+    before_action do
+      if Widget.disabled?(:locations, :cities)
+        raise Widget::WidgetDisabled.new("Widget disabled", :geography)
+      end
+    end
+
+    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")
+          .limit(limit)
+      end
+
+      @cities = paginate(results).map { |city| CityDecorator.new(city) }
+    end
+  end
+end

data/app/controllers/ahoy_captain/countries_controller.rb

@@ -0,0 +1,24 @@
+module AhoyCaptain
+  class CountriesController < ApplicationController
+    include Limitable
+    include Rangeable
+
+    before_action do
+      if Widget.disabled?(:locations, :countries)
+        raise Widget::WidgetDisabled.new("Widget disabled", :geography)
+      end
+    end
+
+    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")
+          .limit(limit)
+      end
+
+      @countries = paginate(results).map { |country| CountryDecorator.new(country) }
+    end
+  end
+end

data/app/controllers/ahoy_captain/devices_controller.rb

@@ -10,11 +10,14 @@ module AhoyCaptain
 
     def index
       results = cached(:devices, params[:devices_type]) do
-        DeviceQuery.call(params)
-                   .limit(limit)
+          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)
       end
 
-      @devices = results.map { |device| DeviceDecorator.new(device, self) }
+      @devices = results.map { |device| DeviceDecorator.new(device) }
     end
   end
 end

data/app/controllers/ahoy_captain/entry_pages_controller.rb

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

data/app/controllers/ahoy_captain/exit_pages_controller.rb

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

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

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

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| serialize(row.url) }
+          render json: query.map { |row| { text: 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.distinct("entry_pages.url").select("entry_pages.url as url")
-
-          render json: query.map { |row| serialize(row.url) }
+          query = event_query.all.with_url.distinct_url
+          render json: query.map { |row| { text: row.url } }
         end
 
       end

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

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

data/app/controllers/ahoy_captain/realtimes_controller.rb

@@ -1,7 +1,7 @@
 module AhoyCaptain
   class RealtimesController < ApplicationController
     def show
-      @total = event_query.where("#{AhoyCaptain.event.table_name}.time > ?", 1.minute.ago).distinct(:visit_id).count(:visit_id)
+      @total = event_query.where('time > ?', 1.minute.ago).distinct(:visit_id).count(:visit_id)
     end
   end
 end

data/app/controllers/ahoy_captain/regions_controller.rb

@@ -0,0 +1,24 @@
+module AhoyCaptain
+  class RegionsController < ApplicationController
+    include Limitable
+
+    before_action do
+      if Widget.disabled?(:locations, :regions)
+        raise Widget::WidgetDisabled.new("Widget disabled", :geography)
+      end
+    end
+
+    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)
+      end
+
+      @regions = paginate(results).map { |region| RegionDecorator.new(region) }
+    end
+  end
+end

data/app/controllers/ahoy_captain/sources_controller.rb

@@ -10,11 +10,14 @@ module AhoyCaptain
 
     def index
       results = cached(:sources) do
-        SourceQuery.call(params)
+        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")
                    .limit(limit)
       end
 
-      @sources = paginate(results).map { |source| AhoyCaptain::SourceDecorator.new(source, self) }
+      @sources = paginate(results).map { |source| AhoyCaptain::SourceDecorator.new(source) }
     end
   end
 

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

@@ -1,148 +1,6 @@
 module AhoyCaptain
   module Stats
     class BaseController < ApplicationController
-
-      INTERVAL_PERIOD = {
-        "realtime" => ["minute"],
-        "day" => ["minute", "hour"],
-        "7d" => ["hour", "day"],
-        "month" => ["day", "week"],
-        "all" => ["day", "week", "month"]
-      }
-
-      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)
-          params[:interval]
-        else
-          default_interval_for_period
-        end
-      end
-
-      def default_interval_for_period
-        default_interval_for_date_range(range)
-      end
-
-      def default_interval_for_date_range(range)
-        if range[1].nil?
-          # assume we're in a realtime
-          return INTERVAL_PERIOD["realtime"][0]
-        end
-        diff = (range[1] - range[0]).seconds.in_days
-        if diff >= 31
-          "month"
-        elsif diff > 1
-          "day"
-        elsif diff == 1
-          "hour"
-        else
-          "hour"
-        end
-      end
-
-      helper_method :available_intervals
-      def available_intervals
-        if range
-          return INTERVAL_PERIOD["realtime"] if range[1].nil?
-
-          diff = (range[1] - range[0]).seconds.in_days
-
-          if diff < 1
-            INTERVAL_PERIOD["day"]
-          elsif diff <= 7
-            INTERVAL_PERIOD["7d"]
-          elsif diff <= 31
-            INTERVAL_PERIOD["month"]
-          else
-            INTERVAL_PERIOD["all"]
-          end
-        else
-          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

@@ -1,11 +1,9 @@
 module AhoyCaptain
   module Stats
     class BounceRatesController < BaseController
-      # @todo: this is lazy
       def index
-        @stats = AhoyCaptain::Stats::BounceRatesQuery.call(params)
-        @stats = lazy_window(@stats.with_lazy_comparison(compare_mode?).group_by_period(selected_interval, "daily_bounce_rate.date").average("bounce_rate"))
-        @label = "Bounce Rate"
+        @stats = AhoyCaptain::Stats::BounceRatesQuery.call(params).group_by_day("ahoy_visits.started_at").average("num_events * 100")
+        #.group_by_day("ahoy_visits.started_at").average("total_events")
       end
     end
   end

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

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

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

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

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

@@ -2,9 +2,7 @@ module AhoyCaptain
   module Stats
     class UniqueVisitorsController < BaseController
       def index
-        @stats = AhoyCaptain::Stats::UniqueVisitorsQuery.call(params).with_lazy_comparison(compare_mode?).group_by_period(selected_interval, :started_at).count
-        @stats = lazy_window(@stats)
-        @label = "Visitors"
+        @stats = AhoyCaptain::Stats::UniqueVisitorsQuery.call(params).group_by_day(:started_at).count
       end
     end
   end

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

@@ -1,10 +1,15 @@
 module AhoyCaptain
   module Stats
     class ViewsPerVisitsController < BaseController
-      def index
-        @stats = lazy_window(AhoyCaptain::Stats::ViewsPerVisitQuery.call(params).with_lazy_comparison(compare_mode?).group_by_period(selected_interval, 'views_per_visit_table.started_at').average(:views_per_visit))
+      include Rangeable
 
-        @label = "Views"
+      def index
+        @stats = AhoyCaptain::Stats::ViewsPerVisitQuery.call(params).group_by_day('views_per_visit_table.started_at').average(:views_per_visit)
+        (range[0]..range[1]).to_a.each do |date|
+          unless @stats.key?(date.to_date)
+            @stats[date.to_date] = 2
+          end
+        end
       end
     end
   end

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

@@ -2,8 +2,7 @@ module AhoyCaptain
   module Stats
     class VisitDurationsController < BaseController
       def index
-        @stats = lazy_window(AhoyCaptain::Stats::VisitDurationQuery.call(params).with_lazy_comparison(compare_mode?).group_by_period(selected_interval, 'started_at').average(:duration))
-        @label = "Duration"
+        @stats = AhoyCaptain::Stats::VisitDurationQuery.call(params).group('started_at').average(:duration)
       end
     end
   end

data/app/controllers/ahoy_captain/top_pages_controller.rb

@@ -10,11 +10,17 @@ module AhoyCaptain
 
     def index
       results = cached(:top_pages) do
-        TopPageQuery.call(params)
+        event_query.with_routes.select(
+          "#{AhoyCaptain.config.event[:url_column]} as url",
+          "count(*) as count",
+          "sum(count(*)) over() as total_count"
+        )
+                   .group(Arel.sql ("(#{AhoyCaptain.config.event[:url_column]})"))
+                   .order(Arel.sql("count(#{AhoyCaptain.config.event[:url_column]}) desc"))
                    .limit(limit)
       end
 
-      @pages = paginate(results).map { |page| TopPageDecorator.new(page, self) }
+      @pages = paginate(results).map { |page| TopPageDecorator.new(page) }
     end
   end
 end

data/app/decorators/ahoy_captain/application_decorator.rb

@@ -1,39 +1,15 @@
-require 'csv'
-
 module AhoyCaptain
   class ApplicationDecorator
     attr_reader :object
 
-    def self.to_csv(collection, context)
-      rows = collection.map { |row| new(row, context) }
-      CSV.generate do |csv|
-        csv << csv_map(context.params).keys
-
-        rows.each do |row|
-          items = []
-          csv_map.values.each do |attr|
-            items << row.send(attr)
-          end
-
-          csv << items
-        end
-      end
-    end
-
-    def self.csv_map(params = {})
-      raise NotImplementedError
-    end
-
-    delegate_missing_to :object
-    def initialize(object, context)
+    def initialize(object)
       @object = object
-      @context = context
     end
 
     private
 
     def h
-      @h ||= @context.view_context
+      @h ||= Current.request.view_context
     end
 
     def params
@@ -52,7 +28,7 @@ module AhoyCaptain
     end
 
     def request
-      @context.request
+      Current.request.request
     end
   end
 end

data/app/decorators/ahoy_captain/campaign_decorator.rb

@@ -1,13 +1,5 @@
 module AhoyCaptain
   class CampaignDecorator < ApplicationDecorator
-
-    def self.csv_map(params = {})
-      {
-        params[:campaigns_type] => :label,
-        "Total" => :unit_amount
-      }
-    end
-
     def display_name
       if object.label == "Direct/None"
         value = ""