Add NaiveDateTimeFormatter, NaiveDateTimeRangeFormatter

Author: kean

NaiveDateTime.playground/Contents.swift

@@ -11,6 +11,8 @@ import NaiveDateTime
 let date = NaiveDate("2017-11-01")!
 Calendar.current.date(from: date)
 
+NaiveDateFormatter(dateStyle: .short).string(from: date)
+
 
 /*:
  ## `NaiveTime`
@@ -21,6 +23,7 @@ Calendar.current.date(from: date)
 let time = NaiveTime("15:00")!
 Calendar.current.date(from: time)
 
+NaiveDateFormatter(timeStyle: .short).string(from: time)
 
 /*:
  ## `NaiveDateTime`
@@ -30,3 +33,5 @@ Calendar.current.date(from: time)
 
 let dateTime = NaiveDateTime("2017-11-01T15:30:00")!
 Calendar.current.date(from: dateTime)
+
+NaiveDateFormatter(dateStyle: .short, timeStyle: .short).string(from: dateTime)

NaiveDateTime.xcodeproj/project.pbxproj

@@ -18,6 +18,13 @@
 		0CAA5D3E1DB1495E001F6D96 /* NaiveDateTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C5108211D4E81CE00F1F405 /* NaiveDateTime.framework */; };
 		0CAA5D441DB1496B001F6D96 /* NaiveDateTimeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CAA5D1F1DB14780001F6D96 /* NaiveDateTimeTests.swift */; };
 		0CE6A8AF1FD1DB9700627ED1 /* Calendar+NaiveDateTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8AE1FD1DB9700627ED1 /* Calendar+NaiveDateTime.swift */; };
+		0CE6A8B61FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */; };
+		0CE6A8B71FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */; };
+		0CE6A8B81FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */; };
+		0CE6A8B91FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */; };
+		0CE6A8BB1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8BA1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift */; };
+		0CE6A8BC1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8BA1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift */; };
+		0CE6A8BD1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE6A8BA1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -63,6 +70,8 @@
 		0CAA5D461DB149FF001F6D96 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
 		0CE052001D4E830700A12B45 /* NaiveDateTime.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NaiveDateTime.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0CE6A8AE1FD1DB9700627ED1 /* Calendar+NaiveDateTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Calendar+NaiveDateTime.swift"; sourceTree = "<group>"; };
+		0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NaiveDateTimeFormatter.swift; sourceTree = "<group>"; };
+		0CE6A8BA1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NaiveDateTimeFormatterTest.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -152,6 +161,7 @@
 			children = (
 				0C20715A1D4E83A700EA5BEF /* NaiveDateTime.swift */,
 				0CE6A8AE1FD1DB9700627ED1 /* Calendar+NaiveDateTime.swift */,
+				0CE6A8B51FD1E00900627ED1 /* NaiveDateTimeFormatter.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -181,6 +191,7 @@
 			children = (
 				0CAA5D1E1DB14780001F6D96 /* Info.plist */,
 				0CAA5D1F1DB14780001F6D96 /* NaiveDateTimeTests.swift */,
+				0CE6A8BA1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -479,13 +490,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C20715C1D4E83A700EA5BEF /* NaiveDateTime.swift in Sources */,
+				0CE6A8B71FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		0C5108321D4E824A00F1F405 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0CE6A8B61FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */,
 				0CE6A8AF1FD1DB9700627ED1 /* Calendar+NaiveDateTime.swift in Sources */,
 				0C20715B1D4E83A700EA5BEF /* NaiveDateTime.swift in Sources */,
 			);
@@ -496,13 +509,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C20715D1D4E83A700EA5BEF /* NaiveDateTime.swift in Sources */,
+				0CE6A8B81FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		0CAA5D0E1DB14766001F6D96 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0CE6A8BB1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */,
 				0CAA5D211DB14780001F6D96 /* NaiveDateTimeTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -511,6 +526,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0CE6A8BC1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */,
 				0CAA5D331DB14912001F6D96 /* NaiveDateTimeTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -519,6 +535,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0CE6A8BD1FD1E69400627ED1 /* NaiveDateTimeFormatterTest.swift in Sources */,
 				0CAA5D441DB1496B001F6D96 /* NaiveDateTimeTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -528,6 +545,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C20715E1D4E83A700EA5BEF /* NaiveDateTime.swift in Sources */,
