ahoy_matey 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640c91af9741127b748f530d102751a73f71b4c9
-  data.tar.gz: b341bf79dc207745b63f7a419711d402f2fc8cc0
+  metadata.gz: 0c48c8c5793b7e8f7c53ee1fcfed647340749cee
+  data.tar.gz: ad2e9686bebde7233be8804ac899a1672f352240
 SHA512:
-  metadata.gz: 9f154fb9aefbee54089fc9c6e269c26e7f09eb4229c211ccd073d9d8a25fb191c875155a687e358966ff20b9dc3c39bf00e1a6701eda787ed212a800e594408c
-  data.tar.gz: ddac0a216a109b50904be1a2553cfa48df607908dacb50a3329f88bf8a7025faaa86df4e067247390dac8c2dbccc2d520fcabe50e072fe4240111682ffb46b5e
+  metadata.gz: 5b3a16dd65efc501a56fa2a6e2574dc228dbc236d97d352153bd6012b85243450753a62f4155737a2d43610ac619f225004492ed8bcfc8a5e088ef93b67fb56a
+  data.tar.gz: 23e2ee9cc5ec7d772cce7a4af348b95b93090c5d3a7113fd1d47fcd9fe3bbca4cbbb145cbc21d3826ca159d984566e3e1c8f3b45d89d9a7319bba2ae2d8026eb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.2
+
+- 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
 
 - Added `Ahoy.server_side_visits = :when_needed` to automatically create visits server-side when needed for events and `visitable`

data/README.md

@@ -79,7 +79,7 @@ skip_before_action :track_ahoy_visit
 
 This is typically useful for APIs.
 
-You can also defer visit tracking to JavaScript. This is useful for preventing bots (that aren’t detected by their user agent) and users with cookies disabled from creating a new visit on each request. `:when_needed` will create visits server-side when needed by events, and `false` will discard events without a visit.
+You can also defer visit tracking to JavaScript. This is useful for preventing bots (that aren’t detected by their user agent) and users with cookies disabled from creating a new visit on each request. `:when_needed` will create visits server-side only when needed by events, and `false` will disable server-side creation completely, discarding events without a visit.
 
 ```ruby
 Ahoy.server_side_visits = :when_needed
@@ -120,7 +120,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def track_action
-    ahoy.track "Viewed action", request.path_parameters
+    ahoy.track "Ran action", request.path_parameters
   end
 end
 ```
@@ -263,6 +263,27 @@ Change the job queue with:
 Ahoy.job_queue = :low_priority
 ```
 
+#### Geocoding Performance
+
+To avoid calls to a remote API, download the [GeoLite2 City database](https://dev.maxmind.com/geoip/geoip2/geolite2/) and configure Geocoder to use it.
+
+Add this line to your application’s Gemfile:
+
+```ruby
+gem 'maxminddb'
+```
+
+And create an initializer at `config/initializers/geocoder.rb` with:
+
+```ruby
+Geocoder.configure(
+  ip_lookup: :geoip2,
+  geoip2: {
+    file: Rails.root.join("lib", "GeoLite2-City.mmdb")
+  }
+)
+```
+
 ### 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).

data/ahoy_matey.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties", ">= 4.2"
   spec.add_dependency "addressable"
-  spec.add_dependency "geocoder"
+  spec.add_dependency "geocoder", ">= 1.4.5"
   spec.add_dependency "browser", "~> 2.0"
   spec.add_dependency "referer-parser", ">= 0.3"
   spec.add_dependency "user_agent_parser"

data/app/jobs/ahoy/geocode_v2_job.rb

@@ -7,14 +7,13 @@ module Ahoy
         begin
           Geocoder.search(ip).first
         rescue => e
-          Rails.logger.warn "[ahoy] Geocode error: #{e.class.name}: #{e.message}"
+          Ahoy.log "Geocode error: #{e.class.name}: #{e.message}"
           nil
         end
 
-      if location
+      if location && location.country.present?
         data = {
-          visit_token: visit_token,
-          country: location.try(:country).presence,
+          country: location.country,
           region: location.try(:state).presence,
           city: location.try(:city).presence,
           postal_code: location.try(:postal_code).presence,

data/docs/Ahoy-2-Upgrade.md

@@ -17,7 +17,7 @@ gem 'ahoy_matey', '~> 2'
 And run:
 
 ```sh
