Resolve merge conflict for x-webkit-deflate-frame

.gitignore

@@ -6,3 +6,19 @@ build/
 nohup.out
 .DS_Store
 xcuserdata/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+*xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+extern/

.travis.yml

@@ -0,0 +1,27 @@
+language: objective-c
+osx_image: xcode7.2
+sudo: false
+xcode_project: SocketRocket.xcodeproj
+env:
+  global:
+    - IOS_SDK=iphonesimulator9.2
+    - IOS_SCHEME="SocketRocket-iOS"
+    - MACOS_SDK=macosx10.11
+    - MACOS_SCHEME="SocketRocketOSX"
+    - TVOS_SDK=appletvsimulator9.1
+    - TVOS_SCHEME="SocketRocket-tvOS"
+  matrix:
+    - DESTINATION="OS=9.2,name=iPad 2"         SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.2,name=iPad Air"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.2,name=iPhone 5"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.2,name=iPhone 6s"      SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=8.4,name=iPhone 6"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=8.4,name=iPad Air"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.1,name=Apple TV 1080p" SDK="$TVOS_SDK"  SCHEME="$TVOS_SCHEME"
+    - DESTINATION="platform=OS X"              SDK="$MACOS_SDK" SCHEME="$MACOS_SCHEME"
+before_script:
+    - bundle install
+script:
+    - xcodebuild -version
+    - xcodebuild -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build test | xcpretty -tc
+    - pod lib lint --verbose --fail-fast

Contributing.md

@@ -0,0 +1,19 @@
+###Sign the CLA
+
+All contributors to your PR must sign our [Individual Contributor License Agreement (CLA)](https://spreadsheets.google.com/spreadsheet/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1). The CLA is a short form that ensures that you are eligible to contribute.
+
+###One issue or bug per Pull Request
+
+Keep your Pull Requests small. Small PRs are easier to reason about which makes them significantly more likely to get merged.
+
+###Issues before features
+
+If you want to add a feature, please file an [Issue](issues) first. An Issue gives us the opportunity to discuss the requirements and implications of a feature with you before you start writing code.
+
+###Backwards compatibility
+
+Respect the minimum deployment target. If you are adding code that uses new APIs, make sure to prevent older clients from crashing or misbehaving. Our CI runs against our minimum deployment targets, so you will not get a green build unless your code is backwards compatible. 
+
+###Forwards compatibility
+
+Please do not write new code using deprecated APIs.

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'cocoapods', '0.39.0'

Makefile

@@ -1,6 +1,12 @@
 TEST_SCENARIOS="[1-8]*"
 TEST_URL='ws://localhost:9001/'
 
+all:
+	$(MAKE) -C SocketRocket
+
+clean:
+	$(MAKE) -C SocketRocket clean
+
 test:
 
 	mkdir -p pages/results

README.rst

@@ -3,12 +3,12 @@ SocketRocket Objective-C WebSocket Client (beta)
 A conforming WebSocket (`RFC 6455 <http://tools.ietf.org/html/rfc6455>`_)
 client library.
 
-`Test results for SocketRocket here <http://square.github.com/SocketRocket/results/>`_.
+`Test results for SocketRocket here <http://square.github.io/SocketRocket/results/>`_.
 You can compare to what `modern browsers look like here
-<http://www.tavendo.de/autobahn/testsuite/report/clients/index.html>`_.
+<http://tavendo.com/autobahn/testsuite/report/clients/index.html>`_.
 
 SocketRocket currently conforms to all ~300 of `Autobahn
-<http://www.tavendo.de/autobahn/testsuite.html>`_'s fuzzing tests (aside from
+<http://autobahn.ws/testsuite/>`_'s fuzzing tests (aside from
 two UTF-8 ones where it is merely *non-strict*. tests 6.4.2 and 6.4.4)
 
 Features/Design
@@ -56,7 +56,7 @@ There's a few options. Choose one, or just figure it out
 
 
 Depending on how you configure your project you may need to ``#import`` either
