ahoy_matey 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90d64ae8641aa0bae1bc44acf29379a585ebbad0bbb87325380508d5a8ffcc7
-  data.tar.gz: 7c01ce8cbd2e92e3555479b251889d171b54be9d5c369fca51f413fdc912ab01
+  metadata.gz: 0007d4286157e3456e73cd0fbcf9ac46905f7088caabd047f1514b4782a99432
+  data.tar.gz: 3b036aa183d4a847df7b1c42be88ce968cffaa3ce9b14281fc05abce747addcc
 SHA512:
-  metadata.gz: fe62cce407d17f736b616f11a742fefe338cdedd2457665cb3e578bafe0bd6fbb889dd315382dcb70d563a35dd5c5e05de908c069e12d21ab92e0cee637e42d7
-  data.tar.gz: f399c7708f6c1071c72db3d9164ab77bd3377fdc0eab7064707fb1202b240156be03669070763bf2f13bcf0bfcac134286eb9e9f9fb988d78267c71da9603386
+  metadata.gz: 6f74414728cdd0325ebe091894cc3300bfb889cd978cc15491c244682ca73c26294ce32585f9e91613bb69516eb80a867b7f968e249e4492beea3f83f298de6f
+  data.tar.gz: 927cc957710268438b2b01379fe4f58f5f43840f465033cbac200b183396da14391fe4f90121781cd1c34fa574b1fa09987434259fe71f43c484c6b56ede9512

data/CHANGELOG.md

@@ -1,11 +1,15 @@
-## 3.0.1
+## 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
+## 3.0.0 (2019-05-29)
 
 - Made Device Detector the default user agent parser
 - Made v2 the default bot detection version
@@ -13,18 +17,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
@@ -32,19 +36,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
@@ -66,58 +70,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
@@ -125,55 +129,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
@@ -181,17 +185,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
@@ -199,47 +203,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()`
@@ -247,16 +251,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/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)
 
@@ -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

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
 

data/lib/ahoy/tracker.rb

@@ -171,12 +171,11 @@ module Ahoy
       # safety net
       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
 

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -253,8 +253,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: []