ahoy_matey 4.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021c0b07d7cddf6a22125683bb5b1d18a078f1ff1f504cca066d4069c6014357
-  data.tar.gz: d49b52ce94f4c7436df4d054324639f9e5cd951fe459a11ca28aaab36231bd19
+  metadata.gz: 9161dead45561a928523eb7d5ed70be20c67c8629499c35cb428271d714895a7
+  data.tar.gz: f17eb958ee297a4eda86388e0458a04a2a39de5b868076521eb65dd6e4cbc21a
 SHA512:
-  metadata.gz: 6082fea0363bb2f25b7309876a36a1982894d3dcc2dc905da2278ab0ca41257f1c322001c86deb36168dbd1649c87199ec65990c9e7307b407b3f96fdb7a2bac
-  data.tar.gz: d833375e6cdb800b51072ed3d3c269e55c21c06287cde4a351022c331b36dd4b9aa812afa7b33156ee7a7b745d08a53b0d726000a919fd616300c0f6149a51b4
+  metadata.gz: c68fa7030244573a75b72167d163a8a0f2cfb5ef01e3718980ea25e5c13a5936973d0d5f83d3302f9e610508d94758ec0587f6fe4dd19c7c23668181ea1dcfe0
+  data.tar.gz: 7950a3cd2dda3818e21a6da37ab0d1b49b01d22110c76f0ae1abd15abba7aaa6140db24d70cedb4d5af0c5022f2b95a2f7e5a11339425eefb51240bb9ea17578

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 5.2.0 (2024-09-04)
+
+- Improved error handling for invalid API parameters
+
+## 5.1.0 (2024-03-26)
+
+- Added support for Trilogy
+- Updated Ahoy.js to 0.4.4
+
+## 5.0.2 (2023-10-05)
+
+- Excluded visits from Rails health check
+
+## 5.0.1 (2023-10-01)
+
+- Fixed error with geocoding with anonymity sets
+
+## 5.0.0 (2023-10-01)
+
+- Changed visits to expire with anonymity sets
+- Fixed error when Active Job is not available
+- Fixed deprecation warning with Rails 7.1
+- Dropped support for Ruby < 3 and Rails < 6.1
+- Dropped support for Mongoid 6
+
+## 4.2.1 (2023-02-23)
+
+- Updated Ahoy.js to 0.4.2
+
+## 4.2.0 (2023-02-07)
+
+- Added primary key type to generated migration
+- Updated Ahoy.js to 0.4.1
+
 ## 4.1.0 (2022-06-12)
 
 - Ensure `exclude_method` is only called once per request

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2022 Andrew Kane
+Copyright (c) 2014-2024 Andrew Kane
 
 MIT License
 

data/README.md

@@ -4,13 +4,13 @@
 
 Track visits and events in Ruby, JavaScript, and native apps. Data is stored in your database by default, and you can customize it for any data store as you grow.
 
