Merge pull request #169 from optimizely/jae/names

change names to OptimizelyClient and start

Author: jaeopt

DemoObjCApp/AppDelegate.m

@@ -33,7 +33,7 @@
 @interface AppDelegate ()
 @property(nonnull, strong, nonatomic) NSString *userId;
 @property(nonnull, strong, nonatomic) NSDictionary *attributes;
-@property(nullable, strong, nonatomic) OptimizelyManager *optimizely;
+@property(nullable, strong, nonatomic) OptimizelyClient *optimizely;
 @end
 
 @implementation AppDelegate
@@ -62,9 +62,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 // MARK: - Initialization Examples
 
 -(void)initializeOptimizelySDKAsynchronous {
-    self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey];
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey];
 
-    [self.optimizely initializeSDKWithCompletion:^(NSData *data, NSError *error) {
+    [self.optimizely startWithCompletion:^(NSData *data, NSError *error) {
         if (error == nil) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
@@ -84,7 +84,7 @@ -(void)initializeOptimizelySDKSynchronous {
         return;
     }
 
-    self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey];
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey];
 
     NSString *datafileJSON = [NSString stringWithContentsOfFile:localDatafilePath encoding:NSUTF8StringEncoding error:nil];
 
@@ -93,7 +93,7 @@ -(void)initializeOptimizelySDKSynchronous {
         self.optimizely = nil;
     } else {
         NSError *error;
-        BOOL status = [self.optimizely initializeSDKWithDatafile:datafileJSON error:&error];
+        BOOL status = [self.optimizely startWithDatafile:datafileJSON error:&error];
         if (status) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {
@@ -113,7 +113,7 @@ -(void)initializeOptimizelySDKWithCustomization {
     // This should be should be much larger (default = 10 mins).
     NSNumber *customDownloadIntervalInSecs = @(30);
 
-    self.optimizely = [[OptimizelyManager alloc] initWithSdkKey:kOptimizelySdkKey
+    self.optimizely = [[OptimizelyClient alloc] initWithSdkKey:kOptimizelySdkKey
                                                          logger:customLogger
                                                 eventDispatcher:nil
                                              userProfileService:nil
@@ -144,7 +144,7 @@ -(void)initializeOptimizelySDKWithCustomization {
 #endif
     }];
 
-    [self.optimizely initializeSDKWithCompletion:^(NSData *data, NSError *error) {
+    [self.optimizely startWithCompletion:^(NSData *data, NSError *error) {
         if (error == nil) {
             NSLog(@"Optimizely SDK initialized successfully!");
         } else {

DemoObjCApp/VariationViewController.h

@@ -16,10 +16,10 @@
 
 #import <UIKit/UIKit.h>
 
-@class OptimizelyManager;
+@class OptimizelyClient;
 
 @interface VariationViewController : UIViewController
-@property(nullable, nonatomic, strong) OptimizelyManager *optimizely;
+@property(nullable, nonatomic, strong) OptimizelyClient *optimizely;
 @property(nonnull, nonatomic, strong) NSString *eventKey;
 @property(nonnull, nonatomic, strong) NSString *variationKey;
 @property(nonnull, nonatomic, strong) NSString *userId;

DemoSwiftApp/AppDelegate.swift

@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let attributes: [String : Any?] = ["browser_type": "safari", "bool_attr": false]
 
     var window: UIWindow?
-    var optimizely: OptimizelyManager!
+    var optimizely: OptimizelyClient!
     var storyboard: UIStoryboard {
         #if os(iOS)
         return UIStoryboard(name: "iOSMain", bundle: nil)
@@ -61,9 +61,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // MARK: - Initialization Examples
 
     func initializeOptimizelySDKAsynchronous() {
-        optimizely = OptimizelyManager(sdkKey: sdkKey)
+        optimizely = OptimizelyClient(sdkKey: sdkKey)
 
-        optimizely.initializeSDK { result in
+        optimizely.start { result in
             switch result {
             case .failure(let error):
                 print("Optimizely SDK initiliazation failed: \(error)")
@@ -83,11 +83,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             fatalError("Local datafile cannot be found")
         }
 
-        optimizely = OptimizelyManager(sdkKey: sdkKey)
+        optimizely = OptimizelyClient(sdkKey: sdkKey)
 
         do {
             let datafileJSON = try String(contentsOfFile: localDatafilePath, encoding: .utf8)
-            try optimizely!.initializeSDK(datafile: datafileJSON)
+            try optimizely!.start(datafile: datafileJSON)
             print("Optimizely SDK initialized successfully!")
         } catch {
             print("Optimizely SDK initiliazation failed: \(error)")
@@ -105,7 +105,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // This should be should be much larger (default = 10 mins).
         let customDownloadIntervalInSecs = 30
 
-        optimizely = OptimizelyManager(sdkKey: sdkKey,
+        optimizely = OptimizelyClient(sdkKey: sdkKey,
                                        logger: customLogger,
                                        periodicDownloadInterval: customDownloadIntervalInSecs)
 
@@ -154,7 +154,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         // initialize SDK
 
-        optimizely!.initializeSDK { result in
+        optimizely!.start { result in
             switch result {
             case .failure(let error):
                 print("Optimizely SDK initiliazation failed: \(error)")

DemoSwiftApp/VariationViewController.swift

@@ -22,7 +22,7 @@ class VariationViewController: UIViewController {
     var eventKey: String!
     var userId: String!
     var variationKey: String?
-    var optimizely: OptimizelyManager?
+    var optimizely: OptimizelyClient?
     var showCoupon: Bool = false {
         didSet  {
             DispatchQueue.main.async {

OptimizelySDK/Extensions/OptimizelyManager+Extension.swift renamed to OptimizelySDK/Extensions/OptimizelyClient+Extension.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 
-extension OptimizelyManager {
+extension OptimizelyClient {
     func registerServices(sdkKey:String,
                           logger:OPTLogger,
                           eventDispatcher:OPTEventDispatcher,

OptimizelySDK/Optimizely/OptimizelyManager+ObjC.swift renamed to OptimizelySDK/Optimizely/OptimizelyClient+ObjC.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 
-extension OptimizelyManager {
+extension OptimizelyClient {
 
 
     @available(swift, obsoleted: 1.0)
@@ -58,16 +58,16 @@ extension OptimizelyManager {
     }
 
     @available(swift, obsoleted: 1.0)
-    @objc(initializeSDKWithCompletion:)
+    @objc(startWithCompletion:)
     /// Start Optimizely SDK (Asynchronous)
     ///
     /// If an updated datafile is available in the server, it's downloaded and the SDK is configured with
     /// the updated datafile.
     ///
     /// - Parameters:
     ///   - completion: callback when initialization is completed
-    public func _objcInitializeSDK(completion: ((Data?, NSError?) -> Void)?) {
-        initializeSDK { result in
+    public func _objcStart(completion: ((Data?, NSError?) -> Void)?) {
+        start { result in
             switch result {
             case .failure(let error):
                 completion?(nil, self.convertErrorForObjc(error))
@@ -78,19 +78,19 @@ extension OptimizelyManager {
     }
 
     @available(swift, obsoleted: 1.0)
-    @objc(initializeSDKWithDatafile:error:)
+    @objc(startWithDatafile:error:)
     /// Start Optimizely SDK (Synchronous)
     ///
     /// - Parameters:
     ///   - datafile: This datafile will be used when cached copy is not available (fresh start).
     ///             A cached copy from previous download is used if it's available.
     ///             The datafile will be updated from the server in the background thread.
     public func _objcStartWith(datafile:String) throws {
-        try self.initializeSDK(datafile: datafile)
+        try self.start(datafile: datafile)
     }
 
     @available(swift, obsoleted: 1.0)
-    @objc(initializeSDKWithDatafile:doFetchDatafileBackground:error:)
+    @objc(startWithDatafile:doFetchDatafileBackground:error:)
     /// Start Optimizely SDK (Synchronous)
     ///
     /// - Parameters:
@@ -101,7 +101,7 @@ extension OptimizelyManager {
     ///             you don't want to download the datafile.  In practice, you should allow the
     ///             background thread to update the cache copy (optional)
     public func _objcStart(datafile: Data, doFetchDatafileBackground: Bool = true) throws {
-        try self.initializeSDK(datafile: datafile, doFetchDatafileBackground: doFetchDatafileBackground)
+        try self.start(datafile: datafile, doFetchDatafileBackground: doFetchDatafileBackground)
     }
 
     @available(swift, obsoleted: 1.0)
@@ -310,7 +310,7 @@ extension OptimizelyManager {
 
 // MARK: - ObjC Type Conversions
 
-extension OptimizelyManager {
+extension OptimizelyClient {
 
     /// EventDispatcher implementation for Objective-C interface support
     class SwiftEventDispatcher: OPTEventDispatcher {

OptimizelySDK/Optimizely/OptimizelyManager.swift renamed to OptimizelySDK/Optimizely/OptimizelyClient.swift

@@ -19,7 +19,7 @@ import Foundation
 public typealias OptimizelyAttributes = [String: Any?]
 public typealias OptimizelyEventTags = [String: Any]
 
-open class OptimizelyManager: NSObject {
+open class OptimizelyClient: NSObject {
 
     // MARK: - Properties
 
@@ -98,7 +98,7 @@ open class OptimizelyManager: NSObject {
     /// - Parameters:
     ///   - resourceTimeout: timeout for datafile download (optional)
     ///   - completion: callback when initialization is completed
-    public func initializeSDK(resourceTimeout:Double? = nil, completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
+    public func start(resourceTimeout:Double? = nil, completion: ((OptimizelyResult<Data>) -> Void)?=nil) {
         fetchDatafileBackground(resourceTimeout:resourceTimeout) { result in
             switch result {
             case .failure:
@@ -124,12 +124,12 @@ open class OptimizelyManager: NSObject {
     ///   - datafile: This datafile will be used when cached copy is not available (fresh start).
     ///             A cached copy from previous download is used if it's available.
     ///             The datafile will be updated from the server in the background thread.
-    public func initializeSDK(datafile: String) throws {
+    public func start(datafile: String) throws {
         guard let datafileData = datafile.data(using: .utf8) else {
             throw OptimizelyError.dataFileInvalid
         }
 
-        try initializeSDK(datafile: datafileData)
+        try start(datafile: datafileData)
     }
 
     /// Start Optimizely SDK (Synchronous)
@@ -141,7 +141,7 @@ open class OptimizelyManager: NSObject {
     ///   - doFetchDatafileBackground: This is for debugging purposes when
     ///             you don't want to download the datafile.  In practice, you should allow the
     ///             background thread to update the cache copy (optional)
-    public func initializeSDK(datafile: Data, doFetchDatafileBackground: Bool = true) throws {
+    public func start(datafile: Data, doFetchDatafileBackground: Bool = true) throws {
         let cachedDatafile = self.datafileHandler.loadSavedDatafile(sdkKey: self.sdkKey)
 
         let selectedDatafile = cachedDatafile ?? datafile
@@ -645,7 +645,7 @@ open class OptimizelyManager: NSObject {
 
 }
 
-extension OptimizelyManager {
+extension OptimizelyClient {
 
     func sendImpressionEvent(experiment: Experiment,
                              variation:Variation,