pusher 0.8.3 → 0.8.4

data/lib/pusher/channel.rb

@@ -9,7 +9,7 @@ module Pusher
 
     def initialize(base_url, name)
       @uri = base_url.dup
-      @uri.path = @uri.path + "/channels/#{name}/events"
+      @uri.path = @uri.path + "/channels/#{name}/"
       @name = name
     end
 
@@ -25,33 +25,8 @@ module Pusher
     #   probably want to run your application inside a server such as thin
     #
     def trigger_async(event_name, data, socket_id = nil, &block)
-      unless defined?(EventMachine) && EventMachine.reactor_running?
-        raise Error, "In order to use trigger_async you must be running inside an eventmachine loop"
-      end
-      require 'em-http' unless defined?(EventMachine::HttpRequest)
-
-      request = Pusher::Request.new(@uri, event_name, data, socket_id)
-
-      deferrable = EM::DefaultDeferrable.new
-      
-      http = EventMachine::HttpRequest.new(@uri).post({
-        :query => request.query, :timeout => 5, :body => request.body,
-        :head => {'Content-Type'=> 'application/json'}
-      })
-      http.callback {
-        begin
-          handle_response(http.response_header.status, http.response.chomp)
-          deferrable.succeed
-        rescue => e
-          deferrable.fail(e)
-        end
-      }
-      http.errback {
-        Pusher.logger.debug("Network error connecting to pusher: #{http.inspect}")
-        deferrable.fail(Error.new("Network error connecting to pusher"))
-      }
-      
-      deferrable
+      request = construct_event_request(event_name, data, socket_id)
+      request.send_async
     end
 
     # Trigger event
@@ -72,31 +47,8 @@ module Pusher
     # @raise [Pusher::HTTPError] on any error raised inside Net::HTTP - the original error is available in the original_error attribute
     #
     def trigger!(event_name, data, socket_id = nil)
-      require 'net/http' unless defined?(Net::HTTP)
-      require 'net/https' if (ssl? && !defined?(Net::HTTPS))
-
-      @http_sync ||= begin
-        http = Net::HTTP.new(@uri.host, @uri.port)
-        http.use_ssl = true if ssl?
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ssl?
-        http
-      end
-
-      request = Pusher::Request.new(@uri, event_name, data, socket_id)
-
-      begin
-        response = @http_sync.post("#{@uri.path}?#{request.query.to_params}",
-          request.body, { 'Content-Type'=> 'application/json' })
-      rescue Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED,
-             Timeout::Error, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError => e
-        error = Pusher::HTTPError.new("#{e.message} (#{e.class})")
-        error.original_error = e
-        raise error
-      end
-
-      return handle_response(response.code.to_i, response.body.chomp)
+      request = construct_event_request(event_name, data, socket_id)
+      request.send_sync
     end
 
     # Trigger event, catching and logging any errors.
@@ -111,6 +63,17 @@ module Pusher
       Pusher.logger.debug(e.backtrace.join("\n"))
     end
     
+    # Request channel stats
+    #
+    # @return [Hash] See Pusher api docs for reported stats
+    # @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', {})
+      return request.send_sync
+    end
+
     # Compute authentication string required to subscribe to this channel.
     #
     # See http://pusher.com/docs/auth_signatures for more details.
@@ -167,23 +130,25 @@ module Pusher
 
     private
 
-    def handle_response(status_code, body)
-      case status_code
-      when 202
-        return true
-      when 400
-        raise Error, "Bad request: #{body}"
-      when 401
-        raise AuthenticationError, body
-      when 404
-        raise Error, "Resource not found: app_id is probably invalid"
+    def construct_event_request(event_name, data, socket_id)
+      params = {
+        :name => event_name,
+      }
+      params[:socket_id] = socket_id if socket_id
+
+      body = case data
+      when String
+        data
       else
-        raise Error, "Unknown error (status code #{status_code}): #{body}"
+        begin
+          MultiJson.encode(data)
+        rescue MultiJson::DecodeError => e
+          Pusher.logger.error("Could not convert #{data.inspect} into JSON")
+          raise e
+        end
       end
-    end
 
-    def ssl?
-      @uri.scheme == 'https'
+      request = Pusher::Request.new(:post, @uri + 'events', params, body)
     end
   end
 end

data/lib/pusher/request.rb

@@ -4,32 +4,104 @@ require 'multi_json'
 
 module Pusher
   class Request
-    attr_reader :body, :query
+    def initialize(verb, uri, params, body = nil, token = nil)
+      @verb = verb
+      @uri = uri
 
-    def initialize(resource, event_name, data, socket_id, token = nil)
-      params = {
-        :name => event_name,
-      }
-      params[:socket_id] = socket_id if socket_id
+      if body
+        @body = body
+        params[:body_md5] = Digest::MD5.hexdigest(body)
+      end
 
