Add Orgs Members API

5 files changed, 187 insertions, 4 deletions

diff --git a/pygithub3/requests/orgs/members.py b/pygithub3/requests/orgs/members.py
new file mode 100644
index 0000000..4596eb3
--- /dev/null
+++ b/pygithub3/requests/orgs/members.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.resources.orgs import Member
+from . import Request
+
+
+class List(Request):
+    uri = 'orgs/{org}/members'
+    resource = Member
+
+
+class Get(Request):
+    uri = 'orgs/{org}/members/{user}'
+
+
+class Delete(Request):
+    uri = 'orgs/{org}/members/{user}'
+
+
+class Listpublic(Request):
+    uri = 'orgs/{org}/public_members'
+    resource = Member
+
+
+class Getpublic(Request):
+    uri = 'orgs/{org}/public_members/{user}'
+
+
+class Publicize(Request):
+    uri = 'orgs/{org}/public_members/{user}'
+
+
+class Conceal(Request):
+    uri = 'orgs/{org}/public_members/{user}'
diff --git a/pygithub3/resources/orgs.py b/pygithub3/resources/orgs.py
index a79395d..6e2d39b 100644
--- a/pygithub3/resources/orgs.py
+++ b/pygithub3/resources/orgs.py
@@ -18,3 +18,9 @@ class Team(Resource):
 
     def __str__(self):
         return '<Team (%s)>' % getattr(self, 'name', '')
+
+
+class Member(Resource):
+
+    def __str__(self):
+        return '<TeamMember (%s)>' % getattr(self, 'login', '')
diff --git a/pygithub3/services/orgs/__init__.py b/pygithub3/services/orgs/__init__.py
index c222956..6a75081 100644
--- a/pygithub3/services/orgs/__init__.py
+++ b/pygithub3/services/orgs/__init__.py
@@ -1,11 +1,16 @@
 # -*- encoding: utf-8 -*-
 
 from pygithub3.services.base import Service
+from .members import Members
 
 
 class Org(Service):
     """ Consume `Orgs API <http://developer.github.com/v3/orgs>`_ """
 
+    def __init__(self, **config):
+        self.members = Members(**config)
+        super(Org, self).__init__(**config)
+
     def list(self, user=None):
         """ Get user's orgs
 
diff --git a/pygithub3/services/orgs/members.py b/pygithub3/services/orgs/members.py
new file mode 100644
index 0000000..3df4dab
--- /dev/null
+++ b/pygithub3/services/orgs/members.py
@@ -0,0 +1,91 @@
+# -*- encoding: utf-8 -*-
+
+from . import Service
+
+
+class Members(Service):
+    """ Consume `Members API <http://developer.github.com/v3/orgs/members/>`_
+    """
+
+    def list(self, org):
+        """ Get org's members
+
+        :param str org: Organisation name
+        :returns: A :doc:`result`
+
+        If you call it authenticated, and are a member of the org, public and
+        private members will be visible.
+
+        If not, only public members will be visible.
+        """
+        request = self.request_builder('orgs.members.list', org=org)
+        return self._get_result(request)
+
+    def is_member(self, org, user):
+        """ Determine if user is a member of org
+
+        :param str org: Organisation name
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.members.get', org=org, user=user)
+        return self._bool(request)
+
+    def remove_member(self, org, user):
+        """ Remove user from all teams in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and an owner of org
+
+        """
+        request = self.request_builder('orgs.members.get', org=org, user=user)
+        return self._delete(request)
+
+    def list_public(self, org):
+        """ Get org's public members
+
+        :param str org: Organisation name
+        :returns: A :doc:`result`
+        """
+        request = self.request_builder('orgs.members.listpublic', org=org)
+        return self._get_result(request)
+
+    def is_public_member(self, org, user):
+        """ Determine if user is a public member of org
+
+        :param str org: Organisation name
+        :param str user: User name
+        """
+        request = self.request_builder('orgs.members.getpublic',
+                                       org=org, user=user)
+        return self._bool(request)
+
+    def publicize_membership(self, org, user):
+        """ Publicize user's membership in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and the user, or an owner of the org
+
+        """
+        request = self.request_builder('orgs.members.publicize',
+                                       org=org, user=user)
+        return self._put(request)
+
+    def conceal_membership(self, org, user):
+        """ Conceal user's membership in org
+
+        :param str org: Organisation name
+        :param str user: User name
+
+        .. warning ::
+            You must be authenticated and the user, or an owner of the org
+
+        """
+        request = self.request_builder('orgs.members.conceal',
+                                       org=org, user=user)
+        return self._delete(request)
diff --git a/pygithub3/tests/services/test_orgs.py b/pygithub3/tests/services/test_orgs.py
index a6416ff..e741666 100644
--- a/pygithub3/tests/services/test_orgs.py
+++ b/pygithub3/tests/services/test_orgs.py
@@ -6,7 +6,7 @@ from mock import patch, Mock
 
 from pygithub3.tests.utils.core import TestCase
 from pygithub3.resources.base import json
-from pygithub3.services.orgs import Org
+from pygithub3.services.orgs import Org, Members
 from pygithub3.tests.utils.base import (mock_response, mock_response_result,
                                         mock_json)
 from pygithub3.tests.utils.services import _
@@ -17,7 +17,6 @@ json.loads = Mock(side_effect=mock_json)
 
 @patch.object(requests.sessions.Session, 'request')
 class TestOrgService(TestCase):
-
     def setUp(self):
         self.org = Org()
 
@@ -30,7 +29,7 @@ class TestOrgService(TestCase):
         request_method.return_value = mock_response_result()
         self.org.list('octocat').all()
         self.assertEqual(request_method.call_args[0],
-            ('get', _('users/octocat/orgs')))
+                         ('get', _('users/octocat/orgs')))
 
     def test_GET(self, request_method):
         request_method.return_value = mock_response()
@@ -41,4 +40,52 @@ class TestOrgService(TestCase):
         request_method.return_value = mock_response('patch')
         self.org.update('acme', {'company': 'ACME Widgets'})
         self.assertEqual(request_method.call_args[0],
-            ('patch', _('orgs/acme')))
+                         ('patch', _('orgs/acme')))
+
+
+@patch.object(requests.sessions.Session, 'request')
+class TestOrgMemberService(TestCase):
+    def setUp(self):
+        self.ms = Members()
+
+    def test_LIST(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ms.list('acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/members')))
+
+    def test_IS_MEMBER(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.is_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('orgs/acme/members/octocat')))
+
+    def test_REMOVE_MEMBER(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.ms.remove_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('orgs/acme/members/octocat')))
+
+    def test_LIST_PUBLIC(self, request_method):
+        request_method.return_value = mock_response_result()
+        self.ms.list_public('acme').all()
+        self.assertEqual(request_method.call_args[0],
+                         ('get', _('orgs/acme/public_members')))
+
+    def test_IS_PUBLIC_MEMBER(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.is_public_member('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('head', _('orgs/acme/public_members/octocat')))
+
+    def test_PUBLICIZE_MEMBERSHIP(self, request_method):
+        request_method.return_value = mock_response()
+        self.ms.publicize_membership('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('put', _('orgs/acme/public_members/octocat')))
+
+    def test_CONCEAL_MEMBERSHIP(self, request_method):
+        request_method.return_value = mock_response('delete')
+        self.ms.conceal_membership('acme', 'octocat')
+        self.assertEqual(request_method.call_args[0],
+                         ('delete', _('orgs/acme/public_members/octocat')))