WIP

components/search/middleware/build_query.js

@@ -11,14 +11,15 @@ var toQuery = requireRoot('components/search/query');
  */
 
 exports.buildQuery = function *(next) {
-  var query = this.request.body.query
+  var body = this.request.body
+    , query = body.query
     , sort = query.sort
     , qualifier = query.qualifier.qualifier;
 
-  this.request.body.reverse = 'last' === qualifier
+  body.reverse = 'last' === qualifier
     ? 'asc' === sort
     : 'desc' === sort;
 
-  this.request.body.query = toQuery(query);
+  body.query = toQuery(query, body.page);
   yield next;
 }

components/search/middleware/index.js

@@ -3,5 +3,6 @@ var compose = require('koa-compose');
 module.exports = compose([
   requireRoot('components/search/middleware/enforce_query').enforceQuery,
   requireRoot('components/search/middleware/parse_query').parseQuery,
+  requireRoot('components/search/middleware/parse_page').parsePage,
   requireRoot('components/search/middleware/build_query').buildQuery
 ]);

components/search/middleware/parse_page.js

@@ -0,0 +1,15 @@
+var number = /^\d+$/;
+
+/**
+ * Validates the request `page` param, defaults
+ * to 0 in the event that the param is anything but
+ * a valid number. Also parses the number from a
+ * string to a number.
+ */
+
+exports.parsePage = function *(next) {
+  var page = 0, reqPage = this.request.body.page;
+  if (number.test(reqPage)) page = Math.abs(+reqPage);
+  this.request.body.page = page;
+  yield next;
+}

components/search/query.js

@@ -1,18 +1,21 @@
 module.exports = toQuery;
 
+const DEFAULT_PAGE_SIZE = requireRoot('core/config').search.DEFAULT_SIZE;
+
 var extend = require('underscore').extend
   , QueryBuilder = requireRoot('core/lib/elasticsearch/query_builders');
 
-function toQuery(search) {
+function toQuery(search, page) {
   var at = search.at
+    , from = getFrom(page)
     , range = search.dateRange
     , qualifier = search.qualifier
     , sort = 'last' === qualifier.qualifier ? 'desc' : 'asc'
     , query;
 
   query = extend(
     QueryBuilder.buildSort('date', sort),
-    QueryBuilder.buildSize(qualifier.arguments[0]),
+    QueryBuilder.buildSize({size: qualifier.arguments[0], from: from}),
     QueryBuilder.buildFilter(
       QueryBuilder.buildDateRange(range.from, range.to)
     )
@@ -27,3 +30,7 @@ function toQuery(search) {
 function buildVenueQuery(at) {
   return QueryBuilder.buildFuzzyLikeThis(["venue.name"], at);
 }
+
+function getFrom(page) {
+  return page * DEFAULT_PAGE_SIZE;
+}

components/search/results.client.js

@@ -16,9 +16,10 @@ module.exports = Collection.extend({
     return response.hits;
   },
 
-  fetch: function(search) {
+  fetch: function(search, page) {
+    page = Math.abs(page || 0);
     return fetch.call(this, {
-      data: {query: search},
+      data: {query: search, page: page},
       reset: true,
       type: 'POST'
     });

components/search/router.client.js

@@ -18,11 +18,11 @@ module.exports = Backbone.Router.extend({
     });
   },
 
-  onSearchSubmit: function(search) {
+  onSearchSubmit: function(search, page) {
     var results = new Results({model: Result});
     results.on('error', this.onSearchError, this);
     results.on('success', this.onSearchSuccess, this);
-    results.fetch(search);
+    results.fetch(search, page);
   },
 
   onSearchError: function(results, xhr) {

components/search/views/form.js

@@ -11,11 +11,11 @@ module.exports = Backbone.View.extend({
     React.renderComponent(Form({onSubmit: this.onSubmit.bind(this)}), this.$el[0]);
   },
 
-  onSubmit: function(value) {
-    if (isEmpty(value))
+  onSubmit: function(search, page) {
+    if (isEmpty(search))
       console.log('empty');
     else
-      this.trigger('submit', value);
+      this.trigger('submit', search, page);
   },
 
   onError: function() {

components/search/views/react/form.jsx

@@ -4,7 +4,7 @@ module.exports = React.createClass({
   handleKeyPress: function(e){
     if ('Enter' !== e.key) return;
     e.preventDefault();
-    this.props.onSubmit(e.target.value);
+    this.props.onSubmit(e.target.value, +$("#search-page").val());
   },
 
   render: function() {
@@ -13,6 +13,7 @@ module.exports = React.createClass({
         <span className="fui-search search-icon"></span>
         <label htmlFor="search">Search</label>
         <input autoFocus autoCapitalize="off" id="search" placeholder="all shows in 1997" type="text" />
+        <input type="hidden" value="0" id="search-page" />
       </form>
     );
   }

core/lib/elasticsearch/query_builders.js

@@ -1,15 +1,16 @@
 /**
  * Builds a size object
  *
- * @param {Number} size
+ * @param {Object} options
  * @return {Object}
  * @api public
  */
 
-exports.buildSize = function(size) {
-  return {size: size};
+exports.buildSize = function(options) {
+  return {size: options.size, from: options.from || 0};
 }
 
+
 /**
  * Builds a filter object
  *

test/core/lib/elasticsearch/query_builders_test.js

@@ -6,8 +6,15 @@ var expect = require('chai').expect
 describe('QueryBuilders', function() {
   describe('.buildSize', function() {
     it('is an elasticsearch size object', function() {
-      var actual = QueryBuilders.buildSize(10)
-        , expected = {size: 10};
+      var actual = QueryBuilders.buildSize({size: 10})
+        , expected = {size: 10, from: 0};
+
+      expect(actual).to.eql(expected);
+    });
+
+    it('is an elasticsearch size object with an explicit `from`', function() {
+      var actual = QueryBuilders.buildSize({size: 10, from: 2})
+        , expected = {size: 10, from: 2};
 
       expect(actual).to.eql(expected);
     });