-``<SocketRocket/SRSocketRocket.h>`` or ``"SRSocketRocket.h"``
+``<SocketRocket/SRWebSocket.h>`` or ``"SRWebSocket.h"``
 
 Framework Dependencies
 ``````````````````````
@@ -73,7 +73,7 @@ SocketRocket now has (64-bit only) OS X support.  ``SocketRocket.framework``
 inside Xcode project is for OS X only.  It should be identical in function aside
 from the unicode validation.  ICU isn't shipped with OS X which is what the
 original implementation used for unicode validation.  The workaround is much
-more rhudimentary and less robust.
+more rudimentary and less robust.
 
 1. Add SocketRocket.xcodeproj as either a subproject of your app or in your workspace.
 2. Add ``SocketRocket.framework`` to the link libraries
@@ -192,11 +192,11 @@ SocketRocket root directory and type::
 
   make test
 
-This will set up your `virtualenv <http://pypi.python.org/pypi/virtualenv>`_.
+This will set up your `virtualenv <https://pypi.python.org/pypi/virtualenv>`_.
 Now, in your terminal::
 
   source .env/bin/activate
-  pip install git+https://github.com/facebook/tornado.git
+  pip install git+https://github.com/tornadoweb/tornado.git
 
 In the same terminal session, start the chatroom server::
 
@@ -209,7 +209,7 @@ There's also a Go implementation (with the latest weekly) where you can::
 
 Chatting
 ````````
-Now, start TestChat.app (just run the target in the XCode project).  If you had
+Now, start TestChat.app (just run the target in the Xcode project).  If you had
 it started already you can hit the refresh button to reconnect.  It should say
 "Connected!" on top.
 
@@ -222,10 +222,8 @@ WebSocket Server Implementation Recommendations
 SocketRocket has been used with the following libraries:
 
 - `Tornado <https://github.com/facebook/tornado>`_
