[Commits] [fluid-project/kettle] c00dfc: KETTLE-31: Sensible diagnostic on receiving malfor...

GitHub noreply at github.com
Wed May 25 22:52:55 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/kettle
  Commit: c00dfcefc209713c61b8f04c7bf9cdd84e32e14d
      https://github.com/fluid-project/kettle/commit/c00dfcefc209713c61b8f04c7bf9cdd84e32e14d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M lib/dataSource.js
    M lib/server.js
    M lib/utils.js
    M package.json
    M tests/DataSourceTests.js
    A tests/data/invalidJSONFile.jsonx

  Log Message:
  -----------
  KETTLE-31: Sensible diagnostic on receiving malformed JSON in dataSource (this util is also reusable). Reorganised "errback" handler for dataSource to correct dependency leak


  Commit: 8e58cd79fbe16943268c9e699de45572f1941776
      https://github.com/fluid-project/kettle/commit/8e58cd79fbe16943268c9e699de45572f1941776
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

  Changed paths:
    M Gruntfile.js
    M lib/app.js
    M lib/configLoader.js
    M lib/dataSource.js
    M lib/middleware.js
    M lib/request.io.js
    M lib/request.js
    M lib/server.io.js
    M lib/server.js
    M lib/session.io.js
    M lib/session.js
    M lib/test/KettleTestUtils.js
    M lib/utils.js
    M package.json
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/MiddlewareTests.js
    M tests/SessionTests.js
    M tests/SocketTests.js
    M tests/configs/CORS.json
    M tests/configs/CORS_noCred.json
    M tests/configs/CORS_origin.json
    M tests/configs/HTTPMethods.json
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config6.json
    M tests/configs/error.json
    M tests/configs/noCORS.json
    M tests/configs/session.json
    M tests/configs/socket.json

  Log Message:
  -----------
  KETTLE-32: Beginning work on updating Kettle to latest express, Infusion and node - some basic tests running, about to start work simplifying implementation by removing middleware events, request proxy and separate handler component


  Commit: 73a64bec7dc6d6971c5be3f36dcd563e4f9925a7
      https://github.com/fluid-project/kettle/commit/73a64bec7dc6d6971c5be3f36dcd563e4f9925a7
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-08 (Sat, 08 Aug 2015)

  Changed paths:
    M kettle.js
    A lib/KettleApp.js
    A lib/KettleConfigLoader.js
    A lib/KettleMiddleware.js
    A lib/KettleRequest.io.js
    A lib/KettleRequest.js
    A lib/KettleRouter.js
    A lib/KettleServer.io.js
    A lib/KettleServer.js
    A lib/KettleSession.io.js
    A lib/KettleSession.js
    A lib/KettleUtils.js
    R lib/app.js
    R lib/configLoader.js
    R lib/middleware.js
    R lib/request.io.js
    R lib/request.js
    R lib/server.io.js
    R lib/server.js
    R lib/session.io.js
    R lib/session.js
    M lib/test/KettleTestUtils.js
    R lib/utils.js
    M package.json
    M tests/HTTPMethodsTests.js
    M tests/configs/HTTPMethods.json

  Log Message:
  -----------
  KETTLE-32: Last version binding to express 3.x - HttpMethodsTests executes and passes, but throws uninterpreted exception


  Commit: 3b209f4aa8aac3d9c7d9d20b0ac84ea5767f0ad5
      https://github.com/fluid-project/kettle/commit/3b209f4aa8aac3d9c7d9d20b0ac84ea5767f0ad5
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-09 (Sun, 09 Aug 2015)

  Changed paths:
    M kettle.js
    M lib/KettleMiddleware.js
    M lib/KettleServer.js
    M lib/test/KettleTestUtils.js
    M package.json

  Log Message:
  -----------
  KETTLE-32: "Smoke test ready" version of NEW NEW NEW NEW Kettle with express 4.x and promise-based dispatching


  Commit: b11e03da1ce8f5ebf7a349aa822ae63cf66a610f
      https://github.com/fluid-project/kettle/commit/b11e03da1ce8f5ebf7a349aa822ae63cf66a610f
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleServer.js
    M lib/KettleUtils.js
    M lib/test/KettleTestUtils.js
    M package.json

  Log Message:
  -----------
  KETTLE-32: First working version of N4 KETTLE with express 4.x and "concrete middleware"


  Commit: 6590488c1435926e33cde53a567d09114f9d859a
      https://github.com/fluid-project/kettle/commit/6590488c1435926e33cde53a567d09114f9d859a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/CrossServerRequestTests.js
    M tests/ErrorTests.js
    M tests/configs/error.json

  Log Message:
  -----------
  KETTLE-32: Core is mostly stabilised - HTTPMethods, Init, CrossServer, Error and DataSource tests are all passing. About to merge in KETTLE-31 and start work on per-request middleware for CORS and then session.


  Commit: 7d539a0234b96c09904267daf3fe5c2a96633e6e
      https://github.com/fluid-project/kettle/commit/7d539a0234b96c09904267daf3fe5c2a96633e6e
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M lib/dataSource.js
    M package.json
    M tests/DataSourceTests.js
    A tests/data/invalidJSONFile.jsonx

  Log Message:
  -----------
  Merge branch 'KETTLE-31' into KETTLE-32

