ahoy_matey 3.0.0 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da649f5c85699714bff1777f3226b232f555e79ec2ece218280541bbb1264d5
-  data.tar.gz: '0180556a4ad007b5d9df07faa327a6d53e9a2cfe1bf810cb78e9d24d6cdc060b'
+  metadata.gz: 17572400fdaab440040c753cf23084f2a47868e5c1ed12229e85fd1904e9c937
+  data.tar.gz: cc917af046906e308830fa1ffa9543db1bc1fe0f79488ccaddef090e6366433d
 SHA512:
-  metadata.gz: e7cd93d376c86d34123c964fceb7f84ef33dc0513bfb66ac1e9da1b5654a7bed69041eb0d99477b50f87c77b5bf8e4c396e4dc8bf99b10db2699ef09fb11ecf8
-  data.tar.gz: f11f02dbd35f36982d932d12a905d060770d9f01f4b0bdfe572002dd5a10feaa07b79b1d3eb0e2df3376f00c6fbe67bbcc29549498599bd9634e164ff04d4184
+  metadata.gz: 325caa06934a20bf7a58f573fff7359b7058cf63e3e7576c48faf1bd5d08ac2564810a28e5a775c3ac324170754db4de35d46f43c0b421f8c4977760af19d153
+  data.tar.gz: e7af674522e09e3fb472b52546f30d10b743e2b2814efd97162d05cb1d4f9b13615dce211cd83e291da16e370a86cf7d8d384b16ad60d8af07c8ced8fbd17f59

data/CHANGELOG.md

@@ -1,4 +1,28 @@
-## 3.0.0
+## 3.0.5 (2020-09-09)
+
+- Added `group_prop` method
+- Use `datetime` type in migration
+
+## 3.0.4 (2020-06-07)
+
+- Updated Ahoy.js to 0.3.6
+
+## 3.0.3 (2020-04-17)
+
+- Updated Ahoy.js to 0.3.5
+
+## 3.0.2 (2020-04-03)
+
+- Added `cookie_options`
+
+## 3.0.1 (2019-09-21)
+
+- Made `Ahoy::Tracker` work outside of requests
+- Fixed storage of `false` values with customized store
+- Fixed error with `user_method` and `Rails::InfoController`
+- Gracefully handle `ActionDispatch::RemoteIp::IpSpoofAttackError`
+
+## 3.0.0 (2019-05-29)
 
 - Made Device Detector the default user agent parser
 - Made v2 the default bot detection version
@@ -6,18 +30,18 @@
 - Removed search keyword detection (most search engines today prevent this)
 - Removed support for Rails < 5
 
-## 2.2.1
+## 2.2.1 (2019-05-26)
 
 - Updated Ahoy.js to 0.3.4
 - Fixed v2 bot detection
 - Added latitude and longitude to installation
 
-## 2.2.0
+## 2.2.0 (2019-01-04)
 
 - Added `amp_event` helper
 - Improved bot detection for Device Detector
 
-## 2.1.0
+## 2.1.0 (2018-05-18)
 
 - Added option for IP masking
 - Added option to use anonymity sets instead of cookies
@@ -25,19 +49,19 @@
 - Fixed `visitable` for Rails 4.2
 - Removed `search_keyword` from new installs
 
-## 2.0.2
+## 2.0.2 (2018-03-14)
 
 - Fixed error on duplicate records
 - Fixed message when visit not found for geocoding
 - Better compatibility with GeoLite2
 - Better browser compatibility for Ahoy.js
 
-## 2.0.1
+## 2.0.1 (2018-02-26)
 
 - Added `Ahoy.server_side_visits = :when_needed` to automatically create visits server-side when needed for events and `visitable`
 - Better handling of visit duration and expiration in JavaScript
 
-## 2.0.0
+## 2.0.0 (2018-02-25)
 
 - Removed dependency on jQuery
 - Use `navigator.sendBeacon` by default in supported browsers
@@ -59,58 +83,58 @@ Breaking changes
 - Removed most built-in stores
 - Removed support for Rails < 4.2
 
-## 1.6.1
+## 1.6.1 (2018-02-02)
 
 - Added `gin` index on properties for events
 - Fixed `visitable` options when name not provided
 
-## 1.6.0
+## 1.6.0 (2017-05-01)
 
 - Added support for Rails 5.1
 
-## 1.5.5
+## 1.5.5 (2017-03-23)
 
 - Added support for Rails API
 - Added NATS and NSQ stores
 
-## 1.5.4
+## 1.5.4 (2017-01-22)
 
 - Fixed issue with duplicate events
 - Added support for PostGIS for `where_properties`
 
-## 1.5.3
+## 1.5.3 (2016-10-31)
 
 - Fixed error with Rails 5 and Mongoid 6
 - Fixed regression with server not generating visit and visitor tokens
 - Accept UTM parameters as request parameters (for native apps)
 
-## 1.5.2
+## 1.5.2 (2016-08-26)
 
 - Better support for Rails 5
 
-## 1.5.1
+## 1.5.1 (2016-08-19)
 
 - Restored throttling after removing side effects
 
-## 1.5.0
+## 1.5.0 (2016-08-19)
 
 - Removed throttling due to unintended side effects with its implementation
 - Ensure basic token requirements
 - Fixed visit recreation on cookie expiration
 - Fixed issue where `/ahoy/visits` is called indefinitely when `Ahoy.cookie_domain = :all`
 
-## 1.4.2
+## 1.4.2 (2016-06-21)
 
 - Fixed issues with `where_properties`
 
-## 1.4.1
+## 1.4.1 (2016-06-20)
 
 - Added `where_properties` method
 - Added Kafka store
 - Added `mount` option
 - Use less intrusive version of `safely`
 
-## 1.4.0
+## 1.4.0 (2016-03-23)
 
 - Use `ActiveRecordTokenStore` by default (integer instead of uuid for id)
 - Detect database for `rails g ahoy:stores:active_record` for easier installation
@@ -118,55 +142,55 @@ Breaking changes
 - Fixed issue with log silencer
 - Use multi-column indexes on `ahoy_events` table creation
 
-## 1.3.1
+## 1.3.1 (2016-03-22)
 
 - Raise errors in test environment
 
-## 1.3.0
+## 1.3.0 (2016-03-06)
 
 - Added throttling
 - Added `max_content_length` and `max_events_per_request`
 
-## 1.2.2
+## 1.2.2 (2016-03-05)
 
 - Fixed issue with latest version of `browser` gem
 - Added support for RabbitMQ
 - Added support for Amazon Kinesis Firehose
 - Fixed deprecation warnings in Rails 5
 
-## 1.2.1
+## 1.2.1 (2015-08-14)
 
 - Fixed `SystemStackError: stack level too deep` when used with `activerecord-session_store`
 
-## 1.2.0
+## 1.2.0 (2015-06-07)
 
 - Added support for PostgreSQL `jsonb` column type
 - Added Fluentd store
 - Added latitude, longitude, and postal_code to visits
 - Log exclusions
 
-## 1.1.1
+## 1.1.1 (2015-01-05)
 
 - Better support for Authlogic
 - Added `screen_height` and `screen_width`
 
-## 1.1.0
+## 1.1.0 (2014-11-02)
 
 - Added `geocode` option
 - Report errors to service by default
 - Fixed association mismatch
 
-## 1.0.2
+## 1.0.2 (2014-07-10)
 
 - Fixed BSON for Mongoid 3
 - Fixed Doorkeeper integration
 - Fixed user tracking in overridden authenticate method
 
-## 1.0.1
+## 1.0.1 (2014-06-27)
 
 - Fixed `visitable` outside of requests
 
-## 1.0.0
+## 1.0.0 (2014-06-18)
 
 - Added support for any data store, and Mongoid out of the box
 - Added `track_visits_immediately` option
@@ -174,17 +198,17 @@ Breaking changes
 - Visits expire after inactivity, not fixed interval
 - Added `visit_duration` and `visitor_duration` options
 
-## 0.3.2
+## 0.3.2 (2014-06-15)
 
 - Fixed bot exclusion for visits
 - Fixed user method
 