-- Go's `weekly build <http://weekly.golang.org>`_ (the official release has an
-  outdated protocol, so you may have to use weekly until `Go 1
-  <http://blog.golang.org/2011/10/preview-of-go-version-1.html>`_ is released)
-- `Autobahn <http://www.tavendo.de/autobahn/testsuite.html>`_ (using its fuzzing
+- Go's `WebSocket package <https://godoc.org/golang.org/x/net/websocket>`_ or Gorilla's `version <http://www.gorillatoolkit.org/pkg/websocket>`_
+- `Autobahn <http://tavendo.com/autobahn/testsuite.html>`_ (using its fuzzing
   client)
 
 The Tornado one is dirt simple and works like a charm.  (`IPython notebook
@@ -239,19 +237,10 @@ It could use some more control over things such as pings, etc., but I
 am sure it will come in time.
 
 Autobahn is a great test suite.  The Python server code is good, and conforms
-well (obviously).  Hovever, for me, twisted would be a deal-breaker for writing
+well (obviously).  However for me, twisted would be a deal-breaker for writing
 something new.  I find it a bit too complex and heavy for a simple service. If
 you are already using twisted though, Autobahn is probably for you.
 
 Contributing
 ------------
-Any contributors to the master SocketRocket repository must sign the `Individual
-Contributor License Agreement
-(CLA)
-<https://spreadsheets.google.com/spreadsheet/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1>`_.
-It's a short form that covers our bases and makes sure you're eligible to
-contribute.
-
-When you have a change you'd like to see in the master repository, `send a pull
-request <https://github.com/square/SocketRocket/pulls>`_. Before we merge your
-request, we'll make sure you're in the list of people who have signed a CLA.
+We’re glad you’re interested in SocketRocket, and we’d love to see where you take it. Please read our `contributing guidelines <https://github.com/square/SocketRocket/blob/master/Contributing.md>`_ prior to submitting a Pull Request.

SRWebSocketTests/SRTAutobahnTests.m

@@ -14,16 +14,16 @@
 //   limitations under the License.
 //
 
-#import <SenTestingKit/SenTestingKit.h>
-#import <SenTestingKit/SenTestRun.h>
-#import "SRWebSocket.h"
+#import <XCTest/XCTest.h>
+#import <XCTest/XCTestRun.h>
+#import <SocketRocket/SRWebSocket.h>
 #import "SRTWebSocketOperation.h"
 #import "SenTestCase+SRTAdditions.h"
 
 #define SRLogDebug(format, ...) 
 //#define SRLogDebug(format, ...) NSLog(format, __VA_ARGS__)
 
-@interface SRTAutobahnTests : SenTestCase
+@interface SRTAutobahnTests : XCTestCase
 @end
 
 @interface TestOperation : SRTWebSocketOperation <SRWebSocketDelegate>
@@ -98,15 +98,14 @@ - (id)initWithInvocation:(NSInvocation *)anInvocation;
 {
     self = [super initWithInvocation:anInvocation];
     if (self) {
-        [self raiseAfterFailure];
         _testURLString = [[NSProcessInfo processInfo].environment objectForKey:@"SR_TEST_URL"];
         _prefixURL = [NSURL URLWithString:_testURLString];
         _agent = [NSBundle bundleForClass:[self class]].bundleIdentifier;
     }
     return self;
 }
 
-- (unsigned int)testCaseCount;
+- (NSUInteger)testCaseCount;
 {
     if (self.invocation) {
         return [super testCaseCount];
@@ -120,7 +119,7 @@ - (unsigned int)testCaseCount;
         return caseGetter.isFinished;
     } timeout:20.0];
 
-    STAssertNil(caseGetter.error, @"CaseGetter should have successfully returned the number of testCases. Instead got error %@", caseGetter.error);
+    XCTAssertNil(caseGetter.error, @"CaseGetter should have successfully returned the number of testCases. Instead got error %@", caseGetter.error);
 
     NSInteger caseCount = caseGetter.caseCount;
 
@@ -132,7 +131,7 @@ - (BOOL)isEmpty;
     return NO;
 }
 
-- (void)performTest:(SenTestCaseRun *) aRun
+- (void)performTest:(XCTestCaseRun *) aRun
 {
     if (self.invocation) {
         [super performTest:aRun];
@@ -150,15 +149,11 @@ - (void)performTest:(SenTestCaseRun *) aRun
 
         NSString *description = [self caseDescriptionForCaseNumber:i];
 
-        SenTestCase *testCase = [[[self class] alloc] initWithInvocation:invocation description:description];
+        XCTestCase *testCase = [[[self class] alloc] initWithInvocation:invocation description:description];
 
-        SenTestCaseRun *run = [[SenTestCaseRun alloc] initWithTest:testCase];
+        XCTestCaseRun *run = [[XCTestCaseRun alloc] initWithTest:testCase];
 
         [testCase performTest:run];
-
-        for (NSException *e in run.exceptions) {
-            [aRun addException:e];
-        }
     }
     [aRun stop];
 
@@ -182,7 +177,7 @@ - (NSString *)caseDescriptionForCaseNumber:(NSInteger)caseNumber;
         return testInfoOperation.isFinished;
     } timeout:60 * 60];
 
-    STAssertNil(testInfoOperation.error, @"Updating the report should not have errored");
+    XCTAssertNil(testInfoOperation.error, @"Updating the report should not have errored");
 
     return [NSString stringWithFormat:@"%@ - %@", [testInfoOperation.info objectForKey:@"id"], [testInfoOperation.info objectForKey:@"description"]];
 }
@@ -220,8 +215,8 @@ - (void)performTestWithNumber:(NSInteger)testNumber;
         return resultOp.isFinished;
     } timeout:60 * 60];
 
-    STAssertTrue(!testOp.error, @"Test operation should not have failed");
-    STAssertEqualObjects(@"OK", [resultOp.info objectForKey:@"behavior"], @"Test behavior should be OK");
+    XCTAssertTrue(!testOp.error, @"Test operation should not have failed");
+    XCTAssertEqualObjects(@"OK", [resultOp.info objectForKey:@"behavior"], @"Test behavior should be OK");
 }
 
 - (void)updateReports;
@@ -234,7 +229,7 @@ - (void)updateReports;
         return updateReportOperation.isFinished;
     } timeout:60 * 60];
 
