pusher 0.11.3 → 0.12.0

data/.travis.yml

@@ -13,5 +13,3 @@ matrix:
   allow_failures:
     - rvm: jruby-18mode
     - rvm: jruby-19mode
-
-script: "rspec spec/*_spec.rb"

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
-gemspec
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -1,48 +1,52 @@
 PATH
   remote: .
   specs:
-    pusher (0.11.3)
+    pusher (0.12.0)
+      httpclient (~> 2.3.0)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
+    addressable (2.3.5)
     cookiejar (0.3.0)
-    crack (0.3.2)
-    diff-lcs (1.1.3)
-    em-http-request (1.0.3)
-      addressable (>= 2.2.3)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
+    em-http-request (1.1.0)
+      addressable (>= 2.3.4)
       cookiejar
-      em-socksify
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0.beta.2)
+    em-socksify (0.3.0)
       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.5.0)
-    rack (1.5.1)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    signature (0.1.6)
-    webmock (1.9.0)
+    eventmachine (1.0.3)
+    http_parser.rb (0.6.0.beta.2)
+    httpclient (2.3.4.1)
+    multi_json (1.7.8)
+    rack (1.5.2)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.2)
+    safe_yaml (0.9.4)
+    signature (0.1.7)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  em-http-request (~> 1.0.0)
+  em-http-request (~> 1.1.0)
   pusher!
   rack
   rake

data/README.md

