Merge branch 'release/5.0.12'

README.md

@@ -21,7 +21,7 @@ SwiftDate is the **definitive toolchain to manipulate and display dates and time
 
 ### Help SwiftDate Development
 
-<img src="Documentation/support_patreon_button.png" width=160px alt="SwiftDate" title="SwiftDate" ahref="https://www.patreon.com/danielemargutti">
+<a href="https://www.patreon.com/danielemargutti"><img src="Documentation/support_patreon_button.png" width=160px alt="SwiftDate" title="SwiftDate"></a>
 </p>
 
 If you are using SwiftDate or any other my libraries please [consider support further development](https://www.patreon.com/danielemargutti) and mainteniance becoming a patreon.

Sources/SwiftDate/DateInRegion/DateInRegion.swift

@@ -17,11 +17,6 @@ public struct DateInRegion: DateRepresentable, Decodable, Encodable, CustomStrin
 	/// Associated region which define where the date is represented into the world.
 	public let region: Region
 
-	/// Allows to generate an unique hash vaalue for an instance of `DateInRegion`
-	public var hashValue: Int {
-		return combineHashes([self.date.hashValue, self.region.hashValue])
-	}
-
 	/// Formatter used to transform this object in a string. By default is `nil` because SwiftDate
 	/// uses the thread shared formatter in order to avoid expensive init of the `DateFormatter` object.
 	/// However, if you need of a custom behaviour you can set a valid value.

Sources/SwiftDate/DateRepresentable.swift

@@ -66,8 +66,9 @@ public protocol DateRepresentable {
 	/// Name of the weekday expressed in given format style.
 	///
 	/// - Parameter style: style to express the value.
+	/// - Parameter locale: locale to use; ignore it to use default's region locale.
 	/// - Returns: weekday name
-	func weekdayName(_ style: SymbolFormatStyle) -> String
+	func weekdayName(_ style: SymbolFormatStyle, locale: LocaleConvertible?) -> String
 
 	/// Week of a year of the receiver.
 	var weekOfYear: Int { get }
@@ -95,17 +96,19 @@ public protocol DateRepresentable {
 	/// Quarter name expressed in given format style.
 	///
 	/// - Parameter style: style to express the value.
+	/// - Parameter locale: locale to use; ignore it to use default's region locale.
 	/// - Returns: quarter name
-	func quarterName(_ style: SymbolFormatStyle) -> String
+	func quarterName(_ style: SymbolFormatStyle, locale: LocaleConvertible?) -> String
 
 	/// Era value of the receiver.
 	var era: Int { get }
 
 	/// Name of the era expressed in given format style.
 	///
 	/// - Parameter style: style to express the value.
+	/// - Parameter locale: locale to use; ignore it to use default's region locale.
 	/// - Returns: era
-	func eraName(_ style: SymbolFormatStyle) -> String
+	func eraName(_ style: SymbolFormatStyle, locale: LocaleConvertible?) -> String
 
 	/// The current daylight saving time offset of the represented date.
 	var DSTOffset: TimeInterval { get }
@@ -376,8 +379,10 @@ public extension DateRepresentable {
 		return self.dateComponents.weekday!
 	}
 
-	func weekdayName(_ style: SymbolFormatStyle) -> String {
-		let formatter = self.formatter(format: nil)
+	func weekdayName(_ style: SymbolFormatStyle, locale: LocaleConvertible? = nil) -> String {
+		let formatter = self.formatter(format: nil) {
+			$0.locale = (locale ?? self.region.locale).toLocale()
+		}
 		let idx = (self.weekday - 1)
 		switch style {
 		case .default:				return formatter.weekdaySymbols[idx]
@@ -442,9 +447,11 @@ public extension DateRepresentable {
 		return self.date > Date()
 	}
 
-	func quarterName(_ style: SymbolFormatStyle) -> String {
-		let formatter = self.formatter(format: nil)
-		let idx = self.quarter
+	func quarterName(_ style: SymbolFormatStyle, locale: LocaleConvertible? = nil) -> String {
+		let formatter = self.formatter(format: nil) {
+			$0.locale = (locale ?? self.region.locale).toLocale()
+		}
+		let idx = (self.quarter - 1)
 		switch style {
 		case .default:									return formatter.quarterSymbols[idx]
 		case .defaultStandalone:						return formatter.standaloneQuarterSymbols[idx]
@@ -457,8 +464,10 @@ public extension DateRepresentable {
 		return self.dateComponents.era!
 	}
 
-	func eraName(_ style: SymbolFormatStyle) -> String {
-		let formatter = self.formatter(format: nil)
+	func eraName(_ style: SymbolFormatStyle, locale: LocaleConvertible? = nil) -> String {
+		let formatter = self.formatter(format: nil) {
+			$0.locale = (locale ?? self.region.locale).toLocale()
+		}
 		let idx = (self.era - 1)
 		switch style {
 		case .default, .defaultStandalone:								return formatter.longEraSymbols[idx]

Sources/SwiftDate/Supports/Commons.swift

@@ -331,26 +331,6 @@ public struct TimeCalculationOptions {
 	}
 }
 
-// MARK: - Hash Generation
-
-// Note: we can remove it for Swift 4.2
-// https://github.com/krzysztofzablocki/Sourcery/blob/a092c4b2a47daee26fa11b8be92e0484a5bc9633/Templates/Tests/Expected/AutoHashable.expected#L7
-internal func combineHashes(_ hashes: [Int]) -> Int {
-	return hashes.reduce(0, combineHashValues)
-}
-
-private func combineHashValues(_ initial: Int, _ other: Int) -> Int {
-	#if arch(x86_64) || arch(arm64)
-	let magic: UInt = 0x9e3779b97f4a7c15
-	#elseif arch(i386) || arch(arm) || arch(arm64_32)
-	let magic: UInt = 0x9e3779b9
-	#endif
-	var lhs = UInt(bitPattern: initial)
-	let rhs = UInt(bitPattern: other)
-	lhs ^= rhs &+ magic &+ (lhs << 6) &+ (lhs >> 2)
-	return Int(bitPattern: lhs)
-}
-
 //MARK: - compactMap for Swift 4.0 (not necessary > 4.0)
 
 #if swift(>=4.1)

SwiftDate.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftDate"
-  s.version      = "5.0.11"
+  s.version      = "5.0.12"
   s.summary      = "The best way to deal with Dates & Time Zones in Swift"
   s.homepage     = "https://github.com/malcommac/SwiftDate.git"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -13,5 +13,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/malcommac/SwiftDate.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*"
   s.frameworks  = "Foundation"
-  s.swift_version = "4.0"
+  s.swift_version = "4.2"
 end

Tests/SwiftDateTests/TestDateInRegion+Components.swift

@@ -55,8 +55,9 @@ class TestDateInRegion_Components: XCTestCase {
 		// TEST #3: Other components
 		XCTAssert( (dateB.region == regionParis), "Failed to assign correct region to date")
 		XCTAssert( (dateB.calendar.identifier == regionParis.calendar.identifier), "Failed to assign correct region's calendar to date")
-		XCTAssert( (dateB.quarterName(.default) == "2e trimestre"), "Failed to get quarterName in default")
-		XCTAssert( (dateB.quarterName(.short) == "T2"), "Failed to get quarterName in short")
+		XCTAssert( (dateB.quarterName(.default) == "1er trimestre"), "Failed to get quarterName in default")
+		XCTAssert( (dateB.quarterName(.short) == "T1"), "Failed to get quarterName in short")
+		XCTAssert( (dateB.quarterName(.default, locale: Locales.italian) == "1º trimestre"), "Failed to get quarterName with overwrite of locale")
 	}
 
 	func testDateInRegion_isLeapMonth() {
@@ -253,4 +254,12 @@ class TestDateInRegion_Components: XCTestCase {
 		XCTAssert( dateB.quarter == 3, "Failed to evaluate quarter property")
 		XCTAssert( dateC.quarter == 4, "Failed to evaluate quarter property")
 	}
+
+	func testAbsoluteDateISOFormatting() {
+		let now = DateInRegion()
+		let iso8601_string = now.toISO([.withInternetDateTime])
+		let absoluteDate = now.date
+		let absoluteDate_iso8601_string = absoluteDate.toISO([.withInternetDateTime])
+		XCTAssert( absoluteDate_iso8601_string == iso8601_string, "Failed respect the absolute ISO date")
+	}
 }