Support to resources-self-nested into collections

copitux · copitux · commit 37a9c5dd5d5d · 2012-02-18T12:07:52.000+01:00
diff --git a/pygithub3/resources/base.py b/pygithub3/resources/base.py
@@ -39,6 +39,13 @@ def loads(self, json_content):
 
     @classmethod
     def __load(self, raw_resource):
+        def self_resource(func):
+            def wrapper(resource, raw_resource):
+                if resource == 'self':
+                    resource = self
+                return func(resource, raw_resource)
+            return wrapper
+
         def parse_date(string_date):
             from datetime import datetime
             try:
@@ -47,12 +54,12 @@ def parse_date(string_date):
                 date = None
             return date
 
+        @self_resource
         def parse_map(resource, raw_resource):
-            if resource == 'self':
-                return self.__load(raw_resource)
             if hasattr(raw_resource, 'items'):
                 return resource.__load(raw_resource)
 
+        @self_resource
         def parse_collection_map(resource, raw_resources):
             # Dict of resources (Ex: Gist file)
             if hasattr(raw_resources, 'items'):
diff --git a/pygithub3/tests/resources/test_core.py b/pygithub3/tests/resources/test_core.py
@@ -19,6 +19,8 @@
 )
 github_return_nested = github_return.copy()
 github_return.update({'self_nested': github_return_nested})
+github_return.update({'self_nested_list': [github_return_nested] * 2})
+github_return.update({'self_nested_dict': dict(arg1=github_return_nested)})
 
 
 class TestResourceMapping(TestCase):
@@ -53,6 +55,11 @@ def test_SELF_nested(self):
         self.assertIsInstance(self.r.list_collection[0], HasSimple)
         self.assertIsInstance(self.r.items_collections['arg1'], HasSimple)
 
+    def test_SELF_nested_in_collections(self):
+        self.assertIsInstance(self.r.self_nested_list[0], Nested)
+        self.assertIsInstance(self.r.self_nested_dict['arg1'], Nested)
+
+
 class TestRawResource(TestCase):
     """ Litle obvious :P """
 
diff --git a/pygithub3/tests/utils/resources.py b/pygithub3/tests/utils/resources.py
@@ -17,5 +17,7 @@ class Nested(Resource):
     _maps = {'simple': Simple, 'self_nested': 'self'}
     _collection_maps = {
         'list_collection': HasSimple,
-        'items_collections': HasSimple
+        'items_collections': HasSimple,
+        'self_nested_list': 'self',
+        'self_nested_dict': 'self',
     }

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ class Nested(Resource):`
`17`	`17`	`_maps = {'simple': Simple, 'self_nested': 'self'}`
`18`	`18`	`_collection_maps = {`
`19`	`19`	`'list_collection': HasSimple,`
`20`		`- 'items_collections': HasSimple`
	`20`	`+ 'items_collections': HasSimple,`
	`21`	`+ 'self_nested_list': 'self',`
	`22`	`+ 'self_nested_dict': 'self',`
`21`	`23`	`}`