ahoy_matey 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9161dead45561a928523eb7d5ed70be20c67c8629499c35cb428271d714895a7
-  data.tar.gz: f17eb958ee297a4eda86388e0458a04a2a39de5b868076521eb65dd6e4cbc21a
+  metadata.gz: ba34513817526ee22ee090db462d8e11168d98ec27cbbb3a866fd8ec29a388c3
+  data.tar.gz: 5acf5aaf4ea4339cc097b24ee3c4cdd5c09dd3f7a1eb080917d534314f74f102
 SHA512:
-  metadata.gz: c68fa7030244573a75b72167d163a8a0f2cfb5ef01e3718980ea25e5c13a5936973d0d5f83d3302f9e610508d94758ec0587f6fe4dd19c7c23668181ea1dcfe0
-  data.tar.gz: 7950a3cd2dda3818e21a6da37ab0d1b49b01d22110c76f0ae1abd15abba7aaa6140db24d70cedb4d5af0c5022f2b95a2f7e5a11339425eefb51240bb9ea17578
+  metadata.gz: 1e5ca2c125b06888e40b16859b3bd5d5a2f547fcd1a6eea4d53110ba8432925d1ef77b09817e2f9b4383307801ab23e9d74fc85dfef747014830d6c1b4563f2d
+  data.tar.gz: 030df3974b1b106e8a57eeffe9d92662b3d59b9486901342e67e3b2f352ef60be7bc85c1d8954fe6eaff0c8a51fada657b96f8b08fe2650d0f20965f7f671738

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.3.0 (2025-02-01)
+
+- Dropped support for Ruby < 3.1 and Rails < 7
+- Dropped support for Mongoid < 8
+
+## 5.2.1 (2024-10-07)
+
+- Fixed connection leasing for Active Record 7.2+
+
 ## 5.2.0 (2024-09-04)
 
 - Improved error handling for invalid API parameters
@@ -358,3 +367,19 @@ Breaking changes
 ## 0.1.0 (2014-03-19)
 
 - First major release
+
+## 0.0.4 (2014-03-01)
+
+- Added UTM parameters
+
+## 0.0.3 (2014-02-26)
+
+- Renamed `ahoy_visit` method to `current_visit`
+
+## 0.0.2 (2014-02-26)
+
+- Added `ahoy_visit` method to controllers
+
+## 0.0.1 (2014-02-26)
+
+- First release

data/README.md

@@ -4,8 +4,6 @@
 
 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 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)
@@ -48,7 +46,7 @@ And restart your web server.
 
 ### JavaScript
 
-For Importmap (Rails 7 default), add to `config/importmap.rb`:
+For Importmap (Rails 7+ default), add to `config/importmap.rb`:
 
 ```ruby
 pin "ahoy", to: "ahoy.js"
@@ -60,13 +58,15 @@ And add to `app/javascript/application.js`:
 import "ahoy"
 ```
 
-For Webpacker (Rails 6 default), run:
+For Bun, esbuild, rollup.js, or Webpack, run:
 
 ```sh
+bun add ahoy.js
+# or
 yarn add ahoy.js
 ```
 
-And add to `app/javascript/packs/application.js`:
+And add to `app/javascript/application.js`:
 
 ```javascript
 import ahoy from "ahoy.js"
@@ -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.2]
+class AddAhoyVisitToOrders < ActiveRecord::Migration[8.0]
   def change
     add_reference :orders, :ahoy_visit
   end
@@ -765,7 +765,7 @@ Send a `POST` request to `/ahoy/events` with `Content-Type: application/json` an
       "properties": {
         "item_id": 123
       },
-      "time": "2018-01-01T00:00:00-07:00"
+      "time": "2025-01-01T00:00:00-07:00"
     }
   ]
 }

data/lib/ahoy/engine.rb

@@ -29,7 +29,7 @@ module Ahoy
 
     # for importmap
     initializer "ahoy.importmap" do |app|
-      if defined?(Importmap)
+      if app.config.respond_to?(:assets) && defined?(Importmap) && defined?(Sprockets)
         app.config.assets.precompile << "ahoy.js"
       end
     end

data/lib/ahoy/query_methods.rb

@@ -10,13 +10,13 @@ module Ahoy
       def where_props(properties)
         return all if properties.empty?
 
-        adapter_name = respond_to?(:connection) ? connection.adapter_name.downcase : "mongoid"
+        adapter_name = respond_to?(:connection_db_config) ? connection_db_config.adapter.to_s : "mongoid"
         case adapter_name
         when "mongoid"
           where(properties.to_h { |k, v| ["properties.#{k}", v] })
-        when /mysql|trilogy/
+        when /mysql|trilogy/i
           where("JSON_CONTAINS(properties, ?, '$') = 1", properties.to_json)
-        when /postgres|postgis/
+        when /postg/i
           case columns_hash["properties"].type
           when :hstore
             properties.inject(all) do |relation, (k, v)|
@@ -31,7 +31,7 @@ module Ahoy
           else
             where("properties::jsonb @> ?", properties.to_json)
           end
-        when /sqlite/
+        when /sqlite/i
           properties.inject(all) do |relation, (k, v)|
             if v.nil?
               relation.where("JSON_EXTRACT(properties, ?) IS NULL", "$.#{k}")
@@ -50,16 +50,16 @@ module Ahoy
         props.flatten!
 
         relation = all
-        adapter_name = respond_to?(:connection) ? connection.adapter_name.downcase : "mongoid"
+        adapter_name = respond_to?(:connection_db_config) ? connection_db_config.adapter.to_s : "mongoid"
         case adapter_name
         when "mongoid"
           raise "Adapter not supported: #{adapter_name}"
-        when /mysql|trilogy/
+        when /mysql|trilogy/i
           props.each do |prop|
-            quoted_prop = connection.quote("$.#{prop}")
+            quoted_prop = connection_pool.with_connection { |c| c.quote("$.#{prop}") }
             relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(properties, #{quoted_prop}))")
           end
-        when /postgres|postgis/
+        when /postg/i
           # convert to jsonb to fix
           # could not identify an equality operator for type json
           # and for text columns
@@ -67,12 +67,12 @@ module Ahoy
           cast = [:jsonb, :hstore].include?(column_type) ? "" : "::jsonb"
 
           props.each do |prop|
-            quoted_prop = connection.quote(prop)
+            quoted_prop = connection_pool.with_connection { |c| c.quote(prop) }
             relation = relation.group("properties#{cast} -> #{quoted_prop}")
           end
-        when /sqlite/
+        when /sqlite/i
           props.each do |prop|
-            quoted_prop = connection.quote("$.#{prop}")
+            quoted_prop = connection_pool.with_connection { |c| c.quote("$.#{prop}") }
             relation = relation.group("JSON_EXTRACT(properties, #{quoted_prop})")
           end
         else

data/lib/ahoy/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: device_detector
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
-description:
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -97,7 +95,6 @@ homepage: https://github.com/ankane/ahoy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,15 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Simple, powerful, first-party analytics for Rails
 test_files: []