Conflicts:
	lib/dataSource.js
	lib/server.js
	package.json
	tests/DataSourceTests.js


  Commit: 33e2826e78315c6d29b13c8ba810f54fef29e8ac
      https://github.com/fluid-project/kettle/commit/33e2826e78315c6d29b13c8ba810f54fef29e8ac
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M package.json

  Log Message:
  -----------
  KETTLE-32: Moved grunt to main dependencies as temp fix for GPII-1129


  Commit: 8a20604580d47c34a640eb23aa803e1a214340a7
      https://github.com/fluid-project/kettle/commit/8a20604580d47c34a640eb23aa803e1a214340a7
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-23 (Sun, 23 Aug 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M package.json
    A tests/CORSTests.js
    M tests/HTTPMethodsTests.js
    R tests/MiddlewareTests.js
    M tests/configs/CORS.json
    M tests/configs/CORS_noCred.json
    M tests/configs/CORS_origin.json
    M tests/configs/HTTPMethods.json
    M tests/configs/error.json
    M tests/configs/noCORS.json

  Log Message:
  -----------
  KETTLE-32: Extremal commit - undesirably verbose method for reporting config parse errors using transform promise sequence - about to revert to standard code


  Commit: adae7112ad7471b7954a898e72523626461df336
      https://github.com/fluid-project/kettle/commit/adae7112ad7471b7954a898e72523626461df336
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/dataSource.js
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    R tests/configs/CORS.json
    R tests/configs/CORS_noCred.json
    R tests/configs/CORS_origin.json
    R tests/configs/HTTPMethods.json
    M tests/configs/config1.json
    R tests/configs/error.json
    A tests/configs/kettle.tests.CORS.config.json
    A tests/configs/kettle.tests.CORS.noCORS.config.json
    A tests/configs/kettle.tests.CORS.noCred.config.json
    A tests/configs/kettle.tests.CORS.origin.config.json
    A tests/configs/kettle.tests.HTTPMethodsConfig.json
    A tests/configs/kettle.tests.error.config.json
    R tests/configs/noCORS.json

  Log Message:
  -----------
  KETTLE-32: Now working CORS tests and "request middleware". Abolished the idea that a request's type is determined from "methods", and added support for comma-separated method handling. Renamed all configs to sensible namespaced names


  Commit: a57f6bd75ddea95fca667f38790ca26f730f8145
      https://github.com/fluid-project/kettle/commit/a57f6bd75ddea95fca667f38790ca26f730f8145
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleServer.js
    M lib/KettleSession.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/CORSTests.js
    M tests/CrossServerRequestTests.js
    M tests/HTTPMethodsTests.js
    M tests/SessionTests.js
    A tests/configs/kettle.tests.session.config.json
    R tests/configs/session.json

  Log Message:
  -----------
  KETTLE-32: WORKING SESSION SUPPORT! Several hundred lines of code destroyed. Various changes to configuration idiom - each "handler" is now freely keyed and has its type moved into "type" to aid overriding. Middleware container renamed to "middlewareHolder" as a result of name collisions with "middleware". Moved raw npm requires into new "kettle.npm" namespace. JSON parsing utilities added to kettle.JSON to ease users wanting sensible diagnostics. Reformed signatures in kettle.test.request to consolidate into (data, request, parsed), and to throw on attempting to reuse a request object. Added standard kettle.test.assertJSONResponse. Better gearing of promise rejection onto firing of onError - note that our rejections currently always reach our own handler. Better configurability might be helpful here, in case user wants to gear rejections onto the standard error handler. Next step - SOCKITS.


  Commit: a105087b91222ab33af2dbc78a25be76da3fdbe5
      https://github.com/fluid-project/kettle/commit/a105087b91222ab33af2dbc78a25be76da3fdbe5
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M kettle.js
    R lib/KettleRequest.io.js
    M lib/KettleRequest.js
    A lib/KettleRequest.ws.js
    R lib/KettleServer.io.js
    M lib/KettleServer.js
    A lib/KettleServer.ws.js
    R lib/KettleSession.io.js
    A lib/KettleSession.ws.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/SessionTests.js
    A tests/SessionWebSocketsTests.js
    R tests/SocketTests.js
    A tests/WebSocketsTests.js
    M tests/all-tests.js
    M tests/configs/config1.json
    A tests/configs/kettle.tests.HTTPMethods.config.json
    R tests/configs/kettle.tests.HTTPMethodsConfig.json
    A tests/configs/kettle.tests.session.webSockets.config.json
    A tests/configs/kettle.tests.webSockets.config.json
    R tests/configs/socket.json

  Log Message:
  -----------
  KETTLE-32: Close to functioning session-qualified WebSockets support - need to extract cookie manually since response is required by standard middleware


  Commit: c76a276aa247abd21de0876846e8801a99053d97
      https://github.com/fluid-project/kettle/commit/c76a276aa247abd21de0876846e8801a99053d97
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M kettle.js
    M lib/KettleRequest.js
    M lib/KettleServer.ws.js
    R lib/KettleSession.ws.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.js
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    A tests/DataSourceJSONTests.js
    A tests/DataSourceTestUtils.js
    M tests/DataSourceTests.js
    M tests/SessionWebSocketsTests.js
    M tests/all-tests.js
    M tests/configs/config1.json
    M tests/configs/kettle.tests.CORS.noCred.config.json
    M tests/configs/kettle.tests.CORS.origin.config.json

  Log Message:
  -----------
  KETTLE-32: All tests passing, with einaros ws-based WebSockets implementation. Considerably simplified handling of session enrolment for WebSockets requests. More tests required for mismatched request and handler types, etc. Also tested under node 4.


  Commit: 5859890a80794efe6797aed520efae39f8c66851
      https://github.com/fluid-project/kettle/commit/5859890a80794efe6797aed520efae39f8c66851
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M kettle.js
    M lib/KettleRequest.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/test/KettleTestUtils.js
    A lib/test/KettleTestUtils.ws.js
    M tests/CORSTests.js
    M tests/DataSourceTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js

  Log Message:
  -----------
  KETTLE-32: Added tests for mismatched request and handler types (HTTP/WebSockets) - WebSockets handler rejects during handshake using verifyClient if an HTTP handler is registered. Better namespacing in DataSource tests. Added core Kettle.test.assertErrorResponse utility, and backported array manipulation functions useful in the GPII TEST DISRUPTOUR.


  Commit: b66be0e6c25363637695ebfb06f161daf59f6a8a
      https://github.com/fluid-project/kettle/commit/b66be0e6c25363637695ebfb06f161daf59f6a8a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleUtils.js
    M lib/test/KettleTestUtils.js
    M lib/test/KettleTestUtils.ws.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    R tests/DataSourceTestUtils.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/SessionTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js
    A tests/shared/DataSourceTestUtils.js
    A tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Widespread refactoring to reposition ws invocation of standard middleware into "verifyClient" rather than after connect. Mismatched requests now handled by standard middleware attached to new "mismatch" request type. Restored test which verifies failed handshake if session-enabled WebSockets request is not enrolled. Improved factoring of tests by moving all test support files into "shared" subdir. Improved config loading so that configPath option can directly reference ${module} style interpolated paths.


  Commit: f7b35db6468d9a9c4a3ccb6b10a8ee8567a342de
      https://github.com/fluid-project/kettle/commit/f7b35db6468d9a9c4a3ccb6b10a8ee8567a342de
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M kettle.js
    M lib/KettleRequest.js
    M lib/dataSource.js
    A lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    M lib/test/KettleTestUtils.ws.js
    M tests/CrossServerRequestTests.js
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-33: Check URL DataSource response for an HTTP error code and convert this into a reject. Factored out http-specific parts of KettleTestUtils into its own file. Allow dynamic URL templating for kettle.test.request requests - needed in various parts of the GPII such as OAuth2 acceptance tests. Added stack entry into "exception to rejection converter" for request. Missing from previous commit comment - split off "handler success/error" from "request success/error" events in order to avoid circularity between these and "request promise". Handler still calls onSuccess/onError as before.


  Commit: 68bcdd7c41b39e6db4a1e5078230857b5a2a928b
      https://github.com/fluid-project/kettle/commit/68bcdd7c41b39e6db4a1e5078230857b5a2a928b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M Gruntfile.js
    M kettle.js
    M lib/KettleApp.js
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleSession.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    M lib/test/KettleTestUtils.ws.js
    M package.json
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/SessionTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js
    M tests/all-tests.js
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config6.json
    M tests/configs/kettle.tests.CORS.config.json
    M tests/configs/kettle.tests.CORS.noCORS.config.json
    M tests/configs/kettle.tests.CORS.noCred.config.json
    M tests/configs/kettle.tests.CORS.origin.config.json
    M tests/configs/kettle.tests.HTTPMethods.config.json
    M tests/configs/kettle.tests.error.config.json
    M tests/configs/kettle.tests.session.config.json
    M tests/configs/kettle.tests.session.webSockets.config.json
    M tests/configs/kettle.tests.webSockets.config.json
    M tests/data/invalidJSONFile.jsonx
    M tests/shared/DataSourceTestUtils.js
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  Merge branch 'master' into KETTLE-32


  Commit: e0e5e0c1caa3ca9195135bb9868a04e266d59d00
      https://github.com/fluid-project/kettle/commit/e0e5e0c1caa3ca9195135bb9868a04e266d59d00
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M Gruntfile.js
    M kettle.js
    M lib/KettleApp.js
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleSession.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    M lib/test/KettleTestUtils.ws.js
    M package.json
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/SessionTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js
    M tests/all-tests.js
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config6.json
    M tests/configs/kettle.tests.CORS.config.json
    M tests/configs/kettle.tests.CORS.noCORS.config.json
    M tests/configs/kettle.tests.CORS.noCred.config.json
    M tests/configs/kettle.tests.CORS.origin.config.json
    M tests/configs/kettle.tests.HTTPMethods.config.json
    M tests/configs/kettle.tests.error.config.json
    M tests/configs/kettle.tests.session.config.json
    M tests/configs/kettle.tests.session.webSockets.config.json
    M tests/configs/kettle.tests.webSockets.config.json
    M tests/data/invalidJSONFile.jsonx
    M tests/shared/DataSourceTestUtils.js
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  Fixing permissions after merge


  Commit: b640f40b2bbe891332136b6a291c612c4f50e924
      https://github.com/fluid-project/kettle/commit/b640f40b2bbe891332136b6a291c612c4f50e924
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M README.md

  Log Message:
  -----------
  KETTLE-32: Early work on README


  Commit: 88afd961c255a8b18004b36ee704cb69027c8202
      https://github.com/fluid-project/kettle/commit/88afd961c255a8b18004b36ee704cb69027c8202
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-13 (Tue, 13 Oct 2015)

  Changed paths:
    M Gruntfile.js
    M README.md
    A examples/simpleConfig/README.md
    A examples/simpleConfig/examples.simpleConfig.json
    A examples/simpleConfig/simpleConfig-client.js
    A examples/simpleConfig/simpleConfig-code.js
    A examples/simpleConfig/simpleConfig-config-driver.js
    A examples/simpleConfig/simpleConfig-config-handler.js
    A examples/simpleDataSource/simpleDataSource.js
    A examples/testingSimpleConfig/testSimpleConfig.js
    M kettle.js
    M lib/KettleConfigLoader.js
    M lib/KettleServer.js
    M lib/dataSource.js
    R lib/init.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.ws.js
    M tests/ConfigLoaderTests.js
    M tests/DataSourceTests.js
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config3.json
    M tests/configs/config4.json
    M tests/configs/config6.json
    M tests/configs/kettle.tests.CORS.config.json
    M tests/configs/kettle.tests.CORS.noCORS.config.json
    M tests/configs/kettle.tests.CORS.noCred.config.json
    M tests/configs/kettle.tests.CORS.origin.config.json
    M tests/configs/kettle.tests.HTTPMethods.config.json
    M tests/configs/kettle.tests.error.config.json
    M tests/configs/kettle.tests.session.config.json
    M tests/configs/kettle.tests.session.webSockets.config.json
    M tests/configs/kettle.tests.webSockets.config.json

  Log Message:
  -----------
  KETTLE-32: First complete draft of documentation and sample programs. Improvements to error handling on missing request grade. Renamed top-level option "typeName` accepted by configs to the more standard "type`. Removed scheme for double-interpolation of dataSource termMaps. dataSource port now defaults to 80.


  Commit: ccd6946d375387178a68386a47ffaa17bd1aef38
      https://github.com/fluid-project/kettle/commit/ccd6946d375387178a68386a47ffaa17bd1aef38
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-18 (Sun, 18 Oct 2015)

  Changed paths:
    M README.md
    M examples/simpleConfig/simpleConfig-code.js
    M examples/simpleConfig/simpleConfig-config-driver.js
    M examples/simpleConfig/simpleConfig-config-handler.js
    M examples/simpleDataSource/simpleDataSource.js
    M examples/testingSimpleConfig/testSimpleConfig.js
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    A tests/BadConfigTests.js
    M tests/CORSTests.js
    M tests/CrossServerRequestTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js
    M tests/all-tests.js
    M tests/configs/config1.json
    A tests/configs/kettle.tests.badConfig.config.json
    M tests/configs/kettle.tests.session.webSockets.config.json
    M tests/configs/kettle.tests.webSockets.config.json
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Moved to %kettle rather than ${kettle} for any paths which appear in configuration. Added new test fixtures to diagnose missing request handlers, as well as testing "error upgrade" configuration. Fixed up fallout from removing double-interpolation from dataSources. Widespread cleanup of stray console messages. "method" is now no longer required on WebSockets requests. Fixed up failure of DataSource to decode error responses that were JSON.


  Commit: 4047ebf80be4d7df624aaf6efd2f47da10022a4a
      https://github.com/fluid-project/kettle/commit/4047ebf80be4d7df624aaf6efd2f47da10022a4a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.ws.js
    M package.json
    M tests/DataSourceTests.js

  Log Message:
  -----------
  KETTLE-34: Fixed expansion of url and request options in dataSource, consolidated option assembly with that from test fixtures, bumped to npm version of node-jqunit


  Commit: 9c989badc6e36c0ef153e2523ed7d37fab5f93f5
      https://github.com/fluid-project/kettle/commit/9c989badc6e36c0ef153e2523ed7d37fab5f93f5
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M README.md
    M lib/KettleMiddleware.js
    M lib/KettleRequest.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M package.json
    M tests/SessionWebSocketsTests.js
    A tests/StaticTests.js
    M tests/all-tests.js
    A tests/configs/kettle.tests.static.config.json
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Support for static middleware, new "kettle.request.notFoundHandler" handler, new "prefix" option to all handlers, documentation for same, more cleanup of logging messages, documentation for all builtin middleware


  Commit: 5442072ec47e017fdb62b5b0b23b4f0c749fe550
      https://github.com/fluid-project/kettle/commit/5442072ec47e017fdb62b5b0b23b4f0c749fe550
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M lib/KettleRequest.js
    M tests/CORSTests.js

  Log Message:
  -----------
  KETTLE-32: Fix for test determinism under node 4 - don't dispatch our handler if some middleware has already sent the response


  Commit: 765b3cfbd23f042a148c68208cf074ab1cd518c1
      https://github.com/fluid-project/kettle/commit/765b3cfbd23f042a148c68208cf074ab1cd518c1
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M lib/test/KettleTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Minor updates to context names and commenting


  Commit: ef9a6146fb69ea9ef5281d1117591b95421ed656
      https://github.com/fluid-project/kettle/commit/ef9a6146fb69ea9ef5281d1117591b95421ed656
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M package.json

  Log Message:
  -----------
  KETTLE-32: Fixes to package.json to remove faulty "postinstall" strategy


  Commit: f03121ece49893194454accb2554e9886b811298
      https://github.com/fluid-project/kettle/commit/f03121ece49893194454accb2554e9886b811298
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js

  Log Message:
  -----------
  KETTLE-32: Rewritten includes for change of package name for "node-jqunit", removed last instances of "path"-based config paths


  Commit: c507948950bf62e491005f2ba2a62e467aebb56f
      https://github.com/fluid-project/kettle/commit/c507948950bf62e491005f2ba2a62e467aebb56f
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M .gitignore
    M README.md
    M lib/KettleConfigLoader.js
    M package.json
    M tests/ConfigLoaderTests.js
    M tests/configs/config2.json
    M tests/configs/config3.json
    M tests/configs/config4.json
    A tests/configs/node_modules/test-module/index.js
    A tests/configs/node_modules/test-module/package.json
    A tests/requires/testBareRequire.js
    A tests/requires/testModuleRelativeRequire.js

  Log Message:
  -----------
  KETTLE-32: Improved documentation on DataSources following initial use. Re-implemented old feature of "modules" as "require" following feature request - old "kettleModuleLoader.js" is no longer required through use of "resolve" module. Updated to ws version 0.8.0 for node 4.2.1-compliant build and recent dev build of Infusion. Various doc tidyup


  Commit: 80f72e6ebe09ac73e8aa94bda36c15ac3c2d33a1
      https://github.com/fluid-project/kettle/commit/80f72e6ebe09ac73e8aa94bda36c15ac3c2d33a1
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M lib/dataSource.js
    M tests/DataSourceTests.js

  Log Message:
  -----------
  KETTLE-38: Fix for failure to derive writable DataSource grade from a derived grade


  Commit: bd1c35ec1c8fc0f768b296810ad0947b0dce5f08
      https://github.com/fluid-project/kettle/commit/bd1c35ec1c8fc0f768b296810ad0947b0dce5f08
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/shared/DataSourceTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Refactored support for url expansion to automatically be sensitive to module roots, eliminated cumbersome double "expander" architecture as well as irregular invocation of file/URL handler. Eliminated expectation of variable "root", restored old support for model-expanded or direct interpolated variables.


  Commit: c0653b9ac006c5b4457abcafcb6c5b4f650b8823
      https://github.com/fluid-project/kettle/commit/c0653b9ac006c5b4457abcafcb6c5b4f650b8823
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M lib/dataSource.js
    M tests/DataSourceTests.js
    A tests/data/formenc.txt

  Log Message:
  -----------
  KETTLE-32: Working support for variant encodings in DataSource


  Commit: 84ef3bce01a38960a52ec2de133d785e7156a42b
      https://github.com/fluid-project/kettle/commit/84ef3bce01a38960a52ec2de133d785e7156a42b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M README.md
    A examples/formDataSource/formDataSource.js
    M examples/simpleDataSource/simpleDataSource.js
    M lib/dataSource.js

  Log Message:
  -----------
  KETTLE-32: Documentation and sample code for using form encoding


  Commit: 229fd41c7953fd3f5109a481eda9531f74037a7a
      https://github.com/fluid-project/kettle/commit/229fd41c7953fd3f5109a481eda9531f74037a7a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M README.md
    M examples/formDataSource/formDataSource.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M tests/DataSourceTests.js
    M tests/shared/DataSourceTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Upgraded kettle.module.terms to be a function since annoyingly in some situations (loading configs) there may be an update between Kettle load time and the module's load time. Perhaps one day the entire world will be modelised. Also renamed "setResponseNamespaces" to "setReponseTransforms" since this previously little-used and poorly named option has come into more use with formenc.


  Commit: c7207e93518b3c61cb6e923f22b1e26f2c365f64
      https://github.com/fluid-project/kettle/commit/c7207e93518b3c61cb6e923f22b1e26f2c365f64
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M README.md
    M lib/KettleUtils.js
    M lib/dataSource.js
    M package.json
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/shared/DataSourceTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Factored kettle.dataSource.url back out into kettle.dataSource.file as it should have been right from the beginning. Using new "linkage" system to connect CouchDB mixin to the resulting complexified hierarchy. Added character encoding option across the dataSources, updated docs. New kettle.dataSource.file.moduleTerms solves the interpolation problem that used to be hacked in with the old crappy "%root" system.


  Commit: 32576ecbfd3021ae054c4c80fffaceb6a24b2e63
      https://github.com/fluid-project/kettle/commit/32576ecbfd3021ae054c4c80fffaceb6a24b2e63
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M README.md
    M lib/KettleServer.js
    M lib/dataSource.js

  Log Message:
  -----------
  KETTLE-32: Improved diagnostics from missing request handlers, courteous 404 from file dataSource, doc updates to reflect reversion of dataSource termMap


  Commit: 81487aa01ff954e54d45986f8778829b127a40a8
      https://github.com/fluid-project/kettle/commit/81487aa01ff954e54d45986f8778829b127a40a8
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M lib/KettleServer.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M tests/DataSourceTests.js

  Log Message:
  -----------
  KETTLE-32: Corrected merge order for URL dataSource options - broken-out options should take priority over URL material


  Commit: ff3508c064cbc5214a6464121102e53b60a14673
      https://github.com/fluid-project/kettle/commit/ff3508c064cbc5214a6464121102e53b60a14673
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M package.json

  Log Message:
  -----------
  KETTLE-32: Updated to latest working Infusion trunk


  Commit: e4d18580914fe92eca896de0306fc7ae04dd094c
      https://github.com/fluid-project/kettle/commit/e4d18580914fe92eca896de0306fc7ae04dd094c
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M lib/KettleRequest.js
    M tests/ErrorTests.js
    M tests/configs/kettle.tests.error.config.json

  Log Message:
  -----------
  KETTLE-32: Fix for a case where request asynchronously fires raw exception - this should back out the current request (from FlowManager SaveTests)


  Commit: 07548abdd282fdcae69968eb5a1fbedd1aee154d
      https://github.com/fluid-project/kettle/commit/07548abdd282fdcae69968eb5a1fbedd1aee154d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M lib/KettleRequest.ws.js
    M lib/test/KettleTestUtils.ws.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js

  Log Message:
  -----------
  KETTLE-32: Reworked WebSockets "send" pathway with transforming promise implementation, to account for the fact that send is asynchronous and senders may want to wait. Original use case was to allow a sender to terminate the request, but it seems that the builtin ws.close is graceful enough to do this synchronously, and the send wait isn't long enough to actually wait for the client's reception during "terminate". So it goes.


  Commit: e8a7788ca1f90786c8282340c3af1c3c97e0b1fc
      https://github.com/fluid-project/kettle/commit/e8a7788ca1f90786c8282340c3af1c3c97e0b1fc
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M README.md
    M lib/KettleConfigLoader.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.ws.js
    M package.json
    M tests/DataSourceTests.js
    M tests/SessionWebSocketsTests.js
    M tests/StaticTests.js
    M tests/WebSocketsTests.js
    M tests/shared/DataSourceTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Reversed order of arguments and changed name of kettle.test.request.ws receive message to onReceiveMessage for consistency with other cases. Moved up to latest Infusion's module API which was backported from here. Tests for new "sendTypedMessage" API. Updates to README for consistency with API changes.


  Commit: c064e8b156f97d162b76e0f6ad76cb474f2d9f7b
      https://github.com/fluid-project/kettle/commit/c064e8b156f97d162b76e0f6ad76cb474f2d9f7b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M lib/KettleConfigLoader.js
    M tests/BadConfigTests.js
    A tests/configs/kettle.tests.badConfig.keys.config.json

  Log Message:
  -----------
  KETTLE-32: Checks for valid top-level keys in a config


  Commit: 9c70fd534bb4ad7926119faeefb3e2b2ec156ca1
      https://github.com/fluid-project/kettle/commit/9c70fd534bb4ad7926119faeefb3e2b2ec156ca1
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    A init.js
    M lib/KettleConfigLoader.js
    M lib/KettleRequest.ws.js

  Log Message:
  -----------
  KETTLE-32: Readded init.js and added some basically courteous diagnostics for the loading process


  Commit: 121c5dbc00c8e75ac1090222dbd02cba47fa6e08
      https://github.com/fluid-project/kettle/commit/121c5dbc00c8e75ac1090222dbd02cba47fa6e08
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M init.js
    M kettle.js
    M lib/KettleApp.js
    M lib/KettleConfigLoader.js
    M lib/KettleMiddleware.js
    A lib/KettleMultiConfig.js
    M lib/KettleRequest.js
    M lib/KettleRequest.ws.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleServer.ws.js
    M lib/KettleSession.js
    M lib/KettleUtils.js
    M lib/dataSource.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/BadConfigTests.js
    M tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    A tests/MultiConfigTests.js
    M tests/SessionTests.js
    M tests/SessionWebSocketsTests.js
    M tests/StaticTests.js
    M tests/WebSocketsTests.js
    A tests/configs/kettle.tests.multiConfig.head.config.json
    A tests/configs/kettle.tests.multiConfig.source.config.json
    A tests/configs/kettle.tests.multiConfig.target.config.json
    M tests/shared/DataSourceTestUtils.js
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Imported up new "multiConfig" system grace to simonjb, updated licence references, updated to dev npm infusion of today


  Commit: aa6410411e65a532fc9dabc3c044e9391649c554
      https://github.com/fluid-project/kettle/commit/aa6410411e65a532fc9dabc3c044e9391649c554
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-12-02 (Wed, 02 Dec 2015)

  Changed paths:
    M README.md
    M examples/simpleConfig/examples.simpleConfig.json
    M examples/simpleConfig/simpleConfig-config-driver.js
    M examples/testingSimpleConfig/testSimpleConfig.js
    M init.js
    M lib/KettleConfigLoader.js
    M package.json
    M tests/ConfigLoaderTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config5.json
    M tests/configs/kettle.tests.CORS.noCORS.config.json
    M tests/configs/kettle.tests.CORS.noCred.config.json
    M tests/configs/kettle.tests.CORS.origin.config.json
    A tests/configs/kettle.tests.loadConfig.config.json
    A tests/configs/kettle.tests.loadConfig.sub.config.json
    M tests/configs/kettle.tests.session.webSockets.config.json
    A tests/shared/HTTPMethodsTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Split old "includes" option into "loadConfigs" and "mergeConfigs". Improved driver semantics and added documentation for driver methods, with tests for command-line and environment-driven options


  Commit: ea93d243bba32a9f7a98de43dafa651a874ef57c
      https://github.com/fluid-project/kettle/commit/ea93d243bba32a9f7a98de43dafa651a874ef57c
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M package.json

  Log Message:
  -----------
  KETTLE-32: Updated to shadow Infusion trunk - includes auto-dedupe support


  Commit: 35fed54aad25d3d44dbd5bbc2dc1350186e2d10f
      https://github.com/fluid-project/kettle/commit/35fed54aad25d3d44dbd5bbc2dc1350186e2d10f
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M README.md

  Log Message:
  -----------
  KETTLE-32: Fixed link for middlewareSequence in docs


  Commit: 2ffb73fcaf36fa0ed246a3302867287b2bdfd95a
      https://github.com/fluid-project/kettle/commit/2ffb73fcaf36fa0ed246a3302867287b2bdfd95a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M lib/test/KettleTestUtils.http.js
    M package.json
    M tests/DataSourceTests.js
    M tests/ErrorTests.js
    M tests/configs/kettle.tests.error.config.json

  Log Message:
  -----------
  KETTLE-32: Fixed plainText variety of kettle.test.assertErrorResponse and dataSource writeable following review comments, updated to latest Infusion


  Commit: 2517cc1d9d047d58aef70db48d1580da718ffc16
      https://github.com/fluid-project/kettle/commit/2517cc1d9d047d58aef70db48d1580da718ffc16
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  KETTLE-32: Comment update


  Commit: cae26e655b57647a0a70fed4ba32b96d5e885c5e
      https://github.com/fluid-project/kettle/commit/cae26e655b57647a0a70fed4ba32b96d5e885c5e
  Author: Tony Atkins <tony at raisingthefloor.org>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M README.md
    M lib/dataSource.js
    M package.json
    M tests/DataSourceTests.js

  Log Message:
  -----------
  KETTLE-40: Wrapped CouchDB read/write in model transformation rules.


  Commit: b6790c5ce9ad97f70bb5690e04be13efe94e821d
      https://github.com/fluid-project/kettle/commit/b6790c5ce9ad97f70bb5690e04be13efe94e821d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M README.md
    M lib/dataSource.js
    M package.json
    M tests/DataSourceTests.js

  Log Message:
  -----------
  Merge branch 'KETTLE-40' into KETTLE-32

* KETTLE-40:
  KETTLE-40: Wrapped CouchDB read/write in model transformation rules.


  Commit: 8df99f5f8962736845263b292fb30e75db4a08bb
      https://github.com/fluid-project/kettle/commit/8df99f5f8962736845263b292fb30e75db4a08bb
  Author: Tony Atkins <tony at raisingthefloor.org>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M README.md

  Log Message:
  -----------
  KETTLE-40:  Fixed typo in link.


  Commit: 994e3dfd97e4951441a6588ade76a5289c2a8072
      https://github.com/fluid-project/kettle/commit/994e3dfd97e4951441a6588ade76a5289c2a8072
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Merge remote-tracking branch 'ADTKINS/KETTLE-40' into KETTLE-32


  Commit: 5ad2f669ef621143a3a49853fbb18194f4679905
      https://github.com/fluid-project/kettle/commit/5ad2f669ef621143a3a49853fbb18194f4679905
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-06 (Fri, 06 May 2016)

  Changed paths:
    M README.md
    A docs/ConfigsAndApplications.md
    A docs/DataSources.md
    A docs/KettleTestingFramework.md
    A docs/Middleware.md
    A docs/RequestHandlersAndApps.md
    A docs/Servers.md
    M kettle.js
    M lib/KettleServer.ws.js
    A lib/dataSource-core.js
    A lib/dataSource-node.js
    R lib/dataSource.js
    A tests/DataSourceMatrixTests.js
    M tests/DataSourceTests.js

  Log Message:
  -----------
  KETTLE-32: Interim commit partway through review


  Commit: a5b1f1ba7f823aba0bde421de725a055601f2825
      https://github.com/fluid-project/kettle/commit/a5b1f1ba7f823aba0bde421de725a055601f2825
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M lib/dataSource-core.js
    M lib/dataSource-node.js
    M package.json
    M tests/DataSourceMatrixTests.js
    A tests/DataSourcePouchDBTests.js
    A tests/DataSourceSimpleTests.js
    R tests/DataSourceTests.js
    M tests/all-tests.js
    A tests/data/pouchDataSourceTestFile.json
    M tests/shared/DataSourceTestUtils.js
    A tests/shared/gpii-pouchdb-harness.js

  Log Message:
  -----------
  KETTLE-32: Partway through URL-based Couch DataSource tests. Commit in order to demonstrate GPII-1784 gpii-pouchdb failure.


  Commit: 533932bea1e84303a57aee96d856c160eaeef965
      https://github.com/fluid-project/kettle/commit/533932bea1e84303a57aee96d856c160eaeef965
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M README.md
    M docs/DataSources.md
    M docs/Middleware.md
    M docs/RequestHandlersAndApps.md
    M lib/dataSource-core.js
    M lib/dataSource-node.js
    M tests/CrossServerRequestTests.js
    M tests/DataSourceJSONTests.js
    M tests/DataSourceMatrixTests.js
    M tests/DataSourcePouchDBTests.js
    M tests/ErrorTests.js
    M tests/SessionWebSocketsTests.js
    M tests/WebSocketsTests.js
    M tests/shared/DataSourceTestUtils.js
    M tests/shared/SessionTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Working CouchDB URL tests and final cleanup for broken-out docs following review. DataSource has been split into browser and node-capable elements pending FLUID-5900.


  Commit: a09f49ef5098ef914909407c283d022a2bcd6b21
      https://github.com/fluid-project/kettle/commit/a09f49ef5098ef914909407c283d022a2bcd6b21
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M docs/KettleTestingFramework.md
    M docs/Middleware.md
    M docs/Servers.md
    M kettle.js
    M lib/KettleConfigLoader.js
    M lib/KettleRequest.js
    M lib/KettleRouter.js
    M lib/KettleServer.js
    M lib/KettleUtils.js
    M lib/dataSource-core.js
    M lib/dataSource-node.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    M package.json
    M tests/BadConfigTests.js
    A tests/BadRequestTests.js
    M tests/CrossServerRequestTests.js
    A tests/DataSourceFileTests.js
    M tests/DataSourceJSONTests.js
    R tests/DataSourceMatrixTests.js
    M tests/DataSourceSimpleTests.js
    A tests/DataSourceURLTests.js
    A tests/GoodRequestTests.js
    M tests/InitTests.js
    A tests/KettleUtilsTests.js
    M tests/all-tests.js
    R tests/configs/kettle.tests.badConfig.config.json
    M tests/shared/DataSourceTestUtils.js
    A tests/shared/SingleRequestTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Fixes to docs and improvements to test coverage following review


  Commit: 9ab7a9e08931dcf7eafaa84c326a986ef296c402
      https://github.com/fluid-project/kettle/commit/9ab7a9e08931dcf7eafaa84c326a986ef296c402
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M lib/KettleServer.js
    M tests/shared/SingleRequestTestDefs.js

  Log Message:
  -----------
  KETTLE-32: Improvements to commenting following review


  Commit: 4ca24571ac7eee031e3d85900d49fb2a6bad252a
      https://github.com/fluid-project/kettle/commit/4ca24571ac7eee031e3d85900d49fb2a6bad252a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M docs/ConfigsAndApplications.md
    M docs/KettleTestingFramework.md

  Log Message:
  -----------
  KETTLE-32: Documentation fixes following review


  Commit: 387654d8dfeb1fc175c7ba23d065d708cbee61b0
      https://github.com/fluid-project/kettle/commit/387654d8dfeb1fc175c7ba23d065d708cbee61b0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M docs/KettleTestingFramework.md
    M docs/RequestHandlersAndApps.md
    M lib/KettleConfigLoader.js
    M tests/InitTests.js

  Log Message:
  -----------
  KETTLE-32: Updated docs to include sendMessage/sendMessageJSON and related fields on kettle.request.ws


  Commit: bd2cc152b64b80aabbf3faad455a952421a96d96
      https://github.com/fluid-project/kettle/commit/bd2cc152b64b80aabbf3faad455a952421a96d96
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M lib/KettleServer.js
    M lib/dataSource-node.js
    M lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.ws.js
    M package.json
    M tests/DataSourcePouchDBTests.js
    M tests/DataSourceURLTests.js
    A tests/data/testkey-cert.pem
    A tests/data/testkey.pem
    M tests/shared/HTTPMethodsTestDefs.js
    R tests/shared/gpii-pouchdb-harness.js

  Log Message:
  -----------
  KETTLE-32, KETTLE-41: Added supported for HTTPS dataSources, moved up to latest version of gpii-pouchdb with removal of most duplicated material, make use of resolveUrl dataSource invoker to resolve KETTLE-41 for arbitrary url resolution support


  Commit: d808f3d5e326265aab9aaa1014703d75fa8ef0d0
      https://github.com/fluid-project/kettle/commit/d808f3d5e326265aab9aaa1014703d75fa8ef0d0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M docs/DataSources.md
    M lib/KettleServer.js
    M lib/dataSource-node.js
    M tests/DataSourcePouchDBTests.js
    M tests/DataSourceURLTests.js
    M tests/shared/DataSourceTestUtils.js

  Log Message:
  -----------
  KETTLE-32: Working tests for HTTPS dataSource configuration and docs and better test for resolveUrl customisation


  Commit: 06dc1a05d800b234ea710f82ac5fdb3dad29f5ca
      https://github.com/fluid-project/kettle/commit/06dc1a05d800b234ea710f82ac5fdb3dad29f5ca
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M package.json
    M tests/DataSourcePouchDBTests.js

  Log Message:
  -----------
  KETTLE-32: Update to versions of infusion, gpii-express and gpii-pouchdb that avoid the module loading cycle GPII-1795, FLUID-5906


  Commit: 6df15ec4c4c6d03bbf22123d264b33173f2b695d
      https://github.com/fluid-project/kettle/commit/6df15ec4c4c6d03bbf22123d264b33173f2b695d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M package.json
    M tests/DataSourcePouchDBTests.js

  Log Message:
  -----------
  KETTLE-32: Updated to trunk versions of gpii-express and gpii-pouchdb, as well as GPII-1318 "shadow trunk" Infusion


  Commit: c22639cfe1365a7f8fcdb821814e1cb1e1be9fef
      https://github.com/fluid-project/kettle/commit/c22639cfe1365a7f8fcdb821814e1cb1e1be9fef
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M package.json

  Log Message:
  -----------
  KETTLE-32: Updating to latest Infusion npm release


  Commit: 938ffbdbb25a079ff2d044d0a6e939d87673f51d
      https://github.com/fluid-project/kettle/commit/938ffbdbb25a079ff2d044d0a6e939d87673f51d
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M .gitignore
    M Gruntfile.js
    M README.md
    A docs/ConfigsAndApplications.md
    A docs/DataSources.md
    A docs/KettleTestingFramework.md
    A docs/Middleware.md
    A docs/RequestHandlersAndApps.md
    A docs/Servers.md
    A examples/formDataSource/formDataSource.js
    A examples/simpleConfig/README.md
    A examples/simpleConfig/examples.simpleConfig.json
    A examples/simpleConfig/simpleConfig-client.js
    A examples/simpleConfig/simpleConfig-code.js
    A examples/simpleConfig/simpleConfig-config-driver.js
    A examples/simpleConfig/simpleConfig-config-handler.js
    A examples/simpleDataSource/simpleDataSource.js
    A examples/testingSimpleConfig/testSimpleConfig.js
    A init.js
    M kettle.js
    A lib/KettleApp.js
    A lib/KettleConfigLoader.js
    A lib/KettleMiddleware.js
    A lib/KettleMultiConfig.js
    A lib/KettleRequest.js
    A lib/KettleRequest.ws.js
    A lib/KettleRouter.js
    A lib/KettleServer.js
    A lib/KettleServer.ws.js
    A lib/KettleSession.js
    A lib/KettleUtils.js
    R lib/app.js
    R lib/configLoader.js
    A lib/dataSource-core.js
    A lib/dataSource-node.js
    R lib/dataSource.js
    R lib/init.js
    R lib/middleware.js
    R lib/request.io.js
    R lib/request.js
    R lib/server.io.js
    R lib/server.js
    R lib/session.io.js
    R lib/session.js
    A lib/test/KettleTestUtils.http.js
    M lib/test/KettleTestUtils.js
    A lib/test/KettleTestUtils.ws.js
    R lib/utils.js
    M package.json
    A tests/BadConfigTests.js
    A tests/BadRequestTests.js
    A tests/CORSTests.js
    M tests/ConfigLoaderTests.js
    M tests/CrossServerRequestTests.js
    A tests/DataSourceFileTests.js
    A tests/DataSourceJSONTests.js
    A tests/DataSourcePouchDBTests.js
    A tests/DataSourceSimpleTests.js
    R tests/DataSourceTests.js
    A tests/DataSourceURLTests.js
    M tests/ErrorTests.js
    A tests/GoodRequestTests.js
    M tests/HTTPMethodsTests.js
    M tests/InitTests.js
    A tests/KettleUtilsTests.js
    R tests/MiddlewareTests.js
    A tests/MultiConfigTests.js
    M tests/SessionTests.js
    A tests/SessionWebSocketsTests.js
    R tests/SocketTests.js
    A tests/StaticTests.js
    A tests/WebSocketsTests.js
    M tests/all-tests.js
    R tests/configs/CORS.json
    R tests/configs/CORS_noCred.json
    R tests/configs/CORS_origin.json
    R tests/configs/HTTPMethods.json
    M tests/configs/config1.json
    M tests/configs/config2.json
    M tests/configs/config3.json
    M tests/configs/config4.json
    M tests/configs/config5.json
    M tests/configs/config6.json
    R tests/configs/error.json
    A tests/configs/kettle.tests.CORS.config.json
    A tests/configs/kettle.tests.CORS.noCORS.config.json
    A tests/configs/kettle.tests.CORS.noCred.config.json
    A tests/configs/kettle.tests.CORS.origin.config.json
    A tests/configs/kettle.tests.HTTPMethods.config.json
    A tests/configs/kettle.tests.badConfig.keys.config.json
    A tests/configs/kettle.tests.error.config.json
    A tests/configs/kettle.tests.loadConfig.config.json
    A tests/configs/kettle.tests.loadConfig.sub.config.json
    A tests/configs/kettle.tests.multiConfig.head.config.json
    A tests/configs/kettle.tests.multiConfig.source.config.json
    A tests/configs/kettle.tests.multiConfig.target.config.json
    A tests/configs/kettle.tests.session.config.json
    A tests/configs/kettle.tests.session.webSockets.config.json
    A tests/configs/kettle.tests.static.config.json
    A tests/configs/kettle.tests.webSockets.config.json
    R tests/configs/noCORS.json
    A tests/configs/node_modules/test-module/index.js
    A tests/configs/node_modules/test-module/package.json
    R tests/configs/session.json
    R tests/configs/socket.json
    A tests/data/formenc.txt
    A tests/data/invalidJSONFile.jsonx
    A tests/data/pouchDataSourceTestFile.json
    A tests/data/testkey-cert.pem
    A tests/data/testkey.pem
    A tests/requires/testBareRequire.js
    A tests/requires/testModuleRelativeRequire.js
    A tests/shared/DataSourceTestUtils.js
    A tests/shared/HTTPMethodsTestDefs.js
    A tests/shared/SessionTestDefs.js
    A tests/shared/SingleRequestTestDefs.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/KETTLE-32'

* amb26/KETTLE-32: (60 commits)
  KETTLE-32: Updating to latest Infusion npm release
  KETTLE-32: Updated to trunk versions of gpii-express and gpii-pouchdb, as well as GPII-1318 "shadow trunk" Infusion
  KETTLE-32: Update to versions of infusion, gpii-express and gpii-pouchdb that avoid the module loading cycle GPII-1795, FLUID-5906
  KETTLE-32: Working tests for HTTPS dataSource configuration and docs and better test for resolveUrl customisation
  KETTLE-32, KETTLE-41: Added supported for HTTPS dataSources, moved up to latest version of gpii-pouchdb with removal of most duplicated material, make use of resolveUrl dataSource invoker to resolve KETTLE-41 for arbitrary url resolution support
  KETTLE-32: Updated docs to include sendMessage/sendMessageJSON and related fields on kettle.request.ws
  KETTLE-32: Documentation fixes following review
  KETTLE-32: Improvements to commenting following review
  KETTLE-32: Fixes to docs and improvements to test coverage following review
  KETTLE-32: Working CouchDB URL tests and final cleanup for broken-out docs following review. DataSource has been split into browser and node-capable elements pending FLUID-5900.
  KETTLE-32: Partway through URL-based Couch DataSource tests. Commit in order to demonstrate GPII-1784 gpii-pouchdb failure.
  KETTLE-32: Interim commit partway through review
  KETTLE-40:  Fixed typo in link.
  KETTLE-40: Wrapped CouchDB read/write in model transformation rules.
  KETTLE-32: Comment update
  KETTLE-32: Fixed plainText variety of kettle.test.assertErrorResponse and dataSource writeable following review comments, updated to latest Infusion
  KETTLE-32: Fixed link for middlewareSequence in docs
  KETTLE-32: Updated to shadow Infusion trunk - includes auto-dedupe support
  KETTLE-32: Split old "includes" option into "loadConfigs" and "mergeConfigs". Improved driver semantics and added documentation for driver methods, with tests for command-line and environment-driven options
  KETTLE-32: Imported up new "multiConfig" system grace to simonjb, updated licence references, updated to dev npm infusion of today
  ...


Compare: https://github.com/fluid-project/kettle/compare/ef796237b7b1...938ffbdbb25a


More information about the Commits mailing list