Release 3.0.2 (#69)

ns-vasilev · web-flow · commit 357425fd5ba7 · 2024-09-04T21:30:33.000+07:00
Release `3.0.2`
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 
 #### 3.x Releases
-- `3.0.x` Releases - [`3.0.0`](#300) | [`3.0.1`](#301)
+- `3.0.x` Releases - [`3.0.0`](#300) | [`3.0.1`](#301) | [`3.0.2`](#302)
 - `3.0.0` Release Candidates - [`3.0.0-rc.1`](#300-rc1) | [`3.0.0-rc.2`](#300-rc2)
 
 #### 2.x Releases
@@ -11,6 +11,17 @@ All notable changes to this project will be documented in this file.
 #### 1.x Releases
 - `1.0.x` Releases - [1.0.0](#100)
 
+## [3.0.2](https://github.com/space-code/flare/releases/tag/3.0.2)
+Released on 2024-09-04.
+
+## Added
+- Implement localizedPriceString for StoreProductDiscount & currencySymbol for StoreProduct
+  - Added in Pull Request [#66](https://github.com/space-code/flare/pull/66).
+
+## Fixed
+- Fix the code formatting
+  - Fixed in Pull Request [#67](https://github.com/space-code/flare/pull/67)
+
 ## [3.0.1](https://github.com/space-code/flare/releases/tag/3.0.1)
 Released on 2024-08-09.
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,7 +47,7 @@ GEM
     open4 (1.3.4)
     public_suffix (5.0.3)
     rchardet (1.8.0)
-    rexml (3.3.3)
+    rexml (3.3.6)
       strscan
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/Flare/Classes/Extensions/Formatters/NumberFormatter+.swift b/Sources/Flare/Classes/Extensions/Formatters/NumberFormatter+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Extensions/Locale/Locale+CurrencyCode.swift b/Sources/Flare/Classes/Extensions/Locale/Locale+CurrencyCode.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Extensions/ProductType+.swift b/Sources/Flare/Classes/Extensions/ProductType+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift b/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift
@@ -7,7 +7,7 @@ import StoreKit
 
 private var requestIdKey: UInt = 0
 
-internal extension SKRequest {
+extension SKRequest {
     var id: String {
         get {
             objc_getAssociatedObject(self, &requestIdKey) as? String ?? ""
diff --git a/Sources/Flare/Classes/Helpers/AsyncSequence/AsyncSequence+Stream.swift b/Sources/Flare/Classes/Helpers/AsyncSequence/AsyncSequence+Stream.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Models/IAPError.swift b/Sources/Flare/Classes/Models/IAPError.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import StoreKit
diff --git a/Sources/Flare/Classes/Models/Internal/Protocols/ISKProduct.swift b/Sources/Flare/Classes/Models/Internal/Protocols/ISKProduct.swift
@@ -16,6 +16,9 @@ protocol ISKProduct {
     /// The currency code for the product's price.
     var currencyCode: String? { get }
 
+    /// The currency Symbol for the product's price.
+    var currencySymbol: String? { get }
+
     /// The price of the product in decimal format.
     var price: Decimal { get }
 
diff --git a/Sources/Flare/Classes/Models/Internal/Protocols/IStoreProductDiscount.swift b/Sources/Flare/Classes/Models/Internal/Protocols/IStoreProductDiscount.swift
@@ -18,6 +18,9 @@ protocol IStoreProductDiscount: Sendable {
     /// The discounted price in the specified currency.
     var price: Decimal { get }
 
+    /// A localized string representing the price of the product.
+    var localizedPriceString: String? { get }
+
     /// The payment mode associated with the discount (e.g., freeTrial, payUpFront, payAsYouGo).
     var paymentMode: PaymentMode { get }
 
diff --git a/Sources/Flare/Classes/Models/Internal/SK1StoreProduct.swift b/Sources/Flare/Classes/Models/Internal/SK1StoreProduct.swift
@@ -39,6 +39,10 @@ extension SK1StoreProduct: ISKProduct {
         product.priceLocale.currencyCodeID
     }
 
+    var currencySymbol: String? {
+        numberFormatter.currencySymbol
+    }
+
     var price: Decimal {
         product.price as Decimal
     }
diff --git a/Sources/Flare/Classes/Models/Internal/SK1StoreProductDiscount.swift b/Sources/Flare/Classes/Models/Internal/SK1StoreProductDiscount.swift
@@ -21,6 +21,9 @@ struct SK1StoreProductDiscount: IStoreProductDiscount {
     /// The discounted price in the specified currency.
     let price: Decimal
 
+    /// A localized string representing the price of the product.
+    let localizedPriceString: String?
+
     /// The payment mode associated with the discount (e.g., freeTrial, payUpFront, payAsYouGo).
     let paymentMode: PaymentMode
 
@@ -56,5 +59,9 @@ struct SK1StoreProductDiscount: IStoreProductDiscount {
         self.subscriptionPeriod = subscriptionPeriod
         numberOfPeriods = productDiscount.numberOfPeriods
         type = discountType
+
+        /// The price formatter.
+        let numberFormatter: NumberFormatter = .numberFormatter(with: self.productDiscount.priceLocale)
+        localizedPriceString = numberFormatter.string(from: self.productDiscount.price)
     }
 }
diff --git a/Sources/Flare/Classes/Models/Internal/SK1StoreTransaction.swift b/Sources/Flare/Classes/Models/Internal/SK1StoreTransaction.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import StoreKit
diff --git a/Sources/Flare/Classes/Models/Internal/SK2StoreProduct.swift b/Sources/Flare/Classes/Models/Internal/SK2StoreProduct.swift
@@ -20,6 +20,9 @@ final class SK2StoreProduct {
         product.priceFormatStyle
     }
 
+    /// The price formatter.
+    private lazy var numberFormatter: NumberFormatter = .numberFormatter(with: self.currencyFormat.locale)
+
     // MARK: Initialization
 
     init(_ product: StoreKit.Product) {
@@ -43,6 +46,10 @@ extension SK2StoreProduct: ISKProduct {
         currencyFormat.currencyCode
     }
 
+    var currencySymbol: String? {
+        numberFormatter.currencySymbol
+    }
+
     var price: Decimal {
         product.price
     }
diff --git a/Sources/Flare/Classes/Models/Internal/SK2StoreProductDiscount.swift b/Sources/Flare/Classes/Models/Internal/SK2StoreProductDiscount.swift
@@ -22,6 +22,9 @@ struct SK2StoreProductDiscount: IStoreProductDiscount, Sendable {
     /// The discounted price in the specified currency.
     let price: Decimal
 
+    /// A localized string representing the price of the product.
+    let localizedPriceString: String?
+
     /// The payment mode associated with the discount (e.g., freeTrial, payUpFront, payAsYouGo).
     let paymentMode: PaymentMode
 
@@ -58,5 +61,6 @@ struct SK2StoreProductDiscount: IStoreProductDiscount, Sendable {
         self.subscriptionPeriod = subscriptionPeriod
         numberOfPeriods = subscriptionOffer.periodCount
         type = discountType
+        localizedPriceString = subscriptionOffer.displayPrice
     }
 }
diff --git a/Sources/Flare/Classes/Models/Internal/StoreEnvironment.swift b/Sources/Flare/Classes/Models/Internal/StoreEnvironment.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Models/ProductType.swift b/Sources/Flare/Classes/Models/ProductType.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Sources/Flare/Classes/Models/StoreProduct.swift b/Sources/Flare/Classes/Models/StoreProduct.swift
@@ -62,6 +62,10 @@ extension StoreProduct: ISKProduct {
         product.currencyCode
     }
 
+    public var currencySymbol: String? {
+        product.currencySymbol
+    }
+
     public var price: Decimal {
         product.price
     }
diff --git a/Sources/Flare/Classes/Models/StoreProductDiscount.swift b/Sources/Flare/Classes/Models/StoreProductDiscount.swift
@@ -64,6 +64,10 @@ extension StoreProductDiscount: IStoreProductDiscount {
         discount.price
     }
 
+    public var localizedPriceString: String? {
+        discount.localizedPriceString
+    }
+
     public var paymentMode: PaymentMode {
         discount.paymentMode
     }
diff --git a/Sources/Flare/Classes/Providers/PaymentProvider/PaymentProvider.swift b/Sources/Flare/Classes/Providers/PaymentProvider/PaymentProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import Concurrency
diff --git a/Sources/Flare/Classes/Providers/ProductProvider/IProductProvider.swift b/Sources/Flare/Classes/Providers/ProductProvider/IProductProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import StoreKit
diff --git a/Sources/Flare/Classes/Providers/ProductProvider/ProductProvider.swift b/Sources/Flare/Classes/Providers/ProductProvider/ProductProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import Atomic
diff --git a/Sources/Flare/Classes/Providers/ReceiptRefreshProvider/ReceiptRefreshProvider.swift b/Sources/Flare/Classes/Providers/ReceiptRefreshProvider/ReceiptRefreshProvider.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import Concurrency
diff --git a/Sources/FlareMock/Mocks/ProductMock.swift b/Sources/FlareMock/Mocks/ProductMock.swift
@@ -39,6 +39,16 @@ public final class ProductMock: ISKProduct {
         return stubbedCurrencyCode
     }
 
+    public var invokedCurrencySymbolGetter = false
+    public var invokedCurrencySymbolGetterCount = 0
+    public var stubbedCurrencySymbol: String!
+
+    public var currencySymbol: String? {
+        invokedCurrencySymbolGetter = true
+        invokedCurrencySymbolGetterCount += 1
+        return stubbedCurrencySymbol
+    }
+
     public var invokedPriceGetter = false
     public var invokedPriceGetterCount = 0
     public var stubbedPrice: Decimal!
diff --git a/Tests/FlareTests/UnitTests/FlareTests.swift b/Tests/FlareTests/UnitTests/FlareTests.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/Providers/IAPProviderTests.swift b/Tests/FlareTests/UnitTests/Providers/IAPProviderTests.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/Providers/ProductProviderTests.swift b/Tests/FlareTests/UnitTests/Providers/ProductProviderTests.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import Concurrency
diff --git a/Tests/FlareTests/UnitTests/Providers/RefundRequestProviderTests.swift b/Tests/FlareTests/UnitTests/Providers/RefundRequestProviderTests.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Extensions/Result+.swift b/Tests/FlareTests/UnitTests/TestHelpers/Extensions/Result+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import Foundation
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Extensions/XCTestCase+.swift b/Tests/FlareTests/UnitTests/TestHelpers/Extensions/XCTestCase+.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import XCTest
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Fakes/StoreTransactionFake.swift b/Tests/FlareTests/UnitTests/TestHelpers/Fakes/StoreTransactionFake.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Helpers/AvailabilityChecker.swift b/Tests/FlareTests/UnitTests/TestHelpers/Helpers/AvailabilityChecker.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 import XCTest
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Helpers/PurchaseManagerTestHelper.swift b/Tests/FlareTests/UnitTests/TestHelpers/Helpers/PurchaseManagerTestHelper.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Helpers/WindowSceneFactory.swift b/Tests/FlareTests/UnitTests/TestHelpers/Helpers/WindowSceneFactory.swift
@@ -1,12 +1,12 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 #if os(iOS) || VISION_OS
     import UIKit
 
-    final class WindowSceneFactory {
+    enum WindowSceneFactory {
         static func makeWindowScene() -> UIWindowScene {
             UIApplication.shared.connectedScenes.first as! UIWindowScene
         }
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Mocks/SKProductMock.swift b/Tests/FlareTests/UnitTests/TestHelpers/Mocks/SKProductMock.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2024 Space Code. All rights reserved.
+// Copyright © 2023 Space Code. All rights reserved.
 //
 
 import StoreKit
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Mocks/StoreTransactionMock.swift b/Tests/FlareTests/UnitTests/TestHelpers/Mocks/StoreTransactionMock.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Stubs/StoreTransactionStub.swift b/Tests/FlareTests/UnitTests/TestHelpers/Stubs/StoreTransactionStub.swift
@@ -1,6 +1,6 @@
 //
 // Flare
-// Copyright © 2023 Space Code. All rights reserved.
+// Copyright © 2024 Space Code. All rights reserved.
 //
 
 @testable import Flare
diff --git a/Tests/FlareUITests/UnitTests/Presentation/Subscriptions/SubscriptionsPresenterTests.swift b/Tests/FlareUITests/UnitTests/Presentation/Subscriptions/SubscriptionsPresenterTests.swift
diff --git a/Tests/IntegrationTests/Helpers/Extensions/Result+.swift b/Tests/IntegrationTests/Helpers/Extensions/Result+.swift
diff --git a/Tests/IntegrationTests/Helpers/Extensions/XCTestCase+.swift b/Tests/IntegrationTests/Helpers/Extensions/XCTestCase+.swift
diff --git a/Tests/UnitTestHostApp/AppDelegate.swift b/Tests/UnitTestHostApp/AppDelegate.swift

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ extension SK1StoreProduct: ISKProduct {`
`39`	`39`	`product.priceLocale.currencyCodeID`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ var currencySymbol: String? {`
	`43`	`+ numberFormatter.currencySymbol`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`var price: Decimal {`
`43`	`47`	`product.price as Decimal`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ final class SK2StoreProduct {`
`20`	`20`	`product.priceFormatStyle`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /// The price formatter.`
	`24`	`+ private lazy var numberFormatter: NumberFormatter = .numberFormatter(with: self.currencyFormat.locale)`
	`25`	`+`
`23`	`26`	`// MARK: Initialization`
`24`	`27`
`25`	`28`	`init(_ product: StoreKit.Product) {`
`@@ -43,6 +46,10 @@ extension SK2StoreProduct: ISKProduct {`
`43`	`46`	`currencyFormat.currencyCode`
`44`	`47`	`}`
`45`	`48`
	`49`	`+ var currencySymbol: String? {`
	`50`	`+ numberFormatter.currencySymbol`
	`51`	`+ }`
	`52`	`+`
`46`	`53`	`var price: Decimal {`
`47`	`54`	`product.price`
`48`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ struct SK2StoreProductDiscount: IStoreProductDiscount, Sendable {`
`22`	`22`	`/// The discounted price in the specified currency.`
`23`	`23`	`let price: Decimal`
`24`	`24`
	`25`	`+ /// A localized string representing the price of the product.`
	`26`	`+ let localizedPriceString: String?`
	`27`	`+`
`25`	`28`	`/// The payment mode associated with the discount (e.g., freeTrial, payUpFront, payAsYouGo).`
`26`	`29`	`let paymentMode: PaymentMode`
`27`	`30`
`@@ -58,5 +61,6 @@ struct SK2StoreProductDiscount: IStoreProductDiscount, Sendable {`
`58`	`61`	`self.subscriptionPeriod = subscriptionPeriod`
`59`	`62`	`numberOfPeriods = subscriptionOffer.periodCount`
`60`	`63`	`type = discountType`
	`64`	`+ localizedPriceString = subscriptionOffer.displayPrice`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ extension StoreProduct: ISKProduct {`
`62`	`62`	`product.currencyCode`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ public var currencySymbol: String? {`
	`66`	`+ product.currencySymbol`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`public var price: Decimal {`
`66`	`70`	`product.price`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ extension StoreProductDiscount: IStoreProductDiscount {`
`64`	`64`	`discount.price`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public var localizedPriceString: String? {`
	`68`	`+ discount.localizedPriceString`
	`69`	`+ }`
	`70`	`+`
`67`	`71`	`public var paymentMode: PaymentMode {`
`68`	`72`	`discount.paymentMode`
`69`	`73`	`}`