Run test workflow on pull request

AUTHORS

@@ -9,4 +9,4 @@ Scott Nixon
 Jason Dorweiler
 Pierre-Alain Dupont
 Karl Goetz
-Alex Kerney
+

HISTORY.rst

@@ -3,16 +3,6 @@
 Release history
 ===============
 
-1.1.0
------
-
-- Added ability to follow redirects in requests
-
-1.0.0
------
-
-- Authenticate with headers
-
 0.9.0
 -----
 

docs/conf.py

@@ -51,9 +51,9 @@ copyright = u'2014, Marc Sibson'
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '0.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pydiscourse/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.1.0"
+__version__ = "0.9.0"
 
 from pydiscourse.client import DiscourseClient

pydiscourse/client.py

@@ -489,11 +489,7 @@ class DiscourseClient(object):
             JSON API response
 
         """
-        return self._get(
-            "/c/{0}.json".format(category_id),
-            override_request_kwargs={"allow_redirects": True},
-            **kwargs
-        )
+        return self._get("/c/{0}.json".format(category_id), **kwargs)
 
     def hot_topics(self, **kwargs):
         """
@@ -949,7 +945,7 @@ class DiscourseClient(object):
         """
         Get all infos of a group by group name
         """
-        return self._get("/groups/{0}.json".format(group_name))
+        return self._get("/groups/{0}/members.json".format(group_name))
 
     def create_group(
         self,
@@ -1285,7 +1281,7 @@ class DiscourseClient(object):
         kwargs["parent_tag_name"] = parent_tag_name
         return self._post("/tag_groups", json=True, **kwargs)["tag_group"]
 
-    def _get(self, path, override_request_kwargs=None, **kwargs):
+    def _get(self, path, **kwargs):
         """
 
         Args:
@@ -1295,9 +1291,9 @@ class DiscourseClient(object):
         Returns:
 
         """
-        return self._request(GET, path, params=kwargs, override_request_kwargs=override_request_kwargs)
+        return self._request(GET, path, params=kwargs)
 
-    def _put(self, path, json=False, override_request_kwargs=None, **kwargs):
+    def _put(self, path, json=False, **kwargs):
         """
 
         Args:
@@ -1308,12 +1304,12 @@ class DiscourseClient(object):
 
         """
         if not json:
-            return self._request(PUT, path, data=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(PUT, path, data=kwargs)
 
         else:
-            return self._request(PUT, path, json=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(PUT, path, json=kwargs)
 
-    def _post(self, path, files=None, json=False, override_request_kwargs=None, **kwargs):
+    def _post(self, path, files={}, json=False, **kwargs):
         """
 
         Args:
@@ -1324,12 +1320,12 @@ class DiscourseClient(object):
 
         """
         if not json:
-            return self._request(POST, path, files=files, data=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(POST, path, files=files, data=kwargs)
 
         else:
-            return self._request(POST, path, files=files, json=kwargs, override_request_kwargs=override_request_kwargs)
+            return self._request(POST, path, files=files, json=kwargs)
 
-    def _delete(self, path, override_request_kwargs=None, **kwargs):
+    def _delete(self, path, **kwargs):
         """
 
         Args:
@@ -1339,11 +1335,9 @@ class DiscourseClient(object):
         Returns:
 
         """
-        return self._request(DELETE, path, params=kwargs, override_request_kwargs=override_request_kwargs)
+        return self._request(DELETE, path, params=kwargs)
 
-    def _request(
-        self, verb, path, params=None, files=None, data=None, json=None, override_request_kwargs=None
-    ):
+    def _request(self, verb, path, params={}, files={}, data={}, json={}):
         """
         Executes HTTP request to API and handles response
 
@@ -1351,21 +1345,17 @@ class DiscourseClient(object):
             verb: HTTP verb as string: GET, DELETE, PUT, POST
             path: the path on the Discourse API
             params: dictionary of parameters to include to the API
-            override_request_kwargs: dictionary of requests.request keyword arguments to override defaults
 
         Returns:
             dictionary of response body data or None
 
         """
-        override_request_kwargs = override_request_kwargs or {}
-
+        params["api_key"] = self.api_key
+        if "api_username" not in params:
+            params["api_username"] = self.api_username
         url = self.host + path
 
-        headers = {
-            "Accept": "application/json; charset=utf-8",
-            "Api-Key": self.api_key,
-            "Api-Username": self.api_username,
-        }
+        headers = {"Accept": "application/json; charset=utf-8"}
 
         # How many times should we retry if rate limited
         retry_count = 4
@@ -1373,7 +1363,9 @@ class DiscourseClient(object):
         retry_backoff = 1
 
         while retry_count > 0:
-            request_kwargs = dict(
+            response = requests.request(
+                verb,
+                url,
                 allow_redirects=False,
                 params=params,
                 files=files,
@@ -1383,10 +1375,6 @@ class DiscourseClient(object):
                 timeout=self.timeout,
             )
 
-            request_kwargs.update(override_request_kwargs)
-
-            response = requests.request(verb, url, **request_kwargs)
-
             log.debug("response %s: %s", response.status_code, repr(response.text))
             if response.ok:
                 break

setup.py

@@ -34,7 +34,7 @@ setup(
         ]
     },
     classifiers=[
-        "Development Status :: 5 - Production/Stable",
+        "Development Status :: 5 - Production/Stable"
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",

tests/test_client.py

@@ -49,12 +49,12 @@ class ClientBaseTestCase(unittest.TestCase):
         self.assertEqual(args[0], verb)
         self.assertEqual(args[1], self.host + url)
 
-        headers = kwargs["headers"]
-        self.assertEqual(headers.pop("Api-Username"), self.api_username)
-        self.assertEqual(headers.pop("Api-Key"), self.api_key)
+        kwargs = kwargs["params"]
+        self.assertEqual(kwargs.pop("api_username"), self.api_username)
+        self.assertEqual(kwargs.pop("api_key"), self.api_key)
 
         if verb == "GET":
-            self.assertEqual(kwargs["params"], params)
+            self.assertEqual(kwargs, params)
 
 
 class TestClientRequests(ClientBaseTestCase):