pusher 0.9.4 → 0.10.0

data/.gitignore

@@ -18,7 +18,6 @@ coverage
 rdoc
 pkg
 .yardoc
-Gemfile.lock
 
 ## PROJECT::SPECIFIC
 .bundle

data/.travis.yml

@@ -1 +1,12 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+
 script: "rspec spec/*_spec.rb"

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    pusher (0.10.0)
+      multi_json (~> 1.0)
+      signature (~> 0.1.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    cookiejar (0.3.0)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    em-http-request (1.0.3)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.2.1)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.0.0)
+    http_parser.rb (0.5.3)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    signature (0.1.4)
+    webmock (1.8.10)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  em-http-request (~> 1.0.0)
+  pusher!
+  rack
+  rake
+  rspec (~> 2.0)
+  webmock

data/README.md

@@ -1,6 +1,8 @@
 Pusher gem
 ==========
 
+[![Build Status](https://secure.travis-ci.org/pusher/pusher-gem.png?branch=master)](http://travis-ci.org/pusher/pusher-gem)
+
 Getting started
 ---------------
 

data/lib/pusher.rb

@@ -30,6 +30,8 @@ module Pusher
     def_delegators :default_client, :authentication_token, :url
     def_delegators :default_client, :encrypted=, :url=
 
+    def_delegators :default_client, :channels, :channel_info, :trigger
+
     attr_writer :logger
 
     # Return a channel by name

data/lib/pusher/channel.rb

@@ -62,21 +62,21 @@ module Pusher
       Pusher.logger.error("#{e.message} (#{e.class})")
       Pusher.logger.debug(e.backtrace.join("\n"))
     end
-    
-    # Request channel stats
+
+    # Request info for a channel
     #
-    # @return [Hash] See Pusher api docs for reported stats
+    # @param info [Array] Array of attributes required (as lowercase strings)
+    # @return [Hash] Hash of requested attributes for this channel
     # @raise [Pusher::Error] on invalid Pusher response - see the error message for more details
     # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
     #
-    def stats
-      request = Pusher::Request.new(:get, @uri + 'stats', {}, nil, nil, @client)
-      return request.send_sync
+    def info(attributes = [])
+      @client.channel_info(name, :info => attributes.join(','))
     end
 
-    # Compute authentication string required to subscribe to this channel.
-    #
-    # See http://pusher.com/docs/auth_signatures for more details.
+    # Compute authentication string required as part of the authentication
+    # endpoint response. Generally the authenticate method should be used in
+    # preference to this one
     #
     # @param socket_id [String] Each Pusher socket connection receives a
     #   unique socket_id. This is sent from pusher.js to your server when
@@ -85,10 +85,16 @@ module Pusher
     # @return [String]
     #
     def authentication_string(socket_id, custom_string = nil)
-      raise "Invalid socket_id" if socket_id.nil? || socket_id.empty?
-      raise 'Custom argument must be a string' unless custom_string.nil? || custom_string.kind_of?(String)
+      if socket_id.nil? || socket_id.empty?
+        raise Error, "Invalid socket_id #{socket_id}"
+      end
+
+      unless custom_string.nil? || custom_string.kind_of?(String)
+        raise Error, 'Custom argument must be a string'
+      end
 
-      string_to_sign = [socket_id, name, custom_string].compact.map{|e|e.to_s}.join(':')
+      string_to_sign = [socket_id, name, custom_string].
+        compact.map(&:to_s).join(':')
       Pusher.logger.debug "Signing #{string_to_sign}"
       token = @client.authentication_token
       digest = OpenSSL::Digest::SHA256.new
@@ -96,11 +102,9 @@ module Pusher
 
       return "#{token.key}:#{signature}"
     end
-    
-    # Deprecated - for backward compatibility
-    alias :socket_auth :authentication_string
 
-    # Generate an authentication endpoint response
+    # Generate the expected response for an authentication endpoint.
+    # See http://pusher.com/docs/authenticating_users for details.
     #
     # @example Private channels
     #   render :json => Pusher['private-my_channel'].authenticate(params[:socket_id])
@@ -123,7 +127,7 @@ module Pusher
     #
     def authenticate(socket_id, custom_data = nil)
       custom_data = MultiJson.encode(custom_data) if custom_data
-      auth = socket_auth(socket_id, custom_data)
+      auth = authentication_string(socket_id, custom_data)
       r = {:auth => auth}
       r[:channel_data] = custom_data if custom_data
       r

data/lib/pusher/client.rb

@@ -21,13 +21,13 @@ module Pusher
       Signature::Token.new(@key, @secret)
     end
 
-    # @private Builds a connection url for Pusherapp
-    def url
+    # @private Builds a url for this app, optionally appending a path
+    def url(path = nil)
       URI::Generic.build({
         :scheme => @scheme,
         :host => @host,
         :port => @port,
-        :path => "/apps/#{@app_id}"
+        :path => "/apps/#{@app_id}#{path}"
       })
     end
 
@@ -59,7 +59,7 @@ module Pusher
       @port = boolean ? 443 : 80
     end
 
-    # Return a channel by name
+    # Return a convenience channel object by name. No API request is made.
     #
     # @example
     #   Pusher['my-channel']
@@ -72,6 +72,74 @@ module Pusher
       @channels[channel_name.to_s] ||= Channel.new(url, channel_name, self)
     end
 
+    # Request a list of occupied channels from the API
+    #
+    # GET /apps/[id]/channels
+    #
+    # @param options [Hash] Hash of options for the API - see Pusher API docs
+    # @return [Hash] See Pusher API docs
+    # @raise [Pusher::Error] on invalid Pusher response - see the error message for more details
+    # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
+    #
+    def channels(options = {})
+      @_channels_url ||= url('/channels')
+      request = Request.new(:get, @_channels_url, options, nil, nil, self)
+      return request.send_sync
+    end
+
+    # Request info for a specific channel
+    #
+    # GET /apps/[id]/channels/[channel_name]
+    #
+    # @param channel_name [String] Channel name
+    # @param options [Hash] Hash of options for the API - see Pusher API docs
+    # @return [Hash] See Pusher API docs
+    # @raise [Pusher::Error] on invalid Pusher response - see the error message for more details
+    # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
+    #
+    def channel_info(channel_name, options = {})
+      request = Request.new(:get, url("/channels/#{channel_name}"), options, nil, nil, self)
+      return request.send_sync
+    end
+
+    # Trigger an event on one or more channels
+    #
+    # POST /apps/[app_id]/events
+    #
+    # @param channels [Array] One of more channel names
+    # @param event_name [String]
+    # @param data [Object] Event data to be triggered in javascript.
+    #   Objects other than strings will be converted to JSON
+    # @param options [Hash] Additional options to send to api, e.g socket_id
+    # @return [Hash] See Pusher API docs
+    # @raise [Pusher::Error] on invalid Pusher response - see the error message for more details
+    # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
+    #
+    def trigger(channels, event_name, data, options = {})
+      @_trigger_url ||= url('/events')
+
+      encoded_data = case data
+      when String
+        data
+      else
+        begin
+          MultiJson.encode(data)
+        rescue MultiJson::DecodeError => e
+          Pusher.logger.error("Could not convert #{data.inspect} into JSON")
+          raise e
+        end
+      end
+
+      options.merge!({
+        :name => event_name,
+        :channels => channels,
+        :data => encoded_data,
+      })
+
+      request = Request.new(:post, @_trigger_url, {}, MultiJson.encode(options), nil, self)
+      return request.send_sync
+    end
+
     private
 
     def configured?

data/lib/pusher/request.rb

@@ -57,7 +57,6 @@ module Pusher
     def initialize(verb, uri, params, body = nil, token = nil, client = Pusher)
       @verb = verb
       @uri = uri
-      @client = client
 
       if body
         @body = body
@@ -65,13 +64,16 @@ module Pusher
       end
 
       request = Signature::Request.new(verb.to_s.upcase, uri.path, params)
-      auth_hash = request.sign(token || @client.authentication_token)
-      @params = params.merge(auth_hash)
+      request.sign(token || client.authentication_token)
+      @params = request.signed_params
     end
 
     def send_sync
-      require 'net/http' unless defined?(Net::HTTP)
-      require 'net/https' if (ssl? && !defined?(Net::HTTPS))
+      if ssl?
+        require 'net/https' unless defined?(Net::HTTPS)
+      else
+        require 'net/http' unless defined?(Net::HTTP)
+      end
 
       @http_sync ||= begin
         http = Net::HTTP.new(@uri.host, @uri.port)
@@ -94,7 +96,7 @@ module Pusher
           raise "Unknown verb"
         end
       rescue Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED,
-             Errno::ETIMEDOUT, Errno::EHOSTUNREACH, Errno::ECONNRESET,
+             Errno::ETIMEDOUT, Errno::EHOSTUNREACH,
              Timeout::Error, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError => e
@@ -103,7 +105,9 @@ module Pusher
         raise error
       end
 
-      return handle_response(response.code.to_i, response.body.chomp)
+      body = response.body ? response.body.chomp : nil
+
+      return handle_response(response.code.to_i, body)
     end
 
     def send_async
@@ -139,7 +143,7 @@ module Pusher
     def handle_response(status_code, body)
       case status_code
       when 200
-        return MultiJson.decode(body, :symbolize_keys => true)
+        return symbolize_first_level(MultiJson.decode(body))
       when 202
         return true
       when 400
@@ -156,5 +160,12 @@ module Pusher
     def ssl?
       @uri.scheme == 'https'
     end
+
+    def symbolize_first_level(hash)
+      hash.inject({}) do |result, (key, value)|
+        result[key.to_sym] = value
+        result
+      end
+    end
   end
 end

data/pusher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "0.9.4"
+  s.version     = "0.10.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]
@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
   s.description = %q{Wrapper for pusher.com REST api}
 
   s.add_dependency "multi_json", "~> 1.0"
-  s.add_dependency 'signature', "~> 0.1.2"
+  s.add_dependency 'signature', "~> 0.1.4"
+  s.add_dependency "jruby-openssl" if defined?(JRUBY_VERSION)
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "webmock"

data/spec/channel_spec.rb

@@ -10,18 +10,28 @@ describe Pusher::Channel do
       :port => 80,
     })
     @client.encrypted = false
+    @channel = @client['test_channel']
 
     WebMock.reset!
     WebMock.disable_net_connect!
+  end
+
+  let(:pusher_url_regexp) { %r{/apps/20/channels/test_channel/events} }
 
-    @pusher_url_regexp = %r{/apps/20/channels/test_channel/events}
+  def stub_post(status, body = nil)
+    options = {:status => status}
+    options.merge!({:body => body}) if body
+
+    WebMock.stub_request(:post, pusher_url_regexp).to_return(options)
+  end
+
+  def stub_post_to_raise(e)
+    WebMock.stub_request(:post, pusher_url_regexp).to_raise(e)
   end
 
   describe 'trigger!' do
     before :each do
-      WebMock.stub_request(:post, @pusher_url_regexp).
-        to_return(:status => 202)
-      @channel = @client['test_channel']
+      stub_post 202
     end
 
     it 'should configure HTTP library to talk to pusher API' do
@@ -41,7 +51,7 @@ describe Pusher::Channel do
         :name => 'Pusher',
         :last_name => 'App'
       })
-      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with { |req|
+      WebMock.should have_requested(:post, pusher_url_regexp).with { |req|
         query_hash = req.uri.query_values
         query_hash["name"].should == 'new_event'
         query_hash["auth_key"].should == @client.key
@@ -60,57 +70,54 @@ describe Pusher::Channel do
     it "should POST string data unmodified in request body" do
       string = "foo\nbar\""
       @channel.trigger!('new_event', string)
-      WebMock.should have_requested(:post, %r{/apps/20/channels/test_channel/events}).with { |req| req.body.should == "foo\nbar\"" }
+      WebMock.should have_requested(:post, pusher_url_regexp).with { |req| req.body.should == "foo\nbar\"" }
     end
 
-    it "should catch all Net::HTTP exceptions and raise a Pusher::HTTPError, exposing the original error if required" do
-      WebMock.stub_request(
-        :post, %r{/apps/20/channels/test_channel/events}
-      ).to_raise(Timeout::Error)
+    def trigger
+      lambda { @channel.trigger!('new_event', 'Some data') }
+    end
 
+    it "should catch all Net::HTTP exceptions and raise a Pusher::HTTPError, exposing the original error if required" do
+      stub_post_to_raise Timeout::Error
       error_raised = nil
+
       begin
-        @client['test_channel'].trigger!('new_event', 'Some data')
+        trigger.call
       rescue => e
         error_raised = e
       end
+
       error_raised.class.should == Pusher::HTTPError
       error_raised.message.should == 'Exception from WebMock (Timeout::Error)'
       error_raised.original_error.class.should == Timeout::Error
     end
 
+
+    it "should raise Pusher::Error if pusher returns 400" do
+      stub_post 400
+      trigger.should raise_error(Pusher::Error)
+    end
+
     it "should raise AuthenticationError if pusher returns 401" do
-      WebMock.stub_request(
-        :post,
-        %r{/apps/20/channels/test_channel/events}
-      ).to_return(:status => 401)
-      lambda {
-        @client['test_channel'].trigger!('new_event', 'Some data')
-      }.should raise_error(Pusher::AuthenticationError)
+      stub_post 401
+      trigger.should raise_error(Pusher::AuthenticationError)
     end
 
     it "should raise Pusher::Error if pusher returns 404" do
-      WebMock.stub_request(
-        :post, %r{/apps/20/channels/test_channel/events}
-      ).to_return(:status => 404)
-      lambda {
-        @client['test_channel'].trigger!('new_event', 'Some data')
-      }.should raise_error(Pusher::Error, 'Resource not found: app_id is probably invalid')
+      stub_post 404
+      trigger.should raise_error(Pusher::Error, 'Resource not found: app_id is probably invalid')
     end
 
     it "should raise Pusher::Error if pusher returns 500" do
-      WebMock.stub_request(
-        :post, %r{/apps/20/channels/test_channel/events}
-      ).to_return(:status => 500, :body => "some error")
-      lambda {
-        @client['test_channel'].trigger!('new_event', 'Some data')
-      }.should raise_error(Pusher::Error, 'Unknown error (status code 500): some error')
+      stub_post 500, "some error"
+      trigger.should raise_error(Pusher::Error, 'Unknown error (status code 500): some error')
     end
   end
 
-  describe 'trigger' do
+  describe '#trigger' do
     it "should log failure if error raised in Net::HTTP call" do
-      stub_request(:post, @pusher_url_regexp).to_raise(Net::HTTPBadResponse)
+      stub_post_to_raise(Net::HTTPBadResponse)
+
       Pusher.logger.should_receive(:error).with("Exception from WebMock (Net::HTTPBadResponse) (Pusher::HTTPError)")
       Pusher.logger.should_receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
@@ -118,21 +125,19 @@ describe Pusher::Channel do
     end
 
     it "should log failure if Pusher returns an error response" do
-      stub_request(:post, @pusher_url_regexp).to_return(:status => 401)
-      # @http.should_receive(:post).and_raise(Net::HTTPBadResponse)
-      Pusher.logger.should_receive(:error).with(" (Pusher::AuthenticationError)")
+      stub_post 401
+      Pusher.logger.should_receive(:error).with("Pusher::AuthenticationError (Pusher::AuthenticationError)")
       Pusher.logger.should_receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
       channel.trigger('new_event', 'Some data')
     end
   end
 
-  describe "trigger_async" do
+  describe "#trigger_async" do
     it "should by default POST to http api" do
       EM.run {
-        stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
-        channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
-        channel.trigger_async('new_event', 'Some data').callback {
+        stub_post 202
+        @channel.trigger_async('new_event', 'Some data').callback {
           WebMock.should have_requested(:post, %r{http://api.pusherapp.com})
           EM.stop
         }
@@ -142,7 +147,7 @@ describe Pusher::Channel do
     it "should POST to https api if ssl enabled" do
       @client.encrypted = true
       EM.run {
-        stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
+        stub_post 202
         channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
         channel.trigger_async('new_event', 'Some data').callback {
           WebMock.should have_requested(:post, %r{https://api.pusherapp.com})
@@ -152,12 +157,12 @@ describe Pusher::Channel do
     end
 
     it "should return a deferrable which succeeds in success case" do
-      stub_request(:post, @pusher_url_regexp).to_return(:status => 202)
+      stub_post 202
 
       EM.run {
-        d = @client['test_channel'].trigger_async('new_event', 'Some data')
+        d = @channel.trigger_async('new_event', 'Some data')
         d.callback {
-          WebMock.should have_requested(:post, @pusher_url_regexp)
+          WebMock.should have_requested(:post, pusher_url_regexp)
           EM.stop
         }
         d.errback {
@@ -168,15 +173,15 @@ describe Pusher::Channel do
     end
 
     it "should return a deferrable which fails (with exception) in fail case" do
-      stub_request(:post, @pusher_url_regexp).to_return(:status => 401)
+      stub_post 401
 
       EM.run {
-        d = @client['test_channel'].trigger_async('new_event', 'Some data')
+        d = @channel.trigger_async('new_event', 'Some data')
         d.callback {
           fail
         }
         d.errback { |error|
-          WebMock.should have_requested(:post, @pusher_url_regexp)
+          WebMock.should have_requested(:post, pusher_url_regexp)
           error.should be_kind_of(Pusher::AuthenticationError)
           EM.stop
         }
@@ -184,76 +189,58 @@ describe Pusher::Channel do
     end
   end
 
-  describe "stats" do
-    before :each do
-      @api_path = %r{/apps/20/channels/presence-test_channel/stats}
+  describe '#info' do
+    it "should call the Client#channel_info" do
+      @client.should_receive(:channel_info).with('mychannel', anything)
+      @channel = @client['mychannel']
+      @channel.info
     end
 
-    it "should call the user_count api" do
-      WebMock.stub_request(:get, @api_path).to_return({
-        :status => 200,
-        :body => MultiJson.encode(:user_count => 1)
+    it "should assemble the requested attribes into the info option" do
+      @client.should_receive(:channel_info).with(anything, {
+        :info => "user_count,connection_count"
       })
-      @channel = @client['presence-test_channel']
-
-      @channel.stats.should == {
-        :user_count => 1
-      }
+      @channel = @client['presence-foo']
+      @channel.info(%w{user_count connection_count})
     end
   end
 
-  describe "socket_auth" do
-    before :each do
-      @channel = @client['test_channel']
+  describe "#authentication_string" do
+    def authentication_string(*data)
+      lambda { @channel.authentication_string(*data) }
     end
 
     it "should return an authentication string given a socket id" do
-      auth = @channel.socket_auth('socketid')
+      auth = @channel.authentication_string('socketid')
 
       auth.should == '12345678900000001:827076f551e22451357939e4c7bb1200de29f921d5bf80b40d71668f9cd61c40'
     end
 
     it "should raise error if authentication is invalid" do
       [nil, ''].each do |invalid|
-        lambda {
-          @channel.socket_auth(invalid)
-        }.should raise_error
+        authentication_string(invalid).should raise_error Pusher::Error
       end
     end
 
     describe 'with extra string argument' do
-
       it 'should be a string or nil' do
-        lambda {
-          @channel.socket_auth('socketid', 'boom')
-        }.should_not raise_error
-
-        lambda {
-          @channel.socket_auth('socketid', 123)
-        }.should raise_error
+        authentication_string('socketid', 123).should raise_error Pusher::Error
+        authentication_string('socketid', {}).should raise_error Pusher::Error
 
-        lambda {
-          @channel.socket_auth('socketid', nil)
-        }.should_not raise_error
-
-        lambda {
-          @channel.socket_auth('socketid', {})
-        }.should raise_error
+        authentication_string('socketid', 'boom').should_not raise_error
+        authentication_string('socketid', nil).should_not raise_error
       end
 
       it "should return an authentication string given a socket id and custom args" do
-        auth = @channel.socket_auth('socketid', 'foobar')
+        auth = @channel.authentication_string('socketid', 'foobar')
 
         auth.should == "12345678900000001:#{hmac(@client.secret, "socketid:test_channel:foobar")}"
       end
-
     end
   end
 
   describe '#authenticate' do
-
     before :each do
-      @channel = @client['test_channel']
       @custom_data = {:uid => 123, :info => {:name => 'Foo'}}
     end
 

data/spec/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'em-http'
 
 describe Pusher do
-  describe 'different clients' do
+  describe 'using multiple Client objects' do
     before :each do
       @client1 = Pusher::Client.new
       @client2 = Pusher::Client.new
@@ -72,6 +72,8 @@ describe Pusher do
     end
   end
 
+  # The behaviour should be the same when using the Client object, or the
+  # 'global' client delegated through the Pusher class
   [lambda { Pusher }, lambda { Pusher::Client.new }].each do |client_gen|
     before :each do
       @client = client_gen.call
@@ -130,7 +132,7 @@ describe Pusher do
         @client.secret = '12345678900000001'
       end
 
-      describe '.[]' do
+      describe '#[]' do
         before do
           @channel = @client['test_channel']
         end
@@ -154,6 +156,71 @@ describe Pusher do
           end
         end
       end
+
+      describe '#channels' do
+        it "should call the correct URL and symbolise response correctly" do
+          api_path = %r{/apps/20/channels}
+          WebMock.stub_request(:get, api_path).to_return({
+            :status => 200,
+            :body => MultiJson.encode('channels' => {
+              "channel1" => {},
+              "channel2" => {}
+            })
+          })
+          @client.channels.should == {
+            :channels => {
+              "channel1" => {},
+              "channel2" => {}
+            }
+          }
+        end
+      end
+
+      describe '#channel_info' do
+        it "should call correct URL and symbolise response" do
+          api_path = %r{/apps/20/channels/mychannel}
+          WebMock.stub_request(:get, api_path).to_return({
+            :status => 200,
+            :body => MultiJson.encode({
+              'occupied' => false,
+            })
+          })
+          @client.channel_info('mychannel').should == {
+            :occupied => false,
+          }
+        end
+      end
+
+      describe '#trigger' do
+        before :each do
+          @api_path = %r{/apps/20/events}
+          WebMock.stub_request(:post, @api_path).to_return({
+            :status => 200,
+            :body => MultiJson.encode({})
+          })
+        end
+
+        it "should call correct URL" do
+          @client.trigger('mychannel', 'event', {'some' => 'data'}).
+            should == {}
+        end
+
+        it "should pass any options in the body of the request" do
+          @client.trigger('mychannel', 'event', {'some' => 'data'}, {
+            :socket_id => "1234"
+          })
+          WebMock.should have_requested(:post, @api_path).with { |req|
+            MultiJson.decode(req.body)["socket_id"].should == '1234'
+          }
+        end
+
+        it "should convert non string data to JSON before posting" do
+          @client.trigger('mychannel', 'event', {'some' => 'data'})
+          WebMock.should have_requested(:post, @api_path).with { |req|
+            MultiJson.decode(req.body)["data"].should == '{"some":"data"}'
+          }
+        end
+      end
     end
   end
 end

metadata

@@ -1,105 +1,142 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pusher
-version: !ruby/object:Gem::Version
-  version: 0.9.4
+version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: 
+  segments: 
+  - 0
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
-authors:
+authors: 
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: &70359107850640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70359107850640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: signature
-  requirement: &70359107850160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
   type: :runtime
-  prerelease: false
-  version_requirements: *70359107850160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70359107849700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *70359107849700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &70359107849320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70359107849320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: em-http-request
-  requirement: &70359107848780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70359107848780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70359107848360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70359107848360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &70359107847900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70359107847900
+  version_requirements: *id007
 description: Wrapper for pusher.com REST api
-email:
+email: 
 - support@pusher.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gemtest
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -116,31 +153,39 @@ files:
 - spec/web_hook_spec.rb
 homepage: http://github.com/pusher/pusher-gem
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Pusher API client
-test_files:
+test_files: 
 - spec/channel_spec.rb
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/web_hook_spec.rb
-has_rdoc: