Merge pull request #21 from ambitioninc/develop

Changed behavior of is_type filter

Author: wesleykendall

entity/models.py

@@ -44,13 +44,13 @@ def is_type(self, *entity_types):
         """
         Returns entities that have any of the types listed in entity_types.
         """
-        return self.filter(entity_type__in=entity_types)
+        return self.filter(entity_type__in=entity_types) if entity_types else self
 
     def is_not_type(self, *entity_types):
         """
         Returns entities that are not any of the types listed in entity_types.
         """
-        return self.exclude(entity_type__in=entity_types)
+        return self.exclude(entity_type__in=entity_types) if entity_types else self
 
     def cache_relationships(self):
         """
@@ -153,9 +153,9 @@ def inactive(self):
     def is_type(self, *entity_types):
         """
         Returns True if the entity's type is in any of the types given. If no entity types are given,
-        returns False.
+        returns True.
         """
-        return self.entity_type_id in (entity_type.id for entity_type in entity_types)
+        return self.entity_type_id in (entity_type.id for entity_type in entity_types) if entity_types else True
 
     def is_not_type(self, *entity_types):
         """

entity/tests/entity_filtering_tests.py

@@ -160,6 +160,20 @@ def test_is_type_super_entities(self):
         self.assertEquals(
             list(account_entity.get_super_entities().is_type(self.team_type, self.account_type)), [team_entity])
 
+    def test_is_type_none(self):
+        """
+        Tests the is_type method using no arguments
+        """
+        # Create an account that belongs to a team
+        team = Team.objects.create(name='Team')
+        account = Account.objects.create(email='[email protected]', team=team)
+
+        # Get the entity related to the account
+        account_entity = Entity.objects.get_for_obj(account)
+        team_entity = Entity.objects.get_for_obj(team)
+        self.assertEquals(
+            set(account_entity.get_super_entities().is_type()), set([team_entity]))
+
     def test_is_type_sub_entities(self):
         """
         Tests the is_type method on sub entities.

entity/tests/model_tests.py

@@ -128,9 +128,12 @@ def test_filter_manager_is_type_none(self):
         Tests filtering by entity type when no type is given.
         """
         team = Team.objects.create()
-        for i in range(5):
-            Account.objects.create(team=team)
-        self.assertEquals([], list(Entity.objects.is_type()))
+        team_entity = Entity.objects.get_for_obj(team)
+        account_entities = [
+            Entity.objects.get_for_obj(Account.objects.create(team=team))
+            for i in range(5)
+        ]
+        self.assertEquals(set([team_entity] + account_entities), set(Entity.objects.is_type()))
 
     def test_filter_manager_one_type(self):
         """

entity/version.py

@@ -1 +1 @@
-__version__ = '0.3.2'
+__version__ = '0.3.3'