Merge pull request #5 from Blackjacx/improve_robustness_of_no_time_sh…

…ort_date Improve Robustness By Using Apple's Default Formatting Styles
Blackjacx · Feb 26, 2018 · 83b0dd2 · 83b0dd2
2 parents ba38e74 + 2cd6ddb
commit 83b0dd2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+* [#5](https://github.com/Blackjacx/SHDateFormatter/pull/5): Improve Robustness By Using Apple's Default Formatting Styles - [@blackjacx](https://github.com/blackjacx).
 
 ## [1.0.2] - 2017-10-10
 ### Changed

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ This framework supports encoding as well as decoding many different date and tim
 * `longWeekdayName`        => Sunday, Monday, Tuesday, ...
 * `shortTimeNoDate`        => 12:00 PM, 1:00 AM
 * `noTimeShortDateNoYear`  => 12/31
-* `noTimeShortDate`        => 12/31/2016
-* `noTimeLongDate`         => December 31, 2016
+* `noTimeShortDate`        => 12/02/2018
+* `noTimeLongDate`         => December 2, 2018
 * `noTimeRelativeDate`     => Today, Tomorrow, ...
 * `ISO8601`                => "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"
 

diff --git a/Source/SHDateFormatter.swift b/Source/SHDateFormatter.swift
@@ -15,11 +15,11 @@ struct Calendars {
 public enum SHDateFormat: String {
     case shortWeekdayName       = "EEE"
     case longWeekdayName        = "EEEE"
-    case shortTimeNoDate        = "shortTimeNoDate"
+    case shortTimeNoDate
     case noTimeShortDateNoYear  = "d.M."
-    case noTimeShortDate        = "d.M.yy"
-    case noTimeLongDate         = "d. MMMM yyyy"
-    case noTimeRelativeDate     = "noTimeRelativeDate"
+    case noTimeShortDate
+    case noTimeLongDate
+    case noTimeRelativeDate
     /**
      * The only correct date format for client/server communication.
      * http://oleb.net/blog/2011/11/working-with-date-and-time-in-cocoa-part-2/
@@ -48,9 +48,7 @@ public struct SHDateFormatter {
         switch format {
         case .shortWeekdayName: fallthrough
         case .longWeekdayName: fallthrough
-        case .noTimeShortDateNoYear: fallthrough
-        case .noTimeShortDate: fallthrough
-        case .noTimeLongDate:
+        case .noTimeShortDateNoYear:
             SHDateFormatter.formatter.dateFormat = DateFormatter.dateFormat(fromTemplate: format.rawValue, options: 0, locale: locale)
 
         case .ISO8601:
@@ -62,11 +60,18 @@ public struct SHDateFormatter {
             SHDateFormatter.formatter.timeStyle = .short
             SHDateFormatter.formatter.dateStyle = .none
 
+        case .noTimeShortDate:
+            SHDateFormatter.formatter.timeStyle = .none
+            SHDateFormatter.formatter.dateStyle = .short
+
+        case .noTimeLongDate:
+            SHDateFormatter.formatter.timeStyle = .none
+            SHDateFormatter.formatter.dateStyle = .long
+
         case .noTimeRelativeDate:
             SHDateFormatter.formatter.doesRelativeDateFormatting = true
             SHDateFormatter.formatter.timeStyle = .none
             SHDateFormatter.formatter.dateStyle = .long
-
         }
     }
 

diff --git a/Tests/DateFormatterSpec.swift b/Tests/DateFormatterSpec.swift
@@ -84,7 +84,7 @@ class DateFormatterSpec: QuickSpec {
 
                     it("NoTimeShortDate") {
                         let result = SHDateFormatter.shared.stringFromDate(date: testDate, format: .noTimeShortDate, locale: deDE_Locale, timeZone: timeZone)
-                        expect(result) == "1.1.00"
+                        expect(result) == "01.01.00"
                     }
 
                     it("NoTimeLongDate") {
@@ -170,7 +170,7 @@ class DateFormatterSpec: QuickSpec {
 
                     it("NoTimeShortDate") {
                         let result = SHDateFormatter.shared.stringFromDate(date: testDate, format: .noTimeShortDate, locale: frFR_Locale, timeZone: timeZone)
-                        expect(result) == "01/01/00"
+                        expect(result) == "01/01/2000"
                     }
 
                     it("NoTimeLongDate") {
@@ -218,7 +218,7 @@ class DateFormatterSpec: QuickSpec {
 
                     it("NoTimeShortDate") {
                         let result = SHDateFormatter.shared.stringFromDate(date: testDate, format: .noTimeShortDate, locale: deDE_Locale, timeZone: timeZone)
-                        expect(result) == "2.1.00"
+                        expect(result) == "02.01.00"
                     }
 
                     it("NoTimeLongDate") {
@@ -304,7 +304,7 @@ class DateFormatterSpec: QuickSpec {
 
                     it("NoTimeShortDate") {
                         let result = SHDateFormatter.shared.stringFromDate(date: testDate, format: .noTimeShortDate, locale: frFR_Locale, timeZone: timeZone)
-                        expect(result) == "02/01/00"
+                        expect(result) == "02/01/2000"
                     }
 
                     it("NoTimeLongDate") {