Create visit for visitable if needed

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.1 [unreleased]
+
+- Create visit for `visitable` if needed
+- Better handling of visit duration and expiration in JavaScript
+
 ## 2.0.0
 
 - Removed dependency on jQuery

lib/ahoy/base_store.rb

@@ -39,6 +39,10 @@ def generate_id
       Ahoy.token_generator.call
     end
 
+    def visit_or_create
+      visit
+    end
+
     protected
 
     def bot?

lib/ahoy/database_store.rb

@@ -8,9 +8,7 @@ def track_visit(data)
     end
 
     def track_event(data)
-      # if we don't have a visit, let's try to create one first
-      ahoy.track_visit unless visit
-
+      visit = visit_or_create
       if visit
         event = event_model.new(slice_data(event_model, data))
         event.visit = visit
@@ -51,6 +49,12 @@ def visit
       @visit ||= visit_model.where(visit_token: ahoy.visit_token).first if ahoy.visit_token
     end
 
+    # if we don't have a visit, let's try to create one first
+    def visit_or_create
+      ahoy.track_visit unless visit
+      visit
+    end
+
     protected
 
     def visit_model

lib/ahoy/model.rb

@@ -7,7 +7,7 @@ def visitable(name = :visit, **options)
       end
       class_eval %{
         def set_ahoy_visit
-          self.#{name} ||= RequestStore.store[:ahoy].try(:visit)
+          self.#{name} ||= RequestStore.store[:ahoy].try(:visit_or_create)
         end
       }
     end

lib/ahoy/tracker.rb

@@ -93,6 +93,10 @@ def visit
       @visit ||= @store.visit
     end
 
+    def visit_or_create
+      @visit ||= @store.visit_or_create
+    end
+
     def new_visit?
       !existing_visit_token
     end