@@ -3,7 +3,15 @@ Pusher gem
 
 [![Build Status](https://secure.travis-ci.org/pusher/pusher-gem.png?branch=master)](http://travis-ci.org/pusher/pusher-gem)
 
-## Configuration
+## Installation & Configuration
+
+Add pusher to your Gemfile, and then run `bundle install`
+
+    gem 'pusher'
+    
+or install via gem
+
+    gem install pusher
 
 After registering at <http://pusher.com> configure your app with the security credentials.
 
@@ -25,6 +33,10 @@ By default API requests are made over HTTP. HTTPS can be used by setting
 
     Pusher.encrypted = true
 
+As of version 0.12, SSL certificates are verified when using the synchronous http client. If you need to disable this behaviour for any reason use:
+
+    Pusher.default_client.sync_http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
 ### Instantiating a Pusher client
 
 Sometimes you may have multiple sets of API keys, or want different configuration in different parts of your application. In these scenarios, a pusher `client` may be configured:
@@ -94,24 +106,45 @@ All requests must be signed by using your secret key, which is handled automatic
     # using a client
     pusher_client.post('url_without_app_id', params)
 
-Note that you don't need to specify your app_id in the URL, as this is inferred from your credentials. As with the trigger method above, `_async` can be suffixed to the method name to return a deferrable.
+Note that you don't need to specify your app_id in the URL, as this is inferred from your credentials.
 
 ### Asynchronous requests
 
-If you are running your application in an evented environment, you may want to use the asynchronous versions of the Pusher API methods to avoid blocking. The convention for this is to add the suffix `_async` to the method, e.g. `trigger_async` or `post_async`.
+There are two main reasons for using the `_async` methods:
+
+* In a web application where the response from Pusher is not used, but you'd like to avoid a blocking call in the request-response cycle
+* Your application is running in an event loop and you need to avoid blocking the reactor
+
+Asynchronous calls are supported either by using an event loop (eventmachine, preferred), or via a thread.
 
-You need to be running eventmachine to make use of this functionality. This is already the case if, for example, you're deploying to Heroku or using the Thin web server. You will also need to add `em-http-request` to your Gemfile.
+The following methods are available (in each case the calling iterface matches the non-async version):
 
-When using an asynchronous version of a method, it will return a deferrable.
+* `Pusher.get_async`
+* `Pusher.post_async`
+* `Pusher.trigger_async`
 
-    Pusher.trigger_async(['a_channel'], 'an_event', {
-      :some => 'data'
-    }, socket_id).callback {
-      # Do something on success
+It is of course also possible to make calls to pusher via a job queue. This approach is recommended if you're sending a large number of events to pusher.
+
+#### With eventmachine
+
+* Add the `em-http-request` gem to your Gemfile (it's not a gem dependency).
+* Run the eventmachine reactor (either using `EM.run` or by running inside an evented server such as Thin).
+
+The `_async` methods return an `EM::Deferrable` which you can bind callbacks to:
+
+    Pusher.get_async("/channels").callback { |response|
+      # use reponse[:channels]
     }.errback { |error|
-      # error is a instance of Pusher::Error
+      # error is an instance of Pusher::Error
     }
 
+A HTTP error or an error response from pusher will cause the errback to be called with an appropriate error object.
+
+#### Without eventmachine
+
+If the eventmachine reactor is not running, async requests will be make using threads (managed by the httpclient gem).
+
+An `HTTPClient::Connection` object is returned immediately which can be [interrogated](http://rubydoc.info/gems/httpclient/HTTPClient/Connection) to discover the status of the request. The usual response checking and processing is not done when the request completes, and frankly this method is most useful when you're not interested in waiting for the response.
 
 
 ## Authenticating subscription requests

data/lib/pusher.rb

@@ -28,6 +28,7 @@ module Pusher
 
     def_delegators :default_client, :authentication_token, :url
     def_delegators :default_client, :encrypted=, :url=
+    def_delegators :default_client, :timeout=, :connect_timeout=, :send_timeout=, :receive_timeout=, :keep_alive_timeout=
 
     def_delegators :default_client, :get, :get_async, :post, :post_async
     def_delegators :default_client, :channels, :channel_info, :trigger, :trigger_async
@@ -43,8 +44,6 @@ module Pusher
       end
     end
 
-    private
-
     def default_client
       @default_client ||= Pusher::Client.new
     end
@@ -56,7 +55,6 @@ module Pusher
 end
 
 require 'pusher/channel'
-require 'pusher/query_encoder'
 require 'pusher/request'
 require 'pusher/resource'
 require 'pusher/webhook'

data/lib/pusher/channel.rb

@@ -51,7 +51,7 @@ module Pusher
     #   event - see http://pusher.com/docs/publisher_api_guide/publisher_excluding_recipients for more info
     #
     # @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
+    # @raise [Pusher::HTTPError] on any error raised inside http client - the original error is available in the original_error attribute
     #
     def trigger!(event_name, data, socket_id = nil)
       params = {}
@@ -79,7 +79,7 @@ module Pusher
     # @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
+    # @raise [Pusher::HTTPError] on any error raised inside http client - the original error is available in the original_error attribute
     #
     def info(attributes = [])
       @client.get("/channels/#{name}", :info => attributes.join(','))

data/lib/pusher/client.rb

@@ -2,8 +2,10 @@ require 'signature'
 
 module Pusher
   class Client
-    attr_accessor :scheme, :host, :port, :app_id, :key, :secret, :http_proxy
-    attr_reader :proxy
+    attr_accessor :scheme, :host, :port, :app_id, :key, :secret
+    attr_reader :http_proxy, :proxy
+    attr_writer :connect_timeout, :send_timeout, :receive_timeout,
+                :keep_alive_timeout
 
     ## CONFIGURATION ##
 
@@ -16,7 +18,14 @@ module Pusher
       @scheme, @host, @port, @app_id, @key, @secret = options.values_at(
         :scheme, :host, :port, :app_id, :key, :secret
       )
+      @http_proxy = nil
       self.http_proxy = options[:http_proxy] if options[:http_proxy]
+
+      # Default timeouts
+      @connect_timeout = 5
+      @send_timeout = 5
+      @receive_timeout = 5
+      @keep_alive_timeout = 30
     end
 
     # @private Returns the authentication token for the client
@@ -79,6 +88,12 @@ module Pusher
       @scheme == 'https'
     end
 
+    # Convenience method to set all timeouts to the same value (in seconds).
+    # For more control, use the individual writers.
+    def timeout=(value)
+      @connect_timeout, @send_timeout, @receive_timeout = value, value, value
+    end
+
     ## INTERACE WITH THE API ##
 
     def resource(path)
@@ -101,7 +116,7 @@ module Pusher
     # @return [Hash] See Pusher API docs
     #
     # @raise [Pusher::Error] Unsuccessful response - see the error message
-    # @raise [Pusher::HTTPError] Error raised inside Net::HTTP. The original error is wrapped in error.original_error
+    # @raise [Pusher::HTTPError] Error raised inside http client. The original error is wrapped in error.original_error
     #
     def get(path, params = {})
       Resource.new(self, path).get(params)
@@ -110,19 +125,14 @@ module Pusher
     # GET arbitrary REST API resource using an asynchronous http client.
     # All request signing is handled automatically.
     #
-    # @example
-    #   Pusher.get_async('/channels', {
-    #     filter_by_prefix: 'private-'
-    #   }).callback { |response_hash|
-    #     # ...
-    #   }.errback { |error|
-    #     # error is a instance of Pusher::Error
-    #   }
+    # When the eventmachine reactor is running, the em-http-request gem is used;
+    # otherwise an async request is made using httpclient. See README for
+    # details and examples.
     #
     # @param path [String] Path excluding /apps/APP_ID
     # @param params [Hash] API params (see http://pusher.com/docs/rest_api)
     #
-    # @return [EM::DefaultDeferrable]
+    # @return Either an EM::DefaultDeferrable or a HTTPClient::Connection
     #
     def get_async(path, params = {})
       Resource.new(self, path).get_async(params)
@@ -175,7 +185,7 @@ module Pusher
     # @return [Hash] See Pusher API docs
     #
     # @raise [Pusher::Error] Unsuccessful response - see the error message
-    # @raise [Pusher::HTTPError] Error raised inside Net::HTTP. The original error is wrapped in error.original_error
+    # @raise [Pusher::HTTPError] Error raised inside http client. The original error is wrapped in error.original_error
     #
     def channels(params = {})
       get('/channels', params)
@@ -191,7 +201,7 @@ module Pusher
     # @return [Hash] See Pusher API docs
     #
     # @raise [Pusher::Error] Unsuccessful response - see the error message
-    # @raise [Pusher::HTTPError] Error raised inside Net::HTTP. The original error is wrapped in error.original_error
+    # @raise [Pusher::HTTPError] Error raised inside http client. The original error is wrapped in error.original_error
     #
     def channel_info(channel_name, params = {})
       get("/channels/#{channel_name}", params)
@@ -210,7 +220,7 @@ module Pusher
     # @return [Hash] See Pusher API docs
     #
     # @raise [Pusher::Error] Unsuccessful response - see the error message
-    # @raise [Pusher::HTTPError] Error raised inside Net::HTTP. The original error is wrapped in error.original_error
+    # @raise [Pusher::HTTPError] Error raised inside http client. The original error is wrapped in error.original_error
     #
     def trigger(channels, event_name, data, params = {})
       post('/events', trigger_params(channels, event_name, data, params))
@@ -224,28 +234,16 @@ module Pusher
     end
 
     # @private Construct a net/http http client
-    def net_http_client
-      begin
-        if encrypted?
-          require 'net/https' unless defined?(Net::HTTPS)
-        else
-          require 'net/http' unless defined?(Net::HTTP)
+    def sync_http_client
+      @client ||= begin
+        require 'httpclient'
+
+        HTTPClient.new(@http_proxy).tap do |c|
+          c.connect_timeout = @connect_timeout
+          c.send_timeout = @send_timeout
+          c.receive_timeout = @receive_timeout
+          c.keep_alive_timeout = @keep_alive_timeout
         end
-
-        http_klass = if (p = @proxy)
-          Net::HTTP.Proxy(p[:host], p[:port], p[:user], p[:password])
-        else
-          Net::HTTP
-        end
-
-        http = http_klass.new(@host, @port)
-
-        if encrypted?
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        http
       end
     end
 
@@ -257,9 +255,12 @@ module Pusher
         end
         require 'em-http' unless defined?(EventMachine::HttpRequest)
 
-        connection_opts = {}
+        connection_opts = {
+          :connect_timeout => @connect_timeout,
+          :inactivity_timeout => @receive_timeout,
+        }
 
-        if @proxy
+        if defined?(@proxy)
           proxy_opts = {
             :host => @proxy[:host],
             :port => @proxy[:port]
@@ -277,7 +278,7 @@ module Pusher
     private
 
     def trigger_params(channels, event_name, data, params)
-      channels = [channels] if channels.kind_of?(String)
+      channels = Array(channels).map(&:to_s)
 
       encoded_data = case data
       when String

data/lib/pusher/request.rb

@@ -4,16 +4,16 @@ require 'multi_json'
 
 module Pusher
   class Request
-    include QueryEncoder
-
     attr_reader :body, :params
 
     def initialize(client, verb, uri, params, body = nil)
       @client, @verb, @uri = client, verb, uri
+      @head = {}
 
+      @body = body
       if body
-        @body = body
         params[:body_md5] = Digest::MD5.hexdigest(body)
+        @head['Content-Type'] = 'application/json'
       end
 
       request = Signature::Request.new(verb.to_s.upcase, uri.path, params)
@@ -22,26 +22,12 @@ module Pusher
     end
 
     def send_sync
-      http = @client.net_http_client
+      http = @client.sync_http_client
 
       begin
-        case @verb
-        when :post
-          response = http.post(encode_query(@uri, @params), @body, {
-            'Content-Type'=> 'application/json'
-          })
-        when :get
-          response = http.get(encode_query(@uri, @params), {
-            'Content-Type'=> 'application/json'
-          })
-        else
-          raise "Unsuported verb"
-        end
-      rescue Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED,
-             Errno::ETIMEDOUT, Errno::EHOSTUNREACH,
-             Timeout::Error, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError => e
+        response = http.request(@verb, @uri, @params, @body, @head)
+      rescue HTTPClient::BadResponseError, HTTPClient::TimeoutError,
+             SocketError, Errno::ECONNREFUSED => e
         error = Pusher::HTTPError.new("#{e.message} (#{e.class})")
         error.original_error = e
         raise error
@@ -53,36 +39,41 @@ module Pusher
     end
 
     def send_async
-      df = EM::DefaultDeferrable.new
+      if defined?(EventMachine) && EventMachine.reactor_running?
+        http_client = @client.em_http_client(@uri)
+        df = EM::DefaultDeferrable.new
 
-      http_client = @client.em_http_client(@uri)
-      http = case @verb
-      when :post
-        http_client.post({
-          :query => @params, :timeout => 5, :body => @body,
-          :head => {'Content-Type'=> 'application/json'}
-        })
-      when :get
-        http_client.get({
-          :query => @params, :timeout => 5,
-          :head => {'Content-Type'=> 'application/json'}
-        })
-      else
-        raise "Unsuported verb"
-      end
-      http.callback {
-        begin
-          df.succeed(handle_response(http.response_header.status, http.response.chomp))
-        rescue => e
-          df.fail(e)
+        http = case @verb
+        when :post
+          http_client.post({
+            :query => @params, :body => @body, :head => @head
+          })
+        when :get
+          http_client.get({
+            :query => @params, :head => @head
+          })
+        else
+          raise "Unsuported verb"
         end
-      }
-      http.errback {
-        Pusher.logger.debug("Network error connecting to pusher: #{http.inspect}")
-        df.fail(Error.new("Network error connecting to pusher"))
-      }
+        http.callback {
+          begin
+            df.succeed(handle_response(http.response_header.status, http.response.chomp))
+          rescue => e
+            df.fail(e)
+          end
+        }
+        http.errback { |e|
+          message = "Network error connecting to pusher (#{http.error})"
+          Pusher.logger.debug(message)
+          df.fail(Error.new(message))
+        }
+
+        return df
+      else
+        http = @client.sync_http_client
 
-      df
+        return http.request_async(@verb, @uri, @params, @body, @head)
+      end
     end
 
     private

data/pusher.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "pusher"
-  s.version     = "0.11.3"
+  s.version     = "0.12.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]
@@ -13,11 +13,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "multi_json", "~> 1.0"
   s.add_dependency 'signature', "~> 0.1.6"
+  s.add_dependency "httpclient", "~> 2.3.0"
   s.add_dependency "jruby-openssl" if defined?(JRUBY_VERSION)
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "webmock"
-  s.add_development_dependency "em-http-request", "~> 1.0.0"
+  s.add_development_dependency "em-http-request", "~> 1.1.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rack"
 

data/spec/channel_spec.rb

@@ -33,18 +33,18 @@ describe Pusher::Channel do
   end
 
   describe '#trigger' do
-    it "should log failure if error raised in Net::HTTP call" do
-      stub_post_to_raise(Net::HTTPBadResponse)
+    it "should log failure if error raised in http call" do
+      stub_post_to_raise(HTTPClient::BadResponseError)
 
-      Pusher.logger.should_receive(:error).with("Exception from WebMock (Net::HTTPBadResponse) (Pusher::HTTPError)")
+      Pusher.logger.should_receive(:error).with("Exception from WebMock (HTTPClient::BadResponseError) (Pusher::HTTPError)")
       Pusher.logger.should_receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
       channel.trigger('new_event', 'Some data')
     end
 
     it "should log failure if Pusher returns an error response" do
-      stub_post 401
-      Pusher.logger.should_receive(:error).with("Pusher::AuthenticationError (Pusher::AuthenticationError)")
+      stub_post 401, "some signature info"
+      Pusher.logger.should_receive(:error).with("some signature info (Pusher::AuthenticationError)")
       Pusher.logger.should_receive(:debug) #backtrace
       channel = Pusher::Channel.new(@client.url, 'test_channel', @client)
       channel.trigger('new_event', 'Some data')
@@ -114,7 +114,7 @@ describe Pusher::Channel do
     end
 
     it 'should return a hash with signature including custom data and data as json string' do
-      MultiJson.stub!(:encode).with(@custom_data).and_return 'a json string'
+      MultiJson.stub(:encode).with(@custom_data).and_return 'a json string'
 
       response = @channel.authenticate('socketid', @custom_data)
 

data/spec/client_spec.rb

@@ -102,7 +102,7 @@ describe Pusher do
 
     describe 'logging configuration' do
       it "can be configured to use any logger" do
-        logger = mock("ALogger")
+        logger = double("ALogger")
         logger.should_receive(:debug).with('foo')
         Pusher.logger = logger
         Pusher.logger.debug('foo')
@@ -314,8 +314,8 @@ describe Pusher do
             }
           end
 
-          it "should catch all Net::HTTP exceptions and raise a Pusher::HTTPError wrapping the original error" do
-            stub_request(verb, @url_regexp).to_raise(Timeout::Error)
+          it "should catch all http exceptions and raise a Pusher::HTTPError wrapping the original error" do
+            stub_request(verb, @url_regexp).to_raise(HTTPClient::TimeoutError)
 
             error = nil
             begin
@@ -326,8 +326,8 @@ describe Pusher do
 
             error.class.should == Pusher::HTTPError
             error.should be_kind_of(Pusher::Error)
-            error.message.should == 'Exception from WebMock (Timeout::Error)'
-            error.original_error.class.should == Timeout::Error
+            error.message.should == 'Exception from WebMock (HTTPClient::TimeoutError)'
+            error.original_error.class.should == HTTPClient::TimeoutError
           end
 
           it "should raise Pusher::Error if call returns 400" do
@@ -357,61 +357,105 @@ describe Pusher do
         end
       end
 
-      [[:get, :get_async], [:post, :post_async]].each do |verb, method|
-        describe "##{method}" do
-          before :each do
-            @url_regexp = %r{api.pusherapp.com}
-            stub_request(verb, @url_regexp).
-              to_return(:status => 200, :body => "{}")
-          end
-
-          let(:call_api) { @client.send(method, '/path') }
+      describe "async calling without eventmachine" do
+        [[:get, :get_async], [:post, :post_async]].each do |verb, method|
+          describe "##{method}" do
+            before :each do
+              @url_regexp = %r{api.pusherapp.com}
+              stub_request(verb, @url_regexp).
+                to_return(:status => 200, :body => "{}")
+            end
 
-          it "should use http by default" do
-            EM.run {
-              call_api.callback {
-                WebMock.should have_requested(verb, %r{http://api.pusherapp.com/apps/20/path})
-                EM.stop
+            let(:call_api) {
+              @client.send(method, '/path').tap { |c|
+                # Allow the async thread (inside httpclient) to run
+                while !c.finished?
+                  sleep 0.01
+                end
               }
             }
-          end
 
-          it "should use https if configured" do
-            EM.run {
+            it "should use http by default" do
+              call_api
+              WebMock.should have_requested(verb, %r{http://api.pusherapp.com/apps/20/path})
+            end
+
+            it "should use https if configured" do
               @client.encrypted = true
-              call_api.callback {
-                WebMock.should have_requested(verb, %r{https://api.pusherapp.com})
-                EM.stop
-              }
-            }
+              call_api
+              WebMock.should have_requested(verb, %r{https://api.pusherapp.com})
+            end
+
+            # Note that the raw httpclient connection object is returned and
+            # the response isn't handled (by handle_response) in the normal way.
+            it "should return a httpclient connection object" do
+              connection = call_api
+              connection.finished?.should be_true
+              response = connection.pop
+              response.status.should == 200
+              response.body.read.should == "{}"
+            end
           end
+        end
+      end
 
-          it "should format the respose hash with symbols at first level" do
-            EM.run {
-              stub_request(verb, @url_regexp).to_return({
-                :status => 200,
-                :body => MultiJson.encode({'something' => {'a' => 'hash'}})
-              })
-              call_api.callback { |response|
-                response.should == {
-                  :something => {'a' => 'hash'}
+      describe "async calling with eventmachine" do
+        [[:get, :get_async], [:post, :post_async]].each do |verb, method|
+          describe "##{method}" do
+            before :each do
+              @url_regexp = %r{api.pusherapp.com}
+              stub_request(verb, @url_regexp).
+                to_return(:status => 200, :body => "{}")
+            end
+
+            let(:call_api) { @client.send(method, '/path') }
+
+            it "should use http by default" do
+              EM.run {
+                call_api.callback {
+                  WebMock.should have_requested(verb, %r{http://api.pusherapp.com/apps/20/path})
+                  EM.stop
                 }
-                EM.stop
               }
-            }
-          end
+            end
 
-          it "should errback with Pusher::Error on unsuccessful response" do
-            EM.run {
-              stub_request(verb, @url_regexp).to_return({:status => 400})
+            it "should use https if configured" do
+              EM.run {
+                @client.encrypted = true
+                call_api.callback {
+                  WebMock.should have_requested(verb, %r{https://api.pusherapp.com})
+                  EM.stop
+                }
+              }
+            end
 
-              call_api.errback { |e|
-                e.class.should == Pusher::Error
-                EM.stop
-              }.callback {
-                fail
+            it "should format the respose hash with symbols at first level" do
+              EM.run {
+                stub_request(verb, @url_regexp).to_return({
+                  :status => 200,
+                  :body => MultiJson.encode({'something' => {'a' => 'hash'}})
+                })
+                call_api.callback { |response|
+                  response.should == {
+                    :something => {'a' => 'hash'}
+                  }
+                  EM.stop
+                }
               }
-            }
+            end
+
+            it "should errback with Pusher::Error on unsuccessful response" do
+              EM.run {
+                stub_request(verb, @url_regexp).to_return({:status => 400})
+
+                call_api.errback { |e|
+                  e.class.should == Pusher::Error
+                  EM.stop
+                }.callback {
+                  fail
+                }
+              }
+            end
           end
         end
       end

data/spec/spec_helper.rb

@@ -21,5 +21,5 @@ end
 
 def hmac(key, data)
   digest = OpenSSL::Digest::SHA256.new
-  expected = OpenSSL::HMAC.hexdigest(digest, key, data)
+  OpenSSL::HMAC.hexdigest(digest, key, data)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +159,6 @@ files:
 - lib/pusher.rb
 - lib/pusher/channel.rb
 - lib/pusher/client.rb
-- lib/pusher/query_encoder.rb
 - lib/pusher/request.rb
 - lib/pusher/resource.rb
 - lib/pusher/webhook.rb
@@ -166,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2045572575417180827
+      hash: -1060459840263191989
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,10 +190,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2045572575417180827
+      hash: -1060459840263191989
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Pusher API client

data/lib/pusher/query_encoder.rb

@@ -1,47 +0,0 @@
-module Pusher
-  # Query string encoding extracted with thanks from em-http-request
-  module QueryEncoder
-    def encode_query(uri, query)
-      encoded_query = if query.kind_of?(Hash)
-        query.map { |k, v| encode_param(k, v) }.join('&')
-      else
-        query.to_s
-      end
-
-      if uri && !uri.query.to_s.empty?
-        encoded_query = [encoded_query, uri.query].reject {|part| part.empty?}.join("&")
-      end
-      encoded_query.to_s.empty? ? uri.path : "#{uri.path}?#{encoded_query}"
-    end
-
-    # URL encodes query parameters:
-    # single k=v, or a URL encoded array, if v is an array of values
-    def encode_param(k, v)
-      if v.is_a?(Array)
-        v.map { |e| escape(k) + "[]=" + escape(e) }.join("&")
-      else
-        escape(k) + "=" + escape(v)
-      end
-    end
-
-    def escape(s)
-      if defined?(EscapeUtils)
-        EscapeUtils.escape_url(s.to_s)
-      else
-        s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) {
-          '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
-        }
-      end
-    end
-
-    if ''.respond_to?(:bytesize)
-      def bytesize(string)
-        string.bytesize
-      end
-    else
-      def bytesize(string)
-        string.size
-      end
-    end
-  end
-end