project status attr fix and some optimisations

Author: maxtepkeev

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+0.6.2 (2014-03-09)
+++++++++++++++++++
+
+- Fixed: Project resource ``status`` attribute was converted to IssueStatus resource by mistake
+
 0.6.1 (2014-02-27)
 ++++++++++++++++++
 

redmine/resources.py

@@ -99,6 +99,7 @@ class _Resource(object):
     _changes = {}
     _includes = ()
     _relations = ()
+    _unconvertible = ()
     _readonly = ('id', 'created_on', 'updated_on', 'author', 'user', 'project', 'issue')
     __length_hint__ = None  # fixes Python 2.6 list() call on resource object
 
@@ -121,8 +122,12 @@ def __setitem__(self, item, value):
     def __getattr__(self, item):
         """Returns the requested attribute and makes a conversion if needed"""
         if item in self.attributes:
+            # If item shouldn't be converted let's return it as it is
+            if item in self._unconvertible:
+                return self.attributes[item]
+
             # If item should be a Resource object, let's convert it
-            if item in _RESOURCE_MAP:
+            elif item in _RESOURCE_MAP:
                 manager = ResourceManager(self.manager.redmine, _RESOURCE_MAP[item])
                 return manager.to_resource(self.attributes[item])
 
@@ -288,6 +293,7 @@ class Project(_Resource):
 
     _includes = ('trackers', 'issue_categories')
     _relations = ('wiki_pages', 'memberships', 'issue_categories', 'versions', 'news', 'issues')
+    _unconvertible = ('status',)
     _readonly = _Resource._readonly + ('identifier',)
 
 
@@ -546,14 +552,7 @@ class Version(_Resource):
     query_update = '/versions/{0}.json'
     query_delete = '/versions/{0}.json'
 
-    def __getattr__(self, item):
-        # We have to return status attribute as it is, otherwise it
-        # will be automatically converted to IssueStatus resource
-        # by the parent _Resource object which is not what we want
-        if item == 'status':
-            return self.attributes[item]
-
-        return super(Version, self).__getattr__(item)
+    _unconvertible = ('status',)
 
 
 class User(_Resource):
@@ -571,20 +570,9 @@ class User(_Resource):
     query_delete = '/users/{0}.json'
 
     _includes = ('memberships', 'groups')
+    _unconvertible = ('status',)
     _readonly = _Resource._readonly + ('api_key', 'last_login_on', 'custom_fields')
 
-    def __getattr__(self, item):
-        # We have to return status attribute as it is, otherwise it
-        # will be automatically converted to IssueStatus resource
-        # by the parent _Resource object which is not what we want
-        if item == 'status':
-            try:
-                return self.attributes[item]
-            except KeyError:
-                return self.action_if_attribute_absent()
-
-        return super(User, self).__getattr__(item)
-
     def __str__(self):
         try:
             return super(User, self).__str__()

tests/test_resources.py

@@ -271,6 +271,11 @@ def test_project_includes(self):
         self.response.json.return_value = response_includes
         self.assertIsInstance(project.trackers, ResourceSet)
 
+    def test_project_returns_status_without_conversion(self):
+        self.response.json.return_value = {'project': {'name': 'Foo', 'id': 1, 'status': 1}}
+        project = self.redmine.project.get(1)
+        self.assertEqual(project.status, 1)
+
     def test_issue_version(self):
         self.assertEqual(self.redmine.issue.resource_class.redmine_version, '1.0')
 
@@ -761,12 +766,9 @@ def test_user_includes(self):
         self.assertIsInstance(user.groups, ResourceSet)
 
     def test_user_returns_status_without_conversion(self):
-        from redmine.exceptions import ResourceAttrError
         self.response.json.return_value = {'user': {'firstname': 'John', 'lastname': 'Smith', 'id': 1, 'status': 1}}
         user = self.redmine.user.get(1)
         self.assertEqual(user.status, 1)
-        self.response.json.return_value = responses['user']['get']
-        self.assertRaises(ResourceAttrError, lambda: self.redmine.user.get(1).status)
 
     def test_group_version(self):
         self.assertEqual(self.redmine.group.resource_class.redmine_version, '2.1')