lib/ahoy.rb in ahoy_matey-3.3.0 vs lib/ahoy.rb in ahoy_matey-4.0.0

@@ -2,11 +2,10 @@
 require "ipaddr"
 
 # dependencies
 require "active_support"
 require "active_support/core_ext"
-require "geocoder"
 require "safely/core"
 
 # modules
 require "ahoy/utils"
 require "ahoy/base_store"
@@ -42,11 +41,11 @@
 
   mattr_accessor :quiet
   self.quiet = true
 
   mattr_accessor :geocode
-  self.geocode = true
+  self.geocode = false
 
   mattr_accessor :max_content_length
   self.max_content_length = 8192
 
   mattr_accessor :max_events_per_request
@@ -126,12 +125,8 @@
 ActiveSupport.on_load(:action_view) do
   include Ahoy::Helper
 end
 
 # Mongoid
-# TODO use
-# ActiveSupport.on_load(:mongoid) do
-#   Mongoid::Document::ClassMethods.include(Ahoy::Model)
-# end
-if defined?(ActiveModel)
-  ActiveModel::Callbacks.include(Ahoy::Model)
+ActiveSupport.on_load(:mongoid) do
+  Mongoid::Document::ClassMethods.include(Ahoy::Model)
 end