Merge pull request #55 from phovea/release_0.1.0

Release 0.1.0

.gitattributes

@@ -67,6 +67,7 @@
 # build config
 *.npmignore text
 *.bowerrc text
+Dockerfile text eof=LF
 
 # Heroku
 Procfile text
@@ -123,4 +124,4 @@ AUTHORS text
 # Note: .db, .p, and .pkl files are associated
 # with the python modules ``pickle``, ``dbm.*``,
 # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
-# (among others).
+# (among others).

.travis.yml

@@ -1,27 +1,30 @@
 language: node_js
-
 node_js:
 - 6
-
+addons:
+  firefox: 49.0.1
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-
-addons:
-  firefox: 49.0.1
 script: npm run dist
-
-deploy:
-  provider: releases
-  api_key:
-    secure: TK9/P34Bi3WuppiDrBCwVcn41yCBwmILaU8hXTBzUPbT7TbeFIwsC6/4CtH85Z+ZrUve4S5pTmWRNf2dQDxWw3uYu7+bJuemV2J1LHG76mognj+TNEiYxfLQUt3Gql4W7C7FcI4Rlx5/uMN9wY1wro8TWUBMwT6jjSrUWIvK3GXoojd5bHvJx07XpjWl9wCon4D0ruZiFoM2mdeP23lbc2GckETi32oEKswnQXxkMACmxbPzoWbvkxH4aK8Bt2Rj2sl2TbPhVkN6DAkHGkGAvLI+2/aRfG27+oo3OKsaDjbuGABct8TfZccJ970CbQ8kbnCjYxstvqkg1JWjF0W67sX/flBZZOEUA5l0OLWo6HqMGMxm7/lEQhIdPMsRmvXL+HVOxkMrB2dda58QzxVwiZp+rRqUaeabPZp8Kl5xodGrVxsBvxe6zAbJ5jCtCSumG6+kLyKI00/kYlghqQNrgUw0ZsYJlQ34h3lo/24QpaeyDpQoCkGWQgtgqiXGpeKSu7bCnOqIqAy3nbT9Utwj7K8gIasTG5idosEAz/THMampNbGDuyxxc340sYGNMg9Bhm1g2ILWRdtV470p5hwBtIDTKi3/PAizEO26+Wh0zI47Sg3ao57avcbCsTmzbZUeA5J4bojmchhJCHX8su9cSCGh/2fJA/1eBIgEvOQ8LNE=
-  file: dist/phovea_vis.tar.gz
-  on:
-    tags: true
-
 notifications:
   slack:
-    secure: E8/1UIdHSczUbN+6i6gd1d5LM4vmLdwLQ30tpyjvnM0wvfDce76oPxLJAy240WJ5ybXRZUtNrttpVpt4tEXCy8aLFCmxD7s77rVloH+q1J8R/ptTFWZGhFGEujk1awEmVbzcWxJkV9/JENQaeGBKxwv8/EQwWwEkAb7p/+AJb9owmH88b3wUZUGHBWtbMiyyaF4Rm1Wg1stJB8Z1Ga7PRF4cqufTgcDdsCPVv9gAY+VxOIGqX/Vfuc9UWpUH8vq8lHUE7Inn5QS78kuFfSgLWga3H6Mu/Gko1XNlWk0QWWQBUvEZ6ZC6Wuo68KzvUjJHDTnx8WyfHue2JNHIslcX+eJq2WHLeEgM24VeNkILCGo/H/60NGHiSjrIv/Y9h6bQ9FDjo6TUyE4nbdPYN1RN9FQ5UbI9Y4Gi753H9mqnHWlEywBOzHxdZCAuz9Wh03CCF/blsvJ+Obbyo6Jrfe+g44jyi9kQdBNQ78qG6v4EXws8FiYao6x3PpgIwFix42Cpr+soAh5FpA3C1zHSAyZZpXF65/lrDl5yPNofK7Wy0B9bw+0I6Z/u7ZKFNVZXvYPGYvtUVcsALGBdmYc61+LCta36Po0KZseWVAlJj6QnOJDYzv0wvV/zsuf9A5KpYFGiqV9Q7zmtiO5FYF5sBy+lE7O9tHVO4O18IRndhRQgxhs=
+    secure: UIMsZ74LfdIB5HY2fQ0aRRfhBU6iLX/J+b33bAELpE3jNUOuzllsgjczlfGEySFg4M48XOprbQPWDU9TX6L7QKx1z2Kf/VaWvTSKkxyf8PC9sr7WZ8ty2VeqXsgzofqItq8y1+/LL19aON8pdR/mgU4fEjN4wfDk0CJlWcaySHWFkVTJh2mzz3sWQzGgWPtZhbdylVb4zasWMQybY1Dr2OAS3eT3Hj4eIrmVf6tXm3hUENQv2uU8fqLXJcXFNBCHy35Xy8NPDmtutZOl0TkKzDmiFCmMsusMIqlCWB17c0rLkcUCM2KkQjBZcnUQqSnLnDXcdlbMmIz3+rm+pHkfIPQRgHeraT19wbNThOq+neLYN5ifzBFqbTFrWRXlRDbywu2txoGqeJ0p95BAlQEz0m7Wka6f767R9g63nyRE76GKC6+CGafUAGNHYsiP81xDScWLxa4FsIXlIme4+VP9usSyRoQnyXMQJ30mE6gReFBvFXu1evP5Ef702MIIfgcoFLHFdzu1uuvMyT8xxQMkZZtjoBYnLLhgkXkDA+c2qzcS/PsWdaRgeUIu7ZmKWbcZvENMuUzitLCLVgYmDIBiI1mgmQi7nBQEw6zau8UT5a8E2GEw5uqhlp3P8w9UXXv2yXPmmtonTNb4dlKodTAQ2wOVqqtTioUDmI9K9tpeJoo=
     on_success: change
     on_failure: always
+deploy:
+  - provider: releases
+    api_key:
+      secure: IeIhf4uIp8AUEd7ImsoZo1/ynXxylGe7OAJKqZonnBmVUhe/1D52WOBOsHqnxe4hLH1ZZKTUMgLAAY09HzmjczpLBI8PKPOEJllbwBr/A+EJqontVwP9iEFelcDOARHzfFRKrj23FRzRcZ7U6HK2YxG2h8I9OYN6kCL3vptKDub3YHXBbJrDYjwAJfPoR3ko62i02fWV6s5JKpXq4XfSUZA0Ajy2jIfA/NfbvO0146bh8XkZoQJGub3nNL7oHRG69kBYwVaV7bgsZCBCMkkHRCX/zaqfipPCh6aWt7ksKaq2YtEj5EHYHVfLkPSAoKeC0H6Ct6EPSlbp0YzoinMFaNHb5qGjFahSUroeolqnkJ/L1oDhUAP2Orp7rJoeeahHZQKq1pCsCp2rVlxEbQYxsdB34vuzdLvfvpPkhbERJc7ZPpwDWl3x1lE/ufLlQiHyp1OzQ81OmoGOinbGZBGmpekg7GQA5bKjnlSwMSSIRqqpdw4Zb6NtCyLh7BrrGBI5LqXxfKFNEQQWMXPgId19YBrlNef5jSjgo5+etscxa9Sj+r893dO9V82FdF35Jj2rLoCHkOyAatlbvcz4qyfpkn+J1DmRVqPPdlEWK/gX36yVhV+CstLxnH8fJknfrw2ILA+p1CAGRm4SH3Jap9Bjagppup0rxWJXndvxsAMacZ8=
+    file: dist/phovea_vis.tar.gz
+    on:
+      tags: true
+      repo: phovea/phovea_vis
+  - provider: npm
+    email: samuel.gratzl@jku.at
+    api_key:
+      secure: X0QuouugY8RI+/P3kJQe9f/cRDKvN1qNM2jr2tAKgFLHKxhrpwA6dFbaD0GcXbVH9Gt0kk66VkiwFhfA1SlRp4YiqiGCcC8KTeps/NLeEpP7Jxbr4JW4a3ueT0RzFbem+JKMERP0dXXIfT4xL1WeLb37Fone7Bc9bRzv/vwKzCmqUMB/T/mzWd+4OIDoRudFif4gt3f3cMUX/L4i7X4Z8ELMre47XTse/aIICk1RMMBPWR2ZIytbWEfbNAVNeed/1o67m/E3t3Bc+pHf91PusXHvtsORW8K9tmldzN28ciQvlCkPdlQnA4ihhcb5OHhl+40+cFvRS4uZ8DQP10haypbzCpWqN7Jv/vw1FwZ8TnloSuESyJhzuj6LG7Me1oJ8W1bkYOlBmdTmJtgbWNUHoTO0UlMUPUMVRxP0Rj/HqOjqvixFIwcQ3quZEtTGTHgYhCwqm8UnUnoMjOKLj4YqRz9wjOl+Hfooq1HPUrAkJ2rkxRSNFipYJoxu0UD/V/qSc+drIXaeOzhqhA4Zz468j+w52Xqr2H4abCtMh6qSMfdhxqznm6ercpHTdW0StG4g7sH7Sg6e0bjl1ry9PDx9O48i9MU3C+1vO8+1Fc3SSal1o20yIFhaJ5BurhRw3kiMhRh+Mc6T5+YZC0fJF09FmDMRfR+LhnxjWtgEt3NDh3I=
+    on:
+      tags: true
+      repo: phovea/phovea_vis

