RubyGems - ahoy_matey - Versions diffs - 2.1.0 → 2.2.0 - Mend

ahoy_matey 2.1.0 → 2.2.0

Files changed (40) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +5 -0
data/CONTRIBUTING.md +9 -7
data/README.md +28 -5
data/app/controllers/ahoy/base_controller.rb +1 -1
data/app/controllers/ahoy/events_controller.rb +1 -1
data/lib/ahoy.rb +9 -0
data/lib/ahoy/base_store.rb +5 -1
data/lib/ahoy/controller.rb +6 -2
data/lib/ahoy/database_store.rb +4 -3
data/lib/ahoy/engine.rb +1 -1
data/lib/ahoy/helper.rb +40 -0
data/lib/ahoy/query_methods.rb +1 -1
data/lib/ahoy/tracker.rb +4 -2
data/lib/ahoy/utils.rb +7 -0
data/lib/ahoy/version.rb +1 -1
data/lib/ahoy/visit_properties.rb +1 -7
data/lib/generators/ahoy/templates/{active_record_event_model.rb → active_record_event_model.rb.tt} +0 -0
data/lib/generators/ahoy/templates/{active_record_migration.rb → active_record_migration.rb.tt} +5 -0
data/lib/generators/ahoy/templates/{active_record_visit_model.rb → active_record_visit_model.rb.tt} +0 -0
data/lib/generators/ahoy/templates/{base_store_initializer.rb → base_store_initializer.rb.tt} +9 -0
data/lib/generators/ahoy/templates/{database_store_initializer.rb → database_store_initializer.rb.tt} +3 -0
data/lib/generators/ahoy/templates/{mongoid_event_model.rb → mongoid_event_model.rb.tt} +0 -0
data/lib/generators/ahoy/templates/{mongoid_visit_model.rb → mongoid_visit_model.rb.tt} +5 -0
metadata +15 -37
data/.github/ISSUE_TEMPLATE.md +0 -7
data/.gitignore +0 -17
data/Gemfile +0 -6
data/Rakefile +0 -9
data/ahoy_matey.gemspec +0 -37
data/docs/Ahoy-2-Upgrade.md +0 -149
data/docs/Data-Store-Examples.md +0 -240
data/test/query_methods/mongoid_test.rb +0 -23
data/test/query_methods/mysql_json_test.rb +0 -18
data/test/query_methods/mysql_text_test.rb +0 -19
data/test/query_methods/postgresql_hstore_test.rb +0 -20
data/test/query_methods/postgresql_json_test.rb +0 -18
data/test/query_methods/postgresql_jsonb_test.rb +0 -19
data/test/query_methods/postgresql_text_test.rb +0 -19
data/test/test_helper.rb +0 -100

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b1c52401a07fcd017af2e52aca841090ee47a1330c9e2c941d19a82fd2b6d7
-  data.tar.gz: 0d9ddec6c4bbe552672dc41cc444cffc2fa0ffda7b4a6a63200bd2de8d8e65e6
+  metadata.gz: 65d9ae15e5742baab80cca54630bd9c446dde514ab820c16163bf856c23839e6
+  data.tar.gz: ca4d9f657de0ef24e56334ae11045ccd615012dac032a0c8e42f1acfc2973da4
 SHA512:
-  metadata.gz: a8c9083093116b8931861b9f180902038871d76e6a363833bd10d55bbd9e8ea89346f62a609ec3990da3232b24e151e075fa4fd3641a247850e18c40db30d912
-  data.tar.gz: a5fe8df81cf9510e8472cda07ff31e2c85d7b2af2102655303623a6677937fb922706db9f2cabac78e49aaf132936c19834be09c3e8acda4ebea3eec7ef82063
+  metadata.gz: 931116ac80eb7774c70fdfeeb4168724fc1608cb1476e9fc7568686d1c523bd4fd3ab5f023249e26b654088136f7004a8d09537d628db8610b23268270b9363a
+  data.tar.gz: 85e15776ffb648e5385658def3525cf0dfc3c8a0d2c1060e5f14af7a50a806c17640bf6741ccc8ed34b8b98b1b3afd3894a534faa539825171b9602ba4279afa

data/CHANGELOG.md CHANGED

@@ -1,3 +1,8 @@
+## 2.2.0
+- Added `amp_event` helper
+- Improved bot detection for Device Detector
 ## 2.1.0
 - Added option for IP masking

