From d0bbcef28518d5850469d23ed8eddd8ff44a4dd2 Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Fri, 27 Jan 2017 06:27:04 -0800 Subject: [PATCH] 0.5! --- gun.js | 3 +-- lib/file.js | 1 + test/common.js | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gun.js b/gun.js index 597b276a..22a01bb3 100644 --- a/gun.js +++ b/gun.js @@ -1346,10 +1346,9 @@ // ~who#where.where=what>when@was // TODO: BUG! Put probably cannot handle plural chains! var gun = this, root = (gun._).root, tmp; - as = {data: data, as: as, gun: gun}; + as = as || {data: data, as: as, gun: gun}; if(typeof cb === 'string'){ as.soul = cb; - as.ack = (as.as||empty).ack; } else { as.ack = cb; } diff --git a/lib/file.js b/lib/file.js index 31f0a802..f4af11db 100644 --- a/lib/file.js +++ b/lib/file.js @@ -41,6 +41,7 @@ Gun.on('get', function(at){ function field(node, field){ if(!node){ return } + node = Gun.obj.copy(node); var tmp = node[field]; node = {_: node._}; if(undefined !== tmp){ diff --git a/test/common.js b/test/common.js index 1b51e6e8..3906f615 100644 --- a/test/common.js +++ b/test/common.js @@ -2,7 +2,7 @@ root = env.window? env.window : root; env.window && root.localStorage && root.localStorage.clear(); //root.Gun = root.Gun || require('../gun'); - root.Gun = root.Gun || require('../gun'); + root.Gun = root.Gun || require('../index'); }(this)); //Gun.log.squelch = true; var gleak = {globals: {}, check: function(){ // via tobyho @@ -1895,7 +1895,8 @@ describe('Gun', function(){ expect(check.alice.PhD).to.be(true); //expect(count.alice).to.be(2); //expect(count.bob).to.be(1); - done(); + if(done.c){return} + done();done.c=1; },50); } }); @@ -1988,6 +1989,7 @@ describe('Gun', function(){ expect(check.alice).to.be('name'); expect(check.bob).to.be('name'); expect(check.Alice).to.be('name'); + if(done.c){return}done.c=1; done(); },10); } @@ -2079,6 +2081,7 @@ describe('Gun', function(){ expect(check['GUN INC']).to.be('work'); expect(check['ACME INC']).to.be('work'); expect(check['ACME INC.']).to.be('work'); + if(done.c){return}done.c=1; done(); },10); } @@ -2175,6 +2178,7 @@ describe('Gun', function(){ expect(check.GUN.name).to.be('GUN'); expect(check.ACME.name).to.be('ACME'); expect(check.ACME.corp).to.be('C'); + if(done.c){return}done.c=1; done(); },10); } @@ -2282,6 +2286,7 @@ describe('Gun', function(){ expect(check.GUN).to.be('name'); expect(check.ACME).to.be('name'); expect(check.ACMEINC).to.be('name'); + if(done.c){return}done.c=1; done(); },10); } @@ -2384,6 +2389,7 @@ describe('Gun', function(){ expect(check.CA).to.be('state'); expect(check.TX).to.be('state'); expect(check.MA).to.be('state'); + if(done.c){return}done.c=1; done(); },10); } @@ -2512,6 +2518,7 @@ describe('Gun', function(){ expect(check.CA).to.be('code'); expect(check.TX).to.be('code'); expect(check.MA).to.be('code'); + if(done.c){return}done.c=1; done(); },10); } @@ -2681,6 +2688,7 @@ describe('Gun', function(){ expect(check.CA).to.be('state'); expect(check.TX).to.be('state'); expect(check.MA).to.be('state'); + if(done.c){return}done.c=1; done(); },10); }