Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify MobiusLoop implementation #151

Merged
merged 6 commits into from
Apr 22, 2020
Merged

Simplify MobiusLoop implementation #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f379a84
Simplify MobiusLoop implementation
JensAyton Apr 8, 2020
b61f4bc
Clarify MobiusLoop details, hopefully
JensAyton Apr 20, 2020
37e47cb
Merge branch 'master' into mobius-loop-rewrite
JensAyton Apr 20, 2020
f3543e4
Propagate access guard to model publisher
JensAyton Apr 20, 2020
7bf37d7
Merge branch 'master' into mobius-loop-rewrite
JensAyton Apr 21, 2020
c80ffda
Merge branch 'master' into mobius-loop-rewrite
JensAyton Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Mobius.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
2DF4C30620DBDD5C00A4B6DE /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287BF209995410043B530 /* AnonymousDisposable.swift */; };
2DF4C30720DBDD5C00A4B6DE /* EventSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C0209995410043B530 /* EventSource.swift */; };
2DF4C30920DBDD5C00A4B6DE /* Mobius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C3209995410043B530 /* Mobius.swift */; };
2DF4C30B20DBDD5C00A4B6DE /* EventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C6209995410043B530 /* EventProcessor.swift */; };
2DF4C30C20DBDD5C00A4B6DE /* MobiusController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C8209995410043B530 /* MobiusController.swift */; };
2DF4C30D20DBDD5C00A4B6DE /* MobiusLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C9209995410043B530 /* MobiusLogger.swift */; };
2DF4C30E20DBDD5C00A4B6DE /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287CA209995410043B530 /* Lock.swift */; };
Expand Down Expand Up @@ -127,7 +126,6 @@
5BB2881D2099957D0043B530 /* First.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287BB209995410043B530 /* First.swift */; };
5BB2881E209995810043B530 /* EventSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C0209995410043B530 /* EventSource.swift */; };
5BB28821209995810043B530 /* Mobius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C3209995410043B530 /* Mobius.swift */; };
5BB28824209995810043B530 /* EventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C6209995410043B530 /* EventProcessor.swift */; };
5BB28826209995810043B530 /* MobiusController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C8209995410043B530 /* MobiusController.swift */; };
5BB28827209995810043B530 /* MobiusLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287C9209995410043B530 /* MobiusLogger.swift */; };
5BB28828209995810043B530 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB287CA209995410043B530 /* Lock.swift */; };
Expand All @@ -140,7 +138,6 @@
5BB2886E20999AD60043B530 /* MobiusIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2884C20999ACE0043B530 /* MobiusIntegrationTests.swift */; };
5BB2886F20999AD60043B530 /* TestingUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2884D20999ACE0043B530 /* TestingUtil.swift */; };
5BB2887120999AD60043B530 /* LoggingInitiateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2884F20999ACE0043B530 /* LoggingInitiateTests.swift */; };
5BB2887220999AD60043B530 /* EventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2885020999ACE0043B530 /* EventProcessorTests.swift */; };
5BB2887520999AD60043B530 /* AnyEventSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2885320999ACE0043B530 /* AnyEventSourceTests.swift */; };
5BB2887620999AD60043B530 /* NextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2885420999ACE0043B530 /* NextTests.swift */; };
5BB2887720999AD60043B530 /* FirstTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB2885520999ACE0043B530 /* FirstTests.swift */; };
Expand Down Expand Up @@ -383,7 +380,6 @@
5BB287BF209995410043B530 /* AnonymousDisposable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnonymousDisposable.swift; sourceTree = "<group>"; };
5BB287C0209995410043B530 /* EventSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventSource.swift; sourceTree = "<group>"; };
5BB287C3209995410043B530 /* Mobius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mobius.swift; sourceTree = "<group>"; };
5BB287C6209995410043B530 /* EventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventProcessor.swift; sourceTree = "<group>"; };
5BB287C8209995410043B530 /* MobiusController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobiusController.swift; sourceTree = "<group>"; };
5BB287C9209995410043B530 /* MobiusLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobiusLogger.swift; sourceTree = "<group>"; };
5BB287CA209995410043B530 /* Lock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lock.swift; sourceTree = "<group>"; };
Expand All @@ -396,7 +392,6 @@
5BB2884C20999ACE0043B530 /* MobiusIntegrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobiusIntegrationTests.swift; sourceTree = "<group>"; };
5BB2884D20999ACE0043B530 /* TestingUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestingUtil.swift; sourceTree = "<group>"; };
5BB2884F20999ACE0043B530 /* LoggingInitiateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoggingInitiateTests.swift; sourceTree = "<group>"; };
5BB2885020999ACE0043B530 /* EventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventProcessorTests.swift; sourceTree = "<group>"; };
5BB2885320999ACE0043B530 /* AnyEventSourceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyEventSourceTests.swift; sourceTree = "<group>"; };
5BB2885420999ACE0043B530 /* NextTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextTests.swift; sourceTree = "<group>"; };
5BB2885520999ACE0043B530 /* FirstTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -706,7 +701,6 @@
5BB287B6209995410043B530 /* Connection.swift */,
5BB287B7209995410043B530 /* Consumer.swift */,
2D3F26EC237B02B8004C2B75 /* AsyncDispatchQueueConnectable.swift */,
5BB287C6209995410043B530 /* EventProcessor.swift */,
5BB287BB209995410043B530 /* First.swift */,
5BB287CA209995410043B530 /* Lock.swift */,
2D15DF72238EA4DD00E78B27 /* LoggingAdaptors.swift */,
Expand Down Expand Up @@ -784,7 +778,6 @@
5BB2884A20999ACE0043B530 /* AnyMobiusLoggerTests.swift */,
5BB2885720999ACE0043B530 /* CompositeDisposableTests.swift */,
5BB2885920999ACE0043B530 /* ConnectablePublisherTests.swift */,
5BB2885020999ACE0043B530 /* EventProcessorTests.swift */,
2D58735F238EC60F001F21ED /* EventRouterDisposalLogicalRaceRegressionTest.swift */,
5BB2885520999ACE0043B530 /* FirstTests.swift */,
5BB2884F20999ACE0043B530 /* LoggingInitiateTests.swift */,
Expand Down Expand Up @@ -1227,7 +1220,6 @@
5B4A369B21107D2600279C7D /* AnyEventSource.swift in Sources */,
2DF4C30220DBDD5800A4B6DE /* ConnectablePublisher.swift in Sources */,
2DF4C2FF20DBDD5800A4B6DE /* Consumer.swift in Sources */,
2DF4C30B20DBDD5C00A4B6DE /* EventProcessor.swift in Sources */,
2DF4C2FC20DBDD5800A4B6DE /* Next.swift in Sources */,
2DF4C30D20DBDD5C00A4B6DE /* MobiusLogger.swift in Sources */,
2DF4C30020DBDD5800A4B6DE /* MobiusLoop.swift in Sources */,
Expand Down Expand Up @@ -1309,7 +1301,6 @@
02D6755323D1E822008200AF /* EnumRoute.swift in Sources */,
5B1F103C210F5EBC0067193C /* ActionConnectable.swift in Sources */,
5BB2881B2099957D0043B530 /* MobiusHooks.swift in Sources */,
5BB28824209995810043B530 /* EventProcessor.swift in Sources */,
5BB2881C2099957D0043B530 /* ConnectablePublisher.swift in Sources */,
02D0DDC02366F08300A1CE4C /* EffectHandler.swift in Sources */,
5BB2881E209995810043B530 /* EventSource.swift in Sources */,
Expand All @@ -1323,7 +1314,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5BB2887220999AD60043B530 /* EventProcessorTests.swift in Sources */,
2DB61AFD23A8F485009E55DB /* NonReentrancyTests.swift in Sources */,
5BB2886F20999AD60043B530 /* TestingUtil.swift in Sources */,
02C406242374260700BD7ED8 /* EffectRouterTests.swift in Sources */,
Expand Down
104 changes: 0 additions & 104 deletions MobiusCore/Source/EventProcessor.swift
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions MobiusCore/Source/Mobius.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ public enum Mobius {
/// - initialModel: The model the loop should start with.
/// - effects: Zero or more effects to execute immediately.
public func start(from initialModel: Model, effects: [Effect] = []) -> MobiusLoop<Model, Event, Effect> {
return MobiusLoop.createLoop(
return MobiusLoop(
model: initialModel,
update: update,
effectHandler: effectHandler,
initialModel: initialModel,
effects: effects,
eventSource: eventSource,
eventConsumerTransformer: eventConsumerTransformer,
effectHandler: effectHandler,
effects: effects,
logger: logger
)
}
Expand Down
Loading