Remove Public SRWebSocket.h Import #157
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SocketRocket is a dependency, but not part of the public interface to Pusher. If you build an app using the OS X framework, you’ll get an error saying SRWebSocket cannot be found.
Contributor
|
+1 for better encapsulation but could you also fix the unit tests. Thanks. |
Instead of calling the SocketRocket delegate methods directly, perform the socketID and state functions that would normally be performed by the SocketRocket delegate manually.
Contributor
Author
|
Whoops, sorry about that. As noted in the commit message, instead of calling the SocketRocket delegate methods directly, it’s now handling and reporting the socketID and state manually. I’m not sure if it’s the best solution, but I couldn’t see any other way without exposing the SocketRocket requirements publicly. |
Contributor
|
I'm not a fan of this solution as its now duplicating logic in the superclass. Can you not just declare the superclass as conforming to the socket delegate protocol in a class extension in the mock connection header? |
Rather than duplicating functionality.
Contributor
Author
|
Ugh, you’re totally right, that’s a much better solution. Sorry, I didn’t mean to complicate things. |
lukeredpath
added a commit
that referenced
this pull request
Oct 29, 2014
Remove Public SRWebSocket.h Import
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SocketRocket is a dependency, but not part of the public interface to Pusher. If you build an app only using the OS X framework (as opposed to CocoaPods), you’ll get an error saying “SRWebSocket.h cannot be found”.
Since SRWebSocket.h is already imported in the .m file, we can just declare the protocol there. This may break really old versions of Xcode, but anything using Xcode 5 or 6 should be fine (probably 4.3 or 4.2 as well).