cloudevents
/
sdk-javascript
mirror of https://github.com/cloudevents/sdk-javascript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict 

Signed-off-by: Fabio José <fabiojose@gmail.com>
This commit is contained in:
Fabio José 2019-06-30 15:33:08 -03:00
parent e91913f70e 6a85a5b392
commit 95e2cf09a5
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -27,15 +27,8 @@ jobs:
on:
tags: true
- stage: coverage
node_js: '6'
deploy:
provider: script
script: npm run coverage
on:
branch: master
on:
branch: develop
env:
global:
secure: t0A5/Fk1Qj8WkAk0ZuQqpFjrpINV6gfL+d1fXgq03EOAG/7FEyyz+AKkYaLT6avp26VWBzLgEoWC3RNmWD0v1/Ruckb95YpQcb5e4JotAce1ZsHgGTgx0UO146tkyGvXBw6MmO2nX2O/sHzkmyR6rlKkBi9LEKokJ9OFd6fi9nNtksgUDxkqNlNTu100fIQAV2RcN47C6iUx+gJIa+H/8QX/Cz02MyheXLe8a763wMQapz5GHrk2KuVY6FpylcAlSi2so+PjEGfKq3MWaQnTPkevkRDLtGcecVtFAq/0VbvoKc97PHoVT0x+nf48k1gj2VnQtYj6EVB74yRvqM9KkNOsfAQ0z9zF5wXMRs11SZywSViLQsnD9Ue6eYbYmodOKn4DFlLtoRyLBUspzLuoL76lERGe2cHU+Ebz2Nb9jL88o+SjfGrSJQEJU7SLZLbzJ7T/3SspWcAlo+Fo9UTCOB4/yL22Yge/SWQkdd1orBhohpjpyrU9Z1+IRvVoU1EICr04zSFUwEwn6Yxbt0ArgTZBEf11bf+YpCo+rBXNAd+XbZ79PGOEppFb+Hxrt9i1S1RnesDJnwC0k7cswU55Rv5gcNCo9lC+N4ZwS5y+5r6DsBfB+12YdsFORFyNbClECro1ODv4STf3rBBnjL8+ziPFjP4d4OwiGY+vG8bvLXY=
script:
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then npm run coverage-publish; fi

4
lib/bindings/http/emitter_binary_0_1.js
View File

@ -11,7 +11,7 @@ function HTTPBinary(configuration){
this.config["headers"]
[Constants.HEADER_CONTENT_TYPE] =
Constants.MIME_CE_JSON + "; charset=" + Constants.CHARSET_DEFAULT;
Constants.MIME_JSON + "; charset=" + Constants.CHARSET_DEFAULT;
}
HTTPBinary.prototype.emit = function(cloudevent){
@ -33,10 +33,10 @@ HTTPBinary.prototype.emit = function(cloudevent){
_headers["CE-Source"] = cloudevent.getSource();
_headers["CE-EventID"] = cloudevent.getId();
// OPTIONAL ATTRIBUTES
if(cloudevent.getEventTypeVersion()) {
_headers["CE-EventTypeVersion"] = cloudevent.getEventTypeVersion();
}
if(cloudevent.getTime()) {
_headers["CE-EventTime"] = cloudevent.getTime();
}

13
lib/bindings/http/emitter_binary_0_2.js
View File

@ -12,7 +12,7 @@ function HTTPBinary02(configuration){
this.config["headers"]
[Constants.HEADER_CONTENT_TYPE] =
Constants.MIME_CE_JSON + "; charset=" + Constants.CHARSET_DEFAULT;
Constants.MIME_JSON + "; charset=" + Constants.CHARSET_DEFAULT;
}
HTTPBinary02.prototype.emit = function(cloudevent){
@ -23,17 +23,24 @@ HTTPBinary02.prototype.emit = function(cloudevent){
// Always set stuff in _config
var _headers = _config["headers"];
_headers[Constants.HEADER_CONTENT_TYPE] = cloudevent.getContenttype();
// OPTIONAL CONTENT TYPE ATTRIBUTE
if (cloudevent.getContenttype()) {
_headers[Constants.HEADER_CONTENT_TYPE] = cloudevent.getContenttype();
}
_headers[Constants.BINARY_HEADERS_02.TYPE] = cloudevent.getType();
_headers[Constants.BINARY_HEADERS_02.SPEC_VERSION] =
cloudevent.getSpecversion();
_headers[Constants.BINARY_HEADERS_02.SOURCE] = cloudevent.getSource();
_headers[Constants.BINARY_HEADERS_02.ID] = cloudevent.getId();
if(cloudevent.getTime()) {
_headers[Constants.BINARY_HEADERS_02.TIME] = cloudevent.getTime();
}
_headers[Constants.BINARY_HEADERS_02.SCHEMA_URL] = cloudevent.getSchemaurl();
if (cloudevent.getSchemaurl()) {
_headers[Constants.BINARY_HEADERS_02.SCHEMA_URL] = cloudevent.getSchemaurl();
}
// Set the cloudevent payload
_config["data"] = cloudevent.format().data;

6
package.json
View File

@ -1,11 +1,11 @@
{
"name": "cloudevents-sdk",
"version": "0.2.2",
"version": "0.2.3",
"description": "CloudEvents SDK for JavaScript",
"main": "index.js",
"scripts": {
"test": "./node_modules/.bin/mocha -C test/**/*.js",
"coverage": "./node_modules/.bin/istanbul cover -x '**/test/**' _mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage"
"test": "./node_modules/.bin/istanbul cover -x 'test/**/*.js' _mocha -- -C test/**/*.js",
"coverage-publish": "./node_modules/.bin/istanbul cover -x 'test/**/*.js' _mocha --report lcovonly -- -C test/**/*.js -R spec && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage"
},
"repository": {
"type": "git",