+				0CE6A8B91FD1E00900627ED1 /* NaiveDateTimeFormatter.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

README.md

@@ -23,55 +23,58 @@ Each of the provided types implements `Equatable`, `Comparable`, `LosslessString
 
 **Important!** The naive types do not perform any validation of the input components (year, hour, etc). If you do need to do any precise manipulations with time use native `Date` and `Calendar` types.
 
-### `NaiveDate`
+### Create
 
-Calendar date without timezone.
+Naive dates and times can be created either from strings (using a predefined format) or by using a memberwise method:
 
 ```swift
-NaiveDate(year: 2017, month: 10, day: 1)
 NaiveDate("2017-10-01")
-print(NaiveDate(year: 2017, month: 10, day: 1) // prints "2017-10-01"
+NaiveDate(year: 2017, month: 10, day: 1)
+
+NaiveTime("15:30:00")
+NaiveTime(hour: 15, minute: 30, second: 0)
+
+NaiveDateTime("2017-10-01T15:30")
+NaiveDateTime(
+    date: NaiveDate(year: 2017, month: 10, day: 1),
+    time: NaiveTime(hour: 15, minute: 30, second: 0)
+)
 ```
 
-When you need time zones, convert `NaiveDate` to `Date`:
+### Format
+
+Format dates without having to worry about time zones:
 
 ```swift
-let date = NaiveDate(year: 2017, month: 10, day: 1)
+let date = NaiveDate("2017-11-01")!
+NaiveDateFormatter(dateStyle: .short).string(from: date)
+// prints "11/1/17"
 
-// Creates `Date` in a calendar's time zone
-// "2017-10-01T00:00:00+0300" if user is in MSK
-Calendar.current.date(from: date)
+let time = NaiveTime("15:00")!
+NaiveDateFormatter(timeStyle: .short).string(from: time)
+// prints "3:00 PM"
 
-// Creates `Date` with +0000 offset
-// "2017-10-01T00:00:00Z"
-Calendar.current.date(from: date, in: TimeZone(secondsFromGMT: 0)!)
+let dateTime = NaiveDateTime("2017-11-01T15:30:00")!
+NaiveDateFormatter(dateStyle: .short, timeStyle: .short).string(from: dateTime)
+// prints "11/1/17, 3:30 PM"
 ```
 
+### Convert
 
-### `NaiveTime`
-
-Time without timezone.
+When you do need time zones, convert `NaiveDate` to `Date`:
 
 ```swift
-NaiveTime(hour: 15, minute: 30, second: 0)
-NaiveTime("15:30:00")
-```
-
-
-### `NaiveDateTime`
+let date = NaiveDate(year: 2017, month: 10, day: 1)
 
-Combined date and time without timezone.
+// Creates `Date` in a calendar's time zone
+// "2017-10-01T00:00:00+0300" if user is in MSK
+Calendar.current.date(from: date)
 
-```swift
-NaiveDateTime(
-    date: NaiveDate(year: 2017, month: 10, day: 1),
-    time: NaiveTime(hour: 15, minute: 30, second: 0)
-)
-NaiveDateTime("2017-10-01T15:30")
+// Creates `Date` with +0000 offset
+// "2017-10-01T00:00:00Z"
+Calendar.current.date(from: date, in: TimeZone(secondsFromGMT: 0)!)
 ```
 
-When you need time zones, convert `NaiveDateTime` to `Date`:
-
 ```swift
 let dateTime = NaiveDateTime(
     date: NaiveDate(year: 2017, month: 10, day: 1),

Sources/Calendar+NaiveDateTime.swift

@@ -11,19 +11,23 @@ public extension Calendar {
     /// Returns a date created from the specified naive date in a given time zone.
     /// - parameter timeZone: `nil` by default (uses Calendar time zone).
     public func date(from date: NaiveDate, in timeZone: TimeZone? = nil) -> Date? {
-        return self.date(from: DateComponents(self, timeZone: timeZone, date: date))
+        return _date(from: date, in: timeZone)
     }
 
     /// Returns a date created from the specified naive time in a given time zone.
     /// - parameter timeZone: `nil` by default (uses Calendar time zone).
     public func date(from time: NaiveTime, in timeZone: TimeZone? = nil) -> Date? {
-        return self.date(from: DateComponents(self, timeZone: timeZone, time: time))
+        return _date(from: time, in: timeZone)
     }
 
     /// Returns a date created from the specified naive datetime in a given time zone.
     /// - parameter timeZone: `nil` by default (uses Calendar time zone).
     public func date(from dateTime: NaiveDateTime, in timeZone: TimeZone? = nil) -> Date? {
-        return self.date(from: DateComponents(self, timeZone: timeZone, dateTime: dateTime))
+        return _date(from: dateTime, in: timeZone)
+    }
+
+    internal func _date<T: _DateComponentsConvertible>(from value: T, in timeZone: TimeZone? = nil) -> Date? {
+        return self.date(from: value.dateComponents(timeZone: timeZone))
     }
 }
 
@@ -54,21 +58,3 @@ public extension Calendar {
         )
     }
 }
-
-// MARK: - Naive* -> DateComponents
-
-public extension DateComponents {
-    public init(_ calendar: Calendar? = nil, timeZone: TimeZone? = nil, date: NaiveDate) {
-        self.init(calendar: calendar, timeZone: timeZone, year: date.year, month: date.month, day: date.day)
-    }
-
-    public init(_ calendar: Calendar? = nil, timeZone: TimeZone? = nil, time: NaiveTime) {
-        self.init(calendar: calendar, timeZone: timeZone, hour: time.hour, minute: time.minute, second: time.second)
-    }
-
-    public init(_ calendar: Calendar? = nil, timeZone: TimeZone? = nil, dateTime: NaiveDateTime) {
-        let date = dateTime.date
-        let time = dateTime.time
-        self.init(calendar: calendar, timeZone: timeZone, year: date.year, month: date.month, day: date.day, hour: time.hour, minute: time.minute, second: time.second)
-    }
-}

Sources/NaiveDateTime.swift

@@ -8,7 +8,7 @@ import Foundation
 // MARK: - NaiveDate -
 
 /// Calendar date without a timezone.
-public struct NaiveDate: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable {
+public struct NaiveDate: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable, _DateComponentsConvertible {
     public let year: Int, month: Int, day: Int
 
     /// Initializes the naive date with a given date components.
@@ -58,13 +58,19 @@ public struct NaiveDate: Equatable, Hashable, Comparable, LosslessStringConverti
     public func encode(to encoder: Encoder) throws {
         try _encode(self, to: encoder)
     }
+
+    // MARK: _DateComponentsConvertible
+
+    public func dateComponents(timeZone: TimeZone? = nil) -> DateComponents {
+        return DateComponents(timeZone: timeZone, year: year, month: month, day: day)
+    }
 }
 
 
 // MARK: - NaiveTime -
 
 /// Time without a timezone. Allows for second precision.
-public struct NaiveTime: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable {
+public struct NaiveTime: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable, _DateComponentsConvertible {
     public let hour: Int, minute: Int, second: Int
 
     /// Initializes the naive time with a given date components.
@@ -137,13 +143,19 @@ public struct NaiveTime: Equatable, Hashable, Comparable, LosslessStringConverti
     public func encode(to encoder: Encoder) throws {
         try _encode(self, to: encoder)
     }
+
+    // MARK: _DateComponentsConvertible
+
+    public func dateComponents(timeZone: TimeZone? = nil) -> DateComponents {
+        return DateComponents(timeZone: timeZone, hour: hour, minute: minute, second: second)
+    }
 }
 
 
 // MARK: - NaiveDateTime -
 
 /// Combined date and time without timezone.
-public struct NaiveDateTime: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable {
+public struct NaiveDateTime: Equatable, Hashable, Comparable, LosslessStringConvertible, Codable, _DateComponentsConvertible {
     public let date: NaiveDate
     public let time: NaiveTime
 
@@ -193,11 +205,22 @@ public struct NaiveDateTime: Equatable, Hashable, Comparable, LosslessStringConv
     public func encode(to encoder: Encoder) throws {
         try _encode(self, to: encoder)
     }
+
+    // MARK: _DateComponentsConvertible
+
+    public func dateComponents(timeZone: TimeZone? = nil) -> DateComponents {
+        return DateComponents(timeZone: timeZone, year: date.year, month: date.month, day: date.day, hour: time.hour, minute: time.minute, second: time.second)
+    }
 }
 
 
 // MARK: - Private -
 
+/// A type that can be converted to DateComponents (and in turn to Date).
+internal protocol _DateComponentsConvertible {
+    func dateComponents(timeZone: TimeZone?) -> DateComponents
+}
+
 private func _decode<T: LosslessStringConvertible>(from decoder: Decoder) throws -> T {
     let container = try decoder.singleValueContainer()
     let string = try container.decode(String.self)