ahoy_matey 2.0.0 → 3.2.0

metadata

@@ -1,113 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: referer-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: user_agent_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    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: safely_block
   requirement: !ruby/object:Gem::Requirement
@@ -123,135 +53,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: device_detector
   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: rake
-  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: minitest
-  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: activerecord
-  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: pg
-  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: mysql2
-  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: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email:
-- andrew@chartkick.com
+description:
+email: andrew@ankane.org
 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
@@ -260,27 +100,19 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -288,24 +120,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.3
+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, first-party analytics for Rails
+test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -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

@@ -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

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

data/Rakefile

@@ -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

@@ -1,36 +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"
-  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_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

@@ -1,147 +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 install
-```
-
-Add to `config/initializers/ahoy.rb`:
-
-```ruby
-Ahoy.api = true
-Ahoy.server_side_visits = false
-```
-
-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`