Merge pull request #81 from postatum/103824794_simplify_api

Use get_item instead of get_resource

ramses/acl.py

@@ -165,7 +165,7 @@ def __getitem__(self, key):
 
     def getitem_es(self, key):
         es = ES(self.item_model.__name__)
-        obj = es.get_resource(id=key)
+        obj = es.get_item(id=key)
         obj.__acl__ = self.item_acl(obj)
         obj.__parent__ = self
         obj.__name__ = key
@@ -187,7 +187,7 @@ def item_acl(self, item):
     def getitem_es(self, key):
         """ Override to support ACL filtering.
 
-        To do so: passes `self.request` to `get_resource` and uses
+        To do so: passes `self.request` to `get_item` and uses
         `ACLFilterES`.
         """
         from nefertari_guards.elasticsearch import ACLFilterES
@@ -196,7 +196,7 @@ def getitem_es(self, key):
             'id': key,
             'request': self.request,
         }
-        obj = es.get_resource(**params)
+        obj = es.get_item(**params)
         obj.__acl__ = self.item_acl(obj)
         obj.__parent__ = self
         obj.__name__ = key

tests/test_acl.py

@@ -258,15 +258,15 @@ def test_magic_getitem_db_based(self):
     def test_getitem_es(self, mock_es):
         found_obj = Mock()
         es_obj = Mock()
-        es_obj.get_resource.return_value = found_obj
+        es_obj.get_item.return_value = found_obj
         mock_es.return_value = es_obj
         obj = acl.BaseACL('req')
         obj.item_model = Mock(__name__='Foo')
         obj.item_model.pk_field.return_value = 'myname'
         obj.item_acl = Mock()
         value = obj.getitem_es(key='varvar')
         mock_es.assert_called_with('Foo')
-        es_obj.get_resource.assert_called_once_with(id='varvar')
+        es_obj.get_item.assert_called_once_with(id='varvar')
         obj.item_acl.assert_called_once_with(found_obj)
         assert value.__acl__ == obj.item_acl()
         assert value.__parent__ is obj