ahoy_captain 0.77 → 0.81

data/app/views/ahoy_captain/goals/index.html.erb

@@ -10,21 +10,21 @@
       <div class="grow">
         <% if @presenter.goals.respond_to?(:each) && @presenter.goals.any? %>
           <% @presenter.goals.each do |item| %>
+
             <div class='leading-10 flex relative'>
-              <progress class='progress-primary bg-base-100 h-8 grow' value="<%= item.uniques %>" max="<%= item.total %>">
+              <progress class='progress-primary bg-base-100 h-8 grow' value="<%= item.cr %>" max="100">
               </progress>
               <span class="grow text-elipsis overflow-hidden absolute left-4 bottom-3 h-8 text-base-content">
               <%= item.name %>
             </span>
               <span class="w-8 ml-8 text-right">
-              <%= render AhoyCaptain::TooltipComponent.new(amount: item.uniques) %>
+              <%= render AhoyCaptain::TooltipComponent.new(amount: item.unique_visits) %>
             </span>
               <span class="w-8 ml-8 text-right">
-              <%= render AhoyCaptain::TooltipComponent.new(amount: item.total) %>
+              <%= render AhoyCaptain::TooltipComponent.new(amount: item.total_events) %>
             </span>
-
               <span class="w-8 ml-8 text-right">
-                <%= item.conversion_rate %>%
+                <%= item.cr %>%
               </span>
             </div>
           <% end %>

data/app/views/ahoy_captain/roots/show.html.erb

@@ -15,7 +15,7 @@
     <%= render AhoyCaptain::TileComponent.new(title: 'Top Sources') do |component| %>
       <% component.with_display_links do %>
         <div data-controller='link' data-link-top_sources-class="text-primary underline">
-        <a href="<%= sources_path(search_params) %>"data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>All</a>
+        <a href="<%= sources_path(search_params) %>" data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>All</a>
         <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Campaign") do |dropdown| %>
           <% %w{utm_source utm_medium utm_term utm_content utm_campaign}.each do |source| %>
             <% dropdown.with_option do %>

data/app/views/ahoy_captain/stats/base/index.html.erb

@@ -1,3 +1,11 @@
 <%= turbo_frame_tag :chart do %>
-  <%= line_chart @stats %>
+  <div class="flex justify-end gap-3 items-center">
+    <a href="<%= export_path(request.query_parameters) %>" target="_blank" data-turbo-frame="false">Download</a>
+    <%= form_with url: url_for(params.permit!), method: :get, data: { controller: "interval" } do %>
+      <%= select_tag :interval, options_for_select(available_intervals.collect { |interval| [interval.titleize, interval] }, selected: selected_interval), class: "select select-bordered select-sm w-full max-w-sm", 'data-action': "change->interval#handleChange" %>
+    <% end %>
+  </div>
+  <div>
+    <%= line_chart @stats %>
+  </div>
 <% end %>

data/app/views/ahoy_captain/stats/show.html.erb

@@ -38,7 +38,7 @@
       <dt class="text-base font-normal text-base-content">Bounce rate</dt>
       <dd class="mt-1 flex items-baseline justify-between md:block lg:flex">
         <div class="flex items-baseline text-2xl font-semibold text-accent-content">
-          <%= number_with_delimiter @presenter.bounce_rate * 100 %>%
+          <%= number_with_delimiter @presenter.bounce_rate %>%
         </div>
       </dd>
     </a>

data/config/routes.rb

@@ -12,6 +12,7 @@ AhoyCaptain::Engine.routes.draw do
     get "/devices/#{k}" => 'devices#index', defaults: { devices_type: v }, as: "devices_#{k}"
   end
 
+  resource :export, only: [:show]
   resource :realtime, only: [:show]
   resources :funnels, only: [:show]
   resources :goals, only: [:index]

data/lib/ahoy_captain/ahoy/event_methods.rb

@@ -5,7 +5,7 @@ module AhoyCaptain
 
       included do
         ransacker :route do |parent|
-          Arel.sql(AhoyCaptain.config.event[:url_column].gsub("properties", "ahoy_events.properties"))
+          Arel.sql(AhoyCaptain.config.event[:url_column])
         end
 
         scope :with_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }

data/lib/ahoy_captain/configuration.rb