ISSUE_TEMPLATE.md

@@ -14,4 +14,4 @@
 * Static or animated images showing the UI behavior
 
 ### Expected behavior
-*
+* 

README.md

@@ -31,7 +31,7 @@ npm run build
 ***
 
 <a href="https://caleydo.org"><img src="http://caleydo.org/assets/images/logos/caleydo.svg" align="left" width="200px" hspace="10" vspace="6"></a>
-This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://caleydo.org/documentation/).
+This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://phovea.caleydo.org).
 
 
 [phovea-image]: https://img.shields.io/badge/Phovea-Client%20Plugin-F47D20.svg
@@ -40,5 +40,5 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
 [npm-url]: https://npmjs.org/package/phovea_vis
 [travis-image]: https://travis-ci.org/phovea/phovea_vis.svg?branch=master
 [travis-url]: https://travis-ci.org/phovea/phovea_vis
-[daviddm-image]: https://david-dm.org/phovea/phovea_vis.svg?theme=shields.io
+[daviddm-image]: https://david-dm.org/phovea/phovea_vis/status.svg
 [daviddm-url]: https://david-dm.org/phovea/phovea_vis

buildInfo.js

@@ -50,28 +50,29 @@ function cleanupDependency(d) {
   return d;
 }
 
-function resolveUeber() {
+function resolveWorkspace() {
   console.log('resolve parent');
-  const ueberDeps = dependencyGraph('..').dependencies;
+  const workspaceDeps = dependencyGraph('..').dependencies;
   const modules = new Set(resolveModules());
 
   const resolveModule = (m) => {
     console.log('resolve', m);
     const pkg = require(`../${m}/package.json`);
     const head = gitHead('../' + m);
+    const repo = pkg.repository.url;
     return {
       name: pkg.name,
       version: pkg.version,
-      resolved: head ? `${pkg.repository.url}#${head}` : pkg.version,
+      resolved: head ? `${repo.endsWith('.git') ? repo.slice(0, repo.length-4) : repo}/commit/${head}` : pkg.version,
       dependencies: deps(pkg.dependencies)
     };
   };
   const deps = (deps) => {
     const r = {};
     Object.keys(deps).forEach((d) => {
-      if (d in ueberDeps) {
-        r[d] = cleanupDependency(ueberDeps[d]);
-        delete ueberDeps[d];
+      if (d in workspaceDeps) {
+        r[d] = cleanupDependency(workspaceDeps[d]);
+        delete workspaceDeps[d];
       } else if (modules.has(d)) {
         modules.delete(d);
         r[d] = resolveModule(d);
@@ -103,7 +104,7 @@ function resolveSingle() {
   const pkg = require(`./package.json`);
   const head = gitHead('.');
   const deps = {};
-  Object.keys(self.dependencies).forEach((d) => {
+  Object.keys(self.dependencies || {}).forEach((d) => {
     deps[d] = cleanupDependency(self.dependencies[d]);
   });
   return {
@@ -117,9 +118,9 @@ function resolveSingle() {
 
 function generate() {
   console.log('building buildInfo');
-  const isUeberContext = fs.existsSync('../phovea_registry.js');
-  if (isUeberContext) {
-    return resolveUeber();
+  const isWorkspaceContext = fs.existsSync('../phovea_registry.js');
+  if (isWorkspaceContext) {
+    return resolveWorkspace();
   } else {
     return resolveSingle();
   }

index.js

@@ -20,30 +20,32 @@ var INDEX_FILE = './index.ts';
  * @returns {number}
  */
 function byName(a, b) {
-    if (a === INDEX_FILE) {
-        return a === b ? 0 : -1;
-    }
-    if (b === INDEX_FILE) {
-        return 1;
-    }
-    return a.toLowerCase().localeCompare(b.toLowerCase());
+  if (a === INDEX_FILE) {
+    return a === b ? 0 : -1;
+  }
+  if (b === INDEX_FILE) {
+    return 1;
+  }
+  return a.toLowerCase().localeCompare(b.toLowerCase());
 }
 //list all modules in the src folder excluding the one starting with _
-var req = require.context('./src', false, /\/[^_].*\.tsx?$/);
+var req = require.context('./src', true, /^\.\/(?!internal)(([^_][\w]+)|(\w+\/index))\.tsx?$/);
 
 var files = req.keys().sort(byName);
 
 //root file exists? else use anonymous root object
 if (files[0] === INDEX_FILE) {
-    module.exports = req(files.shift());
+  module.exports = req(files.shift());
 } else {
-    module.exports = {};
+  module.exports = {};
 }
 
 //generate getter for all modules
 files.forEach(function (f) {
-    Object.defineProperty(module.exports, f.substring(2, f.length - 3), {
-        get: function () { return req(f); },
-        enumerable: true
-    });
+  Object.defineProperty(module.exports, f.substring(2, f.lastIndexOf('/index.') > 0 ? f.lastIndexOf('/index.') : f.lastIndexOf('.')), {
+    get: function () {
+      return req(f);
+    },
+    enumerable: true
+  });
 });

package.json

@@ -1,4 +1,21 @@
 {
+  "name": "phovea_vis",
+  "description": "Utilitiy reposititory containing common visualizations (table, heatmap, scatterplot, axis, pie, distribution, ..)",
+  "homepage": "https://phovea.caleydo.org",
+  "version": "0.1.0",
+  "author": {
+    "name": "The Caleydo Team",
+    "email": "contact@caleydo.org",
+    "url": "https://caleydo.org"
+  },
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/phovea/phovea_vis/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/phovea/phovea_vis.git"
+  },
   "main": "build/phovea_vis.js",
   "files": [
     "src",
@@ -16,9 +33,9 @@
     "compile": "tsc",
     "lint": "tslint -c tslint.json src/**.ts tests/**.ts",
     "docs": "typedoc --options typedoc.json src/**.ts",
-    "prebuild": "npm run test",
+    "prebuild": "node -e \"process.exit(process.env.PHOVEA_SKIP_TESTS === undefined?1:0)\" || npm run test",
     "pretest": "npm run compile",
-    "test": "karma start",
+    "test": "test ! -d tests || karma start",
     "posttest": "npm run lint",
     "test:watch": "karma start --autoWatch=true --singleRun=false",
     "build:dev": "webpack",
@@ -29,61 +46,45 @@
     "release:major": "npm version major && npm publish && git push --follow-tags",
     "release:minor": "npm version minor && npm publish && git push --follow-tags",
     "release:patch": "npm version patch && npm publish && git push --follow-tags",
-    "predist": "npm run build",
+    "predist": "npm run build && npm run docs",
     "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *"
   },
+  "dependencies": {
+    "phovea_core": "0.1.0",
+    "phovea_d3": "0.1.0",
+    "@types/d3": "3.5.36",
+    "d3": "3.5.17"
+  },
   "devDependencies": {
-    "@types/jasmine": "2.5.35",
-    "awesome-typescript-loader": "2.2.4",
-    "css-loader": "0.25.0",
-    "extract-text-webpack-plugin": "2.0.0-beta.4",
-    "file-loader": "0.9.0",
+    "@types/jasmine": "2.5.41",
+    "awesome-typescript-loader": "3.0.3",
+    "css-loader": "0.26.1",
+    "extract-text-webpack-plugin": "2.0.0-rc.3",
+    "file-loader": "0.10.0",
     "html-loader": "0.4.4",
-    "imports-loader": "0.6.5",
-    "jasmine": "2.5.2",
+    "imports-loader": "0.7.0",
+    "jasmine": "2.5.3",
     "json-loader": "0.5.4",
-    "karma": "1.3.0",
+    "karma": "1.4.0",
     "karma-chrome-launcher": "2.0.0",
     "karma-firefox-launcher": "1.0.0",
-    "karma-jasmine": "1.0.2",
-    "karma-junit-reporter": "1.1.0",
+    "karma-jasmine": "1.1.0",
+    "karma-junit-reporter": "2.0.0",
     "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "1.8.0",
+    "karma-webpack": "2.0.2",
     "mkdirp": "0.5.1",
-    "node-sass": "3.10.0",
+    "node-sass": "4.5.0",
     "null-loader": "0.1.1",
     "raw-loader": "0.5.1",
-    "sass-loader": "4.0.2",
+    "sass-loader": "5.0.0",
     "style-loader": "0.13.1",
-    "tslint": "3.15.1",
-    "typedoc": "0.5.1",
-    "typescript": "2.0.6",
+    "tslib": "1.5.0",
+    "tslint": "4.4.2",
+    "typedoc": "0.5.5",
+    "typescript": "2.2.0",
     "url-loader": "0.5.7",
-    "webpack": "2.1.0-beta.26",
-    "webpack-dev-server": "2.1.0-beta.10",
-    "extract-loader": "0.0.2"
-  },
-  "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#v0.0.5",
-    "phovea_d3": "github:phovea/phovea_d3#v0.0.5",
-    "@types/d3": "3.5.36",
-    "d3": "3.5.17"
-  },
-  "name": "phovea_vis",
-  "description": "Utilitiy reposititory containing common visualizations (table, heatmap, scatterplot, axis, pie, distribution, ..)",
-  "homepage": "https://phovea.caleydo.org",
-  "version": "0.0.5",
-  "author": {
-    "name": "The Caleydo Team",
-    "email": "contact@caleydo.org",
-    "url": "https://caleydo.org"
-  },
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/phovea/phovea_vis/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/phovea/phovea_vis.git"
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.3.0",
+    "extract-loader": "0.1.0"
   }
 }

phovea.js

@@ -61,6 +61,13 @@ module.exports = function(registry) {
     sizeDependsOnDataDimension: true
 
   });
+  registry.push('vis', 'list', function () {
+    return System.import('./src/list');
+  }, {
+    name: 'List',
+    filter: 'vector',
+    sizeDependsOnDataDimension: true
+  });
   registry.push('vis', 'scatterplot', function () {
     return System.import('./src/scatterplot');
   }, {
@@ -87,7 +94,7 @@ module.exports = function(registry) {
       true
     ],
     scaling: 'height-only',
-    filter: 'vector'
+    filter: ['vector', '(real|int|categorical)']
 
   });
   registry.push('vis', 'phovea-vis-kaplanmeier', function () {