test_track_rails_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRkODQyZjM0ODM2YzM0NzFhYTE5YTU4ZWQ4YjhhYjQ0ZTg2OWQxYw==
+    ZWRlMmZlOWFkYmQwZmJiMWE5YzAyZDdmYjBkOTIwYTRlZDM2MmZjYg==
   data.tar.gz: !binary |-
-    OGViNGE1Y2NlNTM2NWVhYWI5ZjcxZmIyZGNhYTRjOTA4NTBmMDE0NA==
+    OGZmNTJjMGZiYjI2N2YyMzAxNGVhNzg2ZDk0MTRlYzM2YzdkMDA5MA==
 SHA512:
   metadata.gz: !binary |-
-    OTM5YmZkYTNhNTllZmNhNWNmNzYwODM0ZmNmNzE3NTg1ZDFiYjg1MmY3Mjg2
-    Yjk5NGFmZTA0NWM2ZjhlYTFiNmNkNjc4NzA3NWE3YTdlODg3MWU4MDNjNjZj
-    YzZhYTMyNzM5NTFkNjMyYzcwZTk2Y2Y4YzdmODJkZDI2OTkwZGU=
+    NWI4NGRhMzI4OTcwMzBlNWI1NmM0MDJhOWE5YWEzNzk5ODI3ZjM3OGFhNzZj
+    YzFkMTlhZjU5YjA3YzgxMjQ1ODgwODUyNWY3OTEwOGVhOTIyMjJkNjZmNzAx
+    OGQ0ZWIzZjZhN2MwOGNiYTAxODNhYjk3MWQwOGIwZDEzN2YxNjE=
   data.tar.gz: !binary |-
-    YzMyOWIzYmNiODcwZTI1NzZhYjg0NGY3OWUwZjRjMDExMWIzYTIxZDZhMjZi
-    NzAwNjVmYWM1MGQxNzU0MTlkYTBmNzg0ZGQ3ZDRkY2JiNWUxMzk5Y2FhZjAw
-    YTEyYjUwMjNhNTM5OTVmMzAwNWZiN2I4ZjE5NjRmYjU3YjlkMDQ=
+    NGM5NzAyNWMyYzc1OWY0NTYzZTE5YjcwYTdkZTk5NDhmMGQyMjA0NWYzYzE1
+    ZGVjZWQzYWVlODgwODlhODkxZGI1MmZmMjg0NThkZTU0YTY0NGYzMmVkZGE4
+    OTFjMTUyMDM5MGM1YjQzODAwYzIxZGUwMzliZDMwZGYzNTIwMTI=

data/app/models/test_track/session.rb

@@ -12,6 +12,7 @@ class TestTrack::Session
     yield
   ensure
     manage_cookies!
+    manage_response_headers!
     notify_unsynced_assignments! if sync_assignments?
     create_alias! if signed_up?
   end
@@ -48,7 +49,11 @@ class TestTrack::Session
   alias signed_up? signed_up
 
   def visitor
-    @visitor ||= TestTrack::Visitor.new(id: cookies[visitor_cookie_name])
+    @visitor ||= TestTrack::Visitor.new(id: visitor_id)
+  end
+
+  def visitor_id
+    cookies[visitor_cookie_name] || request_headers[visitor_request_header_name]
   end
 
   def set_cookie(name, value)
@@ -100,10 +105,26 @@ class TestTrack::Session
     controller.request
   end
 
+  def response
+    controller.response
+  end
+
   def cookies
     controller.send(:cookies)
   end
 
+  def request_headers
+    request.headers
+  end
+
+  def response_headers
+    response.headers
+  end
+
+  def manage_response_headers!
+    response_headers[visitor_response_header_name] = visitor.id if visitor.id_overridden_by_existing_visitor?
+  end
+
   def notify_unsynced_assignments!
     payload = {
       mixpanel_distinct_id: mixpanel_distinct_id,
@@ -170,6 +191,14 @@ class TestTrack::Session
     ENV['TEST_TRACK_VISITOR_COOKIE_NAME'] || 'tt_visitor_id'
   end
 
+  def visitor_request_header_name
+    ENV['TEST_TRACK_VISITOR_REQUEST_HEADER_NAME'] || 'X-TT-Visitor-ID'
+  end
+
+  def visitor_response_header_name
+    ENV['TEST_TRACK_VISITOR_RESPONSE_HEADER_NAME'] || 'X-Set-TT-Visitor-ID'
+  end
+
   def fully_qualified_cookie_domain_enabled?
     ENV['TEST_TRACK_FULLY_QUALIFIED_COOKIE_DOMAIN_ENABLED'] == '1'
   end

data/app/models/test_track/visitor.rb

@@ -98,6 +98,10 @@ class TestTrack::Visitor
     !offline? && @remote_visitor.present?
   end
 
+  def id_overridden_by_existing_visitor?
+    @id_overridden_by_existing_visitor || false
+  end
+
   private
 
   def assignments
@@ -113,6 +117,7 @@ class TestTrack::Visitor
   end
 
   def merge!(other)
+    @id_overridden_by_existing_visitor = id != other.id
     @id = other.id
     @assignment_registry = assignment_registry.merge(other.assignment_registry)
     @unsynced_assignments = nil

data/lib/test_track_rails_client/version.rb

@@ -1,3 +1,3 @@
 module TestTrackRailsClient
-  VERSION = "1.0.0" # rubocop:disable Style/MutableConstant
+  VERSION = "1.1.0" # rubocop:disable Style/MutableConstant
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_track_rails_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan O'Neill
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -419,8 +419,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MS45LjM=
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='