Merge pull request #48 from node-modules/fix-array-encode

fix: array encode can be null

Author: fengmk2

.travis.yml

@@ -1,8 +1,13 @@
+sudo: false
 language: node_js
 node_js:
-  - 'iojs-1'
+  - '4'
+  - '3'
+  - '2'
+  - '1'
   - '0.12'
-  - '0.11'
   - '0.10'
-script: "make test-travis"
-after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+script:
+  - "npm run lint && npm run test-cov"
+after_script:
+  - "npm i codecov.io && cat ./coverage/coverage.json | ./node_modules/codecov.io/bin/codecov.io.js"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 dead_horse
+Copyright (c) node-modules and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

Makefile

@@ -3,24 +3,18 @@ hessian.js
 
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]
-[![Test coverage][coveralls-image]][coveralls-url]
-[![Gittip][gittip-image]][gittip-url]
+[![Test coverage][codecov-image]][codecov-url]
 [![David deps][david-image]][david-url]
-[![node version][node-image]][node-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/hessian.js.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/hessian.js
 [travis-image]: https://img.shields.io/travis/node-modules/hessian.js.svg?style=flat-square
 [travis-url]: https://travis-ci.org/node-modules/hessian.js
-[coveralls-image]: https://img.shields.io/coveralls/node-modules/hessian.js.svg?style=flat-square
-[coveralls-url]: https://coveralls.io/r/node-modules/hessian.js?branch=master
-[gittip-image]: https://img.shields.io/gittip/fengmk2.svg?style=flat-square
-[gittip-url]: https://www.gittip.com/fengmk2/
+[codecov-image]: https://codecov.io/github/node-modules/hessian.js/coverage.svg?branch=master
+[codecov-url]: https://codecov.io/github/node-modules/hessian.js?branch=master
 [david-image]: https://img.shields.io/david/node-modules/hessian.js.svg?style=flat-square
 [david-url]: https://david-dm.org/node-modules/hessian.js
-[node-image]: https://img.shields.io/badge/node.js-%3E=_0.10-green.svg?style=flat-square
-[node-url]: http://nodejs.org/download/
 [download-image]: https://img.shields.io/npm/dm/hessian.js.svg?style=flat-square
 [download-url]: https://npmjs.org/package/hessian.js
 
@@ -121,7 +115,7 @@ encoder.write(testObject);
 ### Java Generic Map
 
 ```js
-// java code: 
+// java code:
 // Map<Long, Integer> map = new HashMap<Long, Integer>();
 // map.put(123L, 123456);
 // map.put(123456L, 123);
@@ -384,41 +378,6 @@ xd8 - xef    # one-octet compact long (-x8 to xf, xe0 is 0)
 xf0 - xff    # two-octet compact long (-x800 to x7ff, xf8 is 0)
 ```
 
-## Authors
-
-```
-$ git summary
-
- project  : hessian.js
- repo age : 4 weeks ago
- commits  : 51
- active   : 18 days
- files    : 33
- authors  :
-    36  dead_horse              70.6%
-    15  fengmk2                 29.4%
-```
-
 ## Licences
-(The MIT License)
-
-Copyright (c) 2014 dead-horse and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[MIT](LICENSE)

README.md

@@ -1,12 +1,10 @@
 /**!
- * hessian.js - index.js
- *
- * Copyright(c) 2014
+ * Copyright(c) node-modules and other contributors.
  * MIT Licensed
  *
  * Authors:
  *   dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
  */
 
 'use strict';

index.js

@@ -394,6 +394,9 @@ proto.writeArray = function (arr) {
   var className = ''; // empty string meaning: `javaObject.DEFAULT_CLASSNAME.list`
   var realArray = arr;
   if (!isSimpleArray) {
+    if (is.object(arr) && is.nullOrUndefined(arr.$)) {
+      return this.writeNull();
+    }
     var isComplexArray = is.object(arr) &&
       is.string(arr.$class) && is.array(arr.$);
     if (!isComplexArray) {

lib/v1/encoder.js

@@ -8,7 +8,11 @@
     "lib/"
   ],
   "scripts": {
-    "test": "make test-all"
+    "test": "mocha -R spec -t 15000 -r should test/*.test.js",
+    "test-cov": "istanbul cover node_modules/.bin/_mocha -- -t 15000 -r should test/*.test.js",
+    "lint": "jshint .",
+    "autod": "autod -w --prefix '~' -e benchmark",
+    "benchmark": "node benchmark/encode.js && node benchmark/decode.js"
   },
   "repository": {
     "type": "git",
@@ -30,7 +34,7 @@
   "homepage": "https://github.com/node-modules/hessian.js",
   "dependencies": {
     "byte": "~1.1.1",
-    "debug": "~2.1.3",
+    "debug": "~2.2.0",
     "is-type-of": "~0.3.1",
     "utility": "~1.4.0"
   },
@@ -44,5 +48,8 @@
     "long": "~2.2.3",
     "mocha": "*",
     "should": "~5.2.0"
+  },
+  "engines": {
+    "node": ">= 0.10.0"
   }
 }

package.json

@@ -0,0 +1,78 @@
+/**!
+ * Copyright(c) node-modules and other contributors.
+ * MIT Licensed
+ *
+ * Authors:
+ *   汤尧 <tangyao@gmail.com> (http://tangyao.me)
+ */
+
+"use strict";
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var hessian = require('../');
+
+describe('array.test.js', function () {
+  it('should write null v1', function () {
+    var b = hessian.encode([
+      {
+        $class: '[java.lang.Integer',
+        $: null
+      },
+      {
+        $class: '[java.lang.Integer',
+        $: [1]
+      }
+    ]);
+    var a = hessian.decode(b);
+    a.should.eql([null, [1]]);
+  });
+
+  it('should write undefined v1', function () {
+    var b = hessian.encode([
+      {
+        $class: '[java.lang.Integer',
+        $: undefined
+      },
+      {
+        $class: '[java.lang.Integer',
+        $: [1]
+      }
+    ]);
+    var a = hessian.decode(b);
+    a.should.eql([null, [1]]);
+  });
+
+  it('should write null v2', function () {
+    var b = hessian.encode([
+      {
+        $class: '[java.lang.Integer',
+        $: null
+      },
+      {
+        $class: '[java.lang.Integer',
+        $: [1]
+      }
+    ], '2.0');
+    var a = hessian.decode(b, '2.0');
+    a.should.eql([null, [1]]);
+  });
+
+  it('should write undefined v2', function () {
+    var b = hessian.encode([
+      {
+        $class: '[java.lang.Integer',
+        $: undefined
+      },
+      {
+        $class: '[java.lang.Integer',
+        $: [1]
+      }
+    ], '2.0');
+    var a = hessian.decode(b, '2.0');
+    a.should.eql([null, [1]]);
+  });
+});