Changeset 197:cc2f0c5d2514

Timestamp:

09/26/09 12:54:54 (11 months ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@285

Message:

[multi,resource][s]: fix major bug in multiviews (was not working at all!) and get related test working.

• To get test working create new Resource locator_type (inline) which allows for storing of text inline
  • model/dm.py, tests/test_model.py: update Resource.get_stream
  • use this type when setting up standard fixtures tests/init.py (this allows us multi functional test to run)
  • format.py: fix up conversion to unicode (only do it when necessary -- not needed for inline resource fileobj for example as already unicode)

Location:

shakespeare

Files:

• controllers/multi.py (modified) (2 diffs)
• format.py (modified) (1 diff)
• model/dm.py (modified) (2 diffs)
• tests/__init__.py (modified) (1 diff)
• tests/functional/test_multi.py (modified) (1 diff)
• tests/test_model.py (modified) (1 diff)

shakespeare/controllers/multi.py

@@ -24 +24 @@
         text1 = request.params.get('text_1', None)
         text2 = request.params.get('text_2', None)
-        if not text1 or text2:
+        if not text1 or not text2:
             c.error = 'Texts incorrectly specified'
             return render('multi/view.html')
@@ -34 +34 @@
         for item in textlist:
             tfileobj = item.get_text()
-            # hack for time being ...
-            if item.format == 'mkd':
-                ttext = h.markdown(tfileobj.read())
-            else:
-                ttext = shakespeare.format.format_text(tfileobj, format)
+            # TODO: check format
+            ttext = shakespeare.format.format_text(tfileobj, format)
             texthtml[item.name] = genshi.HTML(ttext)
         c.frame_width = 100.0/numtexts - 4.0

shakespeare/format.py

@@ -43 +43 @@
     def format(self, file):
         self.file = file
-        out = unicode(self.file.read(), 'utf-8')
+        out = self.file.read()
+        if not isinstance(out, unicode):
+            out = unicode(out, 'utf-8')
         out = self.escape_chars(out)
         out = \

shakespeare/model/dm.py

@@ -33 +33 @@
     # url or path
     Column('locator', UnicodeText),
-    # types: url, cache, package, disk
+    # types: url, cache, package, disk, inline
     Column('locator_type', UnicodeText, default=u'url'),
     )
@@ -97 +97 @@
             fileobj = pkg_resources.resource_stream(package, path)
             return fileobj
+        elif self.locator_type == u'inline':
+            from StringIO import StringIO
+            return StringIO(self.locator)
         else:
             raise NotImplementedError

shakespeare/tests/__init__.py

@@ -76 +76 @@
                     work=sonnet18_work,
                     )
+        if not sonnet18.resources:
+            res = model.Resource(locator_type=u'inline',
+                locator=sonnet18_text)
+            sonnet18.resources.append(res)
         assert len(sonnet18_work.materials)==1
         model.Session.flush()

shakespeare/tests/functional/test_multi.py

@@ -30 +30 @@
         # TODO: 2009-07-16 this should be uncommented
         # however form setting does not seem to work (don't know why!)
-        # assert not 'Error' in res, res
+        assert not 'Error' in res, res
    
     def test_view(self):

shakespeare/tests/test_model.py

@@ -56 +56 @@
 
 
+class TestResource:
+    def test_get_stream_inline(self):
+        sometext = u'aaaaaaaaaaaaa'
+        res = model.Resource(locator=sometext, locator_type=u'inline')
+        out = res.get_stream()
+        assert out.read() == sometext
+
+
 class TestStatistic: