support http style hostnames

Author: jlwalke2

CHANGELOG.md

@@ -6,6 +6,7 @@ Unreleased
 
 **Changed**
 - Added `replace` parameter to `sasctl.tasks.publish_model` 
+- `Session` hostname's can now be specified in HTTP format: 'http://example.com'.
 
 **Bugfixes**
 - Renamed `microanalytic_store` service to `microanalytic_score` 

src/sasctl/core.py

@@ -16,7 +16,7 @@
 from uuid import UUID, uuid4
 
 import requests, requests.exceptions
-from requests.adapters import HTTPAdapter, DEFAULT_POOLBLOCK
+from requests.adapters import HTTPAdapter
 from six.moves.urllib.parse import urlsplit, urlunsplit
 from six.moves.urllib.error import HTTPError
 
@@ -263,7 +263,8 @@ def __init__(self, hostname,
                           swat.cas.rest.connection.REST_CASConnection):
                 import base64
 
-                # Use the httpAddress action to retieve information about REST endpoints
+                # Use the httpAddress action to retieve information about
+                # REST endpoints
                 httpAddress = hostname.get_action('builtins.httpAddress')
                 address = httpAddress()
                 domain = address.virtualHost
@@ -273,18 +274,21 @@ def __init__(self, hostname,
                     domain = hostname._sw_connection._current_hostname
                 protocol = address.protocol
                 port = address.port
-
-                # protocol = hostname._protocol
                 auth = hostname._sw_connection._auth.decode('utf-8').replace(
                     'Basic ', '')
-                username, password = base64.b64decode(auth).decode('utf-8').split(
-                    ':')
-                # domain = hostname._hostname
+                username, password = base64.b64decode(auth).decode(
+                    'utf-8').split(':')
             else:
-                raise ValueError(
-                    "A 'swat.CAS' session can only be reused when it's connected via the REST APIs.")
+                raise ValueError("A 'swat.CAS' session can only be reused "
+                                 "when it's connected via the REST APIs.")
         else:
-            domain = str(hostname)
+            url = urlsplit(hostname)
+
+            # Extract http/https from domain name if present and protocl not
+            # explicitly given
+            protocol = protocol or url.scheme
+
+            domain = url.hostname or str(hostname)
 
         self._settings = {'protocol': protocol or 'https',
                          'domain': domain,

tests/unit/test_session.py

@@ -14,6 +14,25 @@
 from sasctl import Session, current_session
 
 
+def test_session_from_url():
+    """Ensure domains in the format http(s)://hostname.com are handled."""
+
+    # Initial session should automatically become the default
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('http://example.com', 'user', 'password')
+    assert s.hostname == 'example.com'
+    assert s._settings['protocol'] == 'http'
+
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('http://example.com', 'user', 'password', protocol='https')
+    assert s.hostname == 'example.com'
+    assert s._settings['protocol'] == 'https'
+
+    with mock.patch('sasctl.core.Session.get_token'):
+        s = Session('https://example.com', 'user', 'password', protocol='http')
+    assert s.hostname == 'example.com'
+    assert s._settings['protocol'] == 'http'
+
 def test_new_session(missing_packages):
     HOST = 'example.com'
     USERNAME = 'user'