lib/ahoy/controller.rb in ahoy_matey-1.6.1 vs lib/ahoy/controller.rb in ahoy_matey-2.0.0

@@ -5,19 +5,13 @@
     def self.included(base)
       if base.respond_to?(:helper_method)
         base.helper_method :current_visit
         base.helper_method :ahoy
       end
-      if base.respond_to?(:before_action)
-        base.before_action :set_ahoy_cookies, unless: -> { Ahoy.api_only }
-        base.before_action :track_ahoy_visit, unless: -> { Ahoy.api_only }
-        base.before_action :set_ahoy_request_store
-      else
-        base.before_filter :set_ahoy_cookies, unless: -> { Ahoy.api_only }
-        base.before_filter :track_ahoy_visit, unless: -> { Ahoy.api_only }
-        base.before_filter :set_ahoy_request_store
-      end
+      base.before_action :set_ahoy_cookies, unless: -> { Ahoy.api_only }
+      base.before_action :track_ahoy_visit, unless: -> { Ahoy.api_only }
+      base.before_action :set_ahoy_request_store
     end
 
     def ahoy
       @ahoy ||= Ahoy::Tracker.new(controller: self)
     end
@@ -31,10 +25,10 @@
       ahoy.set_visit_cookie
     end
 
     def track_ahoy_visit
       if ahoy.new_visit?
-        ahoy.track_visit(defer: !Ahoy.track_visits_immediately)
+        ahoy.track_visit(defer: !Ahoy.server_side_visits)
       end
     end
 
     def set_ahoy_request_store
       RequestStore.store[:ahoy] ||= ahoy