Added instance method - #460

CHANGELOG.md

@@ -1,5 +1,6 @@
-## 3.0.6 (unreleased)
+## 3.1.0 (unreleased)
 
+- Added `instance` method
 - Added optional `request` to `user_method` option
 
 ## 3.0.5 (2020-09-09)

lib/ahoy.rb

@@ -104,6 +104,14 @@ def self.mask_ip(ip)
       addr.mask(48).to_s
     end
   end
+
+  def self.instance
+    Thread.current[:ahoy]
+  end
+
+  def self.instance=(value)
+    Thread.current[:ahoy] = value
+  end
 end
 
 ActiveSupport.on_load(:action_controller) do

lib/ahoy/controller.rb

@@ -39,12 +39,12 @@ def track_ahoy_visit
     end
 
     def set_ahoy_request_store
-      previous_value = Thread.current[:ahoy]
+      previous_value = Ahoy.instance
       begin
-        Thread.current[:ahoy] = ahoy
+        Ahoy.instance = ahoy
         yield
       ensure
-        Thread.current[:ahoy] = previous_value
+        Ahoy.instance = previous_value
       end
     end
   end

lib/ahoy/model.rb

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

test/controller_test.rb

@@ -110,6 +110,19 @@ def test_visitable
     assert_equal visit, Product.last.ahoy_visit
   end
 
+  def test_instance
+    post products_url
+    assert_response :success
+
+    assert_equal 1, Ahoy::Visit.count
+    assert_equal 1, Ahoy::Event.count
+
+    event = Ahoy::Event.last
+    assert_equal "Created product", event.name
+    product = Product.last
+    assert_equal({"product_id" => product.id}, event.properties)
+  end
+
   def test_authenticate
     get products_url
     visit = Ahoy::Visit.last

test/internal/app/models/product.rb

@@ -1,3 +1,9 @@
 class Product < ApplicationRecord
   visitable :ahoy_visit
+
+  after_create :track_create
+
+  def track_create
+    Ahoy.instance.track("Created product", product_id: id)
+  end
 end