lib/ahoy_matey.rb in ahoy_matey-0.2.0 vs lib/ahoy_matey.rb in ahoy_matey-0.2.1

- old
+ new

@@ -8,10 +8,11 @@ require "ahoy/tracker" require "ahoy/controller" require "ahoy/model" require "ahoy/subscribers/active_record" require "ahoy/engine" +require "ahoy/warden" if defined?(Warden) module Ahoy def self.visit_model @visit_model || ::Visit @@ -45,23 +46,12 @@ (controller.respond_to?(:current_user) && controller.current_user) || (controller.respond_to?(:current_resource_owner, true) && controller.send(:current_resource_owner)) || nil end mattr_accessor :subscribers self.subscribers = [] + + mattr_accessor :track_bots + self.track_bots = false end ActionController::Base.send :include, Ahoy::Controller ActiveRecord::Base.send(:extend, Ahoy::Model) if defined?(ActiveRecord) - -if defined?(Warden) - Warden::Manager.after_set_user except: :fetch do |user, auth, opts| - request = ActionDispatch::Request.new(auth.env) - visit_token = request.cookies["ahoy_visit"] || request.headers["Ahoy-Visit"] - if visit_token - visit = Ahoy.visit_model.where(visit_token: visit_token).first - if visit and !visit.user - visit.user = user - visit.save! - end - end - end -end