allow hostnames to be specified via environment variables

.gitignore

@@ -3,6 +3,7 @@ __pycache__
 *.egg-info
 .eggs
 .cache
+.pytest_cache
 .tox
 build
 dist

datadotworld/__init__.py

@@ -35,7 +35,7 @@
 )
 from datadotworld.datadotworld import DataDotWorld, UriParam  # noqa: F401
 
-__version__ = '1.6.0'
+__version__ = '1.6.1'
 
 # Convenience top-level functions
 

datadotworld/client/api.py

@@ -36,7 +36,7 @@
     ContentNegotiatingApiClient
 )
 from datadotworld.util import parse_dataset_key, _user_agent
-
+from datadotworld.hosts import API_HOST, DOWNLOAD_HOST
 
 class RestApiClient(object):
     """REST API client
@@ -48,10 +48,8 @@ class RestApiClient(object):
     def __init__(self, config):
         self._config = config
         self._protocol = 'https'
-        self._download_host = 'download.data.world'
 
-        api_host = 'api.data.world'
-        self._host = "{}://{}/v0".format(self._protocol, api_host)
+        self._host = "{}/v0".format(API_HOST)
         swagger_client = _swagger.ApiClient(
             host=self._host,
             header_name='Authorization',
@@ -457,8 +455,8 @@ def download_datapackage(self, dataset_key, dest_dir):
                              'but {} already exists'.format(dest_dir))
 
         owner_id, dataset_id = parse_dataset_key(dataset_key)
-        url = "{0}://{1}/datapackage/{2}/{3}".format(
-            self._protocol, self._download_host, owner_id, dataset_id)
+        url = "{0}/datapackage/{1}/{2}".format(
+            DOWNLOAD_HOST, owner_id, dataset_id)
         headers = {
             'User-Agent': _user_agent(),
             'Authorization': 'Bearer {0}'.format(self._config.auth_token)

datadotworld/datadotworld.py

@@ -33,6 +33,7 @@
 from datadotworld.models.query import QueryResults
 from datadotworld.util import _user_agent, parse_dataset_key
 from datadotworld.files import RemoteFile
+from datadotworld.hosts import QUERY_HOST
 
 
 class DataDotWorld(object):
@@ -52,9 +53,6 @@ class DataDotWorld(object):
     """
 
     def __init__(self, config=None):
-        self._protocol = 'https'
-        self._query_host = 'query.data.world'
-        self._download_host = 'download.data.world'
         self._config = config or ChainedConfig()
         self.api_client = RestApiClient(self._config)
 
@@ -100,8 +98,8 @@ def query(self, dataset_key, query, query_type="sql", parameters=None):
             params["parameters"] = ",".join(["{}={}".format(
                 k, convert_to_sparql_literal(parameters[k]))
                 for k in parameters.keys()])
-        url = "{0}://{1}/{2}/{3}/{4}".format(self._protocol, self._query_host,
-                                             query_type, owner_id, dataset_id)
+        url = "{0}/{1}/{2}/{3}".format(QUERY_HOST,
+                                       query_type, owner_id, dataset_id)
         headers = {
             'User-Agent': _user_agent(),
             'Accept': 'application/sparql-results+json',

datadotworld/files.py

@@ -26,7 +26,7 @@
 import requests
 from datadotworld.util import parse_dataset_key, _user_agent
 from datadotworld.client.api import RestApiError
-
+from datadotworld.hosts import API_HOST, QUERY_HOST
 
 class RemoteFile:
     """ """
@@ -68,8 +68,8 @@ def __init__(self, config, dataset_key, file_name,
             whether to decode textual responses as unicode when returning
             streamed lines in 'r' mode
         """
-        self._api_host = "https://api.data.world/v0"
-        self._query_host = "https://query.data.world"
+        self._api_host = "{}/v0".format(API_HOST)
+        self._query_host = QUERY_HOST
         self._config = config
         self._dataset_key = dataset_key
         self._file_name = file_name

datadotworld/hosts/__init__.py

@@ -0,0 +1,28 @@
+# data.world-py
+# Copyright 2017 data.world, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the
+# License.
+#
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# This product includes software developed at
+# data.world, Inc.(http://data.world/).
+
+from os import environ
+
+# define constants for the various hosts the SDK may need to connect to
+# for connecting to the public data.world server, the defaults are fine -
+# to connect to a separate data.world environment, the environment variables
+# can be specified.
+API_HOST = environ.get('DW_API_HOST', 'https://api.data.world')
+DOWNLOAD_HOST = environ.get('DW_DOWNLOAD_HOST', 'https://download.data.world')
+QUERY_HOST = environ.get('DW_QUERY_HOST', 'https://query.data.world')