merge master (#231)

* revert get enabled features sorted (#229)

* coveralls code coverage (#221)

* coveralls added
* enable code coverage

* add style guide (#233)

Author: wangjoshuah

.slather.yml

@@ -0,0 +1,5 @@
+coverage_service: coveralls
+xcodeproj: OptimizelySDKiOS/OptimizelySDKiOS.xcodeproj
+scheme: OptimizelySDKiOS
+workspace: OptimizelySDK.xcworkspace
+configuration: Release

.travis.yml

@@ -11,9 +11,12 @@ env:
     - SCHEME=OptimizelySDKiOS-Universal TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.3 NAME='iPhone 6s'
     - SCHEME=OptimizelySDKTVOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'
     - SCHEME=OptimizelySDKTVOS-Universal TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=9.2 NAME='Apple TV 1080p'
+before_install: 
+  - gem install slather --no-rdoc --no-ri --no-document --quiet
 script:
   - pod spec lint --quick
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -quiet -workspace OptimizelySDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" | egrep -B 10 -A 10 "(error|warning|failed|crash|exit|FAILED|Failing|failures)"; fi
+  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -quiet -workspace OptimizelySDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES | egrep -B 10 -A 10 "(error|warning|failed|crash|exit|FAILED|Failing|failures)"; fi
 after_success:
+  - slather
   - sleep 5 # https://github.com/travis-ci/travis-ci/issues/4725
 

CONTRIBUTING.md

@@ -20,7 +20,7 @@ We welcome contributions and feedback! All contributors must sign our [Contribut
 
 ## Style
 
-TBD
+We follow the [Ray Wenderlich style guide](https://github.com/raywenderlich/objective-c-style-guide) since they have put a lot of thought into making their code more legible. While we aim for our Optimizely SDK to be performant and bug free, we also want all customers and third party developers read and understand our code easily.
 
 ## License
 

OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

@@ -363,8 +363,7 @@ - (NSString *)getFeatureVariableString:(nullable NSString *)featureKey
             [enabledFeatures addObject:featureKey];
         }
     }
-    NSArray *enabledFeaturesSorted = [enabledFeatures sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-    return enabledFeaturesSorted;
+    return enabledFeatures;
 }
 
 #pragma mark trackEvent methods

OptimizelySDKCore/OptimizelySDKCoreTests/OptimizelyTest.m

@@ -964,15 +964,6 @@ -(void)testGetEnabledFeaturesWithSomeFeaturesEnabledForUser {
     XCTAssertEqualObjects(features, enabledFeatures);
 }
 
-// should return sorted feature array as some feature is enabled for user
--(void)testGetEnabledFeaturesSortedWithSomeFeaturesEnabledForUser {
-    NSArray<NSString *> *sortedEnabledFeatures = @[@"booleanFeature", @"booleanSingleVariableFeature", @"multiVariateFeature"];
-    NSArray<NSString *> *unSortedEnabledFeatures = @[ @"multiVariateFeature", @"booleanFeature", @"booleanSingleVariableFeature"];
-    NSArray<NSString *> *features = [self.optimizely getEnabledFeatures:kUserId attributes:self.attributes];
-    XCTAssertEqualObjects(features, sortedEnabledFeatures);
-    XCTAssertNotEqualObjects(features, unSortedEnabledFeatures);
-}
-
 #pragma mark - Helper Methods
 
 - (id)getOptimizelyMockForFeatureVariableType:(NSString *)featureVariableType variableKey:(NSString *)variableKey expectedReturn:(NSString *)expectedReturn {

OptimizelySDKCore/OptimizelySDKCoreTests/TestData/test_data_10_experiments.json

@@ -713,29 +713,6 @@
       "experimentIds": [],
       "variables": []
     },
-    {
-      "id": "155559",
-      "key": "multiVariateFeature",
-      "groupId": "",
-      "rolloutId": "",
-      "experimentIds": [
-        "6358043287"
-      ],
-      "variables": [
-        {
-          "id": "155560",
-          "key": "firstLetter",
-          "type": "string",
-          "defaultValue": "H"
-        },
-        {
-          "id": "155561",
-          "key": "restOfName",
-          "type": "string",
-          "defaultValue": "arry"
-        }
-      ]
-    },
     {
       "id": "155549",
       "key": "booleanFeature",
@@ -788,6 +765,29 @@
         }
       ]
     },
+    {
+      "id": "155559",
+      "key": "multiVariateFeature",
+      "groupId": "",
+      "rolloutId": "",
+      "experimentIds": [
+        "6358043287"
+      ],
+      "variables": [
+        {
+          "id": "155560",
+          "key": "firstLetter",
+          "type": "string",
+          "defaultValue": "H"
+        },
+        {
+          "id": "155561",
+          "key": "restOfName",
+          "type": "string",
+          "defaultValue": "arry"
+        }
+      ]
+    },
     {
       "id": "155666",
       "key": "doubleSingleVariableFeature",

OptimizelySDKiOS/OptimizelySDKiOS.xcodeproj/xcshareddata/xcschemes/OptimizelySDKiOS.xcscheme

@@ -27,7 +27,8 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">