Changeset 179:a5588860c659

Timestamp:

08/30/08 13:12:29 (2 years ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:10edda23-d834-0410-9182-b00384516d49/trunk@191

Message:

[lib/json,lib/cli][s]: expand demo-data to also load napoleon campaign thread.

• lib/json.py: As a result of this found a bug in json load code (was not loading threads correctly). Fixed this.
• tests/: this change required a minor fix to teardown in factlet functional test.

Location:

microfacts

Files:

• lib/cli.py (modified) (3 diffs)
• lib/json.py (modified) (1 diff)
• tests/functional/test_factlet.py (modified) (2 diffs)
• tests/test_json.py (modified) (1 diff)

microfacts/lib/cli.py

@@ -38 +38 @@
 import paste.script
 class DemoData(MicrofactsCommand):
-    '''Create some demo data in the DB (Bloomsbury Group etc).
+    '''Create some demo data in the DB (Bloomsbury Group + Napoleon).
     '''
     summary = __doc__.split('\n')[0]
@@ -59 +59 @@
         if self.verbose:
             print 'Creating test data'
+        print 'Loading Bloomsbury data'
         self.make_data()
+        print 'Loading Napoleon data'
+        self.make_data_napoleon()
         if self.verbose:
             print 'Creating test data: Complete!'
@@ -88 +91 @@
                 in self.thread_titles ]
         return factlets, threads
+
+    @classmethod
+    def make_data_napoleon(self):
+        import pkg_resources
+        import microfacts.model as model
+        import microfacts.lib.json
+        data = pkg_resources.resource_stream('microfacts',
+                'data/napoleon.js')
+        out = microfacts.lib.json.load(data)
+        data.close()
 
 class Dbpedia(MicrofactsCommand):

microfacts/lib/json.py

@@ -183 +183 @@
             results['factlets'] += ft_converter.to_domain_objects(data['factlets'])
         _to_threads(data['threads'])
-    elif 'factlets' in data and 'title' not in 'data': # just factlets
+    elif 'factlets' in data and 'title' not in data: # just factlets
         results['factlets'] += ft_converter.to_domain_objects(data['factlets'])
     elif 'factlets' in data and 'title' in data: # a thread
-        td_converter.to_domain_object([data])
+        thread = td_converter.to_domain_object(data)
+        results['threads'] = [ thread ]
+        results['factlets'] = thread.factlets
     else: # just a single factlet
         tempft = ft_converter.to_domain_object(data)

microfacts/tests/functional/test_factlet.py

@@ -13 +13 @@
         )
         out = microfacts.lib.json.load(sample)
+        self.thread = out['threads'][0]
         self.factlets = out['factlets']
         assert len(self.factlets) == 6
@@ -20 +21 @@
 
     def tearDown(self):
+        model.Session.delete(self.thread)
         for fct in self.factlets:
             model.Session.delete(fct)

microfacts/tests/test_json.py

@@ -117 +117 @@
         assert results is not None
         assert len(results['factlets']) == 6
+        assert len(results['threads']) == 1