add post_filter function

.gitignore

@@ -1,2 +1,3 @@
 dist/docs
 node_modules/
+.idea/

dist/elastic.js

@@ -1,6 +1,6 @@
-/*! elastic.js - v1.2.0 - 2014-10-13
+/*! elastic.js - v1.2.0 - 2016-02-22
  * https://github.com/fullscale/elastic.js
- * Copyright (c) 2014 FullScale Labs, LLC; Licensed MIT */
+ * Copyright (c) 2016 FullScale Labs, LLC; Licensed MIT */
 
 /**
  @namespace
@@ -10960,6 +10960,19 @@
         return this;
       },
 
+      /**
+       * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-inner-hits.html
+       * q should be a json
+       */
+      inner_hits: function(q) {
+        if (q == null) {
+          return query.has_child.query;
+        }
+
+        query.has_child.inner_hits = q;
+        return this;
+      },
+
       /**
             Sets the child document type to search against
 
@@ -12087,23 +12100,14 @@
     @param {String} likeText The text to find documents like it.
 
      */
-  ejs.MoreLikeThisQuery = function (fields, likeText) {
+  ejs.MoreLikeThisQuery = function (likeText) {
 
     var 
       _common = ejs.QueryMixin('mlt'),
       query = _common.toJSON();
 
     query.mlt.like_text = likeText;
-    query.mlt.fields = [];
 
-    if (isString(fields)) {
-      query.mlt.fields.push(fields);
-    } else if (isArray(fields)) {
-      query.mlt.fields = fields;
-    } else {
-      throw new TypeError('Argument must be string or array');
-    }
-
     return extend(_common, {
 
       /**
@@ -12117,20 +12121,29 @@
              */
       fields: function (f) {
         if (f == null) {
-          return query.mlt.fields;
+          return this;
         }
 
         if (isString(f)) {
-          query.mlt.fields.push(f);
+          query.mlt.fields = [f];
         } else if (isArray(f)) {
           query.mlt.fields = f;
         } else {
-          throw new TypeError('Argument must be a string or array');
+          throw new TypeError('Must pass a field or an array of fields');
         }
 
         return this;
       },
-
+
+      docs: function(doc) {
+        if (isArray(doc)) {
+          query.mlt.docs = doc;
+        } else {
+          throw new TypeError('Must pass an array of docs as argument');
+        }
+        return this;
+      },
+
       /**
             The text to find documents like
 
@@ -16350,6 +16363,26 @@
         return this;
       },
 
+      /**
+            Allows you to set a specified post_filter on this request object.
+
+            @member ejs.Request
+            @param {Object} filter Any valid <code>Filter</code> object.
+            @returns {Object} returns <code>this</code> so that calls can be chained.
+            */
+      post_filter: function (filter) {
+        if (filter == null) {
+          return query.filter;
+        }
+
+        if (!isFilter(filter)) {
+          throw new TypeError('Argument must be a Filter');
+        }
+
+        query.post_filter = filter.toJSON();
+        return this;
+      },
+
       /**
             Performs highlighting based on the <code>Highlight</code>
             settings.

src/query/HasChildQuery.js

@@ -51,6 +51,19 @@
         return this;
       },
 
+      /**
+       * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-inner-hits.html
+       * q should be a json
+       */
+      inner_hits: function(q) {
+        if (q == null) {
+          return query.has_child.query;
+        }
+
+        query.has_child.inner_hits = q;
+        return this;
+      },
+
       /**
             Sets the child document type to search against
 

src/query/MoreLikeThisQuery.js

@@ -16,23 +16,14 @@
     @param {String} likeText The text to find documents like it.
 
      */
-  ejs.MoreLikeThisQuery = function (fields, likeText) {
+  ejs.MoreLikeThisQuery = function (likeText) {
 
     var 
       _common = ejs.QueryMixin('mlt'),
       query = _common.toJSON();
 
     query.mlt.like_text = likeText;
-    query.mlt.fields = [];
 
-    if (isString(fields)) {
-      query.mlt.fields.push(fields);
-    } else if (isArray(fields)) {
-      query.mlt.fields = fields;
-    } else {
-      throw new TypeError('Argument must be string or array');
-    }
-
     return extend(_common, {
 
       /**
@@ -46,20 +37,29 @@
              */
       fields: function (f) {
         if (f == null) {
-          return query.mlt.fields;
+          return this;
         }
 
         if (isString(f)) {
-          query.mlt.fields.push(f);
+          query.mlt.fields = [f];
         } else if (isArray(f)) {
           query.mlt.fields = f;
         } else {
-          throw new TypeError('Argument must be a string or array');
+          throw new TypeError('Must pass a field or an array of fields');
         }
 
         return this;
       },
-
+
+      docs: function(doc) {
+        if (isArray(doc)) {
+          query.mlt.docs = doc;
+        } else {
+          throw new TypeError('Must pass an array of docs as argument');
+        }
+        return this;
+      },
+
       /**
             The text to find documents like
 

src/search/Request.js

@@ -379,6 +379,26 @@
         return this;
       },
 
+      /**
+            Allows you to set a specified post_filter on this request object.
+
+            @member ejs.Request
+            @param {Object} filter Any valid <code>Filter</code> object.
+            @returns {Object} returns <code>this</code> so that calls can be chained.
+            */
+      post_filter: function (filter) {
+        if (filter == null) {
+          return query.filter;
+        }
+
+        if (!isFilter(filter)) {
+          throw new TypeError('Argument must be a Filter');
+        }
+
+        query.post_filter = filter.toJSON();
+        return this;
+      },
+
       /**
             Performs highlighting based on the <code>Highlight</code>
             settings.

tests/query_test.js

@@ -1213,9 +1213,9 @@ exports.queries = {
     test.done();
   },
   MoreLikeThisQuery: function (test) {
-    test.expect(22);
+    test.expect(21);
 
-    var mltQuery = ejs.MoreLikeThisQuery(['f', 'f2'], 'like text'),
+    var mltQuery = ejs.MoreLikeThisQuery('like text'),
       expected,
       doTest = function () {
         test.deepEqual(mltQuery.toJSON(), expected);
@@ -1224,24 +1224,23 @@ exports.queries = {
     expected = {
       mlt: {
         like_text: 'like text',
-        fields: ['f', 'f2']
       }
     };
 
     test.ok(mltQuery, 'MoreLikeThisQuery exists');
     test.ok(mltQuery.toJSON(), 'toJSON() works');
     doTest();
 
-    mltQuery = ejs.MoreLikeThisQuery('f', 'like text');
+    mltQuery = ejs.MoreLikeThisQuery('like text');
     expected = {
       mlt: {
         like_text: 'like text',
-        fields: ['f']
       }
     };
     doTest();
 
     mltQuery.fields('f2');
+    expected.mlt.fields = [];
     expected.mlt.fields.push('f2');
     doTest();
 
@@ -1303,11 +1302,6 @@ exports.queries = {
 
     test.strictEqual(mltQuery._type(), 'query');
 
-
-    test.throws(function () {
-      ejs.MoreLikeThisQuery(9, 'like');
-    }, TypeError);
-
     test.throws(function () {
       mltQuery.fields(3);
     }, TypeError);