-bundle install
+bundle update ahoy_matey
 ```
 
 Add to `config/initializers/ahoy.rb`:

data/lib/ahoy.rb

@@ -66,6 +66,10 @@ module Ahoy
 
   mattr_accessor :token_generator
   self.token_generator = -> { SecureRandom.uuid }
+
+  def self.log(message)
+    Rails.logger.info { "[ahoy] #{message}" }
+  end
 end
 
 ActiveSupport.on_load(:action_controller) do

data/lib/ahoy/database_store.rb

@@ -4,7 +4,11 @@ module Ahoy
       @visit = visit_model.create!(slice_data(visit_model, data))
     rescue => e
       raise e unless unique_exception?(e)
-      remove_instance_variable(:@visit)
+
+      # so next call to visit will try to fetch from DB
+      if defined?(@visit)
+        remove_instance_variable(:@visit)
+      end
     end
 
     def track_event(data)
@@ -18,19 +22,20 @@ module Ahoy
           raise e unless unique_exception?(e)
         end
       else
-        Rails.logger.warn "[ahoy] Event excluded since visit not created: #{data[:visit_token]}"
+        Ahoy.log "Event excluded since visit not created: #{data[:visit_token]}"
       end
     end
 
     def geocode(data)
-      data = slice_data(visit_model, data.except(:visit_token))
+      visit_token = data.delete(:visit_token)
+      data = slice_data(visit_model, data)
       if defined?(Mongoid::Document) && visit_model < Mongoid::Document
         # upsert since visit might not be found due to eventual consistency
-        visit_model.where(visit_token: ahoy.visit_token).find_one_and_update({"$set": data}, {upsert: true})
+        visit_model.where(visit_token: visit_token).find_one_and_update({"$set": data}, {upsert: true})
       elsif visit
         visit.update_attributes(data)
       else
-        Rails.logger.warn "[ahoy] Visit for geocode not found: #{data[:visit_token]}"
+        Ahoy.log "Visit for geocode not found: #{visit_token}"
       end
     end
 

data/lib/ahoy/tracker.rb

@@ -65,7 +65,11 @@ module Ahoy
       if exclude?
         debug "Geocode excluded"
       else
-        @store.geocode(data.select { |_, v| v })
+        data = {
+          visit_token: visit_token
+          }.merge(data).select { |_, v| v }
+
+        @store.geocode(data)
         true
       end
     rescue => e
@@ -256,7 +260,7 @@ module Ahoy
     end
 
     def debug(message)
-      Rails.logger.debug { "[ahoy] #{message}" }
+      Ahoy.log message
     end
   end
 end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/vendor/assets/javascripts/ahoy.js

@@ -98,7 +98,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Ahoy.js
  * Simple, powerful JavaScript analytics
  * https://github.com/ankane/ahoy.js
- * v0.3.0
+ * v0.3.1
  * MIT License
  */
 
@@ -186,10 +186,13 @@ function ready(callback) {
 }
 
 function matchesSelector(element, selector) {
-  if (element.matches) {
-    return element.matches(selector);
+  var matches = element.matches || element.matchesSelector || element.mozMatchesSelector || element.msMatchesSelector || element.oMatchesSelector || element.webkitMatchesSelector;
+
+  if (matches) {
+    return matches.apply(element, [selector]);
   } else {
-    return element.msMatchesSelector(selector);
+    log("Unable to match");
+    return false;
   }
 }
 
@@ -216,7 +219,6 @@ function generateId() {
 }
 
 function saveEventQueue() {
-  // TODO add stringify method for IE 7 and under
   if (canStringify) {
     setCookie("ahoy_events", JSON.stringify(eventQueue), 1);
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement