Switching to mongoengine dev on github.

apps/reader/views.py

@@ -482,6 +482,7 @@ def load_river_stories(request):
         """function(key, values) {
             return values[0];
         }""",
+        output='inline',
         scope={
             'feed_last_reads': feed_last_reads
         }

apps/rss_feeds/models.py

@@ -392,7 +392,7 @@ class Feed(models.Model):
             }
         """
         dates = {}
-        res = MStory.objects(story_feed_id=self.pk).map_reduce(map_f, reduce_f, keep_temp=False)
+        res = MStory.objects(story_feed_id=self.pk).map_reduce(map_f, reduce_f, 'inline', keep_temp=False)
         for r in res:
             dates[r.key] = r.value
             year = int(re.findall(r"(\d{4})-\d{1,2}", r.key)[0])
@@ -454,7 +454,7 @@ class Feed(models.Model):
                 }
             """
             scores = []
-            res = cls.objects(feed_id=self.pk).map_reduce(map_f, reduce_f, keep_temp=False)
+            res = cls.objects(feed_id=self.pk).map_reduce(map_f, reduce_f, 'inline', keep_temp=False)
             for r in res:
                 facet_values = dict([(k, int(v)) for k,v in r.value.iteritems()])
                 facet_values[facet] = r.key

fabfile.py

@@ -257,6 +257,13 @@ def setup_forked_mongoengine():
         run('git remote add github http://github.com/samuelclay/mongoengine')
         run('git checkout dev')
         run('git pull github dev')
+
+def switch_forked_mongoengine():
+    with cd('~/code/mongoengine'):
+        run('git checkout .')
+        run('git checkout master')
+        run('get branch -D dev')
+        run('git checkout -b dev origin/dev')
         
 def setup_logrotate():
     put('config/logrotate.conf', '/etc/logrotate.d/newsblur', use_sudo=True)