Merge pull request #24 from LucianoPAlmeida/v1.0.5

V1.0.5

.travis.yml

@@ -8,7 +8,6 @@ sudo: required
 env:
   - NEO4J_VERSION="3.1.0"
 
-
 before_install:
   - nvm install 6.9.3
   - nvm use 6.9.3

README.md

@@ -5,7 +5,7 @@ Abstract some trivial operations on the Neo4j driver for Nodejs and make the use
 [![npm version](https://badge.fury.io/js/ogmneo.svg)](https://badge.fury.io/js/ogmneo)
 [![npm](https://img.shields.io/npm/dt/ogmneo.svg)](https://www.npmjs.com/package/ogmneo)
 [![MIT](https://img.shields.io/badge/License-MIT-red.svg)](https://opensource.org/licenses/MIT)
-[![Travis](https://img.shields.io/travis/LucianoPAlmeida/OGMNeo.svg)](https://travis-ci.org/LucianoPAlmeida/OGMNeo)
+[![Travis](https://img.shields.io/travis/LucianoPAlmeida/OGMNeo.svg)](https://travis-ci.org/LucianoPAlmeida/OGMNeo?branch=master)
 [![Codecov](https://img.shields.io/codecov/c/github/LucianoPAlmeida/OGMNeo.svg)](https://codecov.io/gh/LucianoPAlmeida/OGMNeo)
 
 ## Installation

lib/ogmneo-cypher.js

@@ -76,6 +76,7 @@ class OGMNeoCypher {
 function isStatement(s) {
     return _.isString(s) || s.hasOwnProperty('text');
 }
+
 //Private validate statements
 function _validateStatements(statements) {
     if (isStatement(statements)) {

lib/ogmneo-node.js

@@ -34,18 +34,7 @@ class OGMNeoNode {
     */
 
     static createOperation(node, label = null) {
-        let value = _.omitBy(node, _.isUndefined);
-        OGMNeoObjectParse.parseProperties(value);
-        let objectString = OGMNeoObjectParse.objectString(value);
-        let labelCypher = (!_.isEmpty(label) && _.isString(label)) ? `:${label}` : '';
-        let cypher = `CREATE (n${labelCypher} ${objectString}) RETURN n`;
-        return OGMNeoOperationBuilder.create()
-            .cypher(cypher)
-            .object(value)
-            .type(OGMNeoOperation.WRITE).then((result) => {
-                let record = _.first(result.records);
-                return OGMNeoObjectParse.parseRecordNode(record, 'n');
-            }).build();
+        return this._insertOperation('CREATE', node, label);
     }
 
 
@@ -72,11 +61,15 @@ class OGMNeoNode {
     */
 
     static mergeOperation(node, label = null) {
+        return this._insertOperation('MERGE', node, label);
+    }
+
+    static _insertOperation(operation, node, label) {
         let value = _.omitBy(node, _.isUndefined);
         OGMNeoObjectParse.parseProperties(value);
         let objectString = OGMNeoObjectParse.objectString(value);
         let labelCypher = (!_.isEmpty(label) && _.isString(label)) ? `:${label}` : '';
-        let cypher = `MERGE (n${labelCypher} ${objectString}) RETURN n`;
+        let cypher = `${operation} (n${labelCypher} ${objectString}) RETURN n`;
         return OGMNeoOperationBuilder.create()
             .cypher(cypher)
             .object(value)
@@ -86,8 +79,6 @@ class OGMNeoNode {
             }).build();
     }
 
-
-
     /**
         * Updates a node on neo4j.
         *
@@ -448,7 +439,6 @@ class OGMNeoNode {
         }
     }
 
-
     /**
         * Operation for find nodes filtered by the query parameter.
         *
@@ -509,6 +499,7 @@ class OGMNeoNode {
             throw new Error('A OGMNeoQuery object must to be provided');
         }
     }
+
     /**
         * Adding label to a node.
         *