ahoy_matey 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da649f5c85699714bff1777f3226b232f555e79ec2ece218280541bbb1264d5
-  data.tar.gz: '0180556a4ad007b5d9df07faa327a6d53e9a2cfe1bf810cb78e9d24d6cdc060b'
+  metadata.gz: d90d64ae8641aa0bae1bc44acf29379a585ebbad0bbb87325380508d5a8ffcc7
+  data.tar.gz: 7c01ce8cbd2e92e3555479b251889d171b54be9d5c369fca51f413fdc912ab01
 SHA512:
-  metadata.gz: e7cd93d376c86d34123c964fceb7f84ef33dc0513bfb66ac1e9da1b5654a7bed69041eb0d99477b50f87c77b5bf8e4c396e4dc8bf99b10db2699ef09fb11ecf8
-  data.tar.gz: f11f02dbd35f36982d932d12a905d060770d9f01f4b0bdfe572002dd5a10feaa07b79b1d3eb0e2df3376f00c6fbe67bbcc29549498599bd9634e164ff04d4184
+  metadata.gz: fe62cce407d17f736b616f11a742fefe338cdedd2457665cb3e578bafe0bd6fbb889dd315382dcb70d563a35dd5c5e05de908c069e12d21ab92e0cee637e42d7
+  data.tar.gz: f399c7708f6c1071c72db3d9164ab77bd3377fdc0eab7064707fb1202b240156be03669070763bf2f13bcf0bfcac134286eb9e9f9fb988d78267c71da9603386

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.0.1
+
+- 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
 
 - Made Device Detector the default user agent parser

data/README.md

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

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/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,7 +169,7 @@ 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
@@ -180,7 +181,7 @@ module Ahoy
     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 +197,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.1"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-09-22 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:
     - - ">="