Merge branch 'develop' into issue/9-fullfill-order

Author: mindgraffiti

WooCommerce/Classes/Authentication/Prologue/LoginPrologueViewController.swift

@@ -70,7 +70,7 @@ private extension LoginPrologueViewController {
     }
 
     func setupUpperLabel() {
-        upperLabel.text = NSLocalizedString("Check your WooCommerce store on the go, fulfill your orders and get notifications of new sales.", comment: "Login Prologue Legend")
+        upperLabel.text = NSLocalizedString("Your WooCommerce store on the go. Check your sales, fulfill your orders, and get notifications of new sales.", comment: "Login Prologue Legend")
         upperLabel.font = UIFont.font(forStyle: .subheadline, weight: .bold)
         upperLabel.textColor = .white
     }
@@ -135,19 +135,23 @@ private extension LoginPrologueViewController {
     /// Returns the Disclaimer Attributed Text (which contains a link to the Jetpack Setup URL).
     ///
     var disclaimerAttributedText: NSAttributedString {
-        let disclaimerText = NSLocalizedString("This app requires Jetpack to be able to connect to your WooCommerce Store.\nFor configuration instructions, ", comment: "Login Disclaimer Text")
+        let disclaimerText = NSLocalizedString("This app requires Jetpack to be able to connect to your WooCommerce Store.\nRead the ", comment: "Login Disclaimer Text and Jetpack config instructions")
         let disclaimerAttributes: [NSAttributedStringKey: Any] =  [
             .font: UIFont.font(forStyle: .caption1, weight: .thin),
             .foregroundColor: UIColor.black
         ]
 
-        let readText = NSLocalizedString("read here.", comment: "Login Disclaimer Linked Text")
+        let readText = NSLocalizedString("configuration instructions", comment: "Login Disclaimer Linked Text")
         var readAttributes = disclaimerAttributes
         readAttributes[.link] = URL(string: WooConstants.jetpackSetupUrl)
-
         let readAttrText = NSMutableAttributedString(string: readText, attributes: readAttributes)
+
+        let endSentenceText = "."
+        let endSentenceAttrText = NSMutableAttributedString(string: endSentenceText, attributes: disclaimerAttributes)
+
         let disclaimerAttrText = NSMutableAttributedString(string: disclaimerText, attributes: disclaimerAttributes)
         disclaimerAttrText.append(readAttrText)
+        disclaimerAttrText.append(endSentenceAttrText)
 
         return disclaimerAttrText
     }

Yosemite/Yosemite/Base/Dispatcher.swift

@@ -25,7 +25,7 @@ public class Dispatcher {
 
     /// Collection of active Action Processors, per action kind.
     ///
-    private(set) var processors = [Action.TypeIdentifier: ActionsProcessor]()
+    private var processors = [Action.TypeIdentifier: WeakProcessor]()
 
 
     ///  Designated Initializer
@@ -41,7 +41,7 @@ public class Dispatcher {
             fatalError("An action type can only be handled by a single processor!")
         }
 
-        processors[actionType.identifier] = processor
+        processors[actionType.identifier] = WeakProcessor(processor: processor)
     }
 
     /// Unregisters the specified Processor from *ALL* of the dispatcher queues.
@@ -60,6 +60,12 @@ public class Dispatcher {
         return processors[actionType.identifier]?.identifier == processor.identifier
     }
 
+    /// Returns the registered ActionsProcessor, for a specified Action, if any exist.
+    ///
+    public func processor(for actionType: Action.Type) -> ActionsProcessor? {
+        return processors[actionType.identifier]?.processor
+    }
+
     /// Dispatches the given action to all registered processors.
     ///
     public func dispatch(_ action: Action) {
@@ -68,3 +74,31 @@ public class Dispatcher {
         processors[action.identifier]?.onAction(action)
     }
 }
+
+
+// MARK: - WeakProcessor: Allows us to weakly-store ActionProcessors, and thus, prevent retain cycles.
+//
+private class WeakProcessor {
+
+    /// The actual ActionsProcessor we're proxying.
+    ///
+    private(set) weak var processor: ActionsProcessor?
+
+    /// Returns the internal Processor's Identifier, if any.
+    ///
+    var identifier: ActionsProcessor.TypeIdentifier? {
+        return processor?.identifier
+    }
+
+    /// Designated Initializer
+    ///
+    init(processor: ActionsProcessor) {
+        self.processor = processor
+    }
+
+    /// Called whenever a given Action is dispatched.
+    ///
+    func onAction(_ action: Action) {
+        processor?.onAction(action)
+    }
+}

Yosemite/YosemiteTests/Base/DispatcherTests.swift

@@ -65,4 +65,14 @@ class DispatcherTests: XCTestCase {
         dispatcher.dispatch(MockupAccountAction.authenticate)
         XCTAssertEqual(processor.receivedActions.count, 1)
     }
+
+    /// Verifies that the Dispatcher does not strongly retain the ActionsProcessors.
+    ///
+    func testProcessorsAreNotStronglyRetainedByDispatcher() {
+        dispatcher.register(processor: processor, for: SiteAction.self)
+        XCTAssertNotNil(dispatcher.processor(for: SiteAction.self))
+        processor = nil
+
+        XCTAssertNil(dispatcher.processor(for: SiteAction.self))
+    }
 }