Changeset 267:8df4c4afb100

Timestamp:

02/13/10 20:54:33 (7 months ago)

Author:

rgrp <http://rufuspollock.org>

Branch:

default

Message:

[anno][m]: set doc uri and userid when doing annotation (taking advantage of nickstenning's latest commits).

• New functionality under test plus actual use by js tested by eye (since no other option for js)
• In addition now require login to do annotation (redirect to login)
• controllers/user.py: try to use came_from option in repoze to redirect after login (but not working -- came_from does not seem to arrive at login controller post login ...)

Location:

shakespeare

Files:

• controllers/anno.py (modified) (2 diffs)
• controllers/user.py (modified) (1 diff)
• templates/anno/annotate.html (modified) (2 diffs)
• tests/functional/test_anno.py (modified) (4 diffs)

shakespeare/controllers/anno.py

@@ -5 +5 @@
 
 from shakespeare.lib.base import *
+from shakespeare.controllers.our_resource import render_resource
 
 log = logging.getLogger(__name__)
@@ -19 +20 @@
 
     def annotate(self, id=None):
+        c.error = ''
+        c.content = ''
         c.server_api = self.server_api
-        if id:
-            text = id
-        else:
-            text = request.params.get('text', '')
-        c.error = ''
+        text = id if id else request.params.get('text', '')
+
+        if not c.user:
+            h.redirect_to(controller='user', action='login',
+                    came_from=request.url)
+
         if not text:
             c.error = 'No text to annotate!' 
-            c.content = ''
         else:
+            c.uri = text
+            # allow for possibility in future of not having logged in users
+            c.userid = c.user.id
             mat = model.Material.by_name(text)
-            content = mat.get_text().read()
-            # HACK: limit size for present
-            # content = content[:500]
-            c.content = genshi.HTML('<pre>%s</pre>' % content)
-        out = render('anno/annotate.html')
-        # out is a webhelpers.html.builder.literal
-        # we want to work with raw html ...
-        # out = unicode(out)
-        # out = self.anno_middleware.modify_html(out, include_jquery=False)
-        return out
+            # get first resource that isn't pdf
+            res = filter(lambda x: x.format != 'pdf', mat.resources)[0]
+            c.content = genshi.HTML(render_resource(res))
+        return render('anno/annotate.html')
 

shakespeare/controllers/user.py

@@ -29 +29 @@
             return form
         else:
-            h.redirect_to(controller='user', action='read', id=c.user.id)
+            came_from = request.params.get('came_from', None)
+            if came_from:
+                h.redirect_to(str(came_from))
+            else:
+                h.redirect_to(controller='user', action='read', id=c.user.id)
 
     def logout(self):

shakespeare/templates/anno/annotate.html

@@ -7 +7 @@
 
   <py:def function="page_specific_css">
+    <!--
     <script src="http://github.com/nickstenning/annotator/raw/0.5/pkg/annotator.min.js"></script>
     <link href="http://github.com/nickstenning/annotator/raw/0.5/pkg/annotator.min.css" type="text/css" rel="stylesheet" />
-  <!--
-  <script src="/jsannotate/annotator.min.js"></script>
-  <link href="/jsannotate/annotator.min.css" type="text/css" rel="stylesheet" />
-  -->
-  <!--
-    <script src="/jsannotate-lib/vendor/jquery.json.js"></script>
+    -->
+
     <script src="/jsannotate-lib/vendor/jquery.pluginfactory.js"></script>
     <script src="/jsannotate-lib/vendor/jquery.sji.js"></script>
+    <script src="/jsannotate-lib/vendor/jquery.json.js"></script>
     <script src="/jsannotate-lib/extensions.js"></script>
     <script src="/jsannotate-lib/annotator.js"></script>
+    <script src="/jsannotate-lib/annotation_store.js"></script>
     <link rel="stylesheet" type="text/css" href="/jsannotate-lib/annotator.css" />
-    -->
   </py:def>
 
@@ -33 +31 @@
           var annotator_prefix = '/anno_store/annotation';
           // an identifier for the document
-          var annotator_doc_uri = 'xxx';
+          var annotator_doc_uri = '${c.text}';
           $('#text-to-annotate').annotator();
-          $('#text-to-annotate').annotationStore({'prefix': annotator_prefix});
+          $('#text-to-annotate').annotationStore({
+            'prefix': annotator_prefix,
+            'annotationData': {
+              'uri': '${c.uri}',
+              'user': '${c.userid}', 
+            }
+          });
           // 'uri': annotator_doc_uri});
         });

shakespeare/tests/functional/test_anno.py

@@ -1 +1 @@
 from shakespeare.tests import *
+import shakespeare.model as model
 
 class TestAnnoController(TestController):
@@ -5 +6 @@
     def setup_class(self):
         self.text = TestData.make_fixture()
+        self.username = u'xyz.com'
 
     @classmethod
     def teardown_class(self):
-        TestData.remove_fixtures()
+        model.repo.rebuild_db()
 
     def test_index(self):
@@ -14 +16 @@
         assert 'Choose a text to annotate' in res
 
-    def test_annotate(self):
-        res = self.app.get(url_for(controller='anno', action='annotate'))
+    def test_annotate_no_text(self):
+        res = self.app.get(url_for(controller='anno', action='annotate'),
+            extra_environ={'REMOTE_USER': str(self.username)}
+            )
         assert 'Annotate' in res
         assert 'No text to annotate' in res
@@ -23 +27 @@
         form = res.forms[0]
         form['text'] = self.text.name
-        res = form.submit()
+        res = form.submit(extra_environ={'REMOTE_USER': str(self.username)})
         assert 'Annotate' in res 
         assert self.text.content.split()[0] in res, res
         assert '<pre' in res
+
+    def test_annotate(self):
+        res = self.app.get(
+            url_for(controller='anno', action='annotate', id=self.text.name),
+            extra_environ={'REMOTE_USER': str(self.username)}
+            )
+        assert "'uri': '%s'" % self.text.name
+        userid = model.User.query.filter_by(openid=self.username).first().id
+        assert "'user': '%s'" % userid
 
     # run this last