pusher 0.10.0 → 0.11.0

data/spec/client_spec.rb

@@ -70,6 +70,12 @@ describe Pusher do
     it "should send [] messages to different objects" do
       @client1['test'].should_not == @client2['test']
     end
+
+    it "should send http_proxy messages to different objects" do
+      @client1.http_proxy = 'http://oneuser:onepassword@onehost:8080'
+      @client2.http_proxy = 'http://twouser:twopassword@twohost:8880'
+      @client1.http_proxy.should_not == @client2.http_proxy
+    end
   end
 
   # The behaviour should be the same when using the Client object, or the
@@ -125,6 +131,14 @@ describe Pusher do
       end
     end
 
+    describe 'configuring a http proxy' do
+      it "should be possible to configure everything by setting the http_proxy" do
+        @client.http_proxy = 'http://someuser:somepassword@proxy.host.com:8080'
+
+        @client.proxy.should == {:scheme => 'http', :host => 'proxy.host.com', :port => 8080, :user => 'someuser', :password => 'somepassword'}
+      end
+    end
+
     describe 'when configured' do
       before :each do
         @client.app_id = '20'
@@ -141,12 +155,6 @@ describe Pusher do
           @channel.should be_kind_of(Pusher::Channel)
         end
 
-        it "should reuse the same channel objects" do
-          channel1, channel2 = @client['test_channel'], @client['test_channel']
-
-          channel1.object_id.should == channel2.object_id
-        end
-
         %w{app_id key secret}.each do |config|
           it "should raise exception if #{config} not configured" do
             @client.send("#{config}=", nil)
