Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

kevinchekovfeeney · kevinchekovfeeney · commit a44a0e1474ea · 2020-02-06T13:26:31.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # Logs
+local.txt
 logs
 *.log
 npm-debug.log*
@@ -10,7 +11,10 @@ pids
 
 public_pages
 
+mytest
+
 # Directory for instrumented libs generated by jscoverage/JSCover
+
 lib-cov
 
 # Coverage directory used by tools like istanbul
diff --git a/.npmignore b/.npmignore
@@ -26,3 +26,5 @@ CHANGELOG.md
 .prettierrc
 .gitignore
 app.js
+
+.demo
diff --git a/.travis.yml b/.travis.yml
@@ -1,59 +1,65 @@
-#node -pe "require('./package.json').version"
-#before_script:
-  # in master branch increment the version
-  #- npm version patch
-  #  on:
-   #     branch : master
-  #- npm install -g documentation
-  #- npm run doc
-
+before_script:
+  - |
+    if [[  $TRAVIS_BRANCH == 'clientBuild' && $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  ]]; then
+      echo "__INCREMENT_VERSION_NUMBER__"
+      export PACKAGE_VERSION=$(npm version patch)
+      npm install -g documentation
+      npm run doc
+    fi
 
 language: node_js
 sudo: required
 node_js:
   - "stable"
+
 # travis call prepare
 # Send coverage data to Coveralls
+# Deploy terminusdb/terminus-client
 after_script:
   - npm run coveralls-after
 
 branches:
   only:
-    - dev
-    - master
+    - clientBuild
+
+before_deploy:
+  - |
+    if [[ ! $TRAVIS_VAR ]]; then
+      npm run build
+      echo "___TRAVIS_VAR____"
+      export TRAVIS_VAR="1.$TRAVIS_BUILD_NUMBER"
+      git commit --amend -m "[skip travis] version changed $PACKAGE_VERSION"
+      git push https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG HEAD:$TRAVIS_BRANCH
+      git tag -f -a "$PACKAGE_VERSION" -m "new version $PACKAGE_VERSION"
+      export LAST_HASH=$(git ls-remote https://github.com/$TRAVIS_REPO_SLUG $TRAVIS_BRANCH | awk '{ print $1}')
+      echo $NPM_TOKEN
+    fi
 
- before_deploy:
-     if ! [[ $TRAVIS_TAG ]]; then
-        export TRAVIS_TAG="1.$TRAVIS_BUILD_NUMBER" &&
-        npm install -g documentation &&
-        npm version patch &&
-        npm run doc
-      # Set up git user name and tag this commit
-        git config --local user.name "Francesca-Bit"  &&
-        git config --local user.email "francesca@datachemist.com" &&
-        git add package.json &&
-        git commit -m "version changed travis_build_number $TRAVIS_TAG" &&
-        git push origin master &&
-        npm run git-tag;
-      fi
 deploy:
-  - provider: releases
-     api_key: $GITHUB_TOKEN
-     file: public_pages/dist/*
-     skip_cleanup: true
-     on:
-       branch: master
-  -provider: pages
+  - provider: script
     skip_cleanup: true
-    github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
     keep_history: true
-    local_dir: public_pages
+    script: bash public_pages.sh
+    on:
+      branch: clientBuild 
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*
+  - provider: releases
+    target_commitish : $LAST_HASH
+    keep_history: true
+    api_key: $GITHUB_TOKEN
+    skip_cleanup: true
+    overwrite: true
     on:
-        branch: master
+      branch: clientBuild 
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  
   - provider: npm
+    registry: "https://registry.npmjs.org/"
     skip_cleanup: true
+    access: public
     email: "francesca@datachemist.com"
-    api_key: "NPM_TOKEN"
+    api_key: $NPM_TOKEN
     keep_history: true
+    auth_method: "authToken"
     on:
-        branch : master
+      branch : clientBuild
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*
diff --git a/Readme.md b/Readme.md
@@ -1,7 +1,7 @@
 terminus-client
 ===============
 
-[![build status](https://api.travis-ci.org/terminusdb/terminus-client.svg?branch=master)](https://travis-ci.org/terminusdb/terminus-client)
+[![build status](https://api.travis-ci.com/terminusdb/terminus-client.svg?branch=master)](https://travis-ci.com/terminusdb/terminus-client)
 [![Coverage Status](https://coveralls.io/repos/github/terminusdb/terminus-client/badge.svg?branch=master)](https://coveralls.io/repos/github/terminusdb/terminus-client/badge.svg?branch=master)
 [![code helpers]
 
@@ -459,6 +459,9 @@ client.deleteDocument("http://localhost:6363/myFirstTerminusDB/document/chess",o
 
 ```
 
+## Tutorials
+Visit [terminus-tutorials](https://github.com/terminusdb/terminus-tutorials) for tutorial scripts
+
 ## Testing
 * Clone this repository
 
@@ -472,6 +475,12 @@ $ npm install
 $ npm run test
 ```
 
+## Report Issues
+
+If you have encounter any issues, please report it with your os and environment setup, version that you are using and a simple reproducible case.
+
+If you encounter other questions, you can ask in our community [forum](https://community.terminusdb.com/) or [Slack channel](http://bit.ly/terminusdb-slack).
+
 ## Contribute
 It will be nice, if you open an issue first so that we can know what is going on, then, fork this repo and push in your ideas. Do not forget to add a bit of test(s) of what value you adding.
 
diff --git a/dist/index.html b/dist/index.html
diff --git a/dist/terminus-client.min.js b/dist/terminus-client.min.js
diff --git a/dist/terminus-client.min.js.map b/dist/terminus-client.min.js.map
diff --git a/lib/viewer/chartConfig.js b/lib/viewer/chartConfig.js
@@ -104,7 +104,7 @@ WOQLChartConfig.prototype.layout=function(layout){
 }
 
 
-//default is { top: 10, right: 30, left: 0, bottom: 0 }
+//default is { top: 10, right: 30, left: 0, bottom: 80 }
 WOQLChartConfig.prototype.margin=function(marginObj){
 	if(marginObj){
 		this._margin=marginObj;
@@ -250,13 +250,23 @@ WOQLChartRule.prototype.dot=function(isVisible){
 }
 
 WOQLChartRule.prototype.labelRotate=function(angle){
-	if(angle){
+	if(angle!==undefined){
 		this.rule.labelRotate = angle;
 		return this
 	}
 	return this.rule.labelRotate;
 }
 
+//Specify the padding of x-axis. DEFAULT: { left: 0, right: 0 }
+WOQLChartRule.prototype.padding=function(paddingObj){
+	if(paddingObj){
+		this.rule.padding=paddingObj;
+		return this
+	}
+
+	return this.rule.padding;
+}
+
 /*
 * The type of xAxis or yAxis 'number' | 'category' default is 'category'.
 * The type of line chart 'basis'|'basisClosed'|'basisOpen'|'linear'|'linearClosed'|'natural'|'monotoneX'|'monotoneY'|'monotone' | 'step' | 'stepBefore' | 'stepAfter' | 
diff --git a/lib/woql.js b/lib/woql.js
@@ -239,6 +239,16 @@ WOQL.remote = function(url, opts){	return new WOQLQuery().remote(url, opts); }
  */
 WOQL.file = function(url, opts){	return new WOQLQuery().file(url, opts); }
 
+
+/**
+ * Provides details of a file source in a JSON format that includes a URL property
+ * @param {object} url - file data source in a JSON format
+ * @param {object} opts - imput options, optional
+ * @return {object} WOQLQuery
+ */
+WOQL.post = function(url, opts){	return new WOQLQuery().post(url, opts); }
+
+
 /**
  * Create a list of variables for WOQL
  * @param vars - variables to be put in the list
@@ -705,6 +715,11 @@ WOQLQuery.prototype.remote = function(json, opts){
 	return this;
 }
 
+WOQLQuery.prototype.post = function(json, opts){
+	this.cursor['post'] = (opts ? [json, opts] : [json]);
+	return this;
+}
+
 WOQLQuery.prototype.file = function(json, opts){
 	this.cursor['file'] = (opts ? [json, opts] : [json]);
 	return this;
@@ -1908,7 +1923,7 @@ WOQLQuery.prototype.addStart = function(s){
 /**
  * Executes the query using the passed client to connect to a server
  */
-WOQLQuery.prototype.execute = function(client){
+WOQLQuery.prototype.execute = function(client,fileList){
 	if(!this.query["@context"]){
 		this.query['@context'] = client.connection.getJSONContext();
 		for(var pref in UTILS.standard_urls){
@@ -1921,12 +1936,14 @@ WOQLQuery.prototype.execute = function(client){
 	else {
 		var json = this.json();
 	}
+	const opts=fileList ? {fileList:fileList} : null;
 	if(this.contains_update){
-		return client.select(false, json);
-		//return client.update(false, json);
+		//return client.select(false, json,opts);
+		return client.update(false, json,opts);
 	}
 	else {
-		return client.select(false, json);
+		//return client.select(false, json,opts);
+		return client.update(false, json,opts);
 	}
 }
 
diff --git a/lib/woqlClient.js b/lib/woqlClient.js
@@ -297,7 +297,9 @@ WOQLClient.prototype.select = function (qurl, woql, opts) {
 			new URIError(ErrorMessage.getInvalidURIMessage(qurl, 'Select'))
 		);
 	}
-	let q = { 'terminus:query': JSON.stringify(woql) };
+	const fileList = opts ? opts.fileList : {};
+	let q = {'terminus:query' : JSON.stringify(woql), ...fileList};
+
 	q = this.addOptionsToWOQL(q, opts);
 	return this.dispatch(this.connectionConfig.queryURL(), CONST.WOQL_SELECT, q);
 };
@@ -314,11 +316,14 @@ WOQLClient.prototype.select = function (qurl, woql, opts) {
 WOQLClient.prototype.update = function (qurl, woql, opts) {
 	if (qurl && !this.connectionConfig.setQueryURL(qurl)) {
 		return Promise.reject(
-			new URIError(ErrorMessage.getInvalidURIMessage(qurl, 'Update'))
+			new URIError(ErrorMessage.getInvalidURIMessage(qurl, 'Select'))
 		);
 	}
-	woql = this.addOptionsToWOQL(woql, opts);
-	return this.dispatch(this.connectionConfig.queryURL(), 'woql_update', woql);
+	const fileList = opts ? opts.fileList : {};
+	let q = {'terminus:query' : JSON.stringify(woql), ...fileList};
+
+	q = this.addOptionsToWOQL(q, opts);
+	return this.dispatch(this.connectionConfig.queryURL(),  CONST.WOQL_UPDATE, q);
 };
 
 /**
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@terminusdb/terminus-client",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "TerminusDB client library",
   "main": "index.js",
   "directories": {
     "lib": "lib",
     "test": "test"
   },
   "publishConfig": {
-   "access": "public"
+    "access": "public"
   },
   "author": "kevin@datachemist.com",
   "license": "Apache-2.0",
@@ -46,17 +46,17 @@
     "webpack-dev-server": "^3.10.1"
   },
   "scripts": {
-    "versionWIN":"echo %npm_package_version%",
+    "versionWIN": "echo %npm_package_version%",
     "doc": "documentation build lib/** -f html -o public_pages/$npm_package_version/docs",
     "clean": "rimraf -r public_pages/$npm_package_version/dist",
     "test": "npm run cover",
-    "test:only": "mocha --require @babel/register --require @babel/preset-env --recursive",
+    "test:only": "mocha --require @babel/register --require @babel/preset-env --recursive  ",
     "test:watch": "mocha --watch --require @babel/register --require @babel/preset-env --recursive",
     "test:examples": "node examples/",
     "cover": "nyc --check-coverage --lines 30 npm run test:only ",
     "lint": "echo todo",
     "build": "webpack --mode production",
-    "prepare": "npm run clean && npm run test && npm run build",
+    "prepare": "npm run clean && npm run test",
     "coveralls-after": "nyc report --reporter=text-lcov | coveralls",
     "npm:publish": "npm publish --access public",
     "test-single": "mocha $1",
diff --git a/public_pages.sh b/public_pages.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+echo "___SONO IN SCRIPT____"
+
+
+PUBLICATION_BRANCH=gh-pages
+# Checkout the branch
+REPO_PATH=$PWD
+
+echo "$REPO_PATH"
+
+pushd "$HOME" || exit
+git clone --branch=$PUBLICATION_BRANCH  "https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG" tmp_pages 2>&1 > /dev/null
+cd tmp_pages || exit
+
+#rm -rf 1.1.4
+
+# Update pages
+cp -r $REPO_PATH/public_pages/.  .
+# Commit and push latest version
+git add .
+git config user.name  "Travis"
+git config user.email "travis@travis-ci.org"
+git commit -m "Updated version."
+git push -fq origin $PUBLICATION_BRANCH 2>&1 > /dev/null
+popd || exit
diff --git a/test/objectFrame.spec.js b/test/objectFrame.spec.js
@@ -22,3 +22,4 @@ describe('Object Frame Rules', function () {
     })
 })
 
+
