[Pkg-javascript-commits] [node-asn1.js] 52/202: base: plug submodels with function call

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-asn1.js.

commit abf0daf8950e37dab8d63b91d15619acdcbab751
Author: Ilya Petrov <ilya.muromec at gmail.com>
Date:   Wed Aug 20 23:22:18 2014 +0300

    base: plug submodels with function call
    
    Implemented as suggested in #14
    
    Reviewed-By: Fedor Indutny <fedor at indutny.com>
---
 lib/asn1/base/node.js    | 15 ++++++++-------
 lib/asn1/decoders/der.js |  4 +++-
 lib/asn1/encoders/der.js |  4 +++-
 test/use-test.js         | 24 ++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/lib/asn1/base/node.js b/lib/asn1/base/node.js
index db68fb2..b653698 100644
--- a/lib/asn1/base/node.js
+++ b/lib/asn1/base/node.js
@@ -369,18 +369,19 @@ Node.prototype._decodeGeneric = function decodeGeneric(tag, input) {
   else if (tag === 'int' || tag === 'enum')
     return this._decodeInt(input, state.args && state.args[0]);
   else if (state.use !== null)
-    return this._getUse(state.use)._decode(input);
+    return this._getUse(state.use, input._reporterState.obj)._decode(input);
   else
     return input.error('unknown tag: ' + tag);
 
   return null;
 };
 
-Node.prototype._getUse = function _getUse(entity) {
+Node.prototype._getUse = function _getUse(entity, obj) {
+
   var state = this._baseState;
   if (!state.useDecoder) {
     // Create altered use decoder if implicit is set
-    state.useDecoder = this._use(entity);
+    state.useDecoder = this._use(entity, obj);
     assert(state.useDecoder._baseState.parent === null);
     state.useDecoder = state.useDecoder._baseState.children[0];
     if (state.implicit !== null) {
@@ -427,7 +428,7 @@ Node.prototype._createEncoderBuffer = function createEncoderBuffer(data) {
   return new EncoderBuffer(data, this.reporter);
 };
 
-Node.prototype._encode = function encode(data, reporter) {
+Node.prototype._encode = function encode(data, reporter, parent) {
   var state = this._baseState;
 
   // Decode root node
@@ -468,7 +469,7 @@ Node.prototype._encode = function encode(data, reporter) {
       if (typeof data !== 'object')
         return reporter.error('Child expected, but input is not object');
 
-      var res = child._encode(data[child._baseState.key], reporter);
+      var res = child._encode(data[child._baseState.key], reporter, data);
       reporter.leaveKey(prevKey);
 
       return res;
@@ -487,10 +488,10 @@ Node.prototype._encode = function encode(data, reporter) {
         return reporter.error('seqof/setof, but data is not Array');
 
       content = this._createEncoderBuffer(data.map(function(item) {
-        return this._getUse(state.args[0])._encode(item, reporter);
+        return this._getUse(state.args[0], data)._encode(item, reporter);
       }, this));
     } else if (state.use !== null) {
-      result = this._getUse(state.use)._encode(data, reporter);
+      result = this._getUse(state.use, parent)._encode(data, reporter);
     } else {
       content = this._encodePrimitive(state.tag, data);
       primitive = true;
diff --git a/lib/asn1/decoders/der.js b/lib/asn1/decoders/der.js
index bd0a011..9e376f2 100644
--- a/lib/asn1/decoders/der.js
+++ b/lib/asn1/decoders/der.js
@@ -224,7 +224,9 @@ DERNode.prototype._decodeInt = function decodeInt(buffer, values) {
   return res;
 };
 
-DERNode.prototype._use = function use(entity) {
+DERNode.prototype._use = function use(entity, obj) {
+  if (typeof entity === 'function')
+    entity = entity(obj);
   return entity._getDecoder('der').tree;
 };
 
diff --git a/lib/asn1/encoders/der.js b/lib/asn1/encoders/der.js
index bf9b6f4..13b8794 100644
--- a/lib/asn1/encoders/der.js
+++ b/lib/asn1/encoders/der.js
@@ -200,7 +200,9 @@ DERNode.prototype._encodeBool = function encodeBool(value) {
   return this._createEncoderBuffer(value ? 0xff : 0);
 };
 
-DERNode.prototype._use = function use(entity) {
+DERNode.prototype._use = function use(entity, obj) {
+  if (typeof entity === 'function')
+    entity = entity(obj);
   return entity._getEncoder('der').tree;
 };
 
diff --git a/test/use-test.js b/test/use-test.js
index dad8999..e046f2b 100644
--- a/test/use-test.js
+++ b/test/use-test.js
@@ -67,6 +67,30 @@ describe('asn1.js models', function() {
 
     });
 
+    it('should get model with function call', function() {
+      var SubModel = asn1.define('SubModel', function() {
+        this.seq().obj(
+          this.key('x').octstr()
+        )
+      });
+      var Model = asn1.define('Model', function() {
+        this.seq().obj(
+          this.key('a').int(),
+          this.key('sub').use(function(obj) {
+              assert.equal(obj.a, 1);
+              return SubModel;
+          })
+        );
+      });
+
+      var data = {a: 1, sub: {x: new Buffer("123")}};
+      var wire = Model.encode(data, 'der');
+      assert.equal(wire.toString('hex'), '300a02010130050403313233');
+      var back = Model.decode(wire, 'der');
+      assert.deepEqual(back, data);
+
+    });
+
   });
 });
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-asn1.js.git