@@ -16,8 +16,8 @@ module AhoyCaptain
       end
       @event = ActiveSupport::OrderedOptions.new.tap do |option|
         option.view_name = "$view"
-        option.url_column = "CONCAT(properties->>'controller', '#', properties->>'action')"
-        option.url_exists = "JSONB_EXISTS(properties, 'controller') AND JSONB_EXISTS(properties, 'action')"
+        option.url_column = "CONCAT(ahoy_events.properties->>'controller', '#', ahoy_events.properties->>'action')"
+        option.url_exists = "JSONB_EXISTS(ahoy_events.properties, 'controller') AND JSONB_EXISTS(ahoy_events.properties, 'action')"
       end
       @models = ActiveSupport::OrderedOptions.new.tap do |option|
         option.event = "::Ahoy::Event"

data/lib/ahoy_captain/engine.rb

@@ -6,6 +6,7 @@ require 'view_component'
 require 'chartkick'
 require 'groupdate'
 require 'pagy'
+require 'zip'
 
 module AhoyCaptain
   class Engine < Rails::Engine

data/lib/ahoy_captain/goals.rb

@@ -1,19 +1,23 @@
 module AhoyCaptain
   class Goal
     attr_accessor :id
-    attr_reader :title, :event_name
+    attr_reader :title, :event_query
     def initialize
       @id = nil
       @title = nil
-      @event_name = nil
+      @event_query = nil
     end
 
     def label(value)
       @title = value
     end
 
-    def event(value)
-      @event_name = value
+    def name(value)
+      @event_query = -> { AhoyCaptain.event.where(name: value) }
+    end
+
+    def query(&block)
+      @event_query = block
     end
   end
 

data/lib/ahoy_captain/period_collection.rb

@@ -51,7 +51,7 @@ module AhoyCaptain
       }.each do |param, options|
         instance.add(param, options[:label], options[:range])
       end
-      instance.default = :mtd
+      instance.default = :'30d'
       instance
     end
 

data/lib/ahoy_captain/version.rb

@@ -1,3 +1,3 @@
 module AhoyCaptain
-  VERSION = "0.77"
+  VERSION = "0.81"
 end

data/lib/generators/ahoy_captain/migration_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators"
+require "rails/generators/active_record"
+
+module AhoyCaptain
+  module Generators
+    class MigrationGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
+
+      def copy_templates
+        migration_template "migration.rb", "db/migrate/create_ahoy_captain_indexes.rb", migration_version: migration_version
+      end
+
+      private
+
+      def migration_version
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+      end
+    end
+  end
+end

data/lib/generators/ahoy_captain/templates/config.rb.tt

@@ -1,4 +1,4 @@
-AhoyCaptain.configure do
+AhoyCaptain.configure do |config|
   # ==> Event tracking
   #
   # View name
@@ -74,6 +74,12 @@ AhoyCaptain.configure do
   #
   # And handle the default range, which will be used if no range is given:
   # config.ranges.default = '3d'
+  #
+  # The max range if a custom range is sent
+  # config.ranges.max = 180.days
+  #
+  # Set to false to disable custom ranges
+  # config.ranges.custom = true
 
   # ==> Caching
   # config.cache.enabled = false
@@ -91,14 +97,23 @@ AhoyCaptain.configure do
   #
   #   config.goal :unique_id do
   #     label "Some label here"
-  #     event "The event name you're tracking in your Ahoy::Event table"
+  #     name "The event name you're tracking in your Ahoy::Event table"
   #   end
   #
   # Real-world example:
   #
   #   config.goal :appointment_paid do
   #     label "Appointment Paid"
-  #     event "$appointment.paid"
+  #     name "$appointment.paid"
+  #   end
+  #
+  # You can also use queries:
+  #
+  #   config.goal :appointment_paid do
+  #     label "Appointment Paid"
+  #     query do
+  #       ::Ahoy::Event.where(...)
+  #     end
   #   end
 
   # ==> Funnels

data/lib/generators/ahoy_captain/templates/migration.rb.tt

@@ -0,0 +1,7 @@
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_index :<%= ::AhoyCaptain.visit.table_name %>, :started_at unless index_exists?(:<%= ::AhoyCaptain.visit.table_name %>, :started_at)
+    add_index :<%= ::AhoyCaptain.event.table_name %>, :visit_id unless index_exists?(:<%= ::AhoyCaptain.event.table_name %>, :visit_id)
+    add_index :<%= ::AhoyCaptain.event.table_name %>, :time unless index_exists?(:<%= ::AhoyCaptain.event.table_name %>, :time)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_captain
 version: !ruby/object:Gem::Version
