pusher-client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf04dc511a185b1a37118fb7aa892d5f7582ae51
-  data.tar.gz: 39c0e1be1d0b4452804727e9f33237ea398bbd67
+  metadata.gz: ca0b6841ec8088d1414317b0c1c632480120de91
+  data.tar.gz: 1ea3ba5948397e263dd3a941a4093638933abf24
 SHA512:
-  metadata.gz: d28001be9d6969ed7a86bcfbed7507e3f292cd518a5230acf3203cc8573e140af69315b53ba20adcf686c008bf48e133e73e8350bbabb75044d1787edc5dfaaf
-  data.tar.gz: f96d506e8b24e69b922233ed3a85f660bbbfcf2b5e962ca5e633f088339dc712e528a5ba6ba05512d687fc743520a7674b8c68962061d74c7b33a5941b2a329e
+  metadata.gz: 351e96ba78075a7ca23cad3d561b0246344775c2d53d009ac39ce5dc098bbd3b88a595e632789bf794de659f37770c66e8b5b29e08f86c37e5df0c6d55b42ead
+  data.tar.gz: 6096c73347065726af44d9242fb945a055646f3225ccb98dfe84d80646cc9544dc8271c37c5f456442337572abc09edef39587c749de1c9bdd57ac1e5384a74b

data/README.rdoc

@@ -1,6 +1,6 @@
 = pusher-client (Ruby)
 