data/CONTRIBUTING.md CHANGED

@@ -2,17 +2,15 @@
 First, thanks for wanting to contribute. You’re awesome! :heart:
-## Questions
+## Help
-Use [Stack Overflow](https://stackoverflow.com/) with the tag `ahoy`.
+We’re not able to provide support through GitHub Issues. If you’re looking for help with your code, try posting on [Stack Overflow](https://stackoverflow.com/).
-## Feature Requests
+All features should be documented. If you don’t see a feature in the docs, assume it doesn’t exist.
-Create an issue. Start the title with `[Idea]`.
+## Bugs
-## Issues
-Think you’ve discovered an issue?
+Think you’ve discovered a bug?
 1. Search existing issues to see if it’s been reported.
 2. Try the `master` branch to make sure it hasn’t been fixed.
@@ -26,6 +24,10 @@ If the above steps don’t help, create an issue. Include:
 - Detailed steps to reproduce
 - Complete backtraces for exceptions
+## New Features
+If you’d like to discuss a new feature, create an issue and start the title with `[Idea]`.
 ## Pull Requests
 Fork the project and create a pull request. A few tips:

data/README.md CHANGED

@@ -4,8 +4,6 @@
 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.
-**Ahoy 2.0 was recently released!** See [how to upgrade](docs/Ahoy-2-Upgrade.md)
 :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)
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
@@ -34,7 +32,7 @@ Track your first event from a controller with:
 ahoy.track "My first event", {language: "Ruby"}
 ```
-### JavaScript & Native Apps
+### JavaScript, Native Apps, & AMP
 First, enable the API in `config/initializers/ahoy.rb`:
@@ -58,6 +56,12 @@ ahoy.track("My second event", {language: "JavaScript"});
 For Android, check out [Ahoy Android](https://github.com/instacart/ahoy-android). For other platforms, see the [API spec](#api-spec).
+For AMP, track an event with:
+```erb
+<%= amp_event "My third event", language: "AMP" %>
+```
 ### GDPR Compliance
 Ahoy provides a number of options to help with GDPR compliance. See the [GDPR section](#gdpr-compliance-1) for more info.
@@ -93,7 +97,7 @@ Ahoy.server_side_visits = :when_needed
 Each event has a `name` and `properties`.
-There are three ways to track events.
+There are several ways to track events.
 #### JavaScript
@@ -133,6 +137,17 @@ end
 For Android, check out [Ahoy Android](https://github.com/instacart/ahoy-android). For other platforms, see the [API spec](#api-spec).
+#### AMP
+```erb
+<head>
+  <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
+</head>
+<body>
+  <%= amp_event "Viewed article", title: "Analytics with Rails" %>
+</body>
+```
 ### Associated Models
 Say we want to associate orders with visits. Just add `visitable` to the model.
@@ -166,7 +181,7 @@ end
 Customize the column and class name with:
 ```ruby
-visitable :sign_up_visit, class_name: "Visit"
+visitable :sign_up_visit, class_name: "Ahoy::Visit"
 ```
 ### Users
@@ -571,6 +586,14 @@ import ahoy from "ahoy.js";
 ## Upgrading
+### 2.2
+Ahoy now ships with better bot detection if you use Device Detector. This should be more accurate but can significantly reduce the number of visits recorded. For existing installs, it’s opt-in to start. To use it, add to `config/initializers/ahoy.rb`:
+```ruby
+Ahoy.bot_detection_version = 2
+```
 ### 2.1
 Ahoy recommends [Device Detector](https://github.com/podigee/device_detector) for user agent parsing and makes it the default for new installations. To switch, add to `config/initializers/ahoy.rb`:

data/app/controllers/ahoy/base_controller.rb CHANGED

@@ -6,7 +6,7 @@ module Ahoy
       skip_after_action(*filters, raise: false)
       skip_around_action(*filters, raise: false)
     else
-      skip_action_callback *filters
+      skip_action_callback(*filters)
     end
     before_action :verify_request_size
     before_action :renew_cookies

data/app/controllers/ahoy/events_controller.rb CHANGED

@@ -3,7 +3,7 @@ module Ahoy
     def create
       events =
         if params[:name]
-          # legacy API
+          # legacy API and AMP
           [request.params]
         elsif params[:events]
           request.params[:events]

data/lib/ahoy.rb CHANGED

@@ -6,9 +6,11 @@ require "addressable/uri"
 require "geocoder"
 require "safely/core"
+require "ahoy/utils"
 require "ahoy/base_store"
 require "ahoy/controller"
 require "ahoy/database_store"
+require "ahoy/helper"
 require "ahoy/model"
 require "ahoy/query_methods"
 require "ahoy/tracker"
@@ -69,6 +71,9 @@ module Ahoy
   mattr_accessor :track_bots
   self.track_bots = false
+  mattr_accessor :bot_detection_version
+  self.bot_detection_version = 1
   mattr_accessor :token_generator
   self.token_generator = -> { SecureRandom.uuid }
@@ -102,6 +107,10 @@ ActiveSupport.on_load(:active_record) do
   extend Ahoy::Model
 end
+ActiveSupport.on_load(:action_view) do
+  include Ahoy::Helper
+end
 # Mongoid
 if defined?(ActiveModel)
   ActiveModel::Callbacks.include(Ahoy::Model)

data/lib/ahoy/base_store.rb CHANGED

@@ -50,7 +50,11 @@ module Ahoy
         @bot = begin
           if request
             if Ahoy.user_agent_parser == :device_detector
-              DeviceDetector.new(request.user_agent).bot?
+              if Ahoy.bot_detection_version == 2
+                DeviceDetector.new(request.user_agent).device_type.nil?
+              else
+                DeviceDetector.new(request.user_agent).bot?
+              end
             else
               Browser.new(request.user_agent).bot?
             end

data/lib/ahoy/controller.rb CHANGED

@@ -31,8 +31,12 @@ module Ahoy
     end
     def track_ahoy_visit
-      if ahoy.new_visit?
-        ahoy.track_visit(defer: Ahoy.server_side_visits != true)
+      defer = Ahoy.server_side_visits != true
+      if defer && !Ahoy.cookies
+        # avoid calling new_visit?, which triggers a database call
+      elsif ahoy.new_visit?
+        ahoy.track_visit(defer: defer)
       end
     end

data/lib/ahoy/database_store.rb CHANGED

@@ -12,10 +12,11 @@ module Ahoy
     end
     def track_event(data)
-      visit = visit_or_create
+      visit = visit_or_create(started_at: data[:time])
       if visit
         event = event_model.new(slice_data(event_model, data))
         event.visit = visit
+        event.time = visit.started_at if event.time < visit.started_at
         begin
           event.save!
         rescue => e
@@ -58,8 +59,8 @@ module Ahoy
     end
     # if we don't have a visit, let's try to create one first
-    def visit_or_create
-      ahoy.track_visit if !visit && Ahoy.server_side_visits
+    def visit_or_create(started_at: nil)
+      ahoy.track_visit(started_at: started_at) if !visit && Ahoy.server_side_visits
       visit
     end

data/lib/ahoy/engine.rb CHANGED

@@ -1,6 +1,6 @@
 module Ahoy
   class Engine < ::Rails::Engine
-    initializer "ahoy", after: "sprockets.environment" do |app|
+    initializer "ahoy", after: "sprockets.environment" do
       # allow Devise to be loaded after Ahoy
       require "ahoy/warden" if defined?(Warden)

data/lib/ahoy/helper.rb ADDED

@@ -0,0 +1,40 @@
+module Ahoy
+  module Helper
+    def amp_event(name, properties = {})
+      url = Ahoy::Engine.routes.url_helpers.events_url(
+        url_options.slice(:host, :port, :protocol).merge(
+          name: name,
+          properties: properties,
+          screen_width: "SCREEN_WIDTH",
+          screen_height: "SCREEN_HEIGHT",
+          platform: "Web",
+          landing_page: "AMPDOC_URL",
+          referrer: "DOCUMENT_REFERRER",
+          random: "RANDOM"
+        )
+      )
+      url = "#{url}&visit_token=${clientId(ahoy_visit)}&visitor_token=${clientId(ahoy_visitor)}"
+      content_tag "amp-analytics" do
+        content_tag "script", type: "application/json" do
+          json_escape({
+            requests: {
+              pageview: url
+            },
+            triggers: {
+              trackPageview: {
+                on: "visible",
+                request: "pageview"
+              }
+            },
+            transport: {
+              beacon: true,
+              xhrpost: true,
+              image: false
+            }
+          }.to_json).html_safe
+        end
+      end
+    end
+  end
+end

data/lib/ahoy/query_methods.rb CHANGED

@@ -27,7 +27,7 @@ module Ahoy
                 v = "true"
               end
-              relation = relation.where("JSON_UNQUOTE(properties -> ?) = ?", "$.#{k.to_s}", v.as_json)
+              relation = relation.where("JSON_UNQUOTE(properties -> ?) = ?", "$.#{k}", v.as_json)
             end
           else
             properties.each do |k, v|

data/lib/ahoy/tracker.rb CHANGED

@@ -37,7 +37,7 @@ module Ahoy
       report_exception(e)
     end
-    def track_visit(defer: false)
+    def track_visit(defer: false, started_at: nil)
       if exclude?
         debug "Visit excluded"
       elsif missing_params?
@@ -52,7 +52,7 @@ module Ahoy
             visit_token: visit_token,
             visitor_token: visitor_token,
             user_id: user.try(:id),
-            started_at: trusted_time,
+            started_at: trusted_time(started_at),
           }.merge(visit_properties).select { |_, v| v }
           @store.track_visit(data)
@@ -197,6 +197,7 @@ module Ahoy
     end
     def report_exception(e)
+      raise e if Rails.env.development? || Rails.env.test?
       Safely.report_exception(e)
     end
@@ -273,6 +274,7 @@ module Ahoy
     end
     def ensure_token(token)
+      token = Ahoy::Utils.ensure_utf8(token)
       token.to_s.gsub(/[^a-z0-9\-]/i, "").first(64) if token
     end

data/lib/ahoy/utils.rb ADDED

@@ -0,0 +1,7 @@
+module Ahoy
+  module Utils
+    def self.ensure_utf8(str)
+      str.encode("UTF-8", "binary", invalid: :replace, undef: :replace, replace: "") if str
+    end
+  end
+end

data/lib/ahoy/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/ahoy/visit_properties.rb CHANGED

@@ -103,7 +103,7 @@ module Ahoy
     def request_properties
       {
         ip: ip,
-        user_agent: ensure_utf8(request.user_agent),
+        user_agent: Ahoy::Utils.ensure_utf8(request.user_agent),
         referrer: referrer,
         landing_page: landing_page,
         platform: params["platform"],
@@ -113,11 +113,5 @@ module Ahoy
         screen_width: params["screen_width"]
       }
     end
-    def ensure_utf8(str)
-      if str
-        str.encode("UTF-8", "binary", invalid: :replace, undef: :replace, replace: "")
-      end
-    end
   end
 end

data/lib/generators/ahoy/templates/{active_record_event_model.rb → active_record_event_model.rb.tt} RENAMED

File without changes

data/lib/generators/ahoy/templates/{active_record_migration.rb → active_record_migration.rb.tt} RENAMED

@@ -34,6 +34,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.string :utm_content
       t.string :utm_campaign
+      # native apps
+      t.string :app_version
+      t.string :os_version
+      t.string :platform
       t.timestamp :started_at
     end

data/lib/generators/ahoy/templates/{active_record_visit_model.rb → active_record_visit_model.rb.tt} RENAMED

File without changes

data/lib/generators/ahoy/templates/{base_store_initializer.rb → base_store_initializer.rb.tt} RENAMED

@@ -15,3 +15,12 @@ class Ahoy::Store < Ahoy::BaseStore
     # !!!
   end
 end
+# set to true for JavaScript tracking
+Ahoy.api = false
+# better user agent parsing
+Ahoy.user_agent_parser = :device_detector
+# better bot detection
+Ahoy.bot_detection_version = 2

data/lib/generators/ahoy/templates/{database_store_initializer.rb → database_store_initializer.rb.tt} RENAMED

@@ -6,3 +6,6 @@ Ahoy.api = false
 # better user agent parsing
 Ahoy.user_agent_parser = :device_detector
+# better bot detection
+Ahoy.bot_detection_version = 2

data/lib/generators/ahoy/templates/{mongoid_event_model.rb → mongoid_event_model.rb.tt} RENAMED

File without changes

data/lib/generators/ahoy/templates/{mongoid_visit_model.rb → mongoid_visit_model.rb.tt} RENAMED

@@ -41,6 +41,11 @@ class Ahoy::Visit
   field :utm_content, type: String
   field :utm_campaign, type: String
+  # native apps
+  field :app_version, type: String
+  field :os_version, type: String
+  field :platform, type: String
   field :started_at, type: Time
   index({visit_token: 1}, {unique: true})

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -235,37 +235,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description:
-email:
-- andrew@chartkick.com
+email: andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- ahoy_matey.gemspec
 - app/controllers/ahoy/base_controller.rb
 - app/controllers/ahoy/events_controller.rb
 - app/controllers/ahoy/visits_controller.rb
 - app/jobs/ahoy/geocode_job.rb
 - app/jobs/ahoy/geocode_v2_job.rb
 - config/routes.rb
-- docs/Ahoy-2-Upgrade.md
-- docs/Data-Store-Examples.md
 - lib/ahoy.rb
 - lib/ahoy/base_store.rb
 - lib/ahoy/controller.rb
 - lib/ahoy/database_store.rb
 - lib/ahoy/engine.rb
+- lib/ahoy/helper.rb
 - lib/ahoy/model.rb
 - lib/ahoy/query_methods.rb
 - lib/ahoy/tracker.rb
+- lib/ahoy/utils.rb
 - lib/ahoy/version.rb
 - lib/ahoy/visit_properties.rb
 - lib/ahoy/warden.rb
@@ -274,21 +268,13 @@ files:
 - lib/generators/ahoy/base_generator.rb
 - lib/generators/ahoy/install_generator.rb
 - lib/generators/ahoy/mongoid_generator.rb
-- lib/generators/ahoy/templates/active_record_event_model.rb
-- lib/generators/ahoy/templates/active_record_migration.rb
-- lib/generators/ahoy/templates/active_record_visit_model.rb
-- lib/generators/ahoy/templates/base_store_initializer.rb
-- lib/generators/ahoy/templates/database_store_initializer.rb
-- lib/generators/ahoy/templates/mongoid_event_model.rb
-- lib/generators/ahoy/templates/mongoid_visit_model.rb
-- test/query_methods/mongoid_test.rb
-- test/query_methods/mysql_json_test.rb
-- test/query_methods/mysql_text_test.rb
-- test/query_methods/postgresql_hstore_test.rb
-- test/query_methods/postgresql_json_test.rb
-- test/query_methods/postgresql_jsonb_test.rb
-- test/query_methods/postgresql_text_test.rb
-- test/test_helper.rb
+- lib/generators/ahoy/templates/active_record_event_model.rb.tt
+- lib/generators/ahoy/templates/active_record_migration.rb.tt
+- lib/generators/ahoy/templates/active_record_visit_model.rb.tt
+- lib/generators/ahoy/templates/base_store_initializer.rb.tt
+- lib/generators/ahoy/templates/database_store_initializer.rb.tt
+- lib/generators/ahoy/templates/mongoid_event_model.rb.tt
+- lib/generators/ahoy/templates/mongoid_visit_model.rb.tt
 - vendor/assets/javascripts/ahoy.js
 homepage: https://github.com/ankane/ahoy
 licenses:
@@ -302,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -313,13 +299,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
-summary: Simple, powerful visit tracking for Rails
-test_files:
-- test/query_methods/mongoid_test.rb
-- test/query_methods/mysql_json_test.rb
-- test/query_methods/mysql_text_test.rb
-- test/query_methods/postgresql_hstore_test.rb
-- test/query_methods/postgresql_json_test.rb
-- test/query_methods/postgresql_jsonb_test.rb
-- test/query_methods/postgresql_text_test.rb
-- test/test_helper.rb
+summary: Simple, powerful analytics for Rails
+test_files: []

data/.github/ISSUE_TEMPLATE.md DELETED

@@ -1,7 +0,0 @@
-Hi,
-Before creating an issue, please check out the Contributing Guide:
-https://github.com/ankane/ahoy/blob/master/CONTRIBUTING.md
-Thanks!

data/.gitignore DELETED

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile DELETED

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-# Specify your gem's dependencies in ahoy.gemspec
-gemspec
-gem "rails", "~> 5.2.0"

data/Rakefile DELETED

@@ -1,9 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-task default: :test
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.warning = false
-end

data/ahoy_matey.gemspec DELETED

@@ -1,37 +0,0 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ahoy/version"
-Gem::Specification.new do |spec|
-  spec.name          = "ahoy_matey"
-  spec.version       = Ahoy::VERSION
-  spec.authors       = ["Andrew Kane"]
-  spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = "Simple, powerful visit tracking for Rails"
-  spec.homepage      = "https://github.com/ankane/ahoy"
-  spec.license       = "MIT"
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-  spec.add_dependency "railties", ">= 4.2"
-  spec.add_dependency "addressable"
-  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"
-  spec.add_dependency "request_store"
-  spec.add_dependency "safely_block", ">= 0.2.1"
-  spec.add_dependency "device_detector"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "mongoid"
-end

data/docs/Ahoy-2-Upgrade.md DELETED

@@ -1,149 +0,0 @@
-# Ahoy 2 Upgrade
-Ahoy 2.0 brings a number of exciting changes:
-- jQuery is no longer required
-- Uses `navigator.sendBeacon` by default in supported browsers
-- Simpler interface for data stores
-## How to Upgrade
-Update your Gemfile:
-```ruby
-gem 'ahoy_matey', '~> 2'
-```
-And run:
-```sh
-bundle update ahoy_matey
-```
-Add to `config/initializers/ahoy.rb`:
-```ruby
-Ahoy.api = true
-Ahoy.server_side_visits = false
-```
-You can also try the new `Ahoy.server_side_visits = :when_needed` to automatically create visits server-side when needed for events and `visitable`.
-If you use `visitable`, add `class_name` to each instance:
-```ruby
-visitable class_name: "Visit"
-```
-Then follow the instructions for your data store.
-- [ActiveRecordTokenStore](#activerecordtokenstore)
-- [ActiveRecordStore](#activerecordstore)
-- [MongoidStore](#mongoidstore)
-- [Others](#others)
-## Data Stores
-### ActiveRecordTokenStore
-In `config/initializers/ahoy.rb`, replace `Ahoy::Store` with:
-```ruby
-class Ahoy::Store < Ahoy::DatabaseStore
-  def visit_model
-    Visit
-  end
-end
-```
-### ActiveRecordStore
-Add [uuidtools](https://github.com/sporkmonger/uuidtools) to your Gemfile.
-In `config/initializers/ahoy.rb`, replace `Ahoy::Store` with:
-```ruby
-class Ahoy::Store < Ahoy::DatabaseStore
-  def track_visit(data)
-    data[:id] = ensure_uuid(data.delete(:visit_token))
-    data[:visitor_id] = ensure_uuid(data.delete(:visitor_token))
-    super(data)
-  end
-  def track_event(data)
-    data[:id] = ensure_uuid(data.delete(:event_id))
-    super(data)
-  end
-  def visit
-    @visit ||= visit_model.find_by(id: ensure_uuid(ahoy.visit_token)) if ahoy.visit_token
-  end
-  def visit_model
-    Visit
-  end
-  UUID_NAMESPACE = UUIDTools::UUID.parse("a82ae811-5011-45ab-a728-569df7499c5f")
-  def ensure_uuid(id)
-    UUIDTools::UUID.parse(id).to_s
-  rescue
-    UUIDTools::UUID.sha1_create(UUID_NAMESPACE, id).to_s
-  end
-end
-```
-### MongoidStore
-In `config/initializers/ahoy.rb`, replace `Ahoy::Store` with:
-```ruby
-class Ahoy::Store < Ahoy::DatabaseStore
-  def track_visit(data)
-    data[:_id] = binary_uuid(data.delete(:visit_token))
-    data[:visitor_id] = binary_uuid(data.delete(:visitor_token))
-    super(data)
-  end
-  def track_event(data)
-    data[:_id] = binary_uuid(data.delete(:event_id))
-    super(data)
-  end
-  def geocode(data)
-    visit_model.where(id: binary_uuid(ahoy.visit_token)).find_one_and_update({"$set": data}, {upsert: true})
-  end
-  def visit
-    @visit ||= visit_model.where(id: binary_uuid(ahoy.visit_token)).first if ahoy.visit_token
-  end
-  def visit_model
-    Visit
-  end
-  def binary_uuid(token)
-    token = token.delete("-")
-    if defined?(::BSON)
-      ::BSON::Binary.new(token, :uuid)
-    elsif defined?(::Moped::BSON)
-      ::Moped::BSON::Binary.new(:uuid, token)
-    else
-      token
-    end
-  end
-end
-```
-### Others
-Check out the [data store examples](Data-Store-Examples.md).
-## Throttling
-Throttling was removed due to limited practical usefulness. See [instructions for adding it back](../README.md#throttling) if you need it.
-## Options
-- The `mount` option was renamed to `api`
-- The `track_visits_immediately` option was renamed to `server_side_visits`

data/docs/Data-Store-Examples.md DELETED

@@ -1,240 +0,0 @@
-# Data Store Examples
-- [Kafka](#kafka)
-- [RabbitMQ](#rabbitmq)
-- [Fluentd](#fluentd)
-- [NATS](#nats)
-- [NSQ](#nsq)
-- [Amazon Kinesis Firehose](#amazon-kinesis-firehose)
-### Kafka
-Add [ruby-kafka](https://github.com/zendesk/ruby-kafka) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, data)
-    producer.produce(data.to_json, topic: topic)
-  end
-  def producer
-    @producer ||= begin
-      client =
-        Kafka.new(
-          seed_brokers: ENV["KAFKA_URL"] || "localhost:9092",
-          logger: Rails.logger
-        )
-      producer = client.async_producer(delivery_interval: 3)
-      at_exit { producer.shutdown }
-      producer
-    end
-  end
-end
-```
-### RabbitMQ
-Add [bunny](https://github.com/ruby-amqp/bunny) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, message)
-    channel.queue(topic, durable: true).publish(message.to_json)
-  end
-  def channel
-    @channel ||= begin
-      conn = Bunny.new
-      conn.start
-      conn.create_channel
-    end
-  end
-end
-```
-### Fluentd
-Add [fluent-logger](https://github.com/fluent/fluent-logger-ruby) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, message)
-    logger.post(topic, message)
-  end
-  def logger
-    @logger ||= Fluent::Logger::FluentLogger.new("ahoy", host: "localhost", port: 24224)
-  end
-end
-```
-### NATS
-Add [nats-pure](https://github.com/nats-io/pure-ruby-nats) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, data)
-    client.publish(topic, data.to_json)
-  end
-  def client
-    @client ||= begin
-      require "nats/io/client"
-      client = NATS::IO::Client.new
-      client.connect(servers: (ENV["NATS_URL"] || "nats://127.0.0.1:4222").split(","))
-      client
-    end
-  end
-end
-```
-### NSQ
-Add [nsq-ruby](https://github.com/wistia/nsq-ruby) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, data)
-    client.write_to_topic(topic, data.to_json)
-  end
-  def client
-    @client ||= begin
-      require "nsq"
-      client = Nsq::Producer.new(
-        nsqd: ENV["NSQ_URL"] || "127.0.0.1:4150"
-      )
-      at_exit { client.terminate }
-      client
-    end
-  end
-end
-```
-### Amazon Kinesis Firehose
-Add [aws-sdk-firehose](https://github.com/aws/aws-sdk-ruby) to your Gemfile.
-```ruby
-class Ahoy::Store < Ahoy::BaseStore
-  def track_visit(data)
-    post("ahoy_visits", data)
-  end
-  def track_event(data)
-    post("ahoy_events", data)
-  end
-  def geocode(data)
-    post("ahoy_geocode", data)
-  end
-  def authenticate(data)
-    post("ahoy_auth", data)
-  end
-  private
-  def post(topic, data)
-    client.put_record(
-      delivery_stream_name: topic,
-      record: {data: "#{data.to_json}\n"}
-    )
-  end
-  def client
-    @client ||= Aws::Firehose::Client.new
-  end
-end
-```

data/test/query_methods/mongoid_test.rb DELETED

@@ -1,23 +0,0 @@
-require_relative "../test_helper"
-Mongoid.logger.level = Logger::WARN
-Mongo::Logger.logger.level = Logger::WARN
-Mongoid.configure do |config|
-  config.connect_to("ahoy_test")
-end
-class MongoidEvent
-  include Mongoid::Document
-  include Ahoy::QueryMethods
-  field :properties, type: Hash
-end
-class MongoidTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    MongoidEvent
-  end
-end

data/test/query_methods/mysql_json_test.rb DELETED

@@ -1,18 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "mysql2", username: "root", database: "ahoy_test"
-ActiveRecord::Migration.create_table :mysql_json_events, force: true do |t|
-  t.json :properties
-end
-class MysqlJsonEvent < MysqlBase
-end
-class MysqlJsonTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    MysqlJsonEvent
-  end
-end

data/test/query_methods/mysql_text_test.rb DELETED

@@ -1,19 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "mysql2", username: "root", database: "ahoy_test"
-ActiveRecord::Migration.create_table :mysql_text_events, force: true do |t|
-  t.text :properties
-end
-class MysqlTextEvent < MysqlBase
-  serialize :properties, JSON
-end
-class MysqlTextTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    MysqlTextEvent
-  end
-end

data/test/query_methods/postgresql_hstore_test.rb DELETED

@@ -1,20 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "postgresql", database: "ahoy_test"
-ActiveRecord::Migration.enable_extension "hstore"
-ActiveRecord::Migration.create_table :postgresql_hstore_events, force: true do |t|
-  t.hstore :properties
-end
-class PostgresqlHstoreEvent < PostgresqlBase
-end
-class PostgresqlHstoreTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    PostgresqlHstoreEvent
-  end
-end

data/test/query_methods/postgresql_json_test.rb DELETED

@@ -1,18 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "postgresql", database: "ahoy_test"
-ActiveRecord::Migration.create_table :postgresql_json_events, force: true do |t|
-  t.json :properties
-end
-class PostgresqlJsonEvent < PostgresqlBase
-end
-class PostgresqlJsonTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    PostgresqlJsonEvent
-  end
-end

data/test/query_methods/postgresql_jsonb_test.rb DELETED

@@ -1,19 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "postgresql", database: "ahoy_test"
-ActiveRecord::Migration.create_table :postgresql_jsonb_events, force: true do |t|
-  t.jsonb :properties
-  t.index :properties, using: 'gin'
-end
-class PostgresqlJsonbEvent < PostgresqlBase
-end
-class PostgresqlJsonbTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    PostgresqlJsonbEvent
-  end
-end

data/test/query_methods/postgresql_text_test.rb DELETED

@@ -1,19 +0,0 @@
-require_relative "../test_helper"
-ActiveRecord::Base.establish_connection adapter: "postgresql", database: "ahoy_test"
-ActiveRecord::Migration.create_table :postgresql_text_events, force: true do |t|
-  t.text :properties
-end
-class PostgresqlTextEvent < PostgresqlBase
-  serialize :properties, JSON
-end
-class PostgresqlTextTest < Minitest::Test
-  include QueryMethodsTest
-  def model
-    PostgresqlTextEvent
-  end
-end

data/test/test_helper.rb DELETED

@@ -1,100 +0,0 @@
-require "bundler/setup"
-Bundler.require(:default)
-require "minitest/autorun"
-require "minitest/pride"
-require "active_record"
-require "mongoid"
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
-class PostgresqlBase < ActiveRecord::Base
-  include Ahoy::QueryMethods
-  establish_connection adapter: "postgresql", database: "ahoy_test"
-  self.abstract_class = true
-end
-class MysqlBase < ActiveRecord::Base
-  include Ahoy::QueryMethods
-  establish_connection adapter: "mysql2", username: "root", database: "ahoy_test"
-  self.abstract_class = true
-end
-module QueryMethodsTest
-  def setup
-    model.delete_all
-  end
-  def test_empty
-    assert_equal 0, count_events({})
-  end
-  def test_string
-    create_event value: "world"
-    assert_equal 1, count_events(value: "world")
-  end
-  def test_number
-    create_event value: 1
-    assert_equal 1, count_events(value: 1)
-  end
-  def test_date
-    today = Date.today
-    create_event value: today
-    assert_equal 1, count_events(value: today)
-  end
-  def test_time
-    now = Time.now
-    create_event value: now
-    assert_equal 1, count_events(value: now)
-  end
-  def test_true
-    create_event value: true
-    assert_equal 1, count_events(value: true)
-  end
-  def test_false
-    create_event value: false
-    assert_equal 1, count_events(value: false)
-  end
-  def test_nil
-    create_event value: nil
-    assert_equal 1, count_events(value: nil)
-  end
-  def test_any
-    create_event hello: "world", prop2: "hi"
-    assert_equal 1, count_events(hello: "world")
-  end
-  def test_multiple
-    create_event prop1: "hi", prop2: "bye"
-    assert_equal 1, count_events(prop1: "hi", prop2: "bye")
-  end
-  def test_multiple_order
-    create_event prop2: "bye", prop1: "hi"
-    assert_equal 1, count_events(prop1: "hi", prop2: "bye")
-  end
-  def test_partial
-    create_event hello: "world"
-    assert_equal 0, count_events(hello: "world", prop2: "hi")
-  end
-  def test_prefix
-    create_event value: 123
-    assert_equal 0, count_events(value: 1)
-  end
-  def create_event(properties)
-    model.create(properties: properties)
-  end
-  def count_events(properties)
-    model.where_properties(properties).count
-  end
-end