Skip to content

Commit

Permalink
Revert "Added safe cointext manager and started write tests"
Browse files Browse the repository at this point in the history 
This reverts commit 4683c88.
  • Loading branch information
Александр committed May 13, 2018
1 parent e24ad04 commit 6b5bc6f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 372 deletions.
138 changes: 14 additions & 124 deletions CoreNetKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
B94310FB1F932BD900E8A9BA /* PagingRequestContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94310FA1F932BD900E8A9BA /* PagingRequestContext.swift */; };
B94310FF1F932D3200E8A9BA /* ReusablePagingRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94310FE1F932D3200E8A9BA /* ReusablePagingRequest.swift */; };
B94311011F933D0F00E8A9BA /* Countable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94311001F933D0F00E8A9BA /* Countable.swift */; };
B964F35C20A3710900110EA4 /* AccessSafeContextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B964F35B20A3710900110EA4 /* AccessSafeContextManager.swift */; };
B964F36420A382E400110EA4 /* CoreNetKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B964F36320A382E400110EA4 /* CoreNetKitTests.swift */; };
B964F36620A382E400110EA4 /* CoreNetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B94310AA1F931CC000E8A9BA /* CoreNetKit.framework */; };
B96CD4141FDC450800F5A107 /* AccessSafeRequestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96CD4131FDC450800F5A107 /* AccessSafeRequestManager.swift */; };
B96CD4161FDC4E2200F5A107 /* CacheableContextProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96CD4151FDC4E2200F5A107 /* CacheableContextProtocol.swift */; };
B97D3CD51F93440800DB6ED6 /* UrlCacheAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B97D3CD41F93440800DB6ED6 /* UrlCacheAdapter.swift */; };
Expand All @@ -42,16 +39,6 @@
F850843585A22770DB437F08 /* Pods_CoreNetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1E45F76645C0817BCA1818E /* Pods_CoreNetKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
B964F36720A382E400110EA4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B94310A11F931CC000E8A9BA /* Project object */;
proxyType = 1;
remoteGlobalIDString = B94310A91F931CC000E8A9BA;
remoteInfo = CoreNetKit;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4F290E291FE4046E00FFCCF2 /* CoreServerRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreServerRequest.swift; sourceTree = "<group>"; };
4F290E2B1FE4047D00FFCCF2 /* CoreServerResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreServerResponse.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -81,10 +68,6 @@
B94310FA1F932BD900E8A9BA /* PagingRequestContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingRequestContext.swift; sourceTree = "<group>"; };
B94310FE1F932D3200E8A9BA /* ReusablePagingRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReusablePagingRequest.swift; sourceTree = "<group>"; };
B94311001F933D0F00E8A9BA /* Countable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Countable.swift; sourceTree = "<group>"; };
B964F35B20A3710900110EA4 /* AccessSafeContextManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessSafeContextManager.swift; sourceTree = "<group>"; };
B964F36120A382E400110EA4 /* CoreNetKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreNetKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
B964F36320A382E400110EA4 /* CoreNetKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreNetKitTests.swift; sourceTree = "<group>"; };
B964F36520A382E400110EA4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B96CD4131FDC450800F5A107 /* AccessSafeRequestManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessSafeRequestManager.swift; sourceTree = "<group>"; };
B96CD4151FDC4E2200F5A107 /* CacheableContextProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheableContextProtocol.swift; sourceTree = "<group>"; };
B97D3CD41F93440800DB6ED6 /* UrlCacheAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlCacheAdapter.swift; sourceTree = "<group>"; };
Expand All @@ -102,14 +85,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B964F35E20A382E400110EA4 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B964F36620A382E400110EA4 /* CoreNetKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -143,7 +118,6 @@
isa = PBXGroup;
children = (
B94310AC1F931CC000E8A9BA /* CoreNetKit */,
B964F36220A382E400110EA4 /* CoreNetKitTests */,
B94310AB1F931CC000E8A9BA /* Products */,
6597E5C3DF90E0C2B4142DD0 /* Pods */,
5E63305A48BF32F13044AAC9 /* Frameworks */,
Expand All @@ -154,7 +128,6 @@
isa = PBXGroup;
children = (
B94310AA1F931CC000E8A9BA /* CoreNetKit.framework */,
B964F36120A382E400110EA4 /* CoreNetKitTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -257,15 +230,6 @@
path = Pagination;
sourceTree = "<group>";
};
B964F36220A382E400110EA4 /* CoreNetKitTests */ = {
isa = PBXGroup;
children = (
B964F36320A382E400110EA4 /* CoreNetKitTests.swift */,
B964F36520A382E400110EA4 /* Info.plist */,
);
path = CoreNetKitTests;
sourceTree = "<group>";
};
B97D3CD21F9343AD00DB6ED6 /* Adapters */ = {
isa = PBXGroup;
children = (
Expand All @@ -288,7 +252,6 @@
isa = PBXGroup;
children = (
B96CD4131FDC450800F5A107 /* AccessSafeRequestManager.swift */,
B964F35B20A3710900110EA4 /* AccessSafeContextManager.swift */,
);
path = Safe;
sourceTree = "<group>";
Expand Down Expand Up @@ -316,6 +279,7 @@
B94310A61F931CC000E8A9BA /* Frameworks */,
B94310A71F931CC000E8A9BA /* Headers */,
B94310A81F931CC000E8A9BA /* Resources */,
658FA4BB4076ADF5CAD1D872 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -326,31 +290,12 @@
productReference = B94310AA1F931CC000E8A9BA /* CoreNetKit.framework */;
productType = "com.apple.product-type.framework";
};
B964F36020A382E400110EA4 /* CoreNetKitTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = B964F36920A382E400110EA4 /* Build configuration list for PBXNativeTarget "CoreNetKitTests" */;
buildPhases = (
B964F35D20A382E400110EA4 /* Sources */,
B964F35E20A382E400110EA4 /* Frameworks */,
B964F35F20A382E400110EA4 /* Resources */,
);
buildRules = (
);
dependencies = (
B964F36820A382E400110EA4 /* PBXTargetDependency */,
);
name = CoreNetKitTests;
productName = CoreNetKitTests;
productReference = B964F36120A382E400110EA4 /* CoreNetKitTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
B94310A11F931CC000E8A9BA /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0930;
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = "Кравченков Александр";
TargetAttributes = {
Expand All @@ -359,10 +304,6 @@
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
B964F36020A382E400110EA4 = {
CreatedOnToolsVersion = 9.3;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = B94310A41F931CC000E8A9BA /* Build configuration list for PBXProject "CoreNetKit" */;
Expand All @@ -378,7 +319,6 @@
projectRoot = "";
targets = (
B94310A91F931CC000E8A9BA /* CoreNetKit */,
B964F36020A382E400110EA4 /* CoreNetKitTests */,
);
};
/* End PBXProject section */
Expand All @@ -391,16 +331,24 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B964F35F20A382E400110EA4 /* Resources */ = {
isa = PBXResourcesBuildPhase;
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
658FA4BB4076ADF5CAD1D872 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CoreNetKit/Pods-CoreNetKit-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
7F99649A3E58C8ACCBE972D8 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -429,7 +377,6 @@
B94311011F933D0F00E8A9BA /* Countable.swift in Sources */,
B9B4F7861FDC731B00A0B1D1 /* CancellableContext.swift in Sources */,
B94310E71F9324F300E8A9BA /* ServicePaginator + AsyncIterator.swift in Sources */,
B964F35C20A3710900110EA4 /* AccessSafeContextManager.swift in Sources */,
B94310EE1F93250700E8A9BA /* MultipartData.swift in Sources */,
B97D3CD71F93468000DB6ED6 /* CacheAdapter.swift in Sources */,
4F290E2E1FE4064D00FFCCF2 /* ResponseResult.swift in Sources */,
Expand Down Expand Up @@ -458,24 +405,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B964F35D20A382E400110EA4 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B964F36420A382E400110EA4 /* CoreNetKitTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
B964F36820A382E400110EA4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B94310A91F931CC000E8A9BA /* CoreNetKit */;
targetProxy = B964F36720A382E400110EA4 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
B94310B01F931CC000E8A9BA /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -643,38 +574,6 @@
};
name = Release;
};
B964F36A20A382E400110EA4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ZJ45BEVK69;
INFOPLIST_FILE = CoreNetKitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = AK.CoreNetKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
B964F36B20A382E400110EA4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ZJ45BEVK69;
INFOPLIST_FILE = CoreNetKitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = AK.CoreNetKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -696,15 +595,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B964F36920A382E400110EA4 /* Build configuration list for PBXNativeTarget "CoreNetKitTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B964F36A20A382E400110EA4 /* Debug */,
B964F36B20A382E400110EA4 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = B94310A11F931CC000E8A9BA /* Project object */;
Expand Down
2 changes: 1 addition & 1 deletion CoreNetKit/Context/BaseImplementations/ActiveRequestContext.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import CoreEvents

/// Base implementation `ActionableContext`
public class ActiveRequestContext<Model>: ActionableContext<Model>, CancellableContext, PerformableContext {
public class ActiveRequestContext<Model>: ActionableContext<Model>, CancellableContext {

// MARK: - Typealiases

Expand Down
2 changes: 1 addition & 1 deletion CoreNetKit/Context/BaseImplementations/HandleRequestContext.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import CoreEvents

/// Context that incapsulate request handle
/// It may used for automatic convertion response type to awaiting type
public class HandleRequestContext<RequestModel, ResultModel>: ActionableContextProtocol, CancellableContext, PerformableContext {
public class HandleRequestContext<RequestModel, ResultModel>: ActionableContextProtocol, CancellableContext {

// MARK: - Typealiases

Expand Down
1 change: 0 additions & 1 deletion CoreNetKit/Context/BaseImplementations/PagingRequestContext.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class PagingRequestContext<ResultModel>: PaginableRequestContextProtocol
self.perfromRequest()
}


private func perfromRequest() {
self.request.performAsync { self.performHandler(result: $0) }
}
Expand Down
Loading

0 comments on commit 6b5bc6f

Please sign in to comment.