Merge pull request #44 from juzerali/deploy-9

Fixes #9, stop interpreting 'id' field of documents as unique identifier...
phillro · Feb 6, 2013 · b065ee1 · b065ee1
2 parents b746dcf + ead177e
commit b065ee1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -41,22 +41,22 @@ var qryObj = {
 }
 
 elasticSearchClient.search('my_index_name', 'my_type_name', qryObj)
-            .on('data', function(data) {
-                console.log(JSON.parse(data))
-            })
-            .on('done', function(){
-                //always returns 0 right now
-            })
-            .on('error', function(error){
-                console.log(error)
-            })
-            .exec()
-
-elasticSearchClient.index('my_index_name', 'my_type_name', {'name':'name', id:"1111"})
-            .on('data', function(data) {
-                console.log(data)
-            })
-            .exec()
+    .on('data', function(data) {
+        console.log(JSON.parse(data))
+    })
+    .on('done', function(){
+        //always returns 0 right now
+    })
+    .on('error', function(error){
+        console.log(error)
+    })
+    .exec()
+
+elasticSearchClient.index('my_index_name', 'my_type_name', /* _id (optional) */'1111', {'name':'name'})
+    .on('data', function(data) {
+        console.log(data)
+    })
+    .exec()
 
 //Bulk index example
 var commands = []

diff --git a/lib/elasticsearchclient/calls/core.js b/lib/elasticsearchclient/calls/core.js
@@ -2,20 +2,25 @@
 var querystring = require('querystring'),
 ElasticSearchClient = require('../elasticSearchClient')
 
-ElasticSearchClient.prototype.index = function(indexName, typeName, document, options) {
+ElasticSearchClient.prototype.index = function(indexName, typeName, document, id, options) {
     var path = '/' + indexName + '/' + typeName;
     var qs = '';
-    if (options) {
-        qs = querystring.stringify(options)
+    var method = 'POST'
+
+    if(typeof id === 'object'){
+        options = id;
+        id = undefined;
     }
 
-    var method = 'POST'
-    //If the document has an id field, its an update.
-    if (document.id) {
-        path += "/" + document.id
+    if (id) {
+        path += "/" + id
         method = 'PUT'
-        delete document.id
     }
+
+    if (options) {
+        qs = querystring.stringify(options)
+    }
+
     if (qs.length > 0) {
         path += "?" + qs;
     }
@@ -220,20 +225,9 @@ ElasticSearchClient.prototype.moreLikeThis = function(indexName, typeName, docum
 }
 
 ElasticSearchClient.prototype.update = function(indexName, typeName, documentId, document, options) {
-
-    if(typeof documentId === 'object'){
-        options = document;
-        document = documentId;
-        documentId = document.id;
-        delete document.id;
-    }
-
     document = document || {};
     document = {"doc": document};
 
-    if(!documentId)
-        throw "id should be provided for update: " + JSON.stringify(document);
-
     var path = '/' + indexName + '/' + typeName + '/'+documentId+'/_update';
     var qs = '';
     if (options) {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "author": "Phillip Rosen <phill.rosen@gmail.com>",
     "name": "elasticsearchclient",
     "description": "A client for Elastic Search",
-    "version": "0.2.2",
+    "version": "0.3.0",
     "repository": {
         "url": ""
     },

diff --git a/test/core.test.js b/test/core.test.js
@@ -22,7 +22,7 @@ describe("ElasticSearchClient Core api", function(){
         /*
         *   To allow running tests individually `mocha --grep search`
         */
-        elasticSearchClient.index(indexName, objName, {'name':'sushi', id: 'sushi'})
+        elasticSearchClient.index(indexName, objName, {'name':'sushi'}, "sushi")
             .on('data', function(){
                 done();
             })
@@ -41,7 +41,7 @@ describe("ElasticSearchClient Core api", function(){
         })
 
         it("should index an object with given id under the same id", function(done){
-            elasticSearchClient.index(indexName, objName, {'name':'name', id:"1111"})
+            elasticSearchClient.index(indexName, objName, {'name':'name', id:"9999"}, "1111")
                 .on('data', function(data) {
                     data = JSON.parse(data);
                     data._id.should.equal("1111");
@@ -78,39 +78,6 @@ describe("ElasticSearchClient Core api", function(){
             .exec()
         });
 
-        it("should update the existing doc even if only an object with id is passed", function(done){
-            elasticSearchClient.update(indexName, objName, {id: "sushi", age: 23})
-            .on('data', function(data) {
-                data = JSON.parse(data);
-                data.should.be.ok;
-                data._id.should.equal("sushi");
-                done();
-            })
-            .exec()
-        });
-
-        it("should throw error when no id is passed", function(){
-            (function() {
-                elasticSearchClient.update(indexName, objName, {age: 23});    
-            })
-            .should.throw;
-        });
-
-        it("should not throw even when no data is provided", function(){
-            (function() {
-                elasticSearchClient.update(indexName, objName, {age: 25})
-                .on('data', function(data) {
-                    data = JSON.parse(data);
-                    data.should.be.ok;
-                    data.error.should.equal.be.ok;
-                    data.status.should.equal(500);
-                    done();
-            })
-            .exec()
-            })
-            .should.not.throw;
-        });
-
     });
 
     describe("#search", function(){