Rename ProviderClient -> MultipleProviderClient

Perhaps an improvement to names, re:

CityofSantaMonica#46
CityofSantaMonica#35

mds/api/__init__.py

@@ -2,5 +2,4 @@
 Module implementing the MDS Provider API.
 """
 
-from mds.api.client import ProviderClient
-
+from mds.api.client import MultipleProviderClient

mds/api/client.py

@@ -82,7 +82,7 @@ def _prepare_trips_params(
         }
 
 
-class SingleProviderClient(ProviderClientBase):
+class ProviderClient(ProviderClientBase):
     def __init__(self, provider):
         self.provider = provider
 
@@ -147,13 +147,13 @@ def __next_url(page):
                     break
 
 
-class ProviderClient(ProviderClientBase):
+class MultipleProviderClient(ProviderClientBase):
     """
     Client for MDS Provider APIs
     """
     def __init__(self, providers=None, ref=None):
         """
-        Initialize a new ProviderClient object.
+        Initialize a new MultipleProviderClient object.
 
         :providers: is a list of Providers this client tracks by default. If None is given, downloads and uses the official Provider registry.
 
@@ -164,7 +164,7 @@ def __init__(self, providers=None, ref=None):
         """
         self.providers = providers if providers is not None else get_registry(ref)
 
-    def _request(self, providers, endpoint, params, paging):
+    def _request_from_providers(self, providers, endpoint, params, paging):
         """
         Internal helper for sending requests.
 
@@ -184,7 +184,7 @@ def __describe(res):
 
         results = {}
         for provider in providers:
-            client = SingleProviderClient(provider)
+            client = ProviderClient(provider)
             try:
                 results[provider] = list(client.request(endpoint, params, paging))
             except requests.RequestException as exc:
@@ -228,7 +228,7 @@ def get_status_changes(
         params = self._prepare_status_changes_params(**kwargs)
 
         # make the request(s)
-        status_changes = self._request(providers, mds.STATUS_CHANGES, params, paging)
+        status_changes = self._request_from_providers(providers, mds.STATUS_CHANGES, params, paging)
 
         return status_changes
 
@@ -272,6 +272,6 @@ def get_trips(
         params = self._prepare_trips_params(**kwargs)
 
         # make the request(s)
-        trips = self._request(providers, mds.TRIPS, params, paging)
+        trips = self._request_from_providers(providers, mds.TRIPS, params, paging)
 
         return trips

mds/tests/test_api.py

@@ -5,7 +5,7 @@
 
 from mds.fake.server import make_static_server_app
 from mds.providers import Provider
-from mds.api import ProviderClient
+from mds.api import MultipleProviderClient
 
 
 def requests_mock_with_app(app, netloc='testserver'):
@@ -53,7 +53,7 @@ def setUp(self):
 
     def _all_items_from_app(self, app, endpoint='trips', get_method_kwargs={}):
         with mock_provider(app) as provider:
-            client = ProviderClient(providers=[provider])
+            client = MultipleProviderClient(providers=[provider])
             method = getattr(client, f'get_{endpoint}')
             pages_by_provider = method(**get_method_kwargs)