Changeset 187

Timestamp:

08/16/08 21:01:22 (11 months ago)

Author:

rgrp

Message:

[shakespeare/stats][l]: implement basic statistical analysis of texts. Currently implemented as core standalone module and plus a WUI controller.

Location:

trunk/shakespeare

Files:

• controllers/stats.py (added)
• model/dm.py (modified) (3 diffs)
• stats.py (added)
• templates/stats (added)
• templates/stats/__init__.py (added)
• templates/stats/index.html (added)
• templates/stats/text.html (added)
• tests/__init__.py (modified) (2 diffs)
• tests/functional/test_stats.py (added)
• tests/test_model.py (modified) (2 diffs)
• tests/test_stats.py (added)

trunk/shakespeare/model/dm.py

@@ -45 +45 @@
     Column('material_id', types.Integer, ForeignKey('material.id')),
     Column('word', types.String(50)),
-    Column('occurrences', types.Integer, default=1),
+    Column('freq', types.Integer),
     )
 
@@ -67 +67 @@
     @classmethod
     def byName(self, name):
-        return self.query.filter_by(name=name).one()
+        return self.query.filter_by(name=name).first()
     
     def get_text(self, format=None):
@@ -92 +92 @@
         cfgp.readfp(fileobj)
         for section in cfgp.sections():
-            try:
-                item = Material.byName(section)
-            except:
+            item = Material.byName(section)
+            if item is None:
                 item = Material(name=section)
+            assert item is not None
             for key, val in cfgp.items(section):
                 setattr(item, key, val)
+            Session.flush()
 
 class Statistic(object):

trunk/shakespeare/tests/__init__.py

@@ -18 +18 @@
 from routes import url_for
 
-__all__ = ['url_for', 'TestController']
+__all__ = ['url_for', 'TestController', 'make_fixture' ]
 
 here_dir = os.path.dirname(os.path.abspath(__file__))
@@ -32 +32 @@
 cmd.run([test_file])
 
+sonnet18_text = \
+'''Shall I compare thee to a summer's day?
+Thou art more lovely and more temperate:
+Rough winds do shake the darling buds of May,
+And summer's lease hath all too short a date:
+
+Sometime too hot the eye of heaven shines,
+And often is his gold complexion dimm'd,
+And every fair from fair sometime declines,
+By chance, or nature's changing course untrimm'd: 
+
+But thy eternal summer shall not fade,
+Nor lose possession of that fair thou ow'st,
+Nor shall death brag thou wander'st in his shade,
+When in eternal lines to time thou grow'st,
+
+  So long as men can breathe, or eyes can see,
+  So long lives this, and this gives life to thee.
+'''
+
+# must use make_fixture rather than just create object as we need to be in
+# current db session
+def make_fixture():
+    import shakespeare.model as model
+    sonnet18_name = 'test_sonnet18'
+    sonnet18 = model.Material.byName(sonnet18_name)
+    if not sonnet18:
+        sonnet18 = model.Material(name=sonnet18_name,
+                title='Sonnet 18',
+                )
+        model.Session.flush()
+    sonnet18.content = sonnet18_text
+    return sonnet18
+
+
 class TestController(object):
 

trunk/shakespeare/tests/test_model.py

@@ -48 +48 @@
         self.text = model.Material(name=self.name, title=self.title)
         self.word = 'jones'
-        self.occurrences = 5
+        self.freq = 5
         self.cc1 = model.Statistic(
                 text=self.text,
                 word=self.word,
-                occurrences=self.occurrences
+                freq=self.freq
                 )
         model.Session.flush()
@@ -69 +69 @@
         out1 = model.Statistic.query.get(self.statid)
         assert out1.text.name == self.name
-        assert out1.occurrences == self.occurrences
+        assert out1.freq == self.freq
 
     def test_select(self):