pusher-client 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1cc802ffe2416f85cd407687b0e23f82569c9f15
+  data.tar.gz: 6af614c433c815e762fc308f0de05bd78e6f8e3c
+SHA512:
+  metadata.gz: 46fd409658e26cc23b41f77f94d789a61f7b2c9efb19535c3c9cf22c70da8146dacaafb803ae07eb5a0a7a8446b2739157509c3fc170fa7df337ab31111d5913
+  data.tar.gz: a77689a96349a40d574b012f0d2f19df81c79b29d081b835ea0b67bd6ae3bc06758896eea0d91c897a19256e61607b366cd2f9ec5ac661f89467b2259f4a5e14

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
 - 1.9.2
 - 1.9.3
 - 2.0.0
+- 2.1.0
 - jruby-18mode
 - jruby-19mode
-- rbx-18mode
-- rbx-19mode

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+
+0.5.0 / 2014-04-15
+==================
+
+ * Updating to protocol v6
+ * Fixes scope issues with user_data
+ * Makes missing user_data on presence channel error explicit
+ * Mask outgoing data.
+ * Update the websocket dependency to 1.1.2
+ * Allow to use app_key that are symbols
+ * Allow to specify the logger when creating a new Socket
+ * Don't set Thread.abort_on_exception = true
+ * Capture Thread exceptions when running async
+ * Not raising an ArgumentError had slipped through the cracks. The test case exist.
+ * Retain a consistent code style with the rest of the code and ruby's unofficial styling.
+ * Add send_channel_event method on socket for client channel events
+
+0.4.0 and previous not documented :/
+

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://www.rubygems.org'
 
 gemspec
-
-gem 'json', :platform => :ruby_18

data/Rakefile

@@ -1,10 +1,7 @@
 require "bundler/gem_tasks"
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
 
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/pusher-client.rb

@@ -15,8 +15,6 @@ module PusherClient
   end
 end
 
-Thread.abort_on_exception = true
-
 require 'pusher-client/version'
 require 'pusher-client/websocket'
 require 'pusher-client/socket'

data/lib/pusher-client/channel.rb

@@ -2,17 +2,19 @@ module PusherClient
 
   class Channel
     attr_accessor :global, :subscribed
-    attr_reader :name, :callbacks, :global_callbacks
+    attr_reader :name, :callbacks, :user_data
 
-    def initialize(channel_name)
+    def initialize(channel_name, user_data=nil, logger=PusherClient.logger)
       @name = channel_name
+      @user_data = user_data
+      @logger = logger
       @global = false
       @callbacks = {}
-      @global_callbacks = {}
       @subscribed = false
     end
 
     def bind(event_name, &callback)
+      PusherClient.logger.debug "Binding #{event_name} to #{name}"
       @callbacks[event_name] = callbacks[event_name] || []
       @callbacks[event_name] << callback
       return self
@@ -20,28 +22,16 @@ module PusherClient
 
     def dispatch_with_all(event_name, data)
       dispatch(event_name, data)
-      dispatch_global_callbacks(event_name, data)
     end
 
     def dispatch(event_name, data)
-      PusherClient.logger.debug "Dispatching callbacks for #{event_name}"
+      logger.debug("Dispatching #{global ? 'global ' : ''}callbacks for #{event_name}")
       if @callbacks[event_name]
         @callbacks[event_name].each do |callback|
           callback.call(data)
         end
       else
-        PusherClient.logger.debug "No callbacks to dispatch for #{event_name}"
-      end
-    end
-
-    def dispatch_global_callbacks(event_name, data)
-      if @global_callbacks[event_name]
-        PusherClient.logger.debug "Dispatching global callbacks for #{event_name}"
-        @global_callbacks[event_name].each do |callback|
-          callback.call(data)
-        end
-      else
-        PusherClient.logger.debug "No global callbacks to dispatch for #{event_name}"
+        logger.debug "No #{global ? 'global ' : ''}callbacks to dispatch for #{event_name}"
       end
     end
 
@@ -49,6 +39,18 @@ module PusherClient
       @subscribed = true
     end
 
+    private
+
+    attr_reader :logger
+  end
+
+  class NullChannel
+    def initialize(channel_name, *a)
+      @name = channel_name
+    end
+    def method_missing(*a)
+      raise ArgumentError, "Channel `#{@name}` hasn't been subscribed yet."
+    end
   end
 
 end

data/lib/pusher-client/channels.rb

@@ -3,15 +3,13 @@ module PusherClient
 
     attr_reader :channels
 
-    def initialize
+    def initialize(logger=PusherClient.logger)
+      @logger = logger
       @channels = {}
     end
 
-    def add(channel_name)
-      unless @channels[channel_name]
-        @channels[channel_name] = Channel.new(channel_name)
-      end
-      @channels[channel_name]
+    def add(channel_name, user_data=nil)
+      @channels[channel_name] ||= Channel.new(channel_name, user_data, @logger)
     end
 
     def find(channel_name)
@@ -20,7 +18,6 @@ module PusherClient
 
     def remove(channel_name)
       @channels.delete(channel_name)
-      @channels
     end
 
     def empty?

data/lib/pusher-client/socket.rb

@@ -6,15 +6,15 @@ module PusherClient
   class Socket
 
     CLIENT_ID = 'pusher-ruby-client'
-    PROTOCOL = '5'
+    PROTOCOL = '6'
 
     attr_reader :path, :connected, :channels, :global_channel, :socket_id
 
     def initialize(app_key, options={})
-      raise "Missing app_key" unless app_key && !app_key.empty?
+      raise ArgumentError, "Missing app_key" if app_key.to_s.empty?
 
       @path = "#{options[:ws_path]}/app/#{app_key}?client=#{CLIENT_ID}&version=#{PusherClient::VERSION}&protocol=#{PROTOCOL}"
-      @key = app_key
+      @key = app_key.to_s
       @secret = options[:secret]
       @socket_id = nil
       @channels = Channels.new
@@ -22,12 +22,19 @@ module PusherClient
       @global_channel.global = true
       @connected = false
       @encrypted = options[:encrypted] || false
+      @logger = options[:logger] || PusherClient.logger
       @private_auth_method = options[:private_auth_method]
       @cert_file = options[:cert_file]
       @ws_host = options[:ws_host] || HOST
       @ws_port = options[:ws_port] || WS_PORT
       @wss_port = options[:wss_port] || WSS_PORT
-      @ssl_verify = options.fetch(:ssl_verify) { true }
+      @ssl_verify = options.fetch(:ssl_verify, true)
+
+      if @encrypted
+        @url = "wss://#{@ws_host}:#{@wss_port}#{@path}"
+      else
+        @url = "ws://#{@ws_host}:#{@ws_port}#{@path}"
+      end
 
       bind('pusher:connection_established') do |data|
         socket = parser(data)
@@ -37,11 +44,12 @@ module PusherClient
       end
 
       bind('pusher:connection_disconnected') do |data|
+        @connected = false
         @channels.channels.each { |c| c.disconnect }
       end
 
       bind('pusher:error') do |data|
-        PusherClient.logger.fatal("Pusher : error : #{data.inspect}")
+        logger.fatal("Pusher : error : #{data.inspect}")
       end
 
       # Keep this in case we're using a websocket protocol that doesn't
@@ -52,52 +60,45 @@ module PusherClient
     end
 
     def connect(async = false)
-      if @encrypted
-        url = "wss://#{@ws_host}:#{@wss_port}#{@path}"
+      return if @connection
+      logger.debug("Pusher : connecting : #{@url}")
+
+      if async
+        @connection_thread = Thread.new do
+          begin
+            connect_internal
+          rescue => ex
+            send_local_event "pusher:error", ex
+          end
+        end
       else
-        url = "ws://#{@ws_host}:#{@ws_port}#{@path}"
+        connect_internal
       end
-      PusherClient.logger.debug("Pusher : connecting : #{url}")
-
-      @connection_thread = Thread.new {
-        options     = {:ssl => @encrypted, :cert_file => @cert_file, :ssl_verify => @ssl_verify}
-        @connection = PusherWebSocket.new(url, options)
-        PusherClient.logger.debug "Websocket connected"
-
-        loop do
-          msg    = @connection.receive[0]
-          next if msg.nil?
-          params = parser(msg)
-          next if params['socket_id'] && params['socket_id'] == self.socket_id
-
-          send_local_event params['event'], params['data'], params['channel']
-        end
-      }
-
-      @connection_thread.run
-      @connection_thread.join unless async
       self
     end
 
     def disconnect
-      if @connected
-        PusherClient.logger.debug "Pusher : disconnecting"
-        @connection.close
-        @connection_thread.kill if @connection_thread
-        @connected = false
-      else
-        PusherClient.logger.warn "Disconnect attempted... not connected"
+      return unless @connection
+      logger.debug("Pusher : disconnecting")
+      @connected = false
+      @connection.close
+      @connection = nil
+      if @connection_thread
+        @connection_thread.kill
+        @connection_thread = nil
       end
     end
 
     def subscribe(channel_name, user_data = nil)
       if user_data.is_a? Hash
-        @user_data = user_data.to_json
-      elsif not user_data.nil?
-        @user_data = {:user_id => user_data}.to_json
+        user_data = user_data.to_json
+      elsif user_data
+        user_data = {:user_id => user_data}.to_json
+      elsif is_presence_channel(channel_name)
+        raise ArgumentError, "user_data is required for presence channels"
       end
 
-      channel = @channels << channel_name
+      channel = @channels.add(channel_name, user_data)
       if @connected
         authorize(channel, method(:authorize_callback))
       end
@@ -106,7 +107,7 @@ module PusherClient
 
     def unsubscribe(channel_name)
       channel = @channels.remove channel_name
-      if @connected
+      if channel && @connected
         send_event('pusher:unsubscribe', {
           'channel' => channel_name
         })
@@ -120,29 +121,22 @@ module PusherClient
     end
 
     def [](channel_name)
-      if @channels[channel_name]
-        @channels[channel_name]
-      else
-        @channels << channel_name
-      end
+      @channels[channel_name] || NullChannel.new(channel_name)
     end
 
     def subscribe_all
-      @channels.channels.clone.each{ |k,v|
-        subscribe(k)
-      }
+      @channels.channels.clone.each { |k,v| subscribe(v.name, v.user_data) }
     end
 
-    #auth for private and presence
+    # auth for private and presence
     def authorize(channel, callback)
       if is_private_channel(channel.name)
         auth_data = get_private_auth(channel)
       elsif is_presence_channel(channel.name)
         auth_data = get_presence_auth(channel)
-        channel_data = @user_data
       end
       # could both be nil if didn't require auth
-      callback.call(channel, auth_data, channel_data)
+      callback.call(channel, auth_data, channel.user_data)
     end
 
     def authorize_callback(channel, auth_data, channel_data)
@@ -163,7 +157,7 @@ module PusherClient
     end
 
     def get_private_auth(channel)
-      if (@private_auth_method.nil?)
+      if @private_auth_method.nil?
         string_to_sign = @socket_id + ':' + channel.name
         signature = hmac(@secret, string_to_sign)
         return "#{@key}:#{signature}"
@@ -173,41 +167,68 @@ module PusherClient
     end
 
     def get_presence_auth(channel)
-      string_to_sign = @socket_id + ':' + channel.name + ':' + @user_data
+      string_to_sign = @socket_id + ':' + channel.name + ':' + channel.user_data
       signature = hmac(@secret, string_to_sign)
       return "#{@key}:#{signature}"
     end
 
 
-    # For compatibility with JavaScript client API
+    # for compatibility with JavaScript client API
     alias :subscribeAll :subscribe_all
 
     def send_event(event_name, data)
       payload = {'event' => event_name, 'data' => data}.to_json
       @connection.send(payload)
-      PusherClient.logger.debug("Pusher : sending event : #{payload}")
+      logger.debug("Pusher : sending event : #{payload}")
+    end
+
+    def send_channel_event(channel, event_name, data)
+      payload = {'channel' => channel, 'event' => event_name, 'data' => data}.to_json
+      @connection.send(payload)
+      logger.debug("Pusher : sending channel event : #{payload}")
     end
 
   protected
 
-    def send_local_event(event_name, event_data, channel_name)
-      if (channel_name)
+    attr_reader :logger
+
+    def connect_internal
+      @connection = PusherWebSocket.new(@url, {
+        :ssl => @encrypted,
+        :cert_file => @cert_file,
+        :ssl_verify => @ssl_verify
+      })
+
+      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
+
+        send_local_event(params['event'], params['data'], params['channel'])
+      end
+    end
+
+    def send_local_event(event_name, event_data, channel_name=nil)
+      if channel_name
         channel = @channels[channel_name]
-        if (channel)
+        if channel
           channel.dispatch_with_all(event_name, event_data)
         end
       end
 
       @global_channel.dispatch_with_all(event_name, event_data)
-      PusherClient.logger.debug("Pusher : event received : channel: #{channel_name}; event: #{event_name}")
+      logger.debug("Pusher : event received : channel: #{channel_name}; event: #{event_name}")
     end
 
     def parser(data)
       return data if data.is_a? Hash
       return JSON.parse(data)
     rescue => err
-      PusherClient.logger.warn(err)
-      PusherClient.logger.warn("Pusher : data attribute not valid JSON - you may wish to implement your own Pusher::Client.parser")
+      logger.warn(err)
+      logger.warn("Pusher : data attribute not valid JSON - you may wish to implement your own Pusher::Client.parser")
       return data
     end
 

data/lib/pusher-client/version.rb

@@ -1,3 +1,3 @@
 module PusherClient
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/pusher-client/websocket.rb

@@ -16,6 +16,7 @@ module PusherClient
       @frame ||= WebSocket::Frame::Incoming::Server.new(:version => @hs.version)
       @socket = TCPSocket.new(@hs.host, @hs.port || 80)
       @cert_file = params[:cert_file]
+      @logger = params[:logger] || PusherClient.logger
 
       if params[:ssl] == true
         ctx = OpenSSL::SSL::SSLContext.new
@@ -44,7 +45,7 @@ module PusherClient
         @hs << data
 
         if @hs.finished?
-          raise Exception unless @hs.valid?
+          raise @hs.error.to_s unless @hs.valid?
           @handshaked = true
           break
         end
@@ -54,7 +55,11 @@ module PusherClient
     def send(data, type = :text)
       raise "no handshake!" unless @handshaked
 
-      data = WebSocket::Frame::Outgoing::Server.new(:version => @hs.version, :data => data, :type => type).to_s
+      data = WebSocket::Frame::Outgoing::Client.new(
+        :version => @hs.version,
+        :data => data,
+        :type => type
+      ).to_s
       @socket.write data
       @socket.flush
     end
@@ -80,14 +85,18 @@ module PusherClient
       end
       messages
     rescue IOError, Errno::EBADF => error
-      PusherClient.logger.debug error.message
+      logger.debug error.message
       []
     end
 
     def close
       @socket.close
     rescue IOError => error
-      PusherClient.logger.debug error.message
+      logger.debug error.message
     end
+
+    private
+
+    attr_reader :logger
   end
 end

data/pusher-client.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.require_paths    = ['lib']
   s.licenses         = ['MIT']
 
-  s.add_runtime_dependency 'websocket', '~> 1.0.0'
-  s.add_runtime_dependency 'json' if RUBY_VERSION < "1.9"
+  s.add_runtime_dependency 'websocket', '~> 1.1.2'
+  s.add_runtime_dependency 'json'
 
-  s.add_development_dependency "bacon"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler"
 end

data/{test/pusherclient_test.rb → spec/pusherclient_spec.rb}

@@ -1,5 +1,4 @@
-require File.dirname(File.expand_path(__FILE__)) + '/teststrap.rb'
-require 'logger'
+require 'spec_helper'
 
 describe "A PusherClient::Channels collection" do
   before do
@@ -7,26 +6,26 @@ describe "A PusherClient::Channels collection" do
   end
 
   it "should initialize empty" do
-    @channels.empty?.should.equal(true)
-    @channels.size.should.equal 0
+    expect(@channels).to be_empty
+    expect(@channels.size).to eq(0)
   end
 
   it "should instantiate new channels added to it by name" do
     @channels << 'TestChannel'
-    @channels.find('TestChannel').class.should.equal(PusherClient::Channel)
+    expect(@channels.find('TestChannel').class).to eq(PusherClient::Channel)
   end
 
   it "should allow removal of channels by name" do
     @channels << 'TestChannel'
-    @channels['TestChannel'].class.should.equal(PusherClient::Channel)
+    expect(@channels['TestChannel'].class).to eq(PusherClient::Channel)
     @channels.remove('TestChannel')
-    @channels.empty?.should.equal(true)
+    expect(@channels).to be_empty
   end
 
   it "should not allow two channels of the same name" do
     @channels << 'TestChannel'
     @channels << 'TestChannel'
-    @channels.size.should.equal 1
+    expect(@channels.size).to eq(1)
   end
 
 end
@@ -38,16 +37,16 @@ describe "A PusherClient::Channel" do
   end
 
   it 'should not be subscribed by default' do
-    @channel.subscribed.should.equal false
+    expect(@channel.subscribed).to be_false
   end
 
   it 'should not be global by default' do
-    @channel.global.should.equal false
+    expect(@channel.global).to be_false
   end
 
   it 'can have procs bound to an event' do
     @channel.bind('TestEvent') {}
-    @channel.callbacks.size.should.equal 1
+    expect(@channel.callbacks.size).to eq(1)
   end
 
   it 'should run callbacks when an event is dispatched' do
@@ -57,7 +56,7 @@ describe "A PusherClient::Channel" do
     end
 
     @channel.dispatch('TestEvent', {})
-    PusherClient.logger.test_messages.should.include?("Local callback running")
+    expect(PusherClient.logger.test_messages).to include("Local callback running")
   end
 
 end
@@ -68,16 +67,16 @@ describe "A PusherClient::Socket" do
   end
 
   it 'should not connect when instantiated' do
-    @socket.connected.should.equal false
+    expect(@socket.connected).to be_false
   end
 
-  it 'should raise ArgumentError if TEST_APP_KEY is not a nonempty string' do
-    lambda { 
+  it 'should raise ArgumentError if TEST_APP_KEY is an empty string' do
+    expect { 
       @broken_socket = PusherClient::Socket.new('')
-    }.should.raise(ArgumentError)
-    lambda { 
-      @broken_socket = PusherClient::Socket.new(555)
-    }.should.raise(ArgumentError)
+    }.to raise_error(ArgumentError)
+    expect { 
+      @broken_socket = PusherClient::Socket.new(nil)
+    }.to raise_error(ArgumentError)
   end
 
   describe "...when connected" do
@@ -86,70 +85,71 @@ describe "A PusherClient::Socket" do
     end
 
     it 'should know its connected' do
-      @socket.connected.should.equal true
+      expect(@socket.connected).to be_true
     end
 
     it 'should know its socket_id' do
-      @socket.socket_id.should.equal '123abc'
+      expect(@socket.socket_id).to eq('123abc')
     end
 
     it 'should not be subscribed to its global channel' do
-      @socket.global_channel.subscribed.should.equal false
+      expect(@socket.global_channel.subscribed).to be_false
     end
 
     it 'should subscribe to a channel' do
       @channel = @socket.subscribe('testchannel')
-      @socket.channels['testchannel'].should.equal @channel
-      @channel.subscribed.should.equal true
+      expect(@socket.channels['testchannel']).to eq(@channel)
+      expect(@channel.subscribed).to be_true
     end
 
     it 'should unsubscribe from a channel' do
-      @channel = @socket.unsubscribe('testchannel')
-      PusherClient.logger.test_messages.last.should.include?('pusher:unsubscribe')
-      @socket.channels['testchannel'].should.equal nil
+      @socket.subscribe('testchannel')
+      @socket.unsubscribe('testchannel')
+      expect(PusherClient.logger.test_messages.last).to include('pusher:unsubscribe')
+      expect(@socket.channels['testchannel']).to be_nil
     end
 
     it 'should subscribe to a private channel' do
       @channel = @socket.subscribe('private-testchannel')
-      @socket.channels['private-testchannel'].should.equal @channel
-      @channel.subscribed.should.equal true
+      expect(@socket.channels['private-testchannel']).to eq(@channel)
+      expect(@channel.subscribed).to be_true
     end
 
     it 'should subscribe to a presence channel with user_id' do
       @channel = @socket.subscribe('presence-testchannel', '123')
-      @socket.channels['presence-testchannel'].should.equal @channel
-      @socket.instance_variable_get('@user_data').should.equal '{"user_id":"123"}'
-      @channel.subscribed.should.equal true
+      expect(@socket.channels['presence-testchannel']).to eq(@channel)
+      expect(@channel.user_data).to eq('{"user_id":"123"}')
+      expect(@channel.subscribed).to be_true
     end
 
     it 'should subscribe to a presence channel with custom channel_data' do
       @channel = @socket.subscribe('presence-testchannel', :user_id => '123', :user_name => 'john')
-      @socket.channels['presence-testchannel'].should.equal @channel
-      @socket.instance_variable_get('@user_data').should.equal '{"user_id":"123","user_name":"john"}'
-      @channel.subscribed.should.equal true
+      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
     end
 
     it 'should allow binding of global events' do
       @socket.bind('testevent') { |data| PusherClient.logger.test("testchannel received #{data}") }
-      @socket.global_channel.callbacks.has_key?('testevent').should.equal true
+      expect(@socket.global_channel.callbacks.has_key?('testevent')).to be_true
     end
 
     it 'should trigger callbacks for global events' do
       @socket.bind('globalevent') { |data| PusherClient.logger.test("Global event!") }
-      @socket.global_channel.callbacks.has_key?('globalevent').should.equal true
+      expect(@socket.global_channel.callbacks.has_key?('globalevent')).to be_true
 
       @socket.simulate_received('globalevent', 'some data', '')
-      PusherClient.logger.test_messages.last.should.include?('Global event!')
+      expect(PusherClient.logger.test_messages.last).to include('Global event!')
     end
 
     it 'should kill the connection thread when disconnect is called' do
       @socket.disconnect
-      Thread.list.size.should.equal 1
+      expect(Thread.list.size).to eq(1)
     end
 
     it 'should not be connected after disconnecting' do
       @socket.disconnect
-      @socket.connected.should.equal false
+      expect(@socket.connected).to be_false
     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) }
-        @socket['testchannel'].callbacks.has_key?('testevent').should.equal true
+        expect(@socket['testchannel'].callbacks.has_key?('testevent')).to be_true
       end
 
       it "should trigger channel callbacks when a message is received" do
@@ -169,11 +169,11 @@ describe "A PusherClient::Socket" do
 
         # Simulate the first event
         @socket.simulate_received('coming', 'Hello!', 'testchannel')
-        PusherClient.logger.test_messages.last.should.include?('Hello!')
+        expect(PusherClient.logger.test_messages.last).to include('Hello!')
 
         # Simulate the second event
         @socket.simulate_received('going', 'Goodbye!', 'testchannel')
-        PusherClient.logger.test_messages.last.should.include?('Goodbye!')
+        expect(PusherClient.logger.test_messages.last).to include('Goodbye!')
       end
 
     end

data/{test/teststrap.rb → spec/spec_helper.rb}

@@ -1,7 +1,8 @@
-require 'bacon'
-require 'logger'
+$:.unshift File.expand_path('../lib', __FILE__)
+
+require 'pusher-client'
 
-require File.dirname(__FILE__) + '/../lib/pusher-client.rb'
+require 'logger'
 
 TEST_APP_KEY = "TEST_APP_KEY"
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Pusher
@@ -10,72 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: Client for consuming WebSockets from http://pusher.com
 email:
 - support@pusher.com
@@ -88,6 +93,7 @@ files:
 - .document
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -104,41 +110,32 @@ files:
 - lib/pusher-client/version.rb
 - lib/pusher-client/websocket.rb
 - pusher-client.gemspec
-- test/pusherclient_test.rb
-- test/test.watchr
-- test/teststrap.rb
+- spec/pusherclient_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/pusher/pusher-ruby-client
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -363523268946277982
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -363523268946277982
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for consuming WebSockets from http://pusher.com
 test_files:
-- test/pusherclient_test.rb
-- test/test.watchr
-- test/teststrap.rb
+- spec/pusherclient_spec.rb
+- spec/spec_helper.rb

data/test/test.watchr

@@ -1,63 +0,0 @@
-ENV["WATCHR"] = "1"
-system 'clear'
-puts "Watchr: Ready! :-)"
-
-def notify_send(result)
-  #title = "Watchr Test Results"
-  if result.include?("FAILED") or result.include?("ERROR")
-    title = "FAIL"
-    image = "~/.autotest_images/fail.png" 
-    message = "One or more tests have failed"
-  else
-    title = "PASS"
-    image = "~/.autotest_images/pass.png"
-    message = "All tests pass"
-  end
-
-  options = "-c Watchr --icon '#{File.expand_path(image)}' '#{title}' '#{message}' --urgency=critical"
-  system %(notify-send #{options} &)
-end
-
-def run(cmd)
-  puts(cmd)
-  `#{cmd}`
-end
-
-def run_all_tests
-  system('clear')
-  result = run "bacon test/*_test.rb"
-  notify_send result
-  puts result
-end
-
-def run_suite
-  run_all_tests
-end
-
-watch('test/teststrap\.rb') { run_all_tests }
-watch('test/factories\.rb') { run_all_tests }
-watch('test/.*_test.*\.rb') { run_all_tests }
-watch('lib/*\.rb') { run_all_tests }
-watch('lib/.*/*\.rb') { run_all_tests }
-
-# Ctrl-\
-Signal.trap 'QUIT' do
-  puts " --- Running all tests ---\n\n"
-  run_all_tests
-end
-
-@interrupted = false
-
-# Ctrl-C
-Signal.trap 'INT' do
-  if @interrupted then
-    @wants_to_quit = true
-    abort("\n")
-  else
-    puts "Interrupt a second time to quit"
-    @interrupted = true
-    Kernel.sleep 1.5
-    # raise Interrupt, nil # let the run loop catch it
-    run_suite
-  end
-end