You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/07/25 15:31:22 UTC
[1/2] tinkerpop git commit: Fixed a problem with writing GraphSON
Date in js CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 1bd35dcc5 -> 5eaf312c0
Fixed a problem with writing GraphSON Date in js CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd643609
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd643609
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd643609
Branch: refs/heads/tp33
Commit: fd643609a8d469130c89dde94d50b66ef0fadf0f
Parents: db46c0f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 25 11:30:33 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 25 11:30:33 2018 -0400
----------------------------------------------------------------------
.../gremlin-javascript/lib/structure/io/type-serializers.js | 2 +-
.../javascript/gremlin-javascript/test/unit/graphson-test.js | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd643609/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 4bc2935..fdf049f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@ -65,7 +65,7 @@ class DateSerializer extends TypeSerializer {
serialize(item) {
return {
[typeKey]: 'g:Date',
- [valueKey]: item.value.getTime()
+ [valueKey]: item.getTime()
};
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd643609/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
index 8f749f7..b459407 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
@@ -50,8 +50,6 @@ describe('GraphSONReader', function () {
const obj = { "@type" : "g:Date", "@value" : 1481750076295 };
const reader = new GraphSONReader();
const result = reader.read(obj);
- console.log("++++++++++++++++++++++++++" + obj);
- console.log("++++++++++++++++++++++++++" + result);
assert.ok(result instanceof Date);
});
it('should parse vertices from GraphSON', function () {
@@ -104,6 +102,11 @@ describe('GraphSONWriter', function () {
const writer = new GraphSONWriter();
assert.strictEqual(writer.write(2), '2');
});
+ it('should write Date', function() {
+ const writer = new GraphSONWriter();
+ const expected = JSON.stringify({ "@type" : "g:Date", "@value" : 1481750076295 });
+ assert.strictEqual(writer.write(new Date(1481750076295)), expected);
+ });
it('should write boolean values', function () {
const writer = new GraphSONWriter();
assert.strictEqual(writer.write(true), 'true');
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5eaf312c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5eaf312c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5eaf312c
Branch: refs/heads/tp33
Commit: 5eaf312c000d3145707513f20109956f5f97265a
Parents: 1bd35dc fd64360
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 25 11:30:52 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 25 11:30:52 2018 -0400
----------------------------------------------------------------------
.../gremlin-javascript/lib/structure/io/type-serializers.js | 2 +-
.../javascript/gremlin-javascript/test/unit/graphson-test.js | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5eaf312c/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
----------------------------------------------------------------------