Simplify parsing

Author: kean

NaiveDate.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name             = 'NaiveDate'
     s.version          = '0.1'
-    s.summary          = 'The missing naive date, time and datetime'
+    s.summary          = 'Naive date and time types'
     s.homepage         = 'https://github.com/kean/NaiveDate'
     s.license          = 'MIT'
     s.author           = 'Alexander Grebenyuk'

README.md

@@ -7,14 +7,14 @@
 <a href="https://travis-ci.org/kean/NaiveDate"><img src="https://img.shields.io/travis/kean/NaiveDate/master.svg"></a>
 </p>
 
-The missing **naive** date, time, and datetime types.
+**Naive** date, time, and datetime types.
 
 
 ## Usage
 
-Native `Date` type is great for working with dates along the time zones (e.g. "2017-09-29T15:00:00+0300"), however there are some scenarios in which naive dates and times are desirable.
+Native `Date` type is great for working with  time zones (e.g. "2017-09-29T15:00:00+0300"), however there are scenarios in which naive dates and times are desirable.
 
-The library implements three types for representing naive date:
+The library implements three types:
 - `NaiveDate` (e.g. "2017-09-29")
 - `NaiveTime` (e.g. "15:30:00")
 - `NaiveDateTime` (e.g. "2017-09-29T15:30:00" - no time zone and no offset).

Sources/NaiveDate.swift

@@ -38,10 +38,10 @@ public struct NaiveDate: Equatable, Hashable, Comparable, LosslessStringConverti
 
     /// Creates a naive date from a given string (e.g. "2017-12-30").
     public init?(_ string: String) {
-        let components = string.components(separatedBy: "-")
-        guard components.count == 3 else { return nil } // must have 3 components
-        guard let year = Int(components[0]), let month = Int(components[1]), let day = Int(components[2]) else { return nil }
-        self = NaiveDate(year: year, month: month, day: day)
+        // Not using `ISO8601DateFormatter` because it only works with `Date`
+        guard let cmps = _components(from: string, separator: "-"),
+            cmps.count == 3 else { return nil }
+        self = NaiveDate(year: cmps[0], month: cmps[1], day: cmps[2])
     }
 
     /// Returns a string representation of a naive date (e.g. "2017-12-30").
@@ -112,21 +112,9 @@ public struct NaiveTime: Equatable, Hashable, Comparable, LosslessStringConverti
 
     /// Creates a naive time from a given string (e.g. "23:59", or "23:59:59").
     public init?(_ string: String) {
-        let components = string.components(separatedBy: ":")
-
-        // has to have at least two components (hour and minute)
-        guard components.count > 1 else { return nil }
-
-        guard let hour = Int(components[0]), let minute = Int(components[1]) else { return nil } // invalid input
-        self.hour = hour
-        self.minute = minute
-
-        if components.count > 2 { // also has seconds
-            guard let second = Int(components[2]) else { return nil } // invalid input
-            self.second = second
-        } else {
-            self.second = 0
-        }
+        guard let cmps = _components(from: string, separator: ":"),
+            (2...3).contains(cmps.count) else { return nil }
+        self.init(hour: cmps[0], minute: cmps[1], second: (cmps.count > 2 ? cmps[2] : 0))
     }
 
     /// Returns a string representation of a naive time (e.g. "23:59:59").
@@ -289,3 +277,9 @@ private func _encode<T: LosslessStringConvertible>(_ value: T, to encoder: Encod
     var container = encoder.singleValueContainer()
     try container.encode(value.description)
 }
+
+private func _components(from string: String, separator: String) -> [Int]? {
+    let substrings = string.components(separatedBy: separator)
+    let components = substrings.flatMap(Int.init)
+    return components.count == substrings.count ? components : nil
+}

Tests/NaiveDateTests.swift

@@ -37,6 +37,11 @@ class NaiveDateTest: XCTestCase {
     func testFromString() {
         XCTAssertNil(NaiveDate("2017"))
         XCTAssertNil(NaiveDate("2017-10"))
+        XCTAssertNil(NaiveDate("2017-AA-10-01"))
+        XCTAssertNil(NaiveDate(" 2017-10-01"))
+        XCTAssertNil(NaiveDate("2017- 10-01"))
+        XCTAssertNil(NaiveDate("2017:10:01"))
+
         XCTAssertEqual(NaiveDate("2017-10-01"), NaiveDate(year: 2017, month: 10, day: 1))
         XCTAssertEqual(NaiveDate("2017-10-1"), NaiveDate(year: 2017, month: 10, day: 1))
     }
@@ -175,11 +180,16 @@ class NaiveTimeTest: XCTestCase {
     // MARK: LosslessStringConvertible
 
     func testFromString() {
-        XCTAssertNil(NaiveTime("2klfdjafk"))
+        XCTAssertNil(NaiveTime("AA"))
         XCTAssertNil(NaiveTime(""))
-        XCTAssertNil(NaiveTime("23:fd"))
-        XCTAssertNil(NaiveTime("23-26"))
+        XCTAssertNil(NaiveTime("23:AA"))
+        XCTAssertNil(NaiveTime("23-59"))
         XCTAssertNil(NaiveTime("23"))
+        XCTAssertNil(NaiveTime("23:AA:59:59"))
+
+        XCTAssertNil(NaiveTime(" 23:59:59"))
+        XCTAssertNil(NaiveTime("23:59:59 "))
+        XCTAssertNil(NaiveTime("23:59 :59"))
 
         XCTAssertEqual(NaiveTime("23:59:59"), NaiveTime(hour: 23, minute: 59, second: 59))
         XCTAssertEqual(NaiveTime("23:59"), NaiveTime(hour: 23, minute: 59, second: 0))