From 6ba279916745ebc52c5c7031c4ee84e21c7e3cfc Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Thu, 24 Oct 2013 22:22:49 +0900
Subject: [PATCH] better syntax for subs parameters

---
 client/helpers/router.js | 103 ++++++++++++++-------------------------
 server/publications.js   |   9 ++++
 2 files changed, 45 insertions(+), 67 deletions(-)

diff --git a/client/helpers/router.js b/client/helpers/router.js
index f51473962..b84c0cc86 100644
--- a/client/helpers/router.js
+++ b/client/helpers/router.js
@@ -212,77 +212,44 @@ Router.after(filters.resetScroll, {except:['posts_top', 'posts_new', 'posts_best
 //--------------------------------------------------------------------------------------------------//
 
 getParameters = function (view, limit, category) {
-  // TODO: streamline syntax to get a base object that gets extended for each view
-  var allParameters = {
-    top: {
-      find: {
-        status: 2
-      },
-      options: {
-        sort: {
-          sticky: -1,
-          score: -1,
-          _id: -1
-        },
-        limit: 10
-      }
+
+  var baseParameters = {
+    find: {
+      status: 2
     },
-    new: {
-      find: {
-        status: 2
-      },
-      options: {
-        sort: {
-          sticky: -1,
-          submitted: -1,
-          _id: -1
-        },
-        limit: 10
-      }
-    },
-    best: {
-      find: {
-        status: 2
-      },
-      options: {
-       sort: {
-          sticky: -1,
-          baseScore: -1,
-          createdAt: -1,
-          _id: -1
-        },
-        limit: 10
-      }
-    },
-    pending: {
-      find: {
-        status: 1
-      },
-      options: {
-       sort: {
-          sticky: -1,
-          createdAt: -1,
-          _id: -1
-        },
-        limit: 10
-      }
-    },
-    category: {
-      find: {
-        status: 2
-      },
-      options: {
-        sort: {
-          sticky: -1,
-          score: -1,
-          _id: -1
-        },
-        limit: 10
-      }
+    options: {
+      limit: 10
     }
   }
 
-  var parameters = allParameters[view];
+  // TODO: find a way to guarantee order of parameters, or else switch back to old syntax
+
+  switch (view) {
+
+    case 'top':
+      var parameters = $.extend(true, baseParameters, {options: {sort: {sticky: -1, score: -1}}});
+      break;
+
+    case 'new':
+      var parameters = $.extend(true, baseParameters, {options: {sort: {sticky: -1, submitted: -1}}});
+      break;
+
+    case 'best':
+      var parameters = $.extend(true, baseParameters, {options: {sort: {sticky: -1, baseScore: -1}}});
+      break;
+
+    case 'pending':
+      var parameters = $.extend(true, baseParameters, {find: {status: 1}, options: {sort: {baseScore: -1}}});
+      break;      
+
+    case 'category': // same as top for now
+      var parameters = $.extend(true, baseParameters, {options: {sort: {sticky: -1, score: -1}}});
+      break;
+
+  }
+
+  // sort by _id to break ties
+  $.extend(true, parameters, {options: {sort: {_id: -1}}})
 
   if(typeof limit != 'undefined')
     _.extend(parameters.options, {limit: parseInt(limit)});
@@ -290,6 +257,8 @@ getParameters = function (view, limit, category) {
   if(typeof category != 'undefined')
     _.extend(parameters.find, {'categories.slug': category});
 
+  // console.log(parameters.options.sort)
+
   return parameters;
 }
 
diff --git a/server/publications.js b/server/publications.js
index 17c76eca5..43a719ff8 100644
--- a/server/publications.js
+++ b/server/publications.js
@@ -65,6 +65,15 @@ Meteor.publish('postsList', function(find, options) {
   if(canViewById(this.userId)){
     options = options || {};
     var posts = Posts.find(find, options);
+
+    // console.log('//-------- Subscription Parameters:');
+    // console.log(find);
+    // console.log(options);
+    // console.log('Found '+posts.fetch().length+ ' posts:');
+    // posts.rewind();
+    // console.log(_.pluck(posts.fetch(), 'headline'));
+    // posts.rewind();
+
     return posts;
   }
 });