-  version: '0.77'
+  version: '0.81'
 platform: ruby
 authors:
 - joshmn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +262,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pp_sql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A full-featured, mountable analytics dashboard for your Rails app, powered
   by Ahoy.
 email:
@@ -272,6 +300,7 @@ files:
 - app/assets/javascript/ahoy_captain/controllers/filter_tag_controller.js
 - app/assets/javascript/ahoy_captain/controllers/funnel_chart_controller.js
 - app/assets/javascript/ahoy_captain/controllers/index.js
+- app/assets/javascript/ahoy_captain/controllers/interval_controller.js
 - app/assets/javascript/ahoy_captain/controllers/link_controller.js
 - app/assets/javascript/ahoy_captain/controllers/navigation_controller.js
 - app/assets/javascript/ahoy_captain/controllers/realtime_controller.js
@@ -303,6 +332,7 @@ files:
 - app/controllers/ahoy_captain/devices_controller.rb
 - app/controllers/ahoy_captain/entry_pages_controller.rb
 - app/controllers/ahoy_captain/exit_pages_controller.rb
+- app/controllers/ahoy_captain/exports_controller.rb
 - app/controllers/ahoy_captain/filters/base_controller.rb
 - app/controllers/ahoy_captain/filters/locations_controller.rb
 - app/controllers/ahoy_captain/filters/operating_systems/names_controller.rb
@@ -340,18 +370,23 @@ files:
 - app/decorators/ahoy_captain/source_decorator.rb
 - app/decorators/ahoy_captain/top_page_decorator.rb
 - app/helpers/ahoy_captain/application_helper.rb
-- app/models/ahoy_captain/current.rb
+- app/models/ahoy_captain/export.rb
 - app/models/ahoy_captain/rangeable.rb
-- app/models/ahoy_captain/url_helpers.rb
 - app/models/ahoy_captain/widget.rb
 - app/models/concerns/ahoy_captain/range_options.rb
 - app/presenters/ahoy_captain/dashboard_presenter.rb
 - app/presenters/ahoy_captain/funnel_presenter.rb
 - app/presenters/ahoy_captain/goals_presenter.rb
 - app/queries/ahoy_captain/application_query.rb
+- app/queries/ahoy_captain/campaign_query.rb
+- app/queries/ahoy_captain/city_query.rb
+- app/queries/ahoy_captain/country_query.rb
+- app/queries/ahoy_captain/device_query.rb
 - app/queries/ahoy_captain/entry_pages_query.rb
 - app/queries/ahoy_captain/event_query.rb
 - app/queries/ahoy_captain/exit_pages_query.rb
+- app/queries/ahoy_captain/region_query.rb
+- app/queries/ahoy_captain/source_query.rb
 - app/queries/ahoy_captain/stats/average_views_per_visit_query.rb
 - app/queries/ahoy_captain/stats/average_visit_duration_query.rb
 - app/queries/ahoy_captain/stats/bounce_rates_query.rb
@@ -360,6 +395,7 @@ files:
 - app/queries/ahoy_captain/stats/unique_visitors_query.rb
 - app/queries/ahoy_captain/stats/views_per_visit_query.rb
 - app/queries/ahoy_captain/stats/visit_duration_query.rb
+- app/queries/ahoy_captain/top_page_query.rb
 - app/queries/ahoy_captain/visit_query.rb
 - app/views/ahoy_captain/campaigns/index.html+details.erb
 - app/views/ahoy_captain/campaigns/index.html.erb
@@ -400,7 +436,9 @@ files:
 - lib/ahoy_captain/railtie.rb
 - lib/ahoy_captain/version.rb
 - lib/generators/ahoy_captain/install_generator.rb
+- lib/generators/ahoy_captain/migration_generator.rb
 - lib/generators/ahoy_captain/templates/config.rb.tt
+- lib/generators/ahoy_captain/templates/migration.rb.tt
 homepage:
 licenses:
 - MIT

data/app/models/ahoy_captain/current.rb

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

data/app/models/ahoy_captain/url_helpers.rb

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