-**Ahoy 4.0 was recently released** - see [how to upgrade](#upgrading)
+**Ahoy 5.0 was recently released** - see [how to upgrade](#upgrading)
 
 :postbox: Check out [Ahoy Email](https://github.com/ankane/ahoy_email) for emails and [Field Test](https://github.com/ankane/field_test) for A/B testing
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-[![Build Status](https://github.com/ankane/ahoy/workflows/build/badge.svg?branch=master)](https://github.com/ankane/ahoy/actions)
+[![Build Status](https://github.com/ankane/ahoy/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/ahoy/actions)
 
 ## Installation
 
@@ -48,7 +48,7 @@ And restart your web server.
 
 ### JavaScript
 
-For Rails 7 / Importmap, add to `config/importmap.rb`:
+For Importmap (Rails 7 default), add to `config/importmap.rb`:
 
 ```ruby
 pin "ahoy", to: "ahoy.js"
@@ -60,7 +60,7 @@ And add to `app/javascript/application.js`:
 import "ahoy"
 ```
 
-For Rails 6 / Webpacker, run:
+For Webpacker (Rails 6 default), run:
 
 ```sh
 yarn add ahoy.js
@@ -72,7 +72,7 @@ And add to `app/javascript/packs/application.js`:
 import ahoy from "ahoy.js"
 ```
 
-For Rails 5 / Sprockets, add to `app/assets/javascripts/application.js`:
+For Sprockets, add to `app/assets/javascripts/application.js`:
 
 ```javascript
 //= require ahoy
@@ -197,7 +197,7 @@ Order.joins(:ahoy_visit).group("device_type").count
 Here’s what the migration to add the `ahoy_visit_id` column should look like:
 
 ```ruby
-class AddAhoyVisitToOrders < ActiveRecord::Migration[7.0]
+class AddAhoyVisitToOrders < ActiveRecord::Migration[7.2]
   def change
     add_reference :orders, :ahoy_visit
   end
@@ -212,7 +212,7 @@ visitable :sign_up_visit
 
 ### Users
 
-Ahoy automatically attaches the `current_user` to the visit. With [Devise](https://github.com/plataformatec/devise), it attaches the user even if they sign in after the visit starts.
+Ahoy automatically attaches the `current_user` to the visit. With [Devise](https://github.com/heartcombo/devise), it attaches the user even if they sign in after the visit starts.
 
 With other authentication frameworks, add this to the end of your sign in method:
 
@@ -262,28 +262,6 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-#### Knock
-
-To attach the user with [Knock](https://github.com/nsarno/knock), either include `Knock::Authenticable`in `ApplicationController`:
-
-```ruby
-class ApplicationController < ActionController::API
-  include Knock::Authenticable
-end
-```
-
-Or include it in Ahoy:
-
-```ruby
-Ahoy::BaseController.include Knock::Authenticable
-```
-
-And use:
-
-```ruby
-Ahoy.user_method = ->(controller) { controller.send(:authenticate_entity, "user") }
-```
-
 ### Exclusions
 
 Bots are excluded from tracking by default. To include them, use:
@@ -308,6 +286,14 @@ By default, a new visit is created after 4 hours of inactivity. Change this with
 Ahoy.visit_duration = 30.minutes
 ```
 
+### Visitor Duration
+
+By default, a new `visitor_token` is generated after 2 years. Change this with:
+
+```ruby
+Ahoy.visitor_duration = 30.days
+```
+
 ### Cookies
 
 To track visits across multiple subdomains, use:
@@ -326,15 +312,15 @@ You can also [disable cookies](#anonymity-sets--cookies)
 
 ### Token Generation
 
-Ahoy uses random UUIDs for visit and visitor tokens by default, but you can use your own generator like [Druuid](https://github.com/recurly/druuid).
+Ahoy uses random UUIDs for visit and visitor tokens by default, but you can use your own generator like [ULID](https://github.com/rafaelsales/ulid).
 
 ```ruby
-Ahoy.token_generator = -> { Druuid.gen }
+Ahoy.token_generator = -> { ULID.generate }
 ```
 
 ### Throttling
 
-You can use [Rack::Attack](https://github.com/kickstarter/rack-attack) to throttle requests to the API.
+You can use [Rack::Attack](https://github.com/rack/rack-attack) to throttle requests to the API.
 
 ```ruby
 class Rack::Attack
@@ -378,13 +364,17 @@ Ahoy.job_queue = :low_priority
 
 ### Local Geocoding
 
-For privacy and performance, we recommend geocoding locally. Add this line to your application’s Gemfile:
+For privacy and performance, we recommend geocoding locally.
+
+For city-level geocoding, download the [GeoLite2 City database](https://dev.maxmind.com/geoip/geolite2-free-geolocation-data).
+
+Add this line to your application’s Gemfile:
 
 ```ruby
 gem "maxminddb"
 ```
 
-For city-level geocoding, download the [GeoLite2 City database](https://dev.maxmind.com/geoip/geoip2/geolite2/) and create `config/initializers/geocoder.rb` with:
+And create `config/initializers/geocoder.rb` with:
 
 ```ruby
 Geocoder.configure(
@@ -401,6 +391,12 @@ For country-level geocoding, install the `geoip-database` package. It’s preins
 sudo apt-get install geoip-database
 ```
 
+Add this line to your application’s Gemfile:
+
+```ruby
+gem "geoip"
+```
+
 And create `config/initializers/geocoder.rb` with:
 
 ```ruby
@@ -450,7 +446,7 @@ class Ahoy::Store < Ahoy::DatabaseStore
 end
 
 Ahoy.mask_ips = true
-Ahoy.cookies = false
+Ahoy.cookies = :none
 ```
 
 This:
@@ -488,20 +484,20 @@ end
 
 ### Anonymity Sets & Cookies
 
-Ahoy can switch from cookies to [anonymity sets](https://privacypatterns.org/patterns/Anonymity-set). Instead of cookies, visitors with the same IP mask and user agent are grouped together in an anonymity set.
+Ahoy can switch from cookies to [anonymity sets](https://privacypatterns.org/patterns/Anonymity-set). Instead of cookies, visitors with the same IP mask and user agent are grouped together in an anonymity set.
 
 ```ruby
-Ahoy.cookies = false
+Ahoy.cookies = :none
 ```
 
+Note: If Ahoy was installed before v5, [add an index](#50) before making this change.
+
 Previously set cookies are automatically deleted. If you use JavaScript tracking, also set:
 
 ```javascript
 ahoy.configure({cookies: false});
 ```
 
-Note: With anonymity sets, visits no longer expire after 4 hours of inactivity. A new visit is only created when the IP mask or user agent changes (for instance, when a user updates their browser). There are plans to address this in the next major version.
-
 ## Data Retention
 
 Data should only be retained for as long as it’s needed. Delete older data with:
@@ -639,7 +635,7 @@ end
 
 [Blazer](https://github.com/ankane/blazer) is a great tool for exploring your data.
 
-With ActiveRecord, you can do:
+With Active Record, you can do:
 
 ```ruby
 Ahoy::Visit.group(:search_keyword).count
@@ -777,19 +773,29 @@ Send a `POST` request to `/ahoy/events` with `Content-Type: application/json` an
 
 ## Upgrading
 
-### 4.0
+### 5.0
 
-There are two notable changes to geocoding:
+Visits now expire with anonymity sets. If using `Ahoy.cookies = false`, a new index is needed.
 
-1. Geocoding is now disabled by default (this was already the case for new installations with 3.2.0+). Check out the instructions for [how to enable it](#geocoding).
+For Active Record, create a migration with:
 
-2. The `geocoder` gem is now an optional dependency. To use geocoding, add it to your Gemfile:
+```ruby
+add_index :ahoy_visits, [:visitor_token, :started_at]
+```
 
-  ```ruby
-  gem "geocoder"
-  ```
+For Mongoid, set:
 
-Also, check out the [upgrade notes](https://github.com/ankane/ahoy.js#upgrading) for Ahoy.js.
+```ruby
+class Ahoy::Visit
+  index({visitor_token: 1, started_at: 1})
+end
+```
+
+Create the index before upgrading, and set:
+
+```ruby
+Ahoy.cookies = :none
+```
 
 ## History
 
@@ -813,26 +819,10 @@ bundle install
 bundle exec rake test
 ```
 
-To test Mongoid, use:
+To test different adapters, use:
 
 ```sh
+ADAPTER=postgresql bundle exec rake test
+ADAPTER=mysql2 bundle exec rake test
 ADAPTER=mongoid bundle exec rake test
 ```
-
-To test query methods, use:
-
-```sh
-# Postgres
-createdb ahoy_test
-bundle exec rake test:query_methods:postgresql
-
-# SQLite
-bundle exec rake test:query_methods:sqlite
-
-# MySQL and MariaDB
-mysqladmin create ahoy_test
-bundle exec rake test:query_methods:mysql
-
-# MongoDB
-bundle exec rake test:query_methods:mongoid
-```

data/app/controllers/ahoy/events_controller.rb

@@ -17,12 +17,23 @@ module Ahoy
           begin
             ActiveSupport::JSON.decode(data)
           rescue ActiveSupport::JSON.parse_error
-            # do nothing
+            # TODO change to nil in Ahoy 6
             []
           end
         end
 
-      events.first(Ahoy.max_events_per_request).each do |event|
+      max_events_per_request = Ahoy.max_events_per_request
+
+      # check before creating any events
+      unless events.is_a?(Array) && events.first(max_events_per_request).all? { |v| v.is_a?(Hash) }
+        logger.info "[ahoy] Invalid parameters"
+        # :unprocessable_entity is probably more correct
+        # but keep consistent with missing parameters for now
+        render plain: "Invalid parameters\n", status: :bad_request
+        return
+      end
+
+      events.first(max_events_per_request).each do |event|
         time = Time.zone.parse(event["time"]) rescue nil
 
         # timestamp is deprecated

data/lib/ahoy/base_store.rb

@@ -3,6 +3,7 @@ module Ahoy
     attr_writer :user
 
     def initialize(options)
+      @user = options[:user]
       @options = options
     end
 
@@ -36,7 +37,9 @@ module Ahoy
     end
 
     def exclude?
-      (!Ahoy.track_bots && bot?) || exclude_by_method?
+      (!Ahoy.track_bots && bot?) ||
+        exclude_by_method? ||
+        (defined?(Rails::HealthController) && controller.is_a?(Rails::HealthController))
     end
 
     def generate_id

data/lib/ahoy/controller.rb

@@ -5,9 +5,8 @@ module Ahoy
         base.helper_method :current_visit
         base.helper_method :ahoy
       end
-      base.before_action :set_ahoy_cookies, unless: -> { Ahoy.api_only }
       base.before_action :track_ahoy_visit, unless: -> { Ahoy.api_only }
-      base.around_action :set_ahoy_request_store
+      base.around_action :set_ahoy_request_store, unless: -> { Ahoy.api_only }
     end
 
     def ahoy
@@ -19,7 +18,7 @@ module Ahoy
     end
 
     def set_ahoy_cookies
-      if Ahoy.cookies
+      if Ahoy.cookies?
         ahoy.set_visitor_cookie
         ahoy.set_visit_cookie
       else
@@ -31,11 +30,17 @@ module Ahoy
     def track_ahoy_visit
       defer = Ahoy.server_side_visits != true
 
-      if defer && !Ahoy.cookies
+      if defer && !Ahoy.cookies?
         # avoid calling new_visit?, which triggers a database call
+      elsif !Ahoy.cookies? && ahoy.exclude?
+        # avoid calling new_visit?, which triggers a database call
+        # may or may not be a new visit
+        Ahoy.log("Request excluded")
       elsif ahoy.new_visit?
         ahoy.track_visit(defer: defer)
       end
+
+      set_ahoy_cookies
     end
 
     def set_ahoy_request_store

data/lib/ahoy/database_store.rb

@@ -53,11 +53,13 @@ module Ahoy
 
     def visit
       unless defined?(@visit)
-        if defined?(Mongoid::Document) && visit_model < Mongoid::Document
-          # find_by raises error by default when not found
-          @visit = visit_model.where(visit_token: ahoy.visit_token).first if ahoy.visit_token
+        if ahoy.send(:existing_visit_token) || ahoy.instance_variable_get(:@visit_token)
+          # find_by raises error by default with Mongoid when not found
+          @visit = visit_model.where(visit_token: ahoy.visit_token).take if ahoy.visit_token
+        elsif !Ahoy.cookies? && ahoy.visitor_token
+          @visit = visit_model.where(visitor_token: ahoy.visitor_token).where(started_at: Ahoy.visit_duration.ago..).order(started_at: :desc).first
         else
-          @visit = visit_model.find_by(visit_token: ahoy.visit_token) if ahoy.visit_token
+          @visit = nil
         end
       end
       @visit

data/lib/ahoy/query_methods.rb

@@ -14,7 +14,7 @@ module Ahoy
         case adapter_name
         when "mongoid"
           where(properties.to_h { |k, v| ["properties.#{k}", v] })
-        when /mysql/
+        when /mysql|trilogy/
           where("JSON_CONTAINS(properties, ?, '$') = 1", properties.to_json)
         when /postgres|postgis/
           case columns_hash["properties"].type
@@ -54,7 +54,7 @@ module Ahoy
         case adapter_name
         when "mongoid"
           raise "Adapter not supported: #{adapter_name}"
-        when /mysql/
+        when /mysql|trilogy/
           props.each do |prop|
             quoted_prop = connection.quote("$.#{prop}")
             relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(properties, #{quoted_prop}))")

data/lib/ahoy/tracker.rb

@@ -49,7 +49,7 @@ module Ahoy
             visit_token: visit_token,
             visitor_token: visitor_token,
             user_id: user.try(:id),
-            started_at: trusted_time(started_at),
+            started_at: trusted_time(started_at)
           }.merge(visit_properties).select { |_, v| v }
 
           @store.track_visit(data)
@@ -99,7 +99,7 @@ module Ahoy
     end
 
     def new_visit?
-      Ahoy.cookies ? !existing_visit_token : visit.nil?
+      Ahoy.cookies? ? !existing_visit_token : visit.nil?
     end
 
     def new_visitor?
@@ -145,6 +145,13 @@ module Ahoy
       delete_cookie("ahoy_track")
     end
 
+    def exclude?
+      unless defined?(@exclude)
+        @exclude = @store.exclude?
+      end
+      @exclude
+    end
+
     protected
 
     def api?
@@ -153,7 +160,7 @@ module Ahoy
 
     # private, but used by API
     def missing_params?
-      if Ahoy.cookies && api? && Ahoy.protect_from_forgery
+      if Ahoy.cookies? && api? && Ahoy.protect_from_forgery
         !(existing_visit_token && existing_visitor_token)
       else
         false
@@ -162,7 +169,7 @@ module Ahoy
 
     def set_cookie(name, value, duration = nil, use_domain = true)
       # safety net
-      return unless Ahoy.cookies && request
+      return unless Ahoy.cookies? && request
 
       cookie = Ahoy.cookie_options.merge(value: value)
       cookie[:expires] = duration.from_now if duration
@@ -184,13 +191,6 @@ module Ahoy
       end
     end
 
-    def exclude?
-      unless defined?(@exclude)
-        @exclude = @store.exclude?
-      end
-      @exclude
-    end
-
     def report_exception(e)
       if defined?(ActionDispatch::RemoteIp::IpSpoofAttackError) && e.is_a?(ActionDispatch::RemoteIp::IpSpoofAttackError)
         debug "Tracking excluded due to IP spoofing"
@@ -207,7 +207,7 @@ module Ahoy
     def visit_token_helper
       @visit_token_helper ||= begin
         token = existing_visit_token
-        token ||= visit_anonymity_set unless Ahoy.cookies
+        token ||= visit&.visit_token unless Ahoy.cookies?
         token ||= generate_id unless Ahoy.api_only
         token
       end
@@ -216,7 +216,7 @@ module Ahoy
     def visitor_token_helper
       @visitor_token_helper ||= begin
         token = existing_visitor_token
-        token ||= visitor_anonymity_set unless Ahoy.cookies
+        token ||= visitor_anonymity_set unless Ahoy.cookies?
         token ||= generate_id unless Ahoy.api_only
         token
       end
@@ -225,7 +225,7 @@ module Ahoy
     def existing_visit_token
       @existing_visit_token ||= begin
         token = visit_header
-        token ||= visit_cookie if Ahoy.cookies && !(api? && Ahoy.protect_from_forgery)
+        token ||= visit_cookie if Ahoy.cookies? && !(api? && Ahoy.protect_from_forgery)
         token ||= visit_param if api?
         token
       end
@@ -234,16 +234,12 @@ module Ahoy
     def existing_visitor_token
       @existing_visitor_token ||= begin
         token = visitor_header
-        token ||= visitor_cookie if Ahoy.cookies && !(api? && Ahoy.protect_from_forgery)
+        token ||= visitor_cookie if Ahoy.cookies? && !(api? && Ahoy.protect_from_forgery)
         token ||= visitor_param if api?
         token
       end
     end
 
-    def visit_anonymity_set
-      @visit_anonymity_set ||= Digest::UUID.uuid_v5(UUID_NAMESPACE, ["visit", Ahoy.mask_ip(request.remote_ip), request.user_agent].join("/"))
-    end
-
     def visitor_anonymity_set
       @visitor_anonymity_set ||= Digest::UUID.uuid_v5(UUID_NAMESPACE, ["visitor", Ahoy.mask_ip(request.remote_ip), request.user_agent].join("/"))
     end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "4.1.0"
+  VERSION = "5.2.0"
 end

data/lib/ahoy.rb

@@ -7,27 +7,59 @@ require "active_support/core_ext"
 require "safely/core"
 
 # modules
-require "ahoy/utils"
-require "ahoy/base_store"
-require "ahoy/controller"
-require "ahoy/database_store"
-require "ahoy/helper"
-require "ahoy/model"
-require "ahoy/query_methods"
-require "ahoy/tracker"
-require "ahoy/version"
-require "ahoy/visit_properties"
-
-require "ahoy/engine" if defined?(Rails)
+require_relative "ahoy/utils"
+require_relative "ahoy/base_store"
+require_relative "ahoy/controller"
+require_relative "ahoy/database_store"
+require_relative "ahoy/helper"
+require_relative "ahoy/model"
+require_relative "ahoy/query_methods"
+require_relative "ahoy/tracker"
+require_relative "ahoy/version"
+require_relative "ahoy/visit_properties"
+
+require_relative "ahoy/engine" if defined?(Rails)
 
 module Ahoy
+  # activejob optional
+  autoload :GeocodeV2Job, "ahoy/geocode_v2_job"
+
   mattr_accessor :visit_duration
   self.visit_duration = 4.hours
 
   mattr_accessor :visitor_duration
   self.visitor_duration = 2.years
 
-  mattr_accessor :cookies
+  def self.cookies=(value)
+    if value == false
+      if defined?(Mongoid::Document) && defined?(Ahoy::Visit) && Ahoy::Visit < Mongoid::Document
+        raise <<~EOS
+          This feature requires a new index in Ahoy 5. Set:
+
+            class Ahoy::Visit
+              index({visitor_token: 1, started_at: 1})
+            end
+
+          Create the index before upgrading, and set:
+
+            Ahoy.cookies = :none
+        EOS
+      else
+        raise <<~EOS
+          This feature requires a new index in Ahoy 5. Create a migration with:
+
+            add_index :ahoy_visits, [:visitor_token, :started_at]
+
+          Run it before upgrading, and set:
+
+            Ahoy.cookies = :none
+        EOS
+      end
+    end
+    @@cookies = value
+  end
+
+  mattr_reader :cookies
   self.cookies = true
 
   # TODO deprecate in favor of cookie_options
@@ -94,6 +126,10 @@ module Ahoy
     logger.info { "[ahoy] #{message}" } if logger
   end
 
+  def self.cookies?
+    cookies && cookies != :none
+  end
+
   def self.mask_ip(ip)
     addr = IPAddr.new(ip)
     if addr.ipv4?

data/lib/ahoy_matey.rb

@@ -1 +1 @@
-require "ahoy"
+require_relative "ahoy"

data/lib/generators/ahoy/activerecord_generator.rb

@@ -21,7 +21,7 @@ module Ahoy
         case adapter
         when /postg/i # postgres, postgis
           "jsonb"
-        when /mysql/i
+        when /mysql|trilogy/i
           "json"
         else
           "text"
@@ -33,23 +33,31 @@ module Ahoy
         properties_type == "text" || (properties_type == "json" && ActiveRecord::Base.connection.try(:mariadb?))
       end
 
-      # use connection_config instead of connection.adapter
-      # so database connection isn't needed
-      def adapter
-        if ActiveRecord::VERSION::STRING.to_f >= 6.1
-          ActiveRecord::Base.connection_db_config.adapter.to_s
-        else
-          ActiveRecord::Base.connection_config[:adapter].to_s
-        end
+      def serialize_options
+        ActiveRecord::VERSION::STRING.to_f >= 7.1 ? "coder: JSON" : "JSON"
       end
 
-      def rails52?
-        ActiveRecord::VERSION::STRING.to_f >= 5.2
+      # use connection_db_config instead of connection.adapter
+      # so database connection isn't needed
+      def adapter
+        ActiveRecord::Base.connection_db_config.adapter.to_s
       end
 
       def migration_version
         "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
+
+      def primary_key_type
+        ", id: :#{key_type}" if key_type
+      end
+
+      def foreign_key_type
+        ", type: :#{key_type}" if key_type
+      end
+
+      def key_type
+        Rails.configuration.generators.options.dig(:active_record, :primary_key_type)
+      end
     end
   end
 end

data/lib/generators/ahoy/templates/active_record_event_model.rb.tt

@@ -6,5 +6,5 @@ class Ahoy::Event < ApplicationRecord
   belongs_to :visit
   belongs_to :user, optional: true<% if serialize_properties? %>
 
-  serialize :properties, JSON<% end %>
+  serialize :properties, <%= serialize_options %><% end %>
 end

data/lib/generators/ahoy/templates/active_record_migration.rb.tt

@@ -1,6 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :ahoy_visits do |t|
+    create_table :ahoy_visits<%= primary_key_type %> do |t|
       t.string :visit_token
       t.string :visitor_token
 
@@ -8,7 +8,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       # simply remove any you don't want
 
       # user
-      t.references :user
+      t.references :user<%= foreign_key_type %>
 
       # standard
       t.string :ip
@@ -45,18 +45,18 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
     end
 
     add_index :ahoy_visits, :visit_token, unique: true
+    add_index :ahoy_visits, [:visitor_token, :started_at]
 
-    create_table :ahoy_events do |t|
-      t.references :visit
-      t.references :user
+    create_table :ahoy_events<%= primary_key_type %> do |t|
+      t.references :visit<%= foreign_key_type %>
+      t.references :user<%= foreign_key_type %>
 
       t.string :name
       t.<%= properties_type %> :properties
       t.datetime :time
     end
 
-    add_index :ahoy_events, [:name, :time]<% if properties_type == "jsonb" %><% if rails52? %>
-    add_index :ahoy_events, :properties, using: :gin, opclass: :jsonb_path_ops<% else %>
-    add_index :ahoy_events, "properties jsonb_path_ops", using: "gin"<% end %><% end %>
+    add_index :ahoy_events, [:name, :time]<% if properties_type == "jsonb" %>
+    add_index :ahoy_events, :properties, using: :gin, opclass: :jsonb_path_ops<% end %>
   end
 end

data/lib/generators/ahoy/templates/mongoid_visit_model.rb.tt

@@ -46,4 +46,5 @@ class Ahoy::Visit
   field :started_at, type: Time
 
   index({visit_token: 1}, {unique: true})
+  index({visitor_token: 1, started_at: 1})
 end

data/vendor/assets/javascripts/ahoy.js

@@ -1,16 +1,15 @@
 /*!
- * Ahoy.js
+ * Ahoy.js v0.4.4
  * Simple, powerful JavaScript analytics
  * https://github.com/ankane/ahoy.js
- * v0.4.0
  * MIT License
  */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
-  (global = global || self, global.ahoy = factory());
-}(this, (function () { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.ahoy = factory());
+})(this, (function () { 'use strict';
 
   // https://www.quirksmode.org/js/cookies.html
 
@@ -67,7 +66,7 @@
 
   ahoy.configure = function (options) {
     for (var key in options) {
-      if (options.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(options, key)) {
         config[key] = options[key];
       }
     }
@@ -102,7 +101,7 @@
   function serialize(object) {
     var data = new FormData();
     for (var key in object) {
-      if (object.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(object, key)) {
         data.append(key, object[key]);
       }
     }
@@ -170,6 +169,9 @@
     document.addEventListener(eventName, function (e) {
       var matchedElement = matchesSelector(e.target, selector);
       if (matchedElement) {
+        var skip = getClosest(matchedElement, "data-ahoy-skip");
+        if (skip !== null && skip !== "false") { return; }
+
         callback.call(matchedElement, e);
       }
     });
@@ -186,8 +188,13 @@
 
   // https://stackoverflow.com/a/2117523/1177228
   function generateId() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
+    if (window.crypto && window.crypto.randomUUID) {
+      return window.crypto.randomUUID();
+    }
+
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = Math.random() * 16 | 0;
+      var v = c === 'x' ? r : (r & 0x3 | 0x8);
       return v.toString(16);
     });
   }
@@ -237,11 +244,11 @@
         xhr.withCredentials = config.withCredentials;
         xhr.setRequestHeader("Content-Type", "application/json");
         for (var header in config.headers) {
-          if (config.headers.hasOwnProperty(header)) {
+          if (Object.prototype.hasOwnProperty.call(config.headers, header)) {
             xhr.setRequestHeader(header, config.headers[header]);
           }
         }
-        xhr.onload = function() {
+        xhr.onload = function () {
           if (xhr.status === 200) {
             success();
           }
@@ -266,11 +273,11 @@
   }
 
   function trackEvent(event) {
-    ahoy.ready( function () {
-      sendRequest(eventsUrl(), eventData(event), function() {
+    ahoy.ready(function () {
+      sendRequest(eventsUrl(), eventData(event), function () {
         // remove from queue
         for (var i = 0; i < eventQueue.length; i++) {
-          if (eventQueue[i].id == event.id) {
+          if (eventQueue[i].id === event.id) {
             eventQueue.splice(i, 1);
             break;
           }
@@ -281,7 +288,7 @@
   }
 
   function trackEventNow(event) {
-    ahoy.ready( function () {
+    ahoy.ready(function () {
       var data = eventData(event);
       var param = csrfParam();
       var token = csrfToken();
@@ -303,7 +310,7 @@
 
   function cleanObject(obj) {
     for (var key in obj) {
-      if (obj.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
         if (obj[key] === null) {
           delete obj[key];
         }
@@ -318,14 +325,14 @@
       id: presence(this.id),
       "class": presence(this.className),
       page: page(),
-      section: getClosestSection(this)
+      section: getClosest(this, "data-section")
     });
   }
 
-  function getClosestSection(element) {
-    for ( ; element && element !== document; element = element.parentNode) {
-      if (element.hasAttribute('data-section')) {
-        return element.getAttribute('data-section');
+  function getClosest(element, attribute) {
+    for (; element && element !== document; element = element.parentNode) {
+      if (element.hasAttribute(attribute)) {
+        return element.getAttribute(attribute);
       }
     }
 
@@ -377,7 +384,7 @@
         }
 
         for (var key in config.visitParams) {
-          if (config.visitParams.hasOwnProperty(key)) {
+          if (Object.prototype.hasOwnProperty.call(config.visitParams, key)) {
             data[key] = config.visitParams[key];
           }
         }
@@ -431,12 +438,12 @@
       js: true
     };
 
-    ahoy.ready( function () {
+    ahoy.ready(function () {
       if (config.cookies && !ahoy.getVisitId()) {
         createVisit();
       }
 
-      ahoy.ready( function () {
+      ahoy.ready(function () {
         log(event);
 
         event.visit_token = ahoy.getVisitId();
@@ -449,7 +456,7 @@
           saveEventQueue();
 
           // wait in case navigating to reduce duplicate events
-          setTimeout( function () {
+          setTimeout(function () {
             trackEvent(event);
           }, 1000);
         }
@@ -467,8 +474,8 @@
     };
 
     if (additionalProperties) {
-      for(var propName in additionalProperties) {
-        if (additionalProperties.hasOwnProperty(propName)) {
+      for (var propName in additionalProperties) {
+        if (Object.prototype.hasOwnProperty.call(additionalProperties, propName)) {
           properties[propName] = additionalProperties[propName];
         }
       }
@@ -482,7 +489,7 @@
     }
     onEvent("click", selector, function (e) {
       var properties = eventProperties.call(this, e);
-      properties.text = properties.tag == "input" ? this.value : (this.textContent || this.innerText || this.innerHTML).replace(/[\s\r\n]+/g, " ").trim();
+      properties.text = properties.tag === "input" ? this.value : (this.textContent || this.innerText || this.innerHTML).replace(/[\s\r\n]+/g, " ").trim();
       properties.href = this.href;
       ahoy.track("$click", properties);
     });
@@ -526,7 +533,7 @@
     ahoy.start = function () {};
   };
 
-  documentReady(function() {
+  documentReady(function () {
     if (config.startOnReady) {
       ahoy.start();
     }
@@ -534,4 +541,4 @@
 
   return ahoy;
 
-})));
+}));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: safely_block
+  name: device_detector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: device_detector
+  name: safely_block
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description:
 email: andrew@ankane.org
 executables: []
@@ -65,14 +65,13 @@ files:
 - app/controllers/ahoy/base_controller.rb
 - app/controllers/ahoy/events_controller.rb
 - app/controllers/ahoy/visits_controller.rb
-- app/jobs/ahoy/geocode_job.rb
-- app/jobs/ahoy/geocode_v2_job.rb
 - config/routes.rb
 - lib/ahoy.rb
 - lib/ahoy/base_store.rb
 - lib/ahoy/controller.rb
 - lib/ahoy/database_store.rb
 - lib/ahoy/engine.rb
+- lib/ahoy/geocode_v2_job.rb
 - lib/ahoy/helper.rb
 - lib/ahoy/model.rb
 - lib/ahoy/query_methods.rb
@@ -106,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Simple, powerful, first-party analytics for Rails

data/app/jobs/ahoy/geocode_job.rb

@@ -1,11 +0,0 @@
-# for smooth update from Ahoy 1 -> 2
-# TODO remove in 5.0
-module Ahoy
-  class GeocodeJob < ActiveJob::Base
-    queue_as { Ahoy.job_queue }
-
-    def perform(visit)
-      Ahoy::GeocodeV2Job.perform_now(visit.visit_token, visit.ip)
-    end
-  end
-end