logicblox-connectblox - npm Package Compare versions

Comparing version 0.2.0 to 0.2.1

index.js

@@ -84,7 +84,7 @@ var net = require("net");
 
-function transaction(workspace, commands) {
+function transaction(workspace, readonly, commands) {
     return {
         transaction: {
             workspace: workspace,
-            readonly: false,
+            readonly: readonly,
             exclusive: false,
@@ -179,3 +179,8 @@ command: commands,
                 }
-            }, callback);
+            }, function(err, result) {
+                if(err) {
+                    return callback(err);
+                }
+                callback(null, result.create.name);
+            });
         },
@@ -222,3 +227,3 @@ resetWorkspace: function(workspace, callback) {
         addBlock: function(workspace, params, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, false, [{
                 add_block: {
@@ -244,3 +249,3 @@ block_name: params.name || null,
         exec: function(workspace, params, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, false, [{
                 exec: {
@@ -263,3 +268,3 @@ block_name: params.name || null,
         query: function(workspace, params, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, true, [{
                 exec: {
@@ -277,3 +282,3 @@ logic: fillPlaceHolders(params.logic, params.args || []),
         queryPredicate: function(workspace, name, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, true, [{
                 query_predicate: {
@@ -295,3 +300,3 @@ predicate: {
         listPredicates: function(workspace, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, true, [{
                 pred_info_bulk: {}
@@ -306,3 +311,3 @@ }]), function(err, result) {
         predInfo: function(workspace, name, callback) {
-            defaultApi.request(transaction(workspace, [{
+            defaultApi.request(transaction(workspace, true, [{
                 pred_info: {
@@ -309,0 +314,0 @@ predicate: {

package.json

 {
     "name": "logicblox-connectblox",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "main": "./lbc.js",
@@ -5,0 +5,0 @@ "devDepenencies": {

test/apitest.js

@@ -11,14 +11,17 @@ var lbConnect = require('..');
     var conn = yield lbConnect();
+    var adminConn = yield lbConnect({admin: true});
 
+    console.log("Cleaning up");
+    var workspaces = yield adminConn.listWorkspaces();
+    for(var i = 0; i < workspaces.length; i++) {
+        var ws = workspaces[i];
+        yield conn.removeWorkspace(ws);
+    }
+    
     console.log("Creating workspace");
-    try {
-        yield conn.createWorkspace(wsName);
-    } catch (e) {
-        if (e.message.indexOf("already exists") === -1) {
-            assert(false, "Error creating workspace: " + e);
-        } else {
-            yield conn.removeWorkspace(wsName);
-            yield conn.createWorkspace(wsName);
-        }
-    }
+    yield conn.createWorkspace(wsName);
+    
+    console.log("Creating anonymous workspace");
+    var result = yield conn.createWorkspace(null);
+    assert.equal(typeof result, "string", "Workspace creation returned a workspace name");
 
@@ -79,14 +82,3 @@ console.log("Adding block");
     yield conn.close();
-
-    console.log("Testing admin API");
-    conn = yield lbConnect({
-        admin: true
-    });
-    var workspaces = yield conn.listWorkspaces();
-    assert.equal(workspaces.length, 1, "workspace count");
-    assert.equal(workspaces[0], wsName, "workspace name");
-
-    var statuses = yield conn.getStatus([wsName]);
-    assert.equal(statuses.length, 1, "status count");
-    yield conn.close();
+    yield adminConn.close();
 })(function(err) {
@@ -93,0 +85,0 @@ if (err) {

No alert changes

Improved metrics

Total package byte prevSize

78572

increased by0.1%

Worsened metrics

Lines of code

839

decreased by-0.36%

No dependency changes