Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Moving to latest RAC release candidate #5

Open
wants to merge 9 commits into
base: swift2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 6 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
[submodule "Carthage/Checkouts/Box"]
path = Carthage/Checkouts/Box
url = https://github.com/robrix/Box.git
[submodule "Carthage/Checkouts/Result"]
path = Carthage/Checkouts/Result
url = https://github.com/antitypical/Result.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "Carthage/Checkouts/Result"]
path = Carthage/Checkouts/Result
url = https://github.com/antitypical/Result.git
[submodule "Carthage/Checkouts/ReactiveCocoa"]
path = Carthage/Checkouts/ReactiveCocoa
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveCocoa/ReactiveCocoa" "v3.0-beta.8"
github "ReactiveCocoa/ReactiveCocoa" ~> 4.0.0
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Quick" ~> 0.3
github "Quick/Nimble" ~> 0.4
github "Quick/Quick" ~> 0.8.0
github "Quick/Nimble" ~> 3.0.0
github "jspahrsummers/xcconfigs" ~> 0.8
9 changes: 4 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
github "robrix/Box" "1.2.2"
github "Quick/Nimble" "v0.4.2"
github "Quick/Quick" "v0.3.1"
github "Quick/Nimble" "v3.1.0"
github "Quick/Quick" "v0.8.0"
github "antitypical/Result" "1.0.2"
github "jspahrsummers/xcconfigs" "0.8.1"
github "antitypical/Result" "0.4.4"
github "ReactiveCocoa/ReactiveCocoa" "b89e1b73f2d1c6a99e0916f699ab6dcda71c74b5"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.1"
1 change: 0 additions & 1 deletion Carthage/Checkouts/Box
Submodule Box deleted from bbe4e6
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 88 files
+8 −0 .gitignore
+9 −0 .travis.yml
+20 −13 CONTRIBUTING.md
+5 −3 Nimble.podspec
+528 −65 Nimble.xcodeproj/project.pbxproj
+2 −2 Nimble.xcodeproj/project.xcworkspace/xcshareddata/Nimble.xccheckout
+8 −5 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-OSX.xcscheme
+8 −5 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+99 −0 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+7 −2 Nimble/Adapters/AdapterProtocols.swift
+20 −0 Nimble/Adapters/AssertionDispatcher.swift
+57 −8 Nimble/Adapters/AssertionRecorder.swift
+35 −0 Nimble/Adapters/NimbleEnvironment.swift
+30 −2 Nimble/Adapters/NimbleXCTestHandler.swift
+73 −25 Nimble/DSL+Wait.swift
+33 −5 Nimble/DSL.swift
+48 −22 Nimble/Expectation.swift
+53 −9 Nimble/Expression.swift
+40 −8 Nimble/FailureMessage.swift
+3 −3 Nimble/Info.plist
+13 −22 Nimble/Matchers/AllPass.swift
+13 −3 Nimble/Matchers/BeAKindOf.swift
+13 −3 Nimble/Matchers/BeAnInstanceOf.swift
+16 −13 Nimble/Matchers/BeCloseTo.swift
+20 −9 Nimble/Matchers/BeEmpty.swift
+4 −4 Nimble/Matchers/BeGreaterThan.swift
+4 −4 Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+3 −3 Nimble/Matchers/BeIdenticalTo.swift
+4 −4 Nimble/Matchers/BeLessThan.swift
+4 −4 Nimble/Matchers/BeLessThanOrEqual.swift
+42 −25 Nimble/Matchers/BeLogical.swift
+3 −3 Nimble/Matchers/BeNil.swift
+8 −8 Nimble/Matchers/BeginWith.swift
+34 −16 Nimble/Matchers/Contain.swift
+11 −11 Nimble/Matchers/EndWith.swift
+45 −11 Nimble/Matchers/Equal.swift
+48 −0 Nimble/Matchers/HaveCount.swift
+3 −3 Nimble/Matchers/Match.swift
+45 −38 Nimble/Matchers/MatcherProtocols.swift
+119 −177 Nimble/Matchers/RaisesException.swift
+66 −0 Nimble/Matchers/SatisfyAnyOf.swift
+181 −0 Nimble/Matchers/ThrowError.swift
+3 −3 Nimble/Nimble.h
+125 −0 Nimble/ObjCExpectation.swift
+354 −0 Nimble/Utils/Async.swift
+0 −73 Nimble/Utils/Poll.swift
+3 −3 Nimble/Utils/SourceLocation.swift
+11 −4 Nimble/Utils/Stringers.swift
+87 −70 Nimble/Wrappers/AsyncMatcherWrapper.swift
+0 −28 Nimble/Wrappers/BasicMatcherWrapper.swift
+0 −18 Nimble/Wrappers/FullMatcherWrapper.swift
+68 −28 Nimble/Wrappers/MatcherFunc.swift
+0 −56 Nimble/Wrappers/NonNilMatcherWrapper.swift
+27 −95 Nimble/Wrappers/ObjCMatcher.swift
+31 −10 Nimble/objc/DSL.h
+47 −6 Nimble/objc/DSL.m
+3 −0 Nimble/objc/NMBExceptionCapture.h
+1 −1 Nimble/objc/NMBExceptionCapture.m
+100 −8 NimbleTests/AsynchronousTest.swift
+54 −21 NimbleTests/Helpers/utils.swift
+1 −1 NimbleTests/Info.plist
+7 −7 NimbleTests/Matchers/AllPassTest.swift
+18 −0 NimbleTests/Matchers/BeAKindOfTest.swift
+20 −0 NimbleTests/Matchers/BeAnInstanceOfTest.swift
+10 −0 NimbleTests/Matchers/BeCloseToTest.swift
+6 −6 NimbleTests/Matchers/BeEmptyTest.swift
+23 −1 NimbleTests/Matchers/BeLogicalTest.swift
+4 −4 NimbleTests/Matchers/ContainTest.swift
+29 −0 NimbleTests/Matchers/EqualTest.swift
+45 −0 NimbleTests/Matchers/HaveCountTest.swift
+107 −54 NimbleTests/Matchers/RaisesExceptionTest.swift
+40 −0 NimbleTests/Matchers/SatisfyAnyOfTest.swift
+137 −0 NimbleTests/Matchers/ThrowErrorTest.swift
+22 −8 NimbleTests/SynchronousTests.swift
+54 −0 NimbleTests/UserDescriptionTest.swift
+5 −1 NimbleTests/objc/NimbleSpecHelper.h
+4 −2 NimbleTests/objc/ObjCAsyncTest.m
+4 −3 NimbleTests/objc/ObjCBeEmptyTest.m
+17 −0 NimbleTests/objc/ObjCContainTest.m
+90 −0 NimbleTests/objc/ObjCHaveCount.m
+130 −53 NimbleTests/objc/ObjCRaiseExceptionTest.m
+32 −0 NimbleTests/objc/ObjCSatisfyAnyOfTest.m
+21 −0 NimbleTests/objc/ObjCSyncTest.m
+52 −0 NimbleTests/objc/ObjCUserDescriptionTest.m
+196 −48 README.md
+8 −0 circle.yml
+200 −0 script/release
+5 −5 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 60 files
+11 −0 .gitignore
+6 −0 .travis.yml
+24 −5 CONTRIBUTING.md
+4 −4 Documentation/ArrangeActAssert.md
+1 −1 Documentation/ConfiguringQuick.md
+47 −11 Documentation/InstallingQuick.md
+2 −2 Documentation/NimbleAssertions.md
+26 −0 Documentation/QuickExamplesAndGroups.md
+3 −0 Documentation/SettingUpYourXcodeProject.md
+1 −1 Externals/Nimble
+6 −0 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.h
+10 −0 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.m
+8 −0 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+ Quick Templates/Quick Configuration Class.xctemplate/TemplateIcon.icns
+73 −0 Quick Templates/Quick Configuration Class.xctemplate/TemplateInfo.plist
+11 −2 Quick.podspec
+501 −11 Quick.xcodeproj/project.pbxproj
+4 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-OSX.xcscheme
+4 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+109 −0 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+3 −3 Quick/Callsite.swift
+5 −5 Quick/Configuration/Configuration.swift
+1 −1 Quick/Configuration/QuickConfiguration.m
+38 −38 Quick/DSL/DSL.swift
+38 −15 Quick/DSL/QCKDSL.h
+10 −1 Quick/DSL/QCKDSL.m
+20 −0 Quick/DSL/World+DSL.h
+21 −19 Quick/DSL/World+DSL.swift
+7 −3 Quick/Example.swift
+12 −8 Quick/ExampleGroup.swift
+1 −1 Quick/ExampleMetadata.swift
+0 −16 Quick/Failure.swift
+3 −1 Quick/Filter.swift
+1 −1 Quick/Info.plist
+3 −5 Quick/Quick.h
+24 −7 Quick/QuickSpec.m
+17 −0 Quick/World.h
+16 −16 Quick/World.swift
+8 −8 QuickFocusedTests/FocusedTests+ObjC.m
+1 −1 QuickFocusedTests/Info.plist
+4 −4 QuickTests/FunctionalTests/AfterEachTests+ObjC.m
+6 −6 QuickTests/FunctionalTests/AfterSuiteTests+ObjC.m
+1 −1 QuickTests/FunctionalTests/AfterSuiteTests.swift
+4 −4 QuickTests/FunctionalTests/BeforeEachTests+ObjC.m
+6 −6 QuickTests/FunctionalTests/BeforeSuiteTests+ObjC.m
+1 −1 QuickTests/FunctionalTests/BeforeSuiteTests.swift
+15 −19 QuickTests/FunctionalTests/FailureTests+ObjC.m
+55 −0 QuickTests/FunctionalTests/FailureUsingXCTAssertTests+ObjC.m
+6 −8 QuickTests/FunctionalTests/ItTests+ObjC.m
+1 −1 QuickTests/FunctionalTests/ItTests.swift
+6 −6 QuickTests/FunctionalTests/PendingTests+ObjC.m
+6 −6 QuickTests/FunctionalTests/SharedExamples+BeforeEachTests+ObjC.m
+35 −6 QuickTests/FunctionalTests/SharedExamplesTests+ObjC.m
+12 −4 QuickTests/Helpers/QCKSpecRunner.m
+1 −6 QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+1 −1 QuickTests/Info.plist
+25 −3 README.md
+1 −1 Rakefile
+18 −0 circle.yml
+199 −0 script/release
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa updated 152 files
58 changes: 38 additions & 20 deletions EditableProperty.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "1D7898204F0A200CCD7DCD44C6DD7CFCE6DBAD95",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"1D7898204F0A200CCD7DCD44C6DD7CFCE6DBAD95" : 0,
"E084C86B03F81D63323C9E7510697EA528A758C7" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6EEAD2AA-65C6-4EBD-8E24-B8512896CFE5",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"1D7898204F0A200CCD7DCD44C6DD7CFCE6DBAD95" : "EditableProperty\/",
"E084C86B03F81D63323C9E7510697EA528A758C7" : "EditableProperty\/Carthage\/Checkouts\/xcconfigs\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "EditableProperty",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "EditableProperty.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:liscio\/EditableProperty.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1D7898204F0A200CCD7DCD44C6DD7CFCE6DBAD95"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jspahrsummers\/xcconfigs.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E084C86B03F81D63323C9E7510697EA528A758C7"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:EditableProperty.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:EditableProperty.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
15 changes: 7 additions & 8 deletions EditableProperty/Committed.swift
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
import Box
import ReactiveCocoa

/// Represents a committed change to the value of an EditableProperty.
public enum Committed<Value, ValidationError: ErrorType> {
/// The change is an automatic update to a new default value.
case DefaultValue(Box<Value>)
case DefaultValue(Value)

/// The change is a new value that has been explicitly set _without_ an
/// editor.
///
/// This might occur from setting `value` directly, or by explicitly binding
/// signals, producers, or other properties to the EditableProperty.
case ExplicitUpdate(Box<Value>)
case ExplicitUpdate(Value)

/// The value was validated and committed by the given editor.
case ValidatedEdit(Box<Value>, Editor<Value, ValidationError>)
case ValidatedEdit(Value, Editor<Value, ValidationError>)

/// The value that was committed.
public var value: Value {
switch self {
case let .DefaultValue(value):
return value.value
return value

case let .ExplicitUpdate(value):
return value.value
return value

case let .ValidatedEdit(value, _):
return value.value
return value
}
}

Expand Down Expand Up @@ -55,7 +54,7 @@ public func == <Value: Equatable, ValidationError> (lhs: Committed<Value, Valida
}
}

extension Committed: Printable {
extension Committed: CustomStringConvertible {
public var description: String {
let value = self.value

Expand Down
Loading