Implement NSTimeZone methods and computed properties

Author: xwu

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -287,6 +287,8 @@ typedef pthread_t _CFThreadRef;
 
 CF_EXPORT _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (* _Nonnull startfn)(void *_Nullable), void *restrict _Nullable context);
 
+CF_EXPORT Boolean _CFTimeZoneInitWithTimeIntervalFromGMT(CFTimeZoneRef result, CFTimeInterval ti);
+
 CF_EXPORT Boolean _CFCharacterSetIsLongCharacterMember(CFCharacterSetRef theSet, UTF32Char theChar);
 CF_EXPORT CFCharacterSetRef _CFCharacterSetCreateCopy(CFAllocatorRef alloc, CFCharacterSetRef theSet);
 CF_EXPORT CFMutableCharacterSetRef _CFCharacterSetCreateMutableCopy(CFAllocatorRef alloc, CFCharacterSetRef theSet);

Foundation/NSDateFormatter.swift

@@ -148,7 +148,7 @@ open class DateFormatter : Formatter {
 
     open var generatesCalendarDates = false { willSet { _reset() } }
 
-    /*@NSCopying*/ open var timeZone: TimeZone! = NSTimeZone.systemTimeZone() { willSet { _reset() } }
+    /*@NSCopying*/ open var timeZone: TimeZone! = NSTimeZone.system { willSet { _reset() } }
 
     /*@NSCopying*/ internal var _calendar: Calendar! { willSet { _reset() } }
     open var calendar: Calendar! {

Foundation/NSTimeZone.swift

@@ -82,7 +82,10 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
     // Time zones created with this never have daylight savings and the
     // offset is constant no matter the date; the name and abbreviation
     // do NOT follow the POSIX convention (of minutes-west).
-    public convenience init(forSecondsFromGMT seconds: Int) { NSUnimplemented() }
+    public init(forSecondsFromGMT seconds: Int) {
+        super.init()
+        _CFTimeZoneInitWithTimeIntervalFromGMT(_cfObject, CFTimeInterval(seconds))
+    }
 
     public convenience init?(abbreviation: String) {
         let abbr = abbreviation._cfObject
@@ -165,58 +168,52 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
 extension NSTimeZone {
 
-    open class func systemTimeZone() -> TimeZone {
+    open class var system: TimeZone {
         return CFTimeZoneCopySystem()._swiftObject
     }
 
     open class func resetSystemTimeZone() {
         CFTimeZoneResetSystem()
+        NotificationCenter.default.post(name: NSNotification.Name.NSSystemTimeZoneDidChange, object: nil)
     }
 
-    open class func defaultTimeZone() -> TimeZone {
-        return CFTimeZoneCopyDefault()._swiftObject
-    }
-
-    open class func setDefaultTimeZone(_ aTimeZone: TimeZone) {
-        CFTimeZoneSetDefault(aTimeZone._cfObject)
+    open class var `default`: TimeZone {
+        get {
+            return CFTimeZoneCopyDefault()._swiftObject
+        }
+        set {
+            CFTimeZoneSetDefault(newValue._cfObject)
+            NotificationCenter.default.post(name: NSNotification.Name.NSSystemTimeZoneDidChange, object: nil)
+        }
     }
-}
 
-extension NSTimeZone: _SwiftBridgable, _CFBridgable {
-    typealias SwiftType = TimeZone
-    var _swiftObject: TimeZone { return TimeZone(reference: self) }
-}
+    open class var local: TimeZone { NSUnimplemented() }
 
-extension CFTimeZone : _SwiftBridgable, _NSBridgable {
-    typealias NSType = NSTimeZone
-    var _nsObject : NSTimeZone { return unsafeBitCast(self, to: NSTimeZone.self) }
-    var _swiftObject: TimeZone { return _nsObject._swiftObject }
-}
-
-extension TimeZone : _NSBridgable, _CFBridgable {
-    typealias NSType = NSTimeZone
-    typealias CFType = CFTimeZone
-    var _nsObject : NSTimeZone { return _bridgeToObjectiveC() }
-    var _cfObject : CFTimeZone { return _nsObject._cfObject }
-}
+    open class var knownTimeZoneNames: [String] {
+        guard let knownNames = CFTimeZoneCopyKnownNames() else { return [] }
+        return knownNames._swiftObject.map { ($0 as! NSString)._swiftObject }
+    }
 
-extension NSTimeZone {
-    open class func localTimeZone() -> TimeZone { NSUnimplemented() }
-    
-    open class var knownTimeZoneNames: [String] { NSUnimplemented() }
-    
     open class var abbreviationDictionary: [String : String] {
         get {
-            NSUnimplemented()
+            guard let dictionary = CFTimeZoneCopyAbbreviationDictionary() else { return [:] }
+            var result = [String : String]()
+            dictionary._swiftObject.forEach {
+                result[($0 as! NSString)._swiftObject] = ($1 as! NSString)._swiftObject
+            }
+            return result
         }
         set {
-            NSUnimplemented()
+            CFTimeZoneSetAbbreviationDictionary(newValue._cfObject)
         }
     }
-    
+
     open class var timeZoneDataVersion: String { NSUnimplemented() }
-    
-    open var secondsFromGMT: Int { NSUnimplemented() }
+
+    open var secondsFromGMT: Int {
+        let currentDate = Date()
+        return secondsFromGMT(for: currentDate)
+    }
 
     /// The abbreviation for the receiver, such as "EDT" (Eastern Daylight Time). (read-only)
     ///
@@ -226,15 +223,52 @@ extension NSTimeZone {
         return abbreviation(for: currentDate)
     }
 
-    open var daylightSavingTime: Bool { NSUnimplemented() }
-    open var daylightSavingTimeOffset: TimeInterval { NSUnimplemented() }
-    /*@NSCopying*/ open var nextDaylightSavingTimeTransition: Date?  { NSUnimplemented() }
-    
+    open var isDaylightSavingTime: Bool {
+        let currentDate = Date()
+        return isDaylightSavingTime(for: currentDate)
+    }
+
+    open var daylightSavingTimeOffset: TimeInterval {
+        let currentDate = Date()
+        return daylightSavingTimeOffset(for: currentDate)
+    }
+
+    /*@NSCopying*/ open var nextDaylightSavingTimeTransition: Date?  {
+        let currentDate = Date()
+        return nextDaylightSavingTimeTransition(after: currentDate)
+    }
+
     open func isEqual(to aTimeZone: TimeZone) -> Bool {
         return CFEqual(self._cfObject, aTimeZone._cfObject)
     }
-    
-    open func localizedName(_ style: NameStyle, locale: Locale?) -> String? { NSUnimplemented() }
+
+    open func localizedName(_ style: NameStyle, locale: Locale?) -> String? {
+        #if os(OSX) || os(iOS)
+            let cfStyle = CFTimeZoneNameStyle(rawValue: style.rawValue)!
+        #else
+            let cfStyle = CFTimeZoneNameStyle(style.rawValue)
+        #endif
+        return CFTimeZoneCopyLocalizedName(self._cfObject, cfStyle, locale?._cfObject)._swiftObject
+    }
+
+}
+
+extension NSTimeZone: _SwiftBridgable, _CFBridgable {
+    typealias SwiftType = TimeZone
+    var _swiftObject: TimeZone { return TimeZone(reference: self) }
+}
+
+extension CFTimeZone : _SwiftBridgable, _NSBridgable {
+    typealias NSType = NSTimeZone
+    var _nsObject : NSTimeZone { return unsafeBitCast(self, to: NSTimeZone.self) }
+    var _swiftObject: TimeZone { return _nsObject._swiftObject }
+}
+
+extension TimeZone : _NSBridgable, _CFBridgable {
+    typealias NSType = NSTimeZone
+    typealias CFType = CFTimeZone
+    var _nsObject : NSTimeZone { return _bridgeToObjectiveC() }
+    var _cfObject : CFTimeZone { return _nsObject._cfObject }
 }
 
 extension NSTimeZone {
@@ -249,3 +283,7 @@ extension NSTimeZone {
     }
 
 }
+
+extension NSNotification.Name {
+    public static let NSSystemTimeZoneDidChange = NSNotification.Name(rawValue: "NSSystemTimeZoneDidChangeNotification")
+}

Foundation/TimeZone.swift

@@ -16,10 +16,6 @@ internal func __NSTimeZoneIsAutoupdating(_ timezone: NSTimeZone) -> Bool {
     return false
 }
 
-internal func __NSTimeZoneCurrent() -> NSTimeZone {
-    fatalError()
-}
-
 /**
  `TimeZone` defines the behavior of a time zone. Time zone values represent geopolitical regions. Consequently, these values have names for these regions. Time zone values also represent a temporal offset, either plus or minus, from Greenwich Mean Time (GMT) and an abbreviation (such as PST for Pacific Standard Time).
 
@@ -37,7 +33,12 @@ public struct TimeZone : CustomStringConvertible, CustomDebugStringConvertible,
 
     /// The time zone currently used by the system.
     public static var current : TimeZone {
-        return TimeZone(adoptingReference: __NSTimeZoneCurrent(), autoupdating: false)
+        return NSTimeZone.system
+    }
+
+    /// The time zone currently used by the system, automatically updating to the user’s current preference.
+    public static var autoupdatingCurrent : TimeZone {
+        return NSTimeZone.local
     }
 
     // MARK: -

TestFoundation/TestNSTimeZone.swift

@@ -33,7 +33,7 @@ class TestNSTimeZone: XCTestCase {
     }
 
     func test_abbreviation() {
-        let tz = NSTimeZone.systemTimeZone()
+        let tz = NSTimeZone.system
         let abbreviation1 = tz.abbreviation()
         let abbreviation2 = tz.abbreviation(for: Date())
         XCTAssertEqual(abbreviation1, abbreviation2, "\(abbreviation1) should be equal to \(abbreviation2)")
@@ -61,7 +61,7 @@ class TestNSTimeZone: XCTestCase {
         var t = time(nil)
         var lt = tm()
         localtime_r(&t, &lt)
-        let zoneName = NSTimeZone.systemTimeZone().abbreviation() ?? "Invalid Abbreviation"
+        let zoneName = NSTimeZone.system.abbreviation() ?? "Invalid Abbreviation"
         let expectedName = String(cString: lt.tm_zone, encoding: String.Encoding.ascii) ?? "Invalid Zone"
         XCTAssertEqual(zoneName, expectedName, "expected name \"\(expectedName)\" is not equal to \"\(zoneName)\"")
     }