Changeset 198:6d6cad1d22ec

Timestamp:

09/16/08 21:42:11 (2 years ago)

Author:

rgrp

Branch:

default

convert_revision:

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

Message:

[data][m]: create new demo data file napoleon_battles.js and refactor commands to have separate DemoData? (new) and TestData? (renamed from old DemoData?) commands.

Files:

• microfacts/data/napoleon_battles.js (copied) (copied from microfacts/data/napoleon.js) (1 diff)
• microfacts/lib/cli.py (modified) (2 diffs)
• microfacts/tests/__init__.py (modified) (1 diff)
• setup.py (modified) (1 diff)

microfacts/data/napoleon_battles.js

@@ -56 +56 @@
         "location" : {"type": "Point", "coordinates": [21.0167 , 54.45] },
         "license" : "GFDL"
+    },
+    {
+        "id": "2fd6654a-5cc3-49a5-aa69-245bce35ce40",
+        "title": "Battle of Wagram",
+        "end": "1809-07-06 00:00:00",
+        "description": "In the Battle of Wagram (5\u20136 July 1809) Napoleon Bonaparte's French forces defeated Archduke Charles' Austrian army, near Vienna, effectively bringing the War of the Fifth Coalition to an end. The battle centered on the isle of Lobau on the Danube and on the plain of the Marchfeld around the town of Deutsch-Wagram. Artillery was a major factor with 300,000 men clashing in the largest battle yet of the Napoleonic Wars.",
+        "license": "GFDL",
+        "image": "http://upload.wikimedia.org/wikipedia/en/2/2b/Wagram_and_vicinity,_5_July,_1809.jpg",
+        "start": "1809-07-05 00:00:00",
+        "location": {"type": "Point", "coordinates": [16.5644435883, 48.299446106]},
+        "source": "http://en.wikipedia.org/wiki/Battle_of_Wagram"
+    },
+    {
+        "id": "a26db09a-fa65-4b00-bb57-22180e2d9deb",
+        "title": "Battle of Leipzig",
+        "end": "1813-10-19 00:00:00",
+        "description": "The Battle of the Nations (or Battle of Leipzig or ) on 16\u201319 October, 1813 was one of the most decisive defeats suffered by Napoleon Bonaparte. The Battle of Leipzig was fought on German soil and involved German troops on both sides, as a large proportion of Napoleon's troops actually came from the German Confederation of the Rhine. It is considered the largest battle in Europe before World War I, with over 500,000 troops involved.",
+        "license": "GFDL",
+        "image": "http://upload.wikimedia.org/wikipedia/commons/2/26/Karte_Voelkerschlacht_bei_Leipzig_18_Oktober_1813.png",
+        "start": "1813-10-16 00:00:00",
+        "location": {"type": "Point", "coordinates": [12.6400003433, 51.25]},
+        "source": "http://en.wikipedia.org/wiki/Battle_of_Leipzig"
+    },
+    {
+        "id": "da817e24-a7f7-44d7-8647-2e3ab55b1c8d",
+        "title": "Battle of Marengo",
+        "description": "In the Battle of Marengo was fought on 14 June 1800 between Napoleon's French and Austrian forces near the city of Alessandria, in Piedmont, Italy. The French defeated Austrian General Michael von Melas's surprise attack, driving the Austrians out from Italy, and enhancing Napoleon's political position in Paris.",
+        "license": "GFDL",
+        "image": "http://upload.wikimedia.org/wikipedia/commons/f/fe/Lejeune_-_Bataille_de_Marengo.jpg",
+        "start": "1800-06-14 00:00:00",
+        "location": {"type": "Point", "coordinates": [8.68052959442, 44.8890800476]},
+        "source": "http://en.wikipedia.org/wiki/Battle_of_Marengo"
+    },
+    {
+        "id": "d97f710c-fa7e-4cf3-bf20-9862fe24a78b",
+        "title": "Battle of Ulm",
+        "description": "The Battle of Ulm (October 16-19, 1805) was a series of minor skirmishes at the end of Napoleon Bonaparte's Ulm Campaign, culminating in the surrender of an entire Austrian army near Ulm in W\u00fcrttemberg.",
+        "license": "GFDL",
+        "start": "1805-10-16",
+        "end": "1805-10-19",
+        "location": {"type": "Point", "coordinates": [13.3999996185, 52.5166664124]},
+        "source": "http://en.wikipedia.org/wiki/Battle_of_Ulm"
     }
   ]

microfacts/lib/cli.py

@@ -40 +40 @@
             print 'Cleaning DB: SUCCESS' 
 
-import paste.script
-class DemoData(MicrofactsCommand):
-    '''Create some demo data in the DB (Bloomsbury Group + Napoleon).
+class TestData(MicrofactsCommand):
+    '''Create test data in the DB (Bloomsbury Group + Napoleon).
     '''
     summary = __doc__.split('\n')[0]
@@ -105 +104 @@
         out = microfacts.lib.json.load(data)
         data.close()
+
+
+class DemoData(MicrofactsCommand):
+    '''Create some demo data in the DB (Bloomsbury Group + Napoleon).
+    '''
+    summary = __doc__.split('\n')[0]
+    usage = __doc__
+
+    def command(self):
+        self._load_config()
+        import pkg_resources
+        import microfacts.model as model
+        import microfacts.lib.json
+        print 'Creating demo data'
+        for fn in [ 'napoleon_battles.js' ]:
+            print 'Loading: ', fn
+            data = pkg_resources.resource_stream('microfacts',
+                    'data/%s' % fn)
+            out = microfacts.lib.json.load(data)
+            data.close()
+        print 'Creating demo data: Complete!'
+
 
 import pprint

microfacts/tests/__init__.py

@@ -35 +35 @@
 
 # TODO: remove (here for moment for backwards compatibility)
-from microfacts.lib.cli import DemoData as TestData
+from microfacts.lib.cli import TestData as TestData
 
 class TestBase(object):

setup.py

@@ -46 +46 @@
 
     [paste.paster_command]
+    test-data = microfacts.lib.cli:TestData
     demo-data = microfacts.lib.cli:DemoData
     clean-db = microfacts.lib.cli:CleanDb