XMLElement.text will never be nil

Per issue #132, XMLElement can't be nil because of how the reduce implementation works. Instead, it will be an empty string. I think this makes more sense than allowing for nils anyway. A lot of the suggestions mentioned on issue #84 are related to reducing the number of nil checks as well, so this should help alleviate some of that.
drmohundro · May 14, 2017 · b34e776 · b34e776
1 parent 40539f8
commit b34e776
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,7 @@ end
 desc 'Clean, build and test SWXMLHash'
 task :test do |_t|
   # xctool_build_cmd = './scripts/build.sh'
-  xcode_build_cmd = 'xcodebuild -workspace SWXMLHash.xcworkspace -scheme "SWXMLHash iOS" -destination "OS=10.2,name=iPhone 6S" clean build test -sdk iphonesimulator | xcpretty'
+  xcode_build_cmd = 'xcodebuild -workspace SWXMLHash.xcworkspace -scheme "SWXMLHash iOS" -destination "OS=10.3,name=iPhone 6S" clean build test -sdk iphonesimulator | xcpretty'
 
   #if system('which xctool')
     #run xctool_build_cmd

diff --git a/Scripts/build.sh b/Scripts/build.sh
@@ -3,4 +3,4 @@
 set -ev
 
 #xctool -scheme "SWXMLHash iOS" clean build test -sdk iphonesimulator
-set -o pipefail && xcodebuild -workspace SWXMLHash.xcworkspace -scheme "SWXMLHash iOS" -destination "OS=10.0,name=iPhone 6S" clean build test -sdk iphonesimulator | xcpretty
+set -o pipefail && xcodebuild -workspace SWXMLHash.xcworkspace -scheme "SWXMLHash iOS" -destination "OS=10.3,name=iPhone 6S" clean build test -sdk iphonesimulator | xcpretty
diff --git a/Source/SWXMLHash+TypeConversion.swift b/Source/SWXMLHash+TypeConversion.swift
@@ -415,7 +415,8 @@ extension XMLElement {
      - returns: The element text
      */
     internal func nonEmptyTextOrThrow() throws -> String {
-        if let textVal = text, !textVal.characters.isEmpty {
+        let textVal = text
+        if !textVal.characters.isEmpty {
             return textVal
         }
 
@@ -464,11 +465,8 @@ extension String: XMLElementDeserializable, XMLAttributeDeserializable {
     - throws: an XMLDeserializationError.TypeConversionFailed if the element cannot be deserialized
     - returns: the deserialized String value
     */
-    public static func deserialize(_ element: XMLElement) throws -> String {
-        guard let text = element.text else {
-            throw XMLDeserializationError.TypeConversionFailed(type: "String", element: element)
-        }
-        return text
+    public static func deserialize(_ element: XMLElement) -> String {
+        return element.text
     }
 
     /**

diff --git a/Source/SWXMLHash.swift b/Source/SWXMLHash.swift
@@ -759,7 +759,7 @@ public class XMLElement: XMLContent {
     }
 
     /// The inner text of the element, if it exists
-    public var text: String? {
+    public var text: String {
         return children
             .map({ $0 as? TextElement })
             .flatMap({ $0 })
@@ -850,11 +850,7 @@ extension XMLElement: CustomStringConvertible {
             return xmlReturn.joined(separator: "")
         }
 
-        if text != nil {
-            return "<\(name)\(attributesString)>\(text!)</\(name)>"
-        } else {
-            return "<\(name)\(attributesString)/>"
-        }
+        return "<\(name)\(attributesString)>\(text)</\(name)>"
     }
 }
 

diff --git a/Tests/SWXMLHashTests/LazyXMLParsingTests.swift b/Tests/SWXMLHashTests/LazyXMLParsingTests.swift
@@ -62,7 +62,7 @@ class LazyXMLParsingTests: XCTestCase {
     }
 
     func testShouldBeAbleToIterateElementGroups() {
-        let result = xml!["root"]["catalog"]["book"].all.map({ $0["genre"].element!.text! }).joined(separator: ", ")
+        let result = xml!["root"]["catalog"]["book"].all.map({ $0["genre"].element!.text }).joined(separator: ", ")
         XCTAssertEqual(result, "Computer, Fantasy, Fantasy")
     }
 
@@ -96,7 +96,7 @@ class LazyXMLParsingTests: XCTestCase {
         let interleavedXml = "<html><body><p>one</p><div>two</div><p>three</p><div>four</div></body></html>"
         let parsed = SWXMLHash.parse(interleavedXml)
 
-        let result = parsed["html"]["body"].children.map({ $0.element!.text! }).joined(separator: ", ")
+        let result = parsed["html"]["body"].children.map({ $0.element!.text }).joined(separator: ", ")
         XCTAssertEqual(result, "one, two, three, four")
     }
 

diff --git a/Tests/SWXMLHashTests/XMLParsingTests.swift b/Tests/SWXMLHashTests/XMLParsingTests.swift
@@ -63,7 +63,7 @@ class XMLParsingTests: XCTestCase {
     }
 
     func testShouldBeAbleToIterateElementGroups() {
-        let result = xml!["root"]["catalog"]["book"].all.map({ $0["genre"].element!.text! }).joined(separator: ", ")
+        let result = xml!["root"]["catalog"]["book"].all.map({ $0["genre"].element!.text }).joined(separator: ", ")
         XCTAssertEqual(result, "Computer, Fantasy, Fantasy")
     }
 
@@ -102,7 +102,7 @@ class XMLParsingTests: XCTestCase {
             let result = element.children.reduce("") { acc, child in
                 switch child {
                 case let elm as SWXMLHash.XMLElement:
-                    guard let text = elm.text else { return acc }
+                    let text = elm.text
                     return acc + text
                 case let elm as TextElement:
                     return acc + elm.text
@@ -120,7 +120,7 @@ class XMLParsingTests: XCTestCase {
         let interleavedXml = "<html><body><p>one</p><div>two</div><p>three</p><div>four</div></body></html>"
         let parsed = SWXMLHash.parse(interleavedXml)
 
-        let result = parsed["html"]["body"].children.map({ $0.element!.text! }).joined(separator: ", ")
+        let result = parsed["html"]["body"].children.map({ $0.element!.text }).joined(separator: ", ")
         XCTAssertEqual(result, "one, two, three, four")
     }