ahoy_captain 0.10.1 → 0.11.1

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

@@ -7,6 +7,7 @@
       <% end %>
     </div>
     <div>
+      <canvas id="overlay" width="600" height="400" style="position:absolute;pointer-events:none;"></canvas>
 
       <% if compare_mode? %>
         <canvas class="h-[300px] w-full"

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

@@ -1,10 +1,15 @@
 <%= turbo_frame_tag :stats, data: { controller: "active-frame-link" } do %>
-  <dl class="grid grid-cols-1 divide-y divide-base-200 overflow-hidden rounded-lg grid-cols-2 md:grid-cols-6 md:divide-y-0" data-controller="active-links" data-active-links-classes-value='["text-primary"]'>
-    <%= render stats_container(@presenter.unique_visitors, stats_unique_visitors_url(search_params), "Unique Visits", :number_with_delimiter, true) %>
-    <%= render stats_container(@presenter.total_visits, stats_total_visits_path(search_params), "Total Visits", :number_with_delimiter) %>
-    <%= render stats_container(@presenter.total_pageviews, stats_total_pageviews_path(search_params), "Total Pageviews", :number_with_delimiter) %>
-    <%= render stats_container(@presenter.views_per_visit, stats_views_per_visits_path(search_params), "Views per Visit", :number_with_delimiter) %>
-    <%= render stats_container(@presenter.bounce_rate, stats_bounce_rates_path(search_params), "Bounce Rate", :number_with_delimiter) %>
-    <%= render stats_container(@presenter.visit_duration, stats_visit_durations_url(search_params), "Visit Duration", :number_to_duration) %>
-  </dl>
+  <div class="grid grid-cols-1 divide-y divide-base-200 overflow-hidden rounded-lg grid-cols-2 md:grid-cols-6 md:divide-y-0" data-controller="active-links" data-active-links-classes-value='["text-primary"]'>
+    <% if @presenter.send(:range).realtime? %>
+      <%= render stats_container(@presenter.unique_visitors, stats_unique_visitors_url(search_params), "Unique Visits (30 min)", :number_with_delimiter, true) %>
+      <%= render stats_container(@presenter.total_pageviews, stats_total_pageviews_path(search_params), "Total Pageviews (30 min)", :number_with_delimiter) %>
+    <% else %>
+      <%= render stats_container(@presenter.unique_visitors, stats_unique_visitors_url(search_params), "Unique Visits", :number_with_delimiter, true) %>
+      <%= render stats_container(@presenter.total_visits, stats_total_visits_path(search_params), "Total Visits", :number_with_delimiter) %>
+      <%= render stats_container(@presenter.total_pageviews, stats_total_pageviews_path(search_params), "Total Pageviews", :number_with_delimiter) %>
+      <%= render stats_container(@presenter.views_per_visit, stats_views_per_visits_path(search_params), "Views per Visit", :number_with_delimiter) %>
+      <%= render stats_container(@presenter.bounce_rate, stats_bounce_rates_path(search_params), "Bounce Rate", :number_with_delimiter) %>
+      <%= render stats_container(@presenter.visit_duration, stats_visit_durations_url(search_params), "Visit Duration", :number_to_duration) %>
+    <% end %>
+  </div>
 <% end %>

data/config/routes.rb

@@ -12,15 +12,19 @@ AhoyCaptain::Engine.routes.draw do
     get "/devices/#{k}" => 'devices#index', defaults: { devices_type: v }, as: "devices_#{k}"
   end
 
+  namespace :locations do
+    resource :map, only: [:show]
+    resources :countries, only: [:index]
+    resources :regions, only: [:index]
+    resources :cities, only: [:index]
+  end
+
   resources :properties, only: [:index, :show]
   resource :export, only: [:show]
   resource :realtime, only: [:show]
   resources :funnels, only: [:show]
   resources :goals, only: [:index]
   resource :stats, only: [:show]
-  resources :countries, only: [:index]
-  resources :regions, only: [:index]
-  resources :cities, only: [:index]
   resources :campaigns, only: [:index]
   resources :sources, only: [:index]
   resources :exit_pages, only: [:index]

data/lib/ahoy_captain/filters_configuration.rb

@@ -31,11 +31,11 @@ module AhoyCaptain
         end
 
         config.register("UTM Tags") do
-          filter column: :utm_medium, label: "UTM Medium", url: :filters_utm_mediums_path, predicates: [:in, :not_in]
-          filter column: :utm_source, label: "UTM Source", url: :filters_utm_sources_path, predicates: [:in, :not_in]
-          filter column: :utm_campaign, label: "UTM Campaign", url: :filters_utm_campaigns_path, predicates: [:in, :not_in]
-          filter column: :utm_term, label: "UTM Term", url: :filters_utm_terms_path, predicates: [:in, :not_in]
-          filter column: :utm_content, label: "UTM Content", url: :filters_utm_contents_path, predicates: [:in, :not_in]
+          filter column: :utm_medium, label: "UTM Medium", url: :filters_utm_mediums_path, predicates: [:in, :not_in, :cont]
+          filter column: :utm_source, label: "UTM Source", url: :filters_utm_sources_path, predicates: [:in, :not_in, :cont]
+          filter column: :utm_campaign, label: "UTM Campaign", url: :filters_utm_campaigns_path, predicates: [:in, :not_in, :cont]
+          filter column: :utm_term, label: "UTM Term", url: :filters_utm_terms_path, predicates: [:in, :not_in, :cont]
+          filter column: :utm_content, label: "UTM Content", url: :filters_utm_contents_path, predicates: [:in, :not_in, :cont]
         end
 
         config.register("Goal") do