@@ -160,7 +168,7 @@ describe Pusher do
       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({
+          stub_request(:get, api_path).to_return({
             :status => 200,
             :body => MultiJson.encode('channels' => {
               "channel1" => {},
@@ -179,7 +187,7 @@ describe Pusher do
       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({
+          stub_request(:get, api_path).to_return({
             :status => 200,
             :body => MultiJson.encode({
               'occupied' => false,
@@ -194,32 +202,218 @@ describe Pusher do
       describe '#trigger' do
         before :each do
           @api_path = %r{/apps/20/events}
-          WebMock.stub_request(:post, @api_path).to_return({
+          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'}).
+          @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'}, {
+        it "should pass any parameters in the body of the request" do
+          @client.trigger(['mychannel', 'c2'], 'event', {'some' => 'data'}, {
             :socket_id => "1234"
           })
           WebMock.should have_requested(:post, @api_path).with { |req|
-            MultiJson.decode(req.body)["socket_id"].should == '1234'
+            parsed = MultiJson.decode(req.body)
+            parsed["name"].should == 'event'
+            parsed["channels"].should == ["mychannel", "c2"]
+            parsed["socket_id"].should == '1234'
           }
         end
 
         it "should convert non string data to JSON before posting" do
-          @client.trigger('mychannel', 'event', {'some' => 'data'})
+          @client.trigger(['mychannel'], 'event', {'some' => 'data'})
           WebMock.should have_requested(:post, @api_path).with { |req|
             MultiJson.decode(req.body)["data"].should == '{"some":"data"}'
           }
         end
+
+        it "should accept a single channel as well as an array" do
+          @client.trigger('mychannel', 'event', {'some' => 'data'})
+          WebMock.should have_requested(:post, @api_path).with { |req|
+            MultiJson.decode(req.body)["channels"].should == ['mychannel']
+          }
+        end
+      end
+
+      describe '#trigger_async' do
+        before :each do
+          @api_path = %r{/apps/20/events}
+          stub_request(:post, @api_path).to_return({
+            :status => 200,
+            :body => MultiJson.encode({})
+          })
+        end
+
+        it "should call correct URL" do
+          EM.run {
+            @client.trigger_async('mychannel', 'event', {'some' => 'data'}).callback { |r|
+              r.should == {}
+              EM.stop
+            }
+          }
+        end
+
+        it "should pass any parameters in the body of the request" do
+          EM.run {
+            @client.trigger_async('mychannel', 'event', {'some' => 'data'}, {
+              :socket_id => "1234"
+            }).callback {
+              WebMock.should have_requested(:post, @api_path).with { |req|
+                MultiJson.decode(req.body)["socket_id"].should == '1234'
+              }
+              EM.stop
+            }
+          }
+        end
+
+        it "should convert non string data to JSON before posting" do
+          EM.run {
+            @client.trigger_async('mychannel', 'event', {'some' => 'data'}).callback {
+              WebMock.should have_requested(:post, @api_path).with { |req|
+                MultiJson.decode(req.body)["data"].should == '{"some":"data"}'
+              }
+              EM.stop
+            }
+          }
+        end
+      end
+
+      [:get, :post].each do |verb|
+        describe "##{verb}" 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(verb, '/path') }
+
+          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
+            WebMock.should have_requested(verb, %r{https://api.pusherapp.com})
+          end
+
+          it "should format the respose hash with symbols at first level" do
+            stub_request(verb, @url_regexp).to_return({
+              :status => 200,
+              :body => MultiJson.encode({'something' => {'a' => 'hash'}})
+            })
+            call_api.should == {
+              :something => {'a' => 'hash'}
+            }
+          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)
+
+            error = nil
+            begin
+              call_api
+            rescue => e
+              error = e
+            end
+
+            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
+          end
+
+          it "should raise Pusher::Error if call returns 400" do
+            stub_request(verb, @url_regexp).to_return({:status => 400})
+            lambda { call_api }.should raise_error(Pusher::Error)
+          end
+
+          it "should raise AuthenticationError if pusher returns 401" do
+            stub_request(verb, @url_regexp).to_return({:status => 401})
+            lambda { call_api }.should raise_error(Pusher::AuthenticationError)
+          end
+
+          it "should raise Pusher::Error if pusher returns 404" do
+            stub_request(verb, @url_regexp).to_return({:status => 404})
+            lambda { call_api }.should raise_error(Pusher::Error, '404 Not found (/apps/20/path)')
+          end
+
+          it "should raise Pusher::Error if pusher returns 407" do
+            stub_request(verb, @url_regexp).to_return({:status => 407})
+            lambda { call_api }.should raise_error(Pusher::Error, 'Proxy Authentication Required')
+          end
+
+          it "should raise Pusher::Error if pusher returns 500" do
+            stub_request(verb, @url_regexp).to_return({:status => 500, :body => "some error"})
+            lambda { call_api }.should raise_error(Pusher::Error, 'Unknown error (status code 500): some error')
+          end
+        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') }
+
+          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
+              }
+            }
+          end
+
+          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
+
+          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
   end

data/spec/spec_helper.rb

@@ -12,7 +12,14 @@ require 'webmock/rspec'
 require 'pusher'
 require 'eventmachine'
 
+RSpec.configure do |config|
+  config.before(:each) do
+    WebMock.reset!
+    WebMock.disable_net_connect!
+  end
+end
+
 def hmac(key, data)
   digest = OpenSSL::Digest::SHA256.new
   expected = OpenSSL::HMAC.hexdigest(digest, key, data)
-end
+end

data/spec/web_hook_spec.rb

@@ -43,12 +43,12 @@ describe Pusher::WebHook do
 
   describe "after initialization" do
     before :each do
-      body = MultiJson.encode(@hook_data)
+      @body = MultiJson.encode(@hook_data)
       request = {
         :key => '1234',
-        :signature => hmac('asdf', body),
+        :signature => hmac('asdf', @body),
         :content_type => 'application/json',
-        :body => body
+        :body => @body
       }
 
       @client = Pusher::Client.new
@@ -71,7 +71,9 @@ describe Pusher::WebHook do
     it "should not validate if secret is wrong" do
       @client.key = '1234'
       @client.secret = 'asdfxxx'
-      Pusher.logger.should_receive(:warn).with("Received WebHook with invalid signature: got a18bd1374b3b198ec457fb11d636ee2024d8077fc542829443729988bd1e4aa4, expected bb81a112a46dee1e4154ee4f328621f32558192c7af12adfc0395082cfcd3c6c")
+      digest = OpenSSL::Digest::SHA256.new
+      expected = OpenSSL::HMAC.hexdigest(digest, @client.secret, @body)
+      Pusher.logger.should_receive(:warn).with("Received WebHook with invalid signature: got #{@wh.signature}, expected #{expected}")
       @wh.should_not be_valid
     end
 
@@ -112,4 +114,4 @@ describe Pusher::WebHook do
       @wh.time.should == Time.at(123.456)
     end
   end
-end
+end

metadata

@@ -1,136 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pusher
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.11.0
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
 platform: ruby
-authors: 
+authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: signature
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: signature
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wrapper for pusher.com REST api
-email: 
+email:
 - support@pusher.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gemtest
 - .gitignore
@@ -144,7 +143,9 @@ 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
 - pusher.gemspec
 - spec/channel_spec.rb
@@ -153,38 +154,35 @@ 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -545190286375519249
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -545190286375519249
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 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