-    STAssertNil(updateReportOperation.error, @"Updating the report should not have errored");
+    XCTAssertNil(updateReportOperation.error, @"Updating the report should not have errored");
 }
 
 @end
@@ -247,7 +242,7 @@ - (id)initWithBaseURL:(NSURL *)url testNumber:(NSInteger)testNumber agent:(NSStr
 {   
 
     NSString *path = [[url URLByAppendingPathComponent:@"runCase"] absoluteString];
-    path = [path stringByAppendingFormat:@"?case=%d&agent=%@", testNumber, agent];
+    path = [path stringByAppendingFormat:@"?case=%@&agent=%@", @(testNumber), agent];
 
     self = [super initWithURL:[NSURL URLWithString:path]];
     if (self) {
@@ -310,7 +305,7 @@ @implementation TestInfoOperation
 - (id)initWithBaseURL:(NSURL *)url caseNumber:(NSInteger)caseNumber;
 {
     NSString *path = [[url URLByAppendingPathComponent:@"getCaseInfo"] absoluteString];
-    path = [path stringByAppendingFormat:@"?case=%d", caseNumber];
+    path = [path stringByAppendingFormat:@"?case=%@", @(caseNumber)];
 
     return [super initWithURL:[NSURL URLWithString:path]];
 }
@@ -330,7 +325,7 @@ @implementation TestResultsOperation
 - (id)initWithBaseURL:(NSURL *)url caseNumber:(NSInteger)caseNumber agent:(NSString *)agent;
 {
     NSString *path = [[url URLByAppendingPathComponent:@"getCaseStatus"] absoluteString];
-    path = [path stringByAppendingFormat:@"?case=%d&agent=%@", caseNumber, agent];
+    path = [path stringByAppendingFormat:@"?case=%@&agent=%@", @(caseNumber), agent];
 
     return [super initWithURL:[NSURL URLWithString:path]];
 }

SRWebSocketTests/SRTWebSocketOperation.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "SRWebSocket.h"
+#import <SocketRocket/SRWebSocket.h>
 
 @interface SRTWebSocketOperation : NSOperation <SRWebSocketDelegate>
 

SRWebSocketTests/SRTWebSocketOperation.m

@@ -7,7 +7,6 @@
 //
 
 #import "SRTWebSocketOperation.h"
-#import "SRWebSocket.h"
 
 @interface SRTWebSocketOperation ()
 

SRWebSocketTests/SRWebSocketTests-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.squareup.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

SRWebSocketTests/SRWebSocketTests-Prefix.pch

@@ -16,6 +16,6 @@
 
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
-    #import <SenTestingKit/SenTestingKit.h>
+    #import <XCTest/XCTest.h>
     #import "SenTestCase+SRTAdditions.h"
 #endif

SRWebSocketTests/SenTestCase+SRTAdditions.h

@@ -14,13 +14,13 @@
 //   limitations under the License.
 //
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 
 typedef BOOL (^PXPredicateBlock)();
 
 
-@interface SenTest (PXAdditions)
+@interface XCTest (PXAdditions)
 
 - (void)runCurrentRunLoopUntilTestPasses:(PXPredicateBlock)predicate timeout:(NSTimeInterval)timeout;
 

SRWebSocketTests/SenTestCase+SRTAdditions.m

@@ -17,7 +17,7 @@
 #import "SenTestCase+SRTAdditions.h"
 
 
-@implementation SenTestCase (SRTAdditions)
+@implementation XCTestCase (SRTAdditions)
 
 - (void)runCurrentRunLoopUntilTestPasses:(PXPredicateBlock)predicate timeout:(NSTimeInterval)timeout;
 {
@@ -32,7 +32,7 @@ - (void)runCurrentRunLoopUntilTestPasses:(PXPredicateBlock)predicate timeout:(NS
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     }
 
-    STAssertTrue(currentTime <= timeoutTime, @"Timed out");
+    XCTAssertTrue(currentTime <= timeoutTime, @"Timed out");
 }
 
 @end