Make toSortedArray similar to toArray

Author: freak4pc

Source/RxSwift/toSortedArray.swift

@@ -2,37 +2,33 @@
 //  toSortedArray.swift
 //  RxSwiftExt
 //
-//  Created by Joan Disho on 17.02.18.
-//  Copyright © 2018 RxSwiftCommunity. All rights reserved.
+//  Created by Joan Disho on 17/02/18.
+//  Copyright © 2018 RxSwift Community. All rights reserved.
 //
 
 import Foundation
 import RxSwift
 
-extension Observable where E: Sequence, E.Element: Comparable {
+public extension ObservableType {
     /**
-     Transforms an observable of comparables into an observable of ordered arrays.
+     Converts an Observable into another Observable that emits the whole sequence as a single array, sorts it using the provided closure and then terminates.
 
-     - parameter ascending: Defined the sorting direction. Defaults to ascending.
-     - returns: The sorted observable.
+     - parameter by: A comparator closure to sort emitted elements.
+     - returns: An observable sequence containing all the sorted emitted elements as an array.
     */
-    public func toSortedArray<T>(ascending: Bool = true)
-        -> Observable<[T]> where E.Element == T {
-        return toSortedArray({ ascending ? $0 < $1 : $0 > $1 })
+    func toSortedArray(by: @escaping (E, E) -> Bool) -> Observable<[E]> {
+        return toArray().map { $0.sorted(by: by) }
     }
+}
 
+public extension ObservableType where E: Comparable {
     /**
-     Transforms an observable of comparables into an observable of ordered arrays by using the function passed in.
-     
-     - parameter areInIncreasingOrder: A function to compare to elements.
-     - returns: The sorted observable.
-     */
-    public func toSortedArray<T>(_ areInIncreasingOrder: @escaping (T, T) -> Bool)
-        -> Observable<[T]> where E.Element == T {
-            return toArray().map { elements in
-                elements.flatMap { element in
-                    element.sorted(by: areInIncreasingOrder)
-                }
-            }
+     Converts an Observable into another Observable that emits the whole sequence as a single array, sorts it using the provided closure and then terminates.
+
+     - parameter ascending: Should the emitted items be ascendign or descending.
+     - returns: An observable sequence containing all the sorted emitted elements as an array.
+    */
+    func toSortedArray(ascending: Bool = true) -> Observable<[E]> {
+        return toSortedArray(by: { ascending ? $0 < $1 : $0 > $1 })
     }
 }

Tests/RxSwift/ToSortedArrayTests.swift

@@ -20,7 +20,7 @@ class ToSortedArrayTests: XCTestCase {
     }
 
     func testDefaultToSortedArray() {
-        let source = Observable.of([1, 4, 6, 1, 7, 8])
+        let source = Observable.of(1, 4, 6, 1, 7, 8)
         let observer = runAndObserve(source.toSortedArray())
         let correct = [
             next(0, [1, 1, 4, 6, 7, 8]),
@@ -30,8 +30,8 @@ class ToSortedArrayTests: XCTestCase {
     }
 
     func testAscCase() {
-        let source = Observable.of([1, 4, 6, 1, 7, 8])
-        let observer = runAndObserve(source.toSortedArray(<))
+        let source = Observable.of(1, 4, 6, 1, 7, 8)
+        let observer = runAndObserve(source.toSortedArray(ascending: true))
         let correct = [
             next(0, [1, 1, 4, 6, 7, 8]),
             completed(0)
@@ -40,8 +40,8 @@ class ToSortedArrayTests: XCTestCase {
     }
 
     func testDescCase() {
-        let source = Observable.of([1, 4, 6, 1, 7, 8])
-        let observer = runAndObserve(source.toSortedArray(>))
+        let source = Observable.of(1, 4, 6, 1, 7, 8)
+        let observer = runAndObserve(source.toSortedArray(ascending: false))
         let correct = [
             next(0, [8, 7, 6, 4, 1, 1]),
             completed(0)