bjornbytes
/
RxLua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from naxxster/fix-with-subscription 

Fix with operator subscription to unsubscribe from all sources
master
Bjorn Swenson 2018-12-02 09:47:49 -08:00 committed by GitHub
parent 14a33c5614 8093dcbd21
commit ebe4eb8ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rx.lua
View File

@ -1718,6 +1718,7 @@ function Observable:with(...)
return Observable.create(function(observer)
local latest = setmetatable({}, {__len = util.constant(#sources)})
local subscriptions = {}
local function setLatest(i)
return function(value)
@ -1738,10 +1739,15 @@ function Observable:with(...)
end
for i = 1, #sources do
sources[i]:subscribe(setLatest(i), util.noop, util.noop)
subscriptions[i] = sources[i]:subscribe(setLatest(i), util.noop, util.noop)
end
return self:subscribe(onNext, onError, onCompleted)
subscriptions[#sources + 1] = self:subscribe(onNext, onError, onCompleted)
return Subscription.create(function ()
for i = 1, #sources + 1 do
if subscriptions[i] then subscriptions[i]:unsubscribe() end
end
end)
end)
end

10
src/operators/with.lua
View File

@ -11,6 +11,7 @@ function Observable:with(...)
return Observable.create(function(observer)
local latest = setmetatable({}, {__len = util.constant(#sources)})
local subscriptions = {}
local function setLatest(i)
return function(value)
@ -31,9 +32,14 @@ function Observable:with(...)
end
for i = 1, #sources do
sources[i]:subscribe(setLatest(i), util.noop, util.noop)
subscriptions[i] = sources[i]:subscribe(setLatest(i), util.noop, util.noop)
end
return self:subscribe(onNext, onError, onCompleted)
subscriptions[#sources + 1] = self:subscribe(onNext, onError, onCompleted)
return Subscription.create(function ()
for i = 1, #sources + 1 do
if subscriptions[i] then subscriptions[i]:unsubscribe() end
end
end)
end)
end

17
tests/with.lua
View File

@ -32,4 +32,21 @@ describe('with', function()
subjectA:onCompleted()
expect(#onCompleted).to.equal(1)
end)
it('should unsubscribe from all source observables', function()
local unsubscribeA = spy()
local observableA = Rx.Observable.create(function(observer)
return Rx.Subscription.create(unsubscribeA)
end)
local unsubscribeB = spy()
local observableB = Rx.Observable.create(function(observer)
return Rx.Subscription.create(unsubscribeB)
end)
local subscription = observableA:with(observableB):subscribe()
subscription:unsubscribe()
expect(#unsubscribeA).to.equal(1)
expect(#unsubscribeB).to.equal(1)
end)
end)