-## 0.3.1
+## 0.3.1 (2014-06-12)
 
 - Fixed visitor cookies when set on server
 - Added `domain` option for server cookies
 
-## 0.3.0
+## 0.3.0 (2014-06-11)
 
 - Added `current_visit_token` and `current_visitor_token` method
 - Switched to UUIDs
@@ -192,47 +216,47 @@ Breaking changes
 - Skip server-side bot events
 - Added `request` argument to `exclude_method`
 
-## 0.2.2
+## 0.2.2 (2014-05-26)
 
 - Added `exclude_method` option
 - Added support for batch events
 - Fixed cookie encoding
 - Fixed `options` variable from being modified
 
-## 0.2.1
+## 0.2.1 (2014-05-16)
 
 - Fixed IE 8 error
 - Added `track_bots` option
 - Added `$authenticate` event
 
-## 0.2.0
+## 0.2.0 (2014-05-13)
 
 - Added event tracking (merged ahoy_events)
 - Added ahoy.js
 
-## 0.1.8
+## 0.1.8 (2014-05-11)
 
 - Fixed bug with `user_type` set to `false` instead of `nil`
 
-## 0.1.7
+## 0.1.7 (2014-05-11)
 
 - Made cookie functions public for ahoy_events
 
-## 0.1.6
+## 0.1.6 (2014-05-07)
 
 - Better user agent parser
 
-## 0.1.5
+## 0.1.5 (2014-05-01)
 
 - Added support for Doorkeeper
 - Added options to `visitable`
 - Added `landing_params` method
 
-## 0.1.4
+## 0.1.4 (2014-04-27)
 
 - Added `ahoy.ready()` and `ahoy.log()` for events
 
-## 0.1.3
+## 0.1.3 (2014-04-24)
 
 - Supports `current_user` from `ApplicationController`
 - Added `ahoy.reset()`
@@ -240,16 +264,16 @@ Breaking changes
 - Added experimental support for native apps
 - Prefer `ahoy` over `Ahoy`
 
-## 0.1.2
+## 0.1.2 (2014-04-15)
 
 - Attach user on Devise sign up
 - Ability to specify visit model
 
-## 0.1.1
+## 0.1.1 (2014-03-20)
 
 - Made most database columns optional
 - Performance hack for referer-parser
 
-## 0.1.0
+## 0.1.0 (2014-03-19)
 
 - First major release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2019 Andrew Kane
+Copyright (c) 2014-2020 Andrew Kane
 
 MIT License
 

data/README.md

@@ -1,10 +1,10 @@
 # Ahoy
 
-:fire: Simple, powerful analytics for Rails
+:fire: Simple, powerful, first-party analytics for Rails
 
 Track visits and events in Ruby, JavaScript, and native apps. Data is stored in your database by default so you can easily combine it with other data.
 
-:postbox: To track emails, check out [Ahoy Email](https://github.com/ankane/ahoy_email), and for A/B testing, check out [Field Test](https://github.com/ankane/field_test)
+: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)
 
@@ -181,7 +181,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 AddVisitIdToOrders < ActiveRecord::Migration[5.2]
+class AddVisitIdToOrders < ActiveRecord::Migration[6.0]
   def change
     add_column :orders, :ahoy_visit_id, :bigint
   end
@@ -292,7 +292,7 @@ By default, a new visit is created after 4 hours of inactivity. Change this with
 Ahoy.visit_duration = 30.minutes
 ```
 
-### Multiple Subdomains
+### Cookies
 
 To track visits across multiple subdomains, use:
 
@@ -300,6 +300,12 @@ To track visits across multiple subdomains, use:
 Ahoy.cookie_domain = :all
 ```
 
+Set other [cookie options](https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html) with:
+
+```ruby
+Ahoy.cookie_options = {same_site: :lax}
+```
+
 ### Geocoding
 
 Disable geocoding with:
@@ -308,7 +314,7 @@ Disable geocoding with:
 Ahoy.geocode = false
 ```
 
-Change the job queue with:
+The default job queue is `:ahoy`. Change this with:
 
 ```ruby
 Ahoy.job_queue = :low_priority