data/lib/ahoy_captain/version.rb

@@ -1,3 +1,3 @@
 module AhoyCaptain
-  VERSION = "0.10.1"
+  VERSION = "0.11.1"
 end

data/lib/ahoy_captain.rb

@@ -32,6 +32,7 @@ module AhoyCaptain
         pin "Chart.bundle", to: "Chart.bundle.js"
         pin "chartjs-plugin-datalabels", to: "https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2", preload: true
         pin "classnames", to: "https://cdnjs.cloudflare.com/ajax/libs/classnames/2.3.2/index.min.js", preload: true
+        pin "chartjs-chart-geo", to: "https://unpkg.com/chartjs-chart-geo@4", preload: true
         pin_all_from AhoyCaptain::Engine.root.join("app/assets/javascript/ahoy_captain/controllers"), under: "controllers", to: "ahoy_captain/controllers"
         pin_all_from AhoyCaptain::Engine.root.join("app/assets/javascript/ahoy_captain/helpers"), under: "helpers", to: "ahoy_captain/helpers"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_captain
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - joshmn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,6 +262,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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:
@@ -278,7 +362,6 @@ files:
 - app/assets/images/ahoy_captain/logo.png
 - app/assets/images/ahoy_captain/safari-pinned-tab.svg
 - app/assets/javascript/ahoy_captain/application.js
-- app/assets/javascript/ahoy_captain/controllers/active_links_controller.js
 - app/assets/javascript/ahoy_captain/controllers/application.js
 - app/assets/javascript/ahoy_captain/controllers/application_controller.js
 - app/assets/javascript/ahoy_captain/controllers/combobox_controller.js
@@ -287,10 +370,12 @@ files:
 - app/assets/javascript/ahoy_captain/controllers/filter/item_controller.js
 - app/assets/javascript/ahoy_captain/controllers/filter_form_controller.js
 - app/assets/javascript/ahoy_captain/controllers/filter_modal_controller.js
+- app/assets/javascript/ahoy_captain/controllers/frame_link_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/line_chart_controller.js
+- app/assets/javascript/ahoy_captain/controllers/map_controller.js
 - app/assets/javascript/ahoy_captain/controllers/predicate_select_controller.js
 - app/assets/javascript/ahoy_captain/controllers/properties_controller.js
 - app/assets/javascript/ahoy_captain/controllers/property_filter_controller.js
@@ -298,10 +383,12 @@ files:
 - app/assets/javascript/ahoy_captain/controllers/tile_controller.js
 - app/assets/javascript/ahoy_captain/controllers/toggle_controller.js
 - app/assets/javascript/ahoy_captain/helpers/chart_utils.js
+- app/assets/javascript/ahoy_captain/helpers/countries.js
 - app/assets/javascript/ahoy_captain/helpers/number_formatters.js
 - app/assets/manifest/ahoy_captain/manifest.js
 - app/components/ahoy_captain/combobox_component.html.erb
 - app/components/ahoy_captain/combobox_component.rb
+- app/components/ahoy_captain/comparison_link_component.html.erb
 - app/components/ahoy_captain/comparison_link_component.rb
 - app/components/ahoy_captain/dropdown_button_component.html.erb
 - app/components/ahoy_captain/dropdown_button_component.rb
@@ -317,6 +404,8 @@ files:
 - app/components/ahoy_captain/filter/tag_component.rb
 - app/components/ahoy_captain/filter/tag_container_component.html.erb
 - app/components/ahoy_captain/filter/tag_container_component.rb
+- app/components/ahoy_captain/previous_next_component.html.erb
+- app/components/ahoy_captain/previous_next_component.rb
 - app/components/ahoy_captain/stats/comparable_container_component.html.erb
 - app/components/ahoy_captain/stats/comparable_container_component.rb
 - app/components/ahoy_captain/stats/container_component.html.erb
@@ -343,8 +432,6 @@ files:
 - app/components/ahoy_captain/tooltip_component.rb
 - app/controllers/ahoy_captain/application_controller.rb
 - app/controllers/ahoy_captain/campaigns_controller.rb
-- app/controllers/ahoy_captain/cities_controller.rb
-- app/controllers/ahoy_captain/countries_controller.rb
 - app/controllers/ahoy_captain/devices_controller.rb
 - app/controllers/ahoy_captain/entry_pages_controller.rb
 - app/controllers/ahoy_captain/exit_pages_controller.rb
@@ -364,9 +451,12 @@ files:
 - app/controllers/ahoy_captain/filters/utms_controller.rb
 - app/controllers/ahoy_captain/funnels_controller.rb
 - app/controllers/ahoy_captain/goals_controller.rb
