Fixes disqus#38: Allow for nested methods to support conduit calls such as diffusion.repository.edit

Author: jdm-twtr

phabricator/__init__.py

@@ -217,18 +217,31 @@ def __repr__(self):
 
 
 class Resource(object):
-    def __init__(self, api, interface=None, endpoint=None, method=None):
+    def __init__(self, api, interface=None, endpoint=None, method=None, nested=False):
         self.api = api
         self.interface = interface or copy.deepcopy(parse_interfaces(INTERFACES))
         self.endpoint = endpoint
         self.method = method
+        self.nested = nested
 
     def __getattr__(self, attr):
         if attr in getattr(self, '__dict__'):
             return getattr(self, attr)
         interface = self.interface
-        if attr not in interface:
+        if self.nested:
+            attr = "%s.%s" % (self.endpoint, attr)
+        submethod_exists = False
+        submethod_match = attr + '.'
+        for key in interface.keys():
+            if key.startswith(submethod_match):
+                submethod_exists = True
+                break
+        if attr not in interface and submethod_exists:
+            return Resource(self.api, interface, attr, self.endpoint, nested=True)
+        elif attr not in interface:
             interface[attr] = {}
+        if self.nested:
+            return Resource(self.api, interface[attr], attr, self.method)
         return Resource(self.api, interface[attr], attr, self.endpoint)
 
     def __call__(self, **kwargs):

phabricator/interfaces.json

@@ -83,6 +83,26 @@ def test_user_whoami(self, mock_connection):
 
         self.assertEqual(api.user.whoami()['userName'], 'testaccount')
 
+    def test_classic_resources(self):
+        api = phabricator.Phabricator(
+            username='test',
+            certificate='test',
+            host='http://localhost'
+        )
+
+        self.assertEqual(api.user.whoami.method, 'user')
+        self.assertEqual(api.user.whoami.endpoint, 'whoami')
+
+    def test_nested_resources(self):
+        api = phabricator.Phabricator(
+            username='test',
+            certificate='test',
+            host='http://localhost'
+        )
+
+        self.assertEqual(api.diffusion.repository.edit.method, 'diffusion')
+        self.assertEqual(api.diffusion.repository.edit.endpoint, 'repository.edit')
+
     @mock.patch('phabricator.httplib.HTTPConnection')
     def test_bad_status(self, mock_connection):
         mock_obj = mock_connection.return_value = mock.Mock()