Separate models from HTTP

Author: rzane

app/models/concerns/test_track/resource.rb

@@ -1,54 +1,9 @@
-require 'faraday'
-require 'faraday/request/json'
-require 'faraday/response/json'
-require 'faraday/response/raise_error'
-
 module TestTrack::Resource
   extend ActiveSupport::Concern
 
   include ActiveModel::API
   include ActiveModel::Attributes
 
-  class << self
-    attr_writer :connection
-
-    # FIXME: Raise UnrecoverableConnectivityError when we have a server error
-    # FIXME: Remove `content_type` option and respect `Content-Type` header
-    def connection
-      @connection ||= Faraday.new(url: ENV['TEST_TRACK_API_URL']) do |conn|
-        conn.use Faraday::Request::Json
-        conn.use Faraday::Response::Json, content_type: []
-        conn.use Faraday::Response::RaiseError
-        # Number of seconds to wait for the connection to open.
-        conn.options[:open_timeout] = (ENV['TEST_TRACK_OPEN_TIMEOUT'] || 2).to_i
-        # Number of seconds to wait for one block to be read (via one read(2) call).
-        conn.options[:timeout] = (ENV['TEST_TRACK_TIMEOUT'] || 4).to_i
-      end
-    end
-  end
-
-  module Helpers
-    private
-
-    def fake_requests?
-      !TestTrack.enabled?
-    end
-
-    def request(method:, path:, fake:, body: nil, headers: nil)
-      # Ensure that fake responses are consistent with real responses
-      return JSON.parse(JSON.generate(fake)) if fake_requests?
-
-      response = TestTrack::Resource.connection.run_request(method, path, body, headers)
-      response.body
-    end
-  end
-
-  include Helpers
-
-  module ClassMethods
-    include Helpers
-  end
-
   private
 
   def _assign_attribute(name, value)

app/models/test_track/client.rb

@@ -0,0 +1,36 @@
+require 'faraday'
+require 'faraday/request/json'
+require 'faraday/response/json'
+require 'faraday/response/raise_error'
+
+module TestTrack::Client
+  extend self
+
+  attr_writer :connection
+
+  def fake?
+    !TestTrack.enabled?
+  end
+
+  def request(method:, path:, fake:, body: nil, headers: nil)
+    # Ensure that fake responses are consistent with real responses
+    return JSON.parse(JSON.generate(fake)) if fake?
+
+    response = connection.run_request(method, path, body, headers)
+    response.body
+  end
+
+  # FIXME: Raise UnrecoverableConnectivityError when we have a server error
+  # FIXME: Remove `content_type` option and respect `Content-Type` header
+  def connection
+    @connection ||= Faraday.new(url: ENV['TEST_TRACK_API_URL']) do |conn|
+      conn.use Faraday::Request::Json
+      conn.use Faraday::Response::Json, content_type: []
+      conn.use Faraday::Response::RaiseError
+      # Number of seconds to wait for the connection to open.
+      conn.options[:open_timeout] = (ENV['TEST_TRACK_OPEN_TIMEOUT'] || 2).to_i
+      # Number of seconds to wait for one block to be read (via one read(2) call).
+      conn.options[:timeout] = (ENV['TEST_TRACK_TIMEOUT'] || 4).to_i
+    end
+  end
+end

app/models/test_track/remote/assignment_event.rb

@@ -21,7 +21,7 @@ def self.create!(attributes)
   def save
     return false unless valid?
 
-    request(
+    TestTrack::Client.request(
       method: :post,
       path: 'api/v1/assignment_event',
       body: { context: context, visitor_id: visitor_id, split_name: split_name, mixpanel_result: mixpanel_result },

app/models/test_track/remote/fake_server.rb

@@ -2,6 +2,6 @@ class TestTrack::Remote::FakeServer
   def self.reset!(seed)
     raise('Cannot reset FakeServer if TestTrack is enabled.') if TestTrack.enabled?
 
-    TestTrack::Resource.connection.put('api/v1/reset', seed: seed)
+    TestTrack::Client.connection.put('api/v1/reset', seed: seed)
   end
 end

app/models/test_track/remote/identifier.rb

@@ -25,7 +25,7 @@ def visitor=(value)
   def save
     return false unless valid?
 
-    result = request(
+    result = TestTrack::Client.request(
       method: :post,
       path: 'api/v1/identifier',
       body: { identifier_type: identifier_type, visitor_id: visitor_id, value: value },

app/models/test_track/remote/identifier_type.rb

@@ -8,7 +8,7 @@ class TestTrack::Remote::IdentifierType
   def save
     return false unless valid?
 
-    request(
+    TestTrack::Client.request(
       method: :post,
       path: 'api/v1/identifier_type',
       body: { name: name },

app/models/test_track/remote/split_config.rb

@@ -7,7 +7,7 @@ class TestTrack::Remote::SplitConfig
   validates :name, :weighting_registry, presence: true
 
   def self.destroy_existing(id)
-    request(
+    TestTrack::Client.request(
       method: :delete,
       path: "api/v1/split_configs/#{id}",
       fake: nil
@@ -19,7 +19,7 @@ def self.destroy_existing(id)
   def save
     return false unless valid?
 
-    request(
+    TestTrack::Client.request(
       method: :post,
       path: 'api/v1/split_configs',
       body: { name: name, weighting_registry: weighting_registry },

app/models/test_track/remote/split_detail.rb

@@ -12,7 +12,7 @@ class TestTrack::Remote::SplitDetail
   attr_reader :variant_details
 
   def self.from_name(name)
-    result = request(
+    result = TestTrack::Client.request(
       method: :get,
       path: "api/v1/split_details/#{name}",
       fake: fake_instance_attributes(name)

app/models/test_track/remote/split_registry.rb

@@ -12,7 +12,7 @@ def fake_instance_attributes(_)
     end
 
     def instance
-      result = request(
+      result = TestTrack::Client.request(
         method: :get,
         path: "api/v3/builds/#{TestTrack.build_timestamp}/split_registry",
         fake: fake_instance_attributes(nil)
@@ -26,7 +26,7 @@ def reset
     end
 
     def to_hash
-      if fake_requests?
+      if TestTrack::Client.fake?
         instance.attributes.freeze
       else
         fetch_cache { instance.attributes }.freeze

app/models/test_track/remote/visitor.rb

@@ -6,7 +6,7 @@ class TestTrack::Remote::Visitor
   attr_reader :assignments
 
   def self.find(id)
-    result = request(
+    result = TestTrack::Client.request(
       method: :get,
       path: "api/v1/visitors/#{id}",
       fake: fake_instance_attributes(nil)
@@ -19,7 +19,7 @@ def self.from_identifier(identifier_type, identifier_value)
     raise "must provide an identifier_type" if identifier_type.blank?
     raise "must provide an identifier_value" if identifier_value.blank?
 
-    result = request(
+    result = TestTrack::Client.request(
       method: :get,
       path: "api/v1/identifier_types/#{identifier_type}/identifiers/#{identifier_value}/visitor",
       fake: fake_instance_attributes(nil)