Merge pull request #3 from volatilegg/fetch-allRaws-easier

Add allRawValues return allRaws value with all values initialised
polac24 · Mar 3, 2018 · 4b0c4c1 · 4b0c4c1
2 parents 11105e2 + 061f2b1
commit 4b0c4c1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/Project/EnumListProjectTests/EnumListTests.swift b/Project/EnumListProjectTests/EnumListTests.swift
@@ -111,12 +111,13 @@ class EnumListTests: XCTestCase {
         // Arrange
 
         // Act
-        SubjectString.Values.initialize()
         let allValues = SubjectString.Values.all
+        let allRawValues = SubjectString.Values.allRawValues
         // Assert
         XCTAssertEqual(allValues, Set([.caseNo1, .caseNo2]))
+        XCTAssertEqual(allRawValues, Set(["case1", "case2"]))
     }
-    
+
     func testAllRawStringValuesExistInAllRaws(){
         // Arrange
 
@@ -126,7 +127,7 @@ class EnumListTests: XCTestCase {
         // Assert
         XCTAssertEqual(allRaws, Set(["case1", "case2"]))
     }
-    
+
     func testNotCallingAllBeforeAskingForAllRawsReturnsEmptySet(){
         enum PrivateSubject: EnumListStringRaw<PrivateSubject.Values>, RawRepresentable{
             struct Values:StringEnumValues {
@@ -146,7 +147,7 @@ class EnumListTests: XCTestCase {
         // Assert
         XCTAssertTrue(allRaws.isEmpty)
     }
-    
+
     func testFetchingNonExistingEnumFillsAllRawsSet(){
         enum PrivateSubject: EnumListStringRaw<PrivateSubject.Values>, RawRepresentable{
             struct Values:StringEnumValues {
@@ -206,7 +207,7 @@ class EnumListTests: XCTestCase {
         // Arrange
 
         // Act
-        PrivateSubject.Values.initialize()
+        _ = PrivateSubject.Values.all
 
         // Assert
         let allRaws = PrivateSubject.Values.allRaws
@@ -219,8 +220,10 @@ class EnumListTests: XCTestCase {
 
         // Act
         let allValues = SubjectInt.Values.all
+        let allRawValues = SubjectInt.Values.allRawValues
         // Assert
         XCTAssertEqual(allValues, Set([.caseNo1, .caseNo2]))
+        XCTAssertEqual(allRawValues, Set([1, 200]))
     }
 
     func testAllRawIntValuesExistInAllRaws(){
@@ -238,7 +241,7 @@ class EnumListTests: XCTestCase {
         SubjectString.Values.allRaws = ["X"]
 
         // Act
-        SubjectString.Values.initialize()
+        _ = SubjectString.Values.all
 
         // Assert
         let allRaws = SubjectString.Values.allRaws
@@ -250,7 +253,7 @@ class EnumListTests: XCTestCase {
         SubjectInt.Values.allRaws = [111]
 
         // Act
-        SubjectInt.Values.initialize()
+        _ = SubjectInt.Values.all
 
         // Assert
         let allRaws = SubjectInt.Values.allRaws
@@ -273,19 +276,21 @@ class EnumListTests: XCTestCase {
         SubjectInt.Values.allRaws = [111]
 
         // Act
-
-        // Assert
         let allRaws = SubjectInt.Values.all
+        let allRawValues = SubjectInt.Values.allRawValues
+        // Assert
+
         XCTAssertEqual(allRaws, Set([.caseNo1, .caseNo2]))
+        XCTAssertEqual(allRawValues, Set([1, 200]))
     }
-
-
+
     func testAllValuesForEnumWithDefaultStringVariableAreValid(){
         XCTAssertEqual(SubjectStringDefaultValue.Values.all, [.caseNo1, .caseNo2])
+        XCTAssertEqual(SubjectStringDefaultValue.Values.allRawValues, ["caseNo1", "case2"])
     }
     func testAllRawValuesForEnumWithDefaultStringVariableAreValid(){
         // Arrange
-        SubjectStringDefaultValue.Values.initialize();
+        _ = SubjectStringDefaultValue.Values.all
         // Act
         XCTAssertEqual(SubjectStringDefaultValue.Values.allRaws, ["caseNo1", "case2"])
     }

diff --git a/Project/EnumListProjectTests/EnumListUnboxTests.swift b/Project/EnumListProjectTests/EnumListUnboxTests.swift
@@ -42,11 +42,12 @@ class EnumListUnboxTests: XCTestCase {
         let _:SubjectString = try a.unbox(key: "data")
 
         // Act
-        SubjectString.Values.initialize()
         let all = SubjectString.Values.all
-
+        let allRawValues = SubjectString.Values.allRawValues
+
         // Assert
         XCTAssertEqual(all, [.caseNo1, .caseNo2])
+        XCTAssertEqual(allRawValues, ["case1", "case2"])
     }
 
     func testUnboxingStringFindsEnum() throws {

diff --git a/README.md b/README.md
@@ -136,7 +136,8 @@ YourEnumName.Values.allRaws //  Set(["caseNo1", "case2"])
 
 ### All Raw Values
 
-To can grab all raw values (which are a `Set<String>` or `Set<Int>`, depending of your `enum` deifinition), but keep in mind that you have to either call `YourEnumName.Values.initialize()` or `YourEnumName.Values.all` before that, just to fill `YourEnumName.Values.allRaws` with valid values.
+ `YourEnumName.Values.allRawValues`  for grabing all raw values (which are a `Set<String>` or `Set<Int>`, depending of your `enum` deifinition).
+**Note:**  `YourEnumName.Values.initialize()` or `YourEnumName.Values.all` are not required to call before anymore.
 
 ### Safety
 

diff --git a/Sources/EnumValuesExtensions.swift b/Sources/EnumValuesExtensions.swift
@@ -25,7 +25,11 @@ public extension StringEnumValues where Element.RawValue == EnumListStringRaw<Se
         initialize()
         return buildAllElementsSet(conversion:{EnumListStringRaw<Self>(stringLiteral: $0)})
     }
-    static func initialize(){
+    static var allRawValues: Set<String> {
+        initialize()
+        return allRaws
+    }
+    private static func initialize(){
         resetRaws(imaginationRawValue: EnumListStringRaw<Self>())
     }
 }
@@ -35,7 +39,11 @@ public extension IntEnumValues where Element.RawValue == EnumListIntRaw<Self>, R
         initialize()
         return buildAllElementsSet(conversion:EnumListIntRaw<Self>.init)
     }
-    static func initialize(){
+    static var allRawValues: Set<Int> {
+        initialize()
+        return allRaws
+    }
+    private static func initialize(){
         resetRaws(imaginationRawValue: EnumListIntRaw<Self>())
     }
 }