v0.0.14

Author: evantahler

.travis.yml

@@ -8,8 +8,5 @@ services:
 language: node_js
 
 node_js:
-  - "0.10"
-  - "0.12"
-  - "iojs"
   - "4.0"
-  - "5.0"
+  - "6.0"

lib/connections/elasticsearch.js

@@ -42,7 +42,7 @@ connection.prototype.insertData = function(index, data, callback){
         body: { doc: d }
       }, function(error){
         if(error){
-          if(error.message.match(/DocumentMissingException/)){
+          if(error.message.match(/DocumentMissingException/) || error.message.match(/document_missing_exception/)){
             writeMethod = 'create';
 
             self.connection[writeMethod]({
@@ -69,7 +69,7 @@ connection.prototype.getAll = function(index, query, fields, chunkSize, dataCall
   var self = this;
   var scrollTime = '5m';
   if(!rowsFound){ rowsFound = 0; }
-  
+
   var payload = {
     index: index,
     scroll: scrollTime,
@@ -84,15 +84,15 @@ connection.prototype.getAll = function(index, query, fields, chunkSize, dataCall
   self.book.logger.log('   ' + self.name + '/' + self.type + ' >> ' + JSON.stringify(payload), 'debug');
 
   self.connection.search(payload, function getMoreUntilDone(error, response){
-    if(error){ 
+    if(error){
       return doneCallback(error, rowsFound);
     }else if(response.hits.hits.length === 0){
       doneCallback(null, rowsFound);
     }else{
       rowsFound += response.hits.hits.length;
 
       var simpleData = [];
-      response.hits.hits.forEach(function(hit){ 
+      response.hits.hits.forEach(function(hit){
         var row = {};
 
         if(hit.fields){
@@ -113,7 +113,7 @@ connection.prototype.getAll = function(index, query, fields, chunkSize, dataCall
           }
         }
 
-        simpleData.push( row ); 
+        simpleData.push( row );
       });
 
       dataCallback(null, simpleData, function(){
@@ -130,4 +130,4 @@ connection.prototype.getAll = function(index, query, fields, chunkSize, dataCall
   });
 };
 
-exports.connection = connection;
+exports.connection = connection;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "empujar",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "When you need to push data around, you push it. Push it real good.  An ETL and Operations tool.",
   "main": "index.js",
   "engines": {

test/connections/elasticsearch.js

@@ -49,9 +49,9 @@ describe('connection: elasticsearch', function(){
       beforeEach(function(done){
         helper.indices.delete({index: index}, function(error){
           setTimeout(function(){
-            if(!error || error.message.match(/IndexMissingException/)){
+            if(!error || error.message.match(/IndexMissingException/) || error.message.match(/index_not_found/) ){
               done();
-            }else{ 
+            }else{
               done(error);
             }
           }, sleep);
@@ -63,12 +63,12 @@ describe('connection: elasticsearch', function(){
         // null, int, float, boolean, small-text, large-text, date, primary key
         var data = [
           {
-            id: 1, 
-            counter: 4, 
-            happy: true, 
-            money: 100.012, 
-            when: new Date(1448486552507), 
-            small_words: 'a small amount of words', 
+            id: 1,
+            counter: 4,
+            happy: true,
+            money: 100.012,
+            when: new Date(1448486552507),
+            small_words: 'a small amount of words',
           }
         ];
 
@@ -99,12 +99,12 @@ describe('connection: elasticsearch', function(){
         // null, int, float, boolean, small-text, large-text, date, primary key
         var data = [
           {
-            id: 1, 
-            counter: 4, 
-            happy: true, 
-            money: 100.012, 
-            when: new Date(1448486552507), 
-            small_words: 'a small amount of words', 
+            id: 1,
+            counter: 4,
+            happy: true,
+            money: 100.012,
+            when: new Date(1448486552507),
+            small_words: 'a small amount of words',
           }
         ];
 
@@ -114,8 +114,8 @@ describe('connection: elasticsearch', function(){
 
             data = [
               {
-                id: 1, 
-                happy: false, 
+                id: 1,
+                happy: false,
               }
             ];
 
@@ -151,25 +151,25 @@ describe('connection: elasticsearch', function(){
         helper.indices.delete({index: index}, function(error){
           setTimeout(function(){
             if(!error || error.message.match(/IndexMissingException/)){
-              
+
               var data = [
                 {
-                  id: 1, 
-                  email: '[email protected]', 
-                  first_name: 'evan', 
-                  when: new Date(1448486552507), 
+                  id: 1,
+                  email: '[email protected]',
+                  first_name: 'evan',
+                  when: new Date(1448486552507),
                 },
                 {
-                  id: 2, 
-                  email: '[email protected]', 
-                  first_name: 'aaron', 
-                  when: new Date(), 
+                  id: 2,
+                  email: '[email protected]',
+                  first_name: 'aaron',
+                  when: new Date(),
                 },
                 {
-                  id: 3, 
-                  email: '[email protected]', 
-                  first_name: 'pablo', 
-                  when: new Date(), 
+                  id: 3,
+                  email: '[email protected]',
+                  first_name: 'pablo',
+                  when: new Date(),
                 }
               ];
 
@@ -179,7 +179,7 @@ describe('connection: elasticsearch', function(){
                 }, sleep);
               });
 
-            }else{ 
+            }else{
               done(error);
             }
           }, sleep);
@@ -284,4 +284,4 @@ describe('connection: elasticsearch', function(){
 
   });
 
-});
+});