-      @body = 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
+      request = Signature::Request.new(verb.to_s.upcase, uri.path, params)
+      auth_hash = request.sign(token || Pusher.authentication_token)
+      @params = params.merge(auth_hash)
+    end
+
+    def send_sync
+      require 'net/http' unless defined?(Net::HTTP)
+      require 'net/https' if (ssl? && !defined?(Net::HTTPS))
+
+      @http_sync ||= begin
+        http = Net::HTTP.new(@uri.host, @uri.port)
+        http.use_ssl = true if ssl?
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ssl?
+        http
+      end
+
+      begin
+        case @verb
+        when :post
+          response = @http_sync.post("#{@uri.path}?#{@params.to_params}",
+            @body, { 'Content-Type'=> 'application/json' })
+        when :get
+          response = @http_sync.get("#{@uri.path}?#{@params.to_params}",
+            { 'Content-Type'=> 'application/json' })
+        else
+          raise "Unknown verb"
         end
+      rescue Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED,
+             Errno::ETIMEDOUT, Errno::EHOSTUNREACH, Errno::ECONNRESET,
+             Timeout::Error, EOFError,
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+             Net::ProtocolError => e
+        error = Pusher::HTTPError.new("#{e.message} (#{e.class})")
+        error.original_error = e
+        raise error
       end
-      params[:body_md5] = Digest::MD5.hexdigest(body)
 
-      request = Signature::Request.new('POST', resource.path, params)
-      auth_hash = request.sign(token || Pusher.authentication_token)
+      return handle_response(response.code.to_i, response.body.chomp)
+    end
+
+    def send_async
+      unless defined?(EventMachine) && EventMachine.reactor_running?
+        raise Error, "In order to use trigger_async you must be running inside an eventmachine loop"
+      end
+      require 'em-http' unless defined?(EventMachine::HttpRequest)
+
+      deferrable = EM::DefaultDeferrable.new
+
+      http = EventMachine::HttpRequest.new(@uri).post({
+        :query => @params, :timeout => 5, :body => @body,
+        :head => {'Content-Type'=> 'application/json'}
+      })
+      http.callback {
+        begin
+          handle_response(http.response_header.status, http.response.chomp)
+          deferrable.succeed
+        rescue => e
+          deferrable.fail(e)
+        end
+      }
+      http.errback {
+        Pusher.logger.debug("Network error connecting to pusher: #{http.inspect}")
+        deferrable.fail(Error.new("Network error connecting to pusher"))
+      }
 
-      @query = params.merge(auth_hash)
+      deferrable
     end
 
+    private
+
+    def handle_response(status_code, body)
+      case status_code
+      when 200
+        return MultiJson.decode(body, :symbolize_keys => true)
+      when 202
+        return true
+      when 400
+        raise Error, "Bad request: #{body}"
+      when 401
+        raise AuthenticationError, body
+      when 404
+        raise Error, "Resource not found: app_id is probably invalid"
+      else
+        raise Error, "Unknown error (status code #{status_code}): #{body}"
+      end
+    end
+
+    def ssl?
+      @uri.scheme == 'https'
+    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.8.3"
+  s.version     = "0.8.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pusher"]
   s.email       = ["support@pusher.com"]

data/spec/channel_spec.rb

@@ -187,6 +187,24 @@ describe Pusher::Channel do
     end
   end
 
+  describe "stats" do
+    before :each do
+      @api_path = %r{/apps/20/channels/presence-test_channel/stats}
+    end
+
+    it "should call the user_count api" do
+      WebMock.stub_request(:get, @api_path).to_return({
+        :status => 200,
+        :body => JSON.generate(:user_count => 1)
+      })
+      @channel = Pusher['presence-test_channel']
+
+      @channel.stats.should == {
+        :user_count => 1
+      }
+    end
+  end
+
   describe "socket_auth" do
     before :each do
       @channel = Pusher['test_channel']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70297839817840 !ruby/object:Gem::Requirement
+  requirement: &70240168472560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839817840
+  version_requirements: *70240168472560
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70297839817300 !ruby/object:Gem::Requirement
+  requirement: &70240168472100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297839817300
+  version_requirements: *70240168472100
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70297839816760 !ruby/object:Gem::Requirement
+  requirement: &70240168471520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297839816760
+  version_requirements: *70240168471520
 - !ruby/object:Gem::Dependency
   name: signature
-  requirement: &70297839816180 !ruby/object:Gem::Requirement
+  requirement: &70240168470820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70297839816180
+  version_requirements: *70240168470820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297839815680 !ruby/object:Gem::Requirement
+  requirement: &70240168470200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70297839815680
+  version_requirements: *70240168470200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70297839815180 !ruby/object:Gem::Requirement
+  requirement: &70240168469760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839815180
+  version_requirements: *70240168469760
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70297839814460 !ruby/object:Gem::Requirement
+  requirement: &70240168468900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70297839814460
+  version_requirements: *70240168468900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70297839813680 !ruby/object:Gem::Requirement
+  requirement: &70240168467600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839813680
+  version_requirements: *70240168467600
 description: Wrapper for pusher.com REST api
 email:
 - support@pusher.com
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Pusher API client