-{<img src="https://travis-ci.org/pusher/pusher-ruby-client.png" />}[https://travis-ci.org/pusher/pusher-ruby-client]
+{<img src="https://travis-ci.org/pusher/pusher-websocket-ruby.png" />}[https://travis-ci.org/pusher/pusher-websocket-ruby]
 
 pusher-client is a ruby gem for consuming WebSockets from the Pusher[http://pusherapp.com] web service.
 
@@ -13,12 +13,12 @@ may be sent on. You can't just bind a global event without subscribing to any ch
 
 == Installation
   gem install pusher-client
-  
+
 == Single-Threaded Usage
 The application will pause at socket.connect and handle events from Pusher as they happen.
 
   require 'pusher-client'
-  options = {:secret => 'YOUR_APPLICATION_SECRET'} 
+  options = { secure: true }
   socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY, options)
 
   # Subscribe to two channels
@@ -84,7 +84,7 @@ increase by including the websocket-native[https://github.com/imanel/websocket-r
 gem in your Gemfile.
 
 == Contributing to pusher-client
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/lib/pusher-client/socket.rb

@@ -21,7 +21,7 @@ module PusherClient
       @global_channel = Channel.new('pusher_global_channel')
       @global_channel.global = true
       @connected = false
-      @encrypted = options[:encrypted] || false
+      @encrypted = options[:encrypted] || options[:secure] || false
       @logger = options[:logger] || PusherClient.logger
       # :private_auth_method is deprecated
       @auth_method = options[:auth_method] || options[:private_auth_method]
@@ -203,12 +203,14 @@ module PusherClient
       logger.debug("Websocket connected")
 
       loop do
-        msg = @connection.receive.first
-        next if msg.nil?
-        params = parser(msg)
-        next if params['socket_id'] && params['socket_id'] == self.socket_id
+        @connection.receive.each do |msg|
+          params = parser(msg)
 
-        send_local_event(params['event'], params['data'], params['channel'])
+          # why ?
+          next if params['socket_id'] && params['socket_id'] == self.socket_id
+
+          send_local_event(params['event'], params['data'], params['channel'])
+        end
       end
     end
 

data/lib/pusher-client/version.rb

@@ -1,3 +1,3 @@
 module PusherClient
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/pusher-client/websocket.rb

@@ -84,9 +84,6 @@ module PusherClient
         messages << message.to_s
       end
       messages
-    rescue IOError, Errno::EBADF => error
-      logger.debug error.message
-      []
     end
 
     def close

data/spec/pusherclient_spec.rb

@@ -37,11 +37,11 @@ describe "A PusherClient::Channel" do
   end
 
   it 'should not be subscribed by default' do
-    expect(@channel.subscribed).to be_false
+    expect(@channel.subscribed).to be_falsey
   end
 
   it 'should not be global by default' do
-    expect(@channel.global).to be_false
+    expect(@channel.global).to be_falsey
   end
 
   it 'can have procs bound to an event' do
@@ -67,7 +67,7 @@ describe "A PusherClient::Socket" do
   end
 
   it 'should not connect when instantiated' do
-    expect(@socket.connected).to be_false
+    expect(@socket.connected).to be_falsey
   end
 
   it 'should raise ArgumentError if TEST_APP_KEY is an empty string' do
@@ -85,7 +85,7 @@ describe "A PusherClient::Socket" do
     end
 
     it 'should know its connected' do
-      expect(@socket.connected).to be_true
+      expect(@socket.connected).to be_truthy
     end
 
     it 'should know its socket_id' do
@@ -93,13 +93,13 @@ describe "A PusherClient::Socket" do
     end
 
     it 'should not be subscribed to its global channel' do
-      expect(@socket.global_channel.subscribed).to be_false
+      expect(@socket.global_channel.subscribed).to be_falsey
     end
 
     it 'should subscribe to a channel' do
       @channel = @socket.subscribe('testchannel')
       expect(@socket.channels['testchannel']).to eq(@channel)
-      expect(@channel.subscribed).to be_true
+      expect(@channel.subscribed).to be_truthy
     end
 
     it 'should unsubscribe from a channel' do
@@ -112,31 +112,31 @@ describe "A PusherClient::Socket" do
     it 'should subscribe to a private channel' do
       @channel = @socket.subscribe('private-testchannel')
       expect(@socket.channels['private-testchannel']).to eq(@channel)
-      expect(@channel.subscribed).to be_true
+      expect(@channel.subscribed).to be_truthy
     end
 
     it 'should subscribe to a presence channel with user_id' do
       @channel = @socket.subscribe('presence-testchannel', '123')
       expect(@socket.channels['presence-testchannel']).to eq(@channel)
       expect(@channel.user_data).to eq('{"user_id":"123"}')
-      expect(@channel.subscribed).to be_true
+      expect(@channel.subscribed).to be_truthy
     end
 
     it 'should subscribe to a presence channel with custom channel_data' do
       @channel = @socket.subscribe('presence-testchannel', :user_id => '123', :user_name => 'john')
       expect(@socket.channels['presence-testchannel']).to eq(@channel)
       expect(@channel.user_data).to eq('{"user_id":"123","user_name":"john"}')
-      expect(@channel.subscribed).to be_true
+      expect(@channel.subscribed).to be_truthy
     end
 
     it 'should allow binding of global events' do
       @socket.bind('testevent') { |data| PusherClient.logger.test("testchannel received #{data}") }
-      expect(@socket.global_channel.callbacks.has_key?('testevent')).to be_true
+      expect(@socket.global_channel.callbacks.has_key?('testevent')).to be_truthy
     end
 
     it 'should trigger callbacks for global events' do
       @socket.bind('globalevent') { |data| PusherClient.logger.test("Global event!") }
-      expect(@socket.global_channel.callbacks.has_key?('globalevent')).to be_true
+      expect(@socket.global_channel.callbacks.has_key?('globalevent')).to be_truthy
 
       @socket.simulate_received('globalevent', 'some data', '')
       expect(PusherClient.logger.test_messages.last).to include('Global event!')
@@ -149,7 +149,7 @@ describe "A PusherClient::Socket" do
 
     it 'should not be connected after disconnecting' do
       @socket.disconnect
-      expect(@socket.connected).to be_false
+      expect(@socket.connected).to be_falsey
     end
 
     describe "when subscribed to a channel" do
@@ -159,7 +159,7 @@ describe "A PusherClient::Socket" do
 
       it 'should allow binding of callbacks for the subscribed channel' do
         @socket['testchannel'].bind('testevent') { |data| PusherClient.logger.test(data) }
-        expect(@socket['testchannel'].callbacks.has_key?('testevent')).to be_true
+        expect(@socket['testchannel'].callbacks.has_key?('testevent')).to be_truthy
       end
 
       it "should trigger channel callbacks when a message is received" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Pusher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Client for consuming WebSockets from http://pusher.com