ahoy_matey 5.0.2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2da2e05c42ba50652c0fc6aada9a25bbaada8746a6802a7585790a751a2d9f4
-  data.tar.gz: 6ad4e393177de9f357957259082e0960ad8ea07e51d2c75e1b07826955a01456
+  metadata.gz: 9161dead45561a928523eb7d5ed70be20c67c8629499c35cb428271d714895a7
+  data.tar.gz: f17eb958ee297a4eda86388e0458a04a2a39de5b868076521eb65dd6e4cbc21a
 SHA512:
-  metadata.gz: cbfcb708d2a2343b51f0eb9b20de751f9802695445049d09f15a09ee214151ac4b20705d4f7369d12cdf254018a3b5f3c3271ebdfef5fc2516c52ecd457f5203
-  data.tar.gz: 135303f5c3c1f04a0e08b38859f4ed67e0d530e83908c1d1e83af7d012c6c68dabd810a2800bec9e32249ea5605a3405a66969ebb55d8cd56eba0a66d7b55af9
+  metadata.gz: c68fa7030244573a75b72167d163a8a0f2cfb5ef01e3718980ea25e5c13a5936973d0d5f83d3302f9e610508d94758ec0587f6fe4dd19c7c23668181ea1dcfe0
+  data.tar.gz: 7950a3cd2dda3818e21a6da37ab0d1b49b01d22110c76f0ae1abd15abba7aaa6140db24d70cedb4d5af0c5022f2b95a2f7e5a11339425eefb51240bb9ea17578

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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

data/LICENSE.txt

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

data/README.md

@@ -10,7 +10,7 @@ Track visits and events in Ruby, JavaScript, and native apps. Data is stored in
 
 :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
 
@@ -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

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/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)

data/lib/ahoy/version.rb

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

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"
@@ -37,14 +37,10 @@ module Ahoy
         ActiveRecord::VERSION::STRING.to_f >= 7.1 ? "coder: JSON" : "JSON"
       end
 
-      # use connection_config instead of connection.adapter
+      # use connection_db_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
+        ActiveRecord::Base.connection_db_config.adapter.to_s
       end
 
       def migration_version

data/vendor/assets/javascripts/ahoy.js

@@ -1,5 +1,5 @@
 /*!
- * Ahoy.js v0.4.2
+ * Ahoy.js v0.4.4
  * Simple, powerful JavaScript analytics
  * https://github.com/ankane/ahoy.js
  * MIT License
@@ -188,6 +188,10 @@
 
   // https://stackoverflow.com/a/2117523/1177228
   function generateId() {
+    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);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Simple, powerful, first-party analytics for Rails