+- app/controllers/ahoy_captain/locations/cities_controller.rb
+- app/controllers/ahoy_captain/locations/countries_controller.rb
+- app/controllers/ahoy_captain/locations/maps_controller.rb
+- app/controllers/ahoy_captain/locations/regions_controller.rb
 - app/controllers/ahoy_captain/properties_controller.rb
 - app/controllers/ahoy_captain/realtimes_controller.rb
-- app/controllers/ahoy_captain/regions_controller.rb
 - app/controllers/ahoy_captain/roots_controller.rb
 - app/controllers/ahoy_captain/sources_controller.rb
 - app/controllers/ahoy_captain/stats/base_controller.rb
@@ -428,10 +518,6 @@ files:
 - app/queries/concerns/ahoy_captain/lazy_comparable_query.rb
 - app/views/ahoy_captain/campaigns/index.html+details.erb
 - app/views/ahoy_captain/campaigns/index.html.erb
-- app/views/ahoy_captain/cities/index.html+details.erb
-- app/views/ahoy_captain/cities/index.html.erb
-- app/views/ahoy_captain/countries/index.html+details.erb
-- app/views/ahoy_captain/countries/index.html.erb
 - app/views/ahoy_captain/devices/_table.html.erb
 - app/views/ahoy_captain/devices/index.html+details.erb
 - app/views/ahoy_captain/devices/index.html.erb
@@ -443,12 +529,18 @@ files:
 - app/views/ahoy_captain/funnels/show.html.erb
 - app/views/ahoy_captain/goals/index.html.erb
 - app/views/ahoy_captain/layouts/application.html.erb
+- app/views/ahoy_captain/layouts/shared/_tile_loader.html.erb
+- app/views/ahoy_captain/locations/cities/index.html+details.erb
+- app/views/ahoy_captain/locations/cities/index.html.erb
+- app/views/ahoy_captain/locations/countries/index.html+details.erb
+- app/views/ahoy_captain/locations/countries/index.html.erb
+- app/views/ahoy_captain/locations/maps/show.html.erb
+- app/views/ahoy_captain/locations/regions/index.html+details.erb
+- app/views/ahoy_captain/locations/regions/index.html.erb
 - app/views/ahoy_captain/properties/_form.html.erb
 - app/views/ahoy_captain/properties/index.html.erb
 - app/views/ahoy_captain/properties/show.html.erb
 - app/views/ahoy_captain/realtimes/show.html.erb
-- app/views/ahoy_captain/regions/index.html+details.erb
-- app/views/ahoy_captain/regions/index.html.erb
 - app/views/ahoy_captain/roots/_filters.html.erb
 - app/views/ahoy_captain/roots/show.html.erb
 - app/views/ahoy_captain/sources/index.html+details.erb

data/app/assets/javascript/ahoy_captain/controllers/active_links_controller.js

@@ -1,30 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-export default class extends Controller {
-  static targets = ["link", "alt"]
-  static values = {
-    classes: { type: Array, default: ["text-primary", "font-semibold"] }
-  }
-
-  // sometimes the target is not the link itself but a child element, and we want to highlight something other than the
-  // link itself.
-  // this can be bettered
-  connect() {
-    this.handleLinkClick = (event) => {
-      let link = null;
-      if(event.target.tagName === "A") {
-        link = event.target;
-      } else {
-        link = (event.target.closest('a').querySelector('[data-active-links-target="link"]'))
-      }
-      this.linkTargets.forEach(link => this.classesValue.forEach(klass => link.classList.remove(klass)))
-      this.classesValue.forEach(klass => link.classList.add(klass))
-    }
-    this.linkTargets.forEach(link => {
-      link.addEventListener('click', this.handleLinkClick)
-    })
-    this.altTargets.forEach(target => {
-      target.addEventListener('click', this.handleLinkClick)
-    })
-  }
-}

data/app/controllers/ahoy_captain/cities_controller.rb

@@ -1,20 +0,0 @@
-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
-        CityQuery.call(params)
-          .limit(limit)
-      end
-
-      @cities = paginate(results).map { |city| CityDecorator.new(city, self) }
-    end
-  end
-end

data/app/controllers/ahoy_captain/countries_controller.rb

@@ -1,20 +0,0 @@
-module AhoyCaptain
-  class CountriesController < ApplicationController
-    include Limitable
-
-    before_action do
-      if Widget.disabled?(:locations, :countries)
-        raise Widget::WidgetDisabled.new("Widget disabled", :geography)
-      end
-    end
-
-    def index
-      results = cached(:countries) do
-        CountryQuery.call(params)
-          .limit(limit)
-      end
-
-      @countries = paginate(results).map { |country| CountryDecorator.new(country, self) }
-    end
-  end
-end

data/app/controllers/ahoy_captain/regions_controller.rb

@@ -1,20 +0,0 @@
-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
-        RegionQuery.call(params)
-                   .limit(limit)
-      end
-
-      @regions = paginate(results).map { |region| RegionDecorator.new(region, self) }
-    end
-  end
-end