@@ -427,6 +433,34 @@ Ahoy.cookies = false
 
 Previously set cookies are automatically deleted.
 
+## Data Retention
+
+Data should only be retained for as long as it’s needed. Delete older data with:
+
+```ruby
+Ahoy::Visit.where("started_at < ?", 2.years.ago).find_in_batches do |visits|
+  visit_ids = visits.map(&:id)
+  Ahoy::Event.where(visit_id: visit_ids).delete_all
+  Ahoy::Visit.where(id: visit_ids).delete_all
+end
+```
+
+You can use [Rollup](https://github.com/ankane/rollup) to aggregate important data before you do.
+
+```ruby
+Ahoy::Visit.rollup("Visits", interval: "hour")
+```
+
+Delete data for a specific user with:
+
+```ruby
+user_id = 123
+visit_ids = Ahoy::Visit.where(user_id: user_id).pluck(:id)
+Ahoy::Event.where(visit_id: visit_ids).delete_all
+Ahoy::Visit.where(id: visit_ids).delete_all
+Ahoy::Event.where(user_id: user_id).delete_all
+```
+
 ## Development
 
 Ahoy is built with developers in mind. You can run the following code in your browser’s console.
@@ -552,7 +586,7 @@ Ahoy::Visit.group(:referring_domain).count
 
 ### Querying Events
 
-Ahoy provides two methods on the event model to make querying easier.
+Ahoy provides a few methods on the event model to make querying easier.
 
 To query on both name and properties, you can use:
 
@@ -563,9 +597,17 @@ Ahoy::Event.where_event("Viewed product", product_id: 123).count
 Or just query properties with:
 
 ```ruby
-Ahoy::Event.where_props(product_id: 123).count
+Ahoy::Event.where_props(product_id: 123, category: "Books").count
 ```
 
+Group by properties with:
+
+```ruby
+Ahoy::Event.group_prop(:product_id, :category).count
+```
+
+Note: MySQL and MariaDB always return string keys (include `"null"` for `nil`) for `group_prop`.
+
 ### Funnels
 
 It’s easy to create funnels.
@@ -578,6 +620,29 @@ viewed_checkout_ids = Ahoy::Event.where(user_id: added_item_ids, name: "Viewed c
 
 The same approach also works with visitor tokens.
 
+### Rollups
+
+Improve query performance by pre-aggregating data with [Rollup](https://github.com/ankane/rollup).
+
+```ruby
+Ahoy::Event.where(name: "Viewed store").rollup("Store views")
+```
+
+This is only needed if you have a lot of data.
+
+### Forecasting
+
+To forecast future visits and events, check out [Prophet](https://github.com/ankane/prophet).
+
+```ruby
+daily_visits = Ahoy::Visit.group_by_day(:started_at).count # uses Groupdate
+Prophet.forecast(daily_visits)
+```
+
+### Recommendations
+
+To make recommendations based on events, check out [Disco](https://github.com/ankane/disco#ahoy).
+
 ## Tutorials
 
 - [Tracking Metrics with Ahoy and Blazer](https://gorails.com/episodes/internal-metrics-with-ahoy-and-blazer)
@@ -694,3 +759,20 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/ahoy/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development:
+
+```sh
+git clone https://github.com/ankane/ahoy.git
+cd ahoy
+bundle install
+bundle exec rake test
+```
+
+To test query methods, start PostgreSQL, MySQL, and MongoDB and use:
+
+```sh
+createdb ahoy_test
+mysqladmin create ahoy_test
+bundle exec rake test:query_methods
+```

data/lib/ahoy.rb

@@ -30,8 +30,12 @@ module Ahoy
   mattr_accessor :cookies
   self.cookies = true
 
+  # TODO deprecate in favor of cookie_options
   mattr_accessor :cookie_domain
 
+  mattr_accessor :cookie_options
+  self.cookie_options = {}
+
   mattr_accessor :server_side_visits
   self.server_side_visits = true
 
@@ -115,6 +119,10 @@ ActiveSupport.on_load(:action_view) do
 end
 
 # Mongoid
+# TODO use
+# ActiveSupport.on_load(:mongoid) do
+#   Mongoid::Document::ClassMethods.include(Ahoy::Model)
+# end
 if defined?(ActiveModel)
   ActiveModel::Callbacks.include(Ahoy::Model)
 end

data/lib/ahoy/base_store.rb

@@ -26,7 +26,7 @@ module Ahoy
         if Ahoy.user_method.respond_to?(:call)
           Ahoy.user_method.call(controller)
         else
-          controller.send(Ahoy.user_method)
+          controller.send(Ahoy.user_method) if controller.respond_to?(Ahoy.user_method, true)
         end
       end
     end

data/lib/ahoy/database_store.rb

@@ -76,7 +76,7 @@ module Ahoy
 
     def slice_data(model, data)
       column_names = model.try(:column_names) || model.attribute_names
-      data.slice(*column_names.map(&:to_sym)).select { |_, v| v }
+      data.slice(*column_names.map(&:to_sym)).select { |_, v| !v.nil? }
     end
 
     def unique_exception?(e)

data/lib/ahoy/query_methods.rb

@@ -31,6 +31,7 @@ module Ahoy
             end
           else
             properties.each do |k, v|
+              # TODO cast to json instead
               relation = relation.where("properties REGEXP ?", "[{,]#{{k.to_s => v}.to_json.sub(/\A\{/, "").sub(/\}\z/, "").gsub("+", "\\\\+")}[,}]")
             end
           end
@@ -57,6 +58,7 @@ module Ahoy
             end
           else
             properties.each do |k, v|
+              # TODO cast to jsonb instead
               relation = relation.where("properties SIMILAR TO ?", "%[{,]#{{k.to_s => v}.to_json.sub(/\A\{/, "").sub(/\}\z/, "").gsub("+", "\\\\+")}[,}]%")
             end
           end
@@ -66,6 +68,49 @@ module Ahoy
         relation
       end
       alias_method :where_properties, :where_props
+
+      def group_prop(*props)
+        # like with group
+        props.flatten!
+
+        relation = self
+        if respond_to?(:columns_hash)
+          column_type = columns_hash["properties"].type
+          adapter_name = connection.adapter_name.downcase
+        else
+          adapter_name = "mongoid"
+        end
+        case adapter_name
+        when "mongoid"
+          raise "Adapter not supported: #{adapter_name}"
+        when /mysql/
+          if connection.try(:mariadb?)
+            props.each do |prop|
+              quoted_prop = connection.quote("$.#{prop}")
+              relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(properties, #{quoted_prop}))")
+            end
+          else
+            column = column_type == :json ? "properties" : "CAST(properties AS JSON)"
+            props.each do |prop|
+              quoted_prop = connection.quote("$.#{prop}")
+              relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(#{column}, #{quoted_prop}))")
+            end
+          end
+        when /postgres|postgis/
+          # convert to jsonb to fix
+          # could not identify an equality operator for type json
+          # and for text columns
+          cast = [:jsonb, :hstore].include?(column_type) ? "" : "::jsonb"
+
+          props.each do |prop|
+            quoted_prop = connection.quote(prop)
+            relation = relation.group("properties#{cast} -> #{quoted_prop}")
+          end
+        else
+          raise "Adapter not supported: #{adapter_name}"
+        end
+        relation
+      end
     end
   end
 end

data/lib/ahoy/tracker.rb

@@ -11,6 +11,7 @@ module Ahoy
       @controller = options[:controller]
       @request = options[:request] || @controller.try(:request)
       @visit_token = options[:visit_token]
+      @user = options[:user]
       @options = options
     end
 
@@ -57,7 +58,7 @@ module Ahoy
 
           @store.track_visit(data)
 
-          Ahoy::GeocodeV2Job.perform_later(visit_token, data[:ip]) if Ahoy.geocode
+          Ahoy::GeocodeV2Job.perform_later(visit_token, data[:ip]) if Ahoy.geocode && data[:ip]
         end
       end
       true
@@ -128,7 +129,7 @@ module Ahoy
     end
 
     def visit_properties
-      @visit_properties ||= Ahoy::VisitProperties.new(request, api: api?).generate
+      @visit_properties ||= request ? Ahoy::VisitProperties.new(request, api: api?).generate : {}
     end
 
     def visit_token
@@ -168,19 +169,18 @@ module Ahoy
 
     def set_cookie(name, value, duration = nil, use_domain = true)
       # safety net
-      return unless Ahoy.cookies
+      return unless Ahoy.cookies && request
 
-      cookie = {
-        value: value
-      }
+      cookie = Ahoy.cookie_options.merge(value: value)
       cookie[:expires] = duration.from_now if duration
-      domain = Ahoy.cookie_domain
-      cookie[:domain] = domain if domain && use_domain
+      # prefer cookie_options[:domain] over cookie_domain
+      cookie[:domain] ||= Ahoy.cookie_domain if Ahoy.cookie_domain
+      cookie.delete(:domain) unless use_domain
       request.cookie_jar[name] = cookie
     end
 
     def delete_cookie(name)
-      request.cookie_jar.delete(name) if request.cookie_jar[name]
+      request.cookie_jar.delete(name) if request && request.cookie_jar[name]
     end
 
     def trusted_time(time = nil)
@@ -196,8 +196,12 @@ module Ahoy
     end
 
     def report_exception(e)
-      raise e if !defined?(Rails) || Rails.env.development? || Rails.env.test?
-      Safely.report_exception(e)
+      if defined?(ActionDispatch::RemoteIp::IpSpoofAttackError) && e.is_a?(ActionDispatch::RemoteIp::IpSpoofAttackError)
+        debug "Tracking excluded due to IP spoofing"
+      else
+        raise e if !defined?(Rails) || Rails.env.development? || Rails.env.test?
+        Safely.report_exception(e)
+      end
     end
 
     def generate_id

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "3.0.0"
+  VERSION = "3.0.5"
 end

data/lib/generators/ahoy/activerecord_generator.rb

@@ -1,27 +1,13 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module Ahoy
   module Generators
     class ActiverecordGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-      source_root File.expand_path("../templates", __FILE__)
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       class_option :database, type: :string, aliases: "-d"
 
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ::ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
-
       def copy_templates
         template "database_store_initializer.rb", "config/initializers/ahoy.rb"
         template "active_record_visit_model.rb", "app/models/ahoy/visit.rb"

data/lib/generators/ahoy/base_generator.rb

@@ -3,7 +3,7 @@ require "rails/generators"
 module Ahoy
   module Generators
     class BaseGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.join(__dir__, "templates")
 
       def copy_templates
         template "base_store_initializer.rb", "config/initializers/ahoy.rb"

data/lib/generators/ahoy/install_generator.rb

@@ -3,7 +3,7 @@ require "rails/generators"
 module Ahoy
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.join(__dir__, "templates")
 
       def copy_templates
         activerecord = defined?(ActiveRecord)

data/lib/generators/ahoy/mongoid_generator.rb

@@ -3,7 +3,7 @@ require "rails/generators"
 module Ahoy
   module Generators
     class MongoidGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.join(__dir__, "templates")
 
       def copy_templates
         template "database_store_initializer.rb", "config/initializers/ahoy.rb"

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

@@ -41,10 +41,10 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.string :os_version
       t.string :platform
 
-      t.timestamp :started_at
+      t.datetime :started_at
     end
 
-    add_index :ahoy_visits, [:visit_token], unique: true
+    add_index :ahoy_visits, :visit_token, unique: true
 
     create_table :ahoy_events do |t|
       t.references :visit
@@ -52,7 +52,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
 
       t.string :name
       t.<%= properties_type %> :properties
-      t.timestamp :time
+      t.datetime :time
     end
 
     add_index :ahoy_events, [:name, :time]<% if properties_type == "jsonb" %><% if rails52? %>

data/vendor/assets/javascripts/ahoy.js

@@ -2,112 +2,17 @@
  * Ahoy.js
  * Simple, powerful JavaScript analytics
  * https://github.com/ankane/ahoy.js
- * v0.3.4
+ * v0.3.6
  * MIT License
  */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
-  (global.ahoy = factory());
+  (global = global || self, global.ahoy = factory());
 }(this, (function () { 'use strict';
 
-  function isUndefined(value) {
-    return value === undefined;
-  }
-
-  function isNull(value) {
-    return value === null;
-  }
-
-  function isObject(value) {
-    return value === Object(value);
-  }
-
-  function isArray(value) {
-    return Array.isArray(value);
-  }
-
-  function isDate(value) {
-    return value instanceof Date;
-  }
-
-  function isBlob(value) {
-    return (
-      value &&
-      typeof value.size === 'number' &&
-      typeof value.type === 'string' &&
-      typeof value.slice === 'function'
-    );
-  }
-
-  function isFile(value) {
-    return (
-      isBlob(value) &&
-      (typeof value.lastModifiedDate === 'object' ||
-        typeof value.lastModified === 'number') &&
-      typeof value.name === 'string'
-    );
-  }
-
-  function isFormData(value) {
-    return value instanceof FormData;
-  }
-
-  function objectToFormData(obj, cfg, fd, pre) {
-    if (isFormData(cfg)) {
-      pre = fd;
-      fd = cfg;
-      cfg = null;
-    }
-
-    cfg = cfg || {};
-    cfg.indices = isUndefined(cfg.indices) ? false : cfg.indices;
-    cfg.nulls = isUndefined(cfg.nulls) ? true : cfg.nulls;
-    fd = fd || new FormData();
-
-    if (isUndefined(obj)) {
-      return fd;
-    } else if (isNull(obj)) {
-      if (cfg.nulls) {
-        fd.append(pre, '');
-      }
-    } else if (isArray(obj)) {
-      if (!obj.length) {
-        var key = pre + '[]';
-
-        fd.append(key, '');
-      } else {
-        obj.forEach(function(value, index) {
-          var key = pre + '[' + (cfg.indices ? index : '') + ']';
-
-          objectToFormData(value, cfg, fd, key);
-        });
-      }
-    } else if (isDate(obj)) {
-      fd.append(pre, obj.toISOString());
-    } else if (isObject(obj) && !isFile(obj) && !isBlob(obj)) {
-      Object.keys(obj).forEach(function(prop) {
-        var value = obj[prop];
-
-        if (isArray(value)) {
-          while (prop.length > 2 && prop.lastIndexOf('[]') === prop.length - 2) {
-            prop = prop.substring(0, prop.length - 2);
-          }
-        }
-
-        var key = pre ? pre + '[' + prop + ']' : prop;
-
-        objectToFormData(value, cfg, fd, key);
-      });
-    } else {
-      fd.append(pre, obj);
-    }
-
-    return fd;
-  }
-
-  var objectToFormdata = objectToFormData;
+  var n=function(n){return void 0===n},e=function(n){return Array.isArray(n)},t=function(n){return n&&"number"==typeof n.size&&"string"==typeof n.type&&"function"==typeof n.slice},s=function(o,i,r,f){return (i=i||{}).indices=!n(i.indices)&&i.indices,i.nullsAsUndefineds=!n(i.nullsAsUndefineds)&&i.nullsAsUndefineds,i.booleansAsIntegers=!n(i.booleansAsIntegers)&&i.booleansAsIntegers,r=r||new FormData,n(o)?r:(null===o?i.nullsAsUndefineds||r.append(f,""):"boolean"!=typeof o?e(o)?o.length&&o.forEach(function(n,e){s(n,i,r,f+"["+(i.indices?e:"")+"]");}):o instanceof Date?r.append(f,o.toISOString()):o!==Object(o)||function(n){return t(n)&&"string"==typeof n.name&&("object"==typeof n.lastModifiedDate||"number"==typeof n.lastModified)}(o)||t(o)?r.append(f,o):Object.keys(o).forEach(function(n){var t=o[n];if(e(t)){ for(;n.length>2&&n.lastIndexOf("[]")===n.length-2;){ n=n.substring(0,n.length-2); } }s(t,i,r,f?f+"["+n+"]":n);}):r.append(f,i.booleansAsIntegers?o?1:0:o),r)};
 
   // https://www.quirksmode.org/js/cookies.html
 
@@ -155,7 +60,9 @@
     cookieDomain: null,
     headers: {},
     visitParams: {},
-    withCredentials: false
+    withCredentials: false,
+    visitDuration: 4 * 60, // default 4 hours
+    visitorDuration: 2 * 365 * 24 * 60 // default 2 years
   };
 
   var ahoy = window.ahoy || window.Ahoy || {};
@@ -173,8 +80,6 @@
 
   var $ = window.jQuery || window.Zepto || window.$;
   var visitId, visitorId, track;
-  var visitTtl = 4 * 60; // 4 hours
-  var visitorTtl = 2 * 365 * 24 * 60; // 2 years
   var isReady = false;
   var queue = [];
   var canStringify = typeof(JSON) !== "undefined" && typeof(JSON.stringify) !== "undefined";
@@ -224,13 +129,13 @@
     isReady = true;
   }
 
-  function ready(callback) {
+  ahoy.ready = function (callback) {
     if (isReady) {
       callback();
     } else {
       queue.push(callback);
     }
-  }
+  };
 
   function matchesSelector(element, selector) {
     var matches = element.matches ||
@@ -258,7 +163,11 @@
 
   // http://beeker.io/jquery-document-ready-equivalent-vanilla-javascript
   function documentReady(callback) {
-    document.readyState === "interactive" || document.readyState === "complete" ? callback() : document.addEventListener("DOMContentLoaded", callback);
+    if (document.readyState === "interactive" || document.readyState === "complete") {
+      setTimeout(callback, 0);
+    } else {
+      document.addEventListener("DOMContentLoaded", callback);
+    }
   }
 
   // https://stackoverflow.com/a/2117523/1177228
@@ -294,7 +203,7 @@
 
   function sendRequest(url, data, success) {
     if (canStringify) {
-      if ($) {
+      if ($ && $.ajax) {
         $.ajax({
           type: "POST",
           url: url,
@@ -343,7 +252,7 @@
   }
 
   function trackEvent(event) {
-    ready( function () {
+    ahoy.ready( function () {
       sendRequest(eventsUrl(), eventData(event), function() {
         // remove from queue
         for (var i = 0; i < eventQueue.length; i++) {
@@ -358,7 +267,7 @@
   }
 
   function trackEventNow(event) {
-    ready( function () {
+    ahoy.ready( function () {
       var data = eventData(event);
       var param = csrfParam();
       var token = csrfToken();
@@ -366,7 +275,7 @@
       // stringify so we keep the type
       data.events_json = JSON.stringify(data.events);
       delete data.events;
-      window.navigator.sendBeacon(eventsUrl(), objectToFormdata(data));
+      window.navigator.sendBeacon(eventsUrl(), s(data));
     });
   }
 
@@ -427,7 +336,7 @@
     } else {
       if (!visitId) {
         visitId = generateId();
-        setCookie("ahoy_visit", visitId, visitTtl);
+        setCookie("ahoy_visit", visitId, config.visitDuration);
       }
 
       // make sure cookies are enabled
@@ -436,7 +345,7 @@
 
         if (!visitorId) {
           visitorId = generateId();
-          setCookie("ahoy_visitor", visitorId, visitorTtl);
+          setCookie("ahoy_visitor", visitorId, config.visitorDuration);
         }
 
         var data = {
@@ -509,12 +418,12 @@
       js: true
     };
 
-    ready( function () {
+    ahoy.ready( function () {
       if (config.cookies && !ahoy.getVisitId()) {
         createVisit();
       }
 
-      ready( function () {
+      ahoy.ready( function () {
         log(event);
 
         event.visit_token = ahoy.getVisitId();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,7 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: combustion
+  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: 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: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: user_agent_parser
+  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: 
 email: andrew@chartkick.com
 executables: []
@@ -225,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Simple, powerful analytics for Rails
+summary: Simple, powerful, first-party analytics for Rails
 test_files: []