[Checkins] SVN: grok/branches/0.12/src/grok/ Merged from trunk:

[Philipp von Weitershausen]

Log message for revision 86803:
  Merged from trunk:
  
  ------------------------------------------------------------------------
  r86800 | philikon | 2008-05-16 20:55:51 +0200 (Fri, 16 May 2008) | 5 lines
  
  Fix bug reported by Whit: Local grants wouldn't be honoured by REST views.
  This was due to their lack of setting self.__parent__ (even though there
  existed a piece of code in grok.rest that seemed to "want" to do this, but
  it was never called).
  
  
  

Changed:
  U   grok/branches/0.12/src/grok/components.py
  A   grok/branches/0.12/src/grok/ftests/rest/localgrants.py
  U   grok/branches/0.12/src/grok/meta.py
  U   grok/branches/0.12/src/grok/rest.py

-=-
Modified: grok/branches/0.12/src/grok/components.py
===================================================================
--- grok/branches/0.12/src/grok/components.py	2008-05-16 19:00:39 UTC (rev 86802)
+++ grok/branches/0.12/src/grok/components.py	2008-05-16 19:03:13 UTC (rev 86803)
@@ -21,6 +21,7 @@
 import pytz
 import simplejson
 
+import zope.location
 from zope import component
 from zope import interface
 from zope.interface.common import idatetime
@@ -202,11 +203,11 @@
 class XMLRPC(object):
     pass
 
-class REST(object):
+class REST(zope.location.Location):
     interface.implements(interfaces.IREST)
 
     def __init__(self, context, request):
-        self.context = context
+        self.context = self.__parent__ = context
         self.request = request
         self.body = request.bodyStream.getCacheStream().read()
 

Copied: grok/branches/0.12/src/grok/ftests/rest/localgrants.py (from rev 86800, grok/trunk/src/grok/ftests/rest/localgrants.py)
===================================================================
--- grok/branches/0.12/src/grok/ftests/rest/localgrants.py	                        (rev 0)
+++ grok/branches/0.12/src/grok/ftests/rest/localgrants.py	2008-05-16 19:03:13 UTC (rev 86803)
@@ -0,0 +1,75 @@
+"""
+REST objects, like all views, are properly located objects and will
+therefore honour local grants, for instance.  Let's consider the
+following model in the root folder.  
+
+  >>> root = getRootFolder()
+  >>> root['manfred'] = manfred = Mammoth('manfred')
+
+For this model we have registered a REST GET view that's protected
+with a permission.  Therefore we can't access it as anonymous:
+
+  >>> print http(r'''
+  ... GET /++rest++mammoth/manfred HTTP/1.1
+  ... ''')
+  HTTP/1.1 401 Unauthorized
+  Content-Length: 0
+  Content-Type: text/plain
+  WWW-Authenticate: basic realm="Zope"
+
+However, if we make a (local!) grant, e.g. on the root object, we can
+access the view just fine:
+
+  >>> from zope.securitypolicy.interfaces import IPrincipalPermissionManager
+  >>> root_perms = IPrincipalPermissionManager(root)
+  >>> root_perms.grantPermissionToPrincipal('mammoth.Touch', 'zope.anybody')
+
+With the grant in place we can access it as anonymous:
+
+  >>> print http(r'''
+  ... GET /++rest++mammoth/manfred HTTP/1.1
+  ... ''')
+  HTTP/1.1 200 Ok
+  Content-Length: 7
+  Content-Type: text/plain
+  <BLANKLINE>
+  manfred
+
+In fact, inspecting the view object itself, we see that it is a true
+ILocation and has the appropriate parent pointer:
+
+  >>> from zope.publisher.browser import TestRequest
+  >>> request = TestRequest(skin=MammothRestLayer)
+  >>> from zope.component import getMultiAdapter
+  >>> view = getMultiAdapter((manfred, request), name='GET')
+
+  >>> from zope.location.interfaces import ILocation
+  >>> ILocation.providedBy(view)
+  True
+  >>> view.__parent__ is manfred
+  True
+
+"""
+import grok
+
+class Mammoth(grok.Model):
+
+    def __init__(self, name):
+        self.name = name
+
+class MammothRestLayer(grok.IRESTLayer):
+    pass
+
+class MammothRestProtocol(grok.RESTProtocol):
+    grok.layer(MammothRestLayer)
+    grok.name('mammoth')
+
+class TouchMammoth(grok.Permission):
+    grok.name('mammoth.Touch')
+
+class MammothRest(grok.REST):
+    grok.layer(MammothRestLayer)
+
+    @grok.require('mammoth.Touch')
+    def GET(self):
+        return self.context.name

Modified: grok/branches/0.12/src/grok/meta.py
===================================================================
--- grok/branches/0.12/src/grok/meta.py	2008-05-16 19:00:39 UTC (rev 86802)
+++ grok/branches/0.12/src/grok/meta.py	2008-05-16 19:03:13 UTC (rev 86803)
@@ -56,7 +56,6 @@
 from grok.util import determine_class_component
 from grok.util import determine_class_directive, public_methods_from_class
 from grok.util import check_provides_one
-from grok.rest import RestPublisher
 from grok.interfaces import IRESTSkinType
 
 def get_context(module_info, factory):
@@ -239,10 +238,8 @@
         for method in methods:
             name = method.__name__
 
-            # Make sure that the class inherits RestPublisher, so that the
-            # views have a location
             method_view = type(
-                factory.__name__, (factory, RestPublisher),
+                factory.__name__, (factory,),
                 {'__call__': method }
                 )
 

Modified: grok/branches/0.12/src/grok/rest.py
===================================================================
--- grok/branches/0.12/src/grok/rest.py	2008-05-16 19:00:39 UTC (rev 86802)
+++ grok/branches/0.12/src/grok/rest.py	2008-05-16 19:03:13 UTC (rev 86803)
@@ -6,21 +6,11 @@
 from zope.interface import Interface
 from zope.interface.interfaces import IInterface
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.http import IHTTPRequest
 from zope.app.publication.http import MethodNotAllowed
-import zope.location
 
 from grok.interfaces import IRESTSkinType
 
-class RestPublisher(zope.location.Location):
-    grok.implements(IBrowserPublisher)
-
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-        self.__parent__ = self.context
-
 class GrokMethodNotAllowed(MethodNotAllowed):
     pass