ably-rest 0.8.15 → 0.9.0

data/lib/submodules/ably-ruby/spec/acceptance/rest/base_spec.rb

@@ -137,7 +137,7 @@ describe Ably::Rest do
 
       context 'when auth#token_renewable?' do
         before do
-          client.auth.authorise
+          client.auth.authorize
         end
 
         it 'should automatically reissue a token' do

data/lib/submodules/ably-ruby/spec/acceptance/rest/channel_spec.rb

@@ -360,7 +360,10 @@ describe Ably::Rest::Channel do
       let(:channel_name) { "persisted:#{random_str(4)}" }
       let(:channel) { client.channel(channel_name) }
       let(:endpoint) do
-        client.endpoint
+        client.endpoint.tap do |client_end_point|
+          client_end_point.user = key_name
+          client_end_point.password = key_secret
+        end
       end
       let(:default_history_options) do
           {
@@ -375,7 +378,6 @@ describe Ably::Rest::Channel do
             query_params = default_history_options
             .merge(option => milliseconds).map { |k, v| "#{k}=#{v}" }.join('&')
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/messages?#{query_params}").
-              with(basic_auth: [key_name, key_secret]).
               to_return(:body => '{}', :headers => { 'Content-Type' => 'application/json' })
           }
 

data/lib/submodules/ably-ruby/spec/acceptance/rest/client_spec.rb

@@ -111,8 +111,7 @@ describe Ably::Rest::Client do
           let(:client_options)      { default_options.merge(key: api_key) }
 
           let!(:get_message_history_stub) do
-            stub_request(:get, "https://#{environment}-#{Ably::Rest::Client::DOMAIN}/channels/#{channel_name}/messages?#{history_querystring}").
-              with(basic_auth: [key_name, key_secret]).
+            stub_request(:get, "https://#{api_key}@#{environment}-#{Ably::Rest::Client::DOMAIN}/channels/#{channel_name}/messages?#{history_querystring}").
               to_return(body: [], headers: { 'Content-Type' => 'application/json' })
           end
 
@@ -285,9 +284,7 @@ describe Ably::Rest::Client do
       context 'when environment is NOT production' do
         let(:client_options) { default_options.merge(environment: 'sandbox', key: api_key) }
         let!(:default_host_request_stub) do
-          stub_request(:post, "https://#{environment}-#{Ably::Rest::Client::DOMAIN}#{path}").
-            with(basic_auth: [key_name, key_secret]).
-            to_return do
+          stub_request(:post, "https://#{api_key}@#{environment}-#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
             raise Faraday::TimeoutError.new('timeout error message')
           end
         end
@@ -316,16 +313,16 @@ describe Ably::Rest::Client do
         end
 
         let!(:first_fallback_request_stub) do
-          stub_request(:post, "https://#{custom_hosts[0]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+          stub_request(:post, "https://#{api_key}@#{custom_hosts[0]}#{path}").to_return(&fallback_block)
         end
 
         let!(:second_fallback_request_stub) do
-          stub_request(:post, "https://#{custom_hosts[1]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+          stub_request(:post, "https://#{api_key}@#{custom_hosts[1]}#{path}").to_return(&fallback_block)
         end
 
         context 'and connection times out' do
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return do
+            stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
               raise Faraday::TimeoutError.new('timeout error message')
             end
           end
@@ -339,7 +336,7 @@ describe Ably::Rest::Client do
 
           context "and the total request time exeeds #{http_defaults.fetch(:max_retry_duration)} seconds" do
             let!(:default_host_request_stub) do
-              stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return do
+              stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
                 sleep max_retry_duration * 1.5
                 raise Faraday::TimeoutError.new('timeout error message')
               end
@@ -356,7 +353,7 @@ describe Ably::Rest::Client do
 
         context 'and connection fails' do
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return do
+            stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
               raise Faraday::ConnectionFailed.new('connection failure error message')
             end
           end
@@ -372,7 +369,7 @@ describe Ably::Rest::Client do
         context 'and basic authentication fails' do
           let(:status) { 401 }
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return(
+            stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return(
               headers: { 'Content-Type' => 'application/json' },
               status: status,
               body: {
@@ -404,7 +401,7 @@ describe Ably::Rest::Client do
             end
           end
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
           end
 
           it 'attempts the fallback hosts as this is an authentication failure' do
@@ -440,20 +437,20 @@ describe Ably::Rest::Client do
           end
         end
         let!(:default_host_request_stub) do
-          stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+          stub_request(:post, "https://#{api_key}@#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
         end
 
         context 'with custom fallback hosts provided' do
           let!(:first_fallback_request_stub) do
-            stub_request(:post, "https://#{custom_hosts[0]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{custom_hosts[0]}#{path}").to_return(&fallback_block)
           end
 
           let!(:second_fallback_request_stub) do
-            stub_request(:post, "https://#{custom_hosts[1]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{custom_hosts[1]}#{path}").to_return(&fallback_block)
           end
 
           let(:client_options) {
-            production_options.merge(fallback_hosts: custom_hosts, log_level: :error)
+            production_options.merge(fallback_hosts: custom_hosts)
           }
 
           it 'attempts the fallback hosts as this is an authentication failure (#RSC15b, #TO3k6)' do
@@ -519,8 +516,7 @@ describe Ably::Rest::Client do
                   port: port,
                   tls: false,
                   http_request_timeout: request_timeout,
-                  max_retry_duration: request_timeout * 3,
-                  log_level: :error
+                  max_retry_duration: request_timeout * 3
                 )
               end
               let(:fail_fallback_request_count) { 1 }
@@ -623,16 +619,16 @@ describe Ably::Rest::Client do
           end
         end
         let!(:default_host_request_stub) do
-          stub_request(:post, "https://#{env}-#{Ably::Rest::Client::DOMAIN}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+          stub_request(:post, "https://#{api_key}@#{env}-#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
         end
 
         context 'with custom fallback hosts provided (#RSC15b, #TO3k6)' do
           let!(:first_fallback_request_stub) do
-            stub_request(:post, "https://#{custom_hosts[0]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{custom_hosts[0]}#{path}").to_return(&fallback_block)
           end
 
           let!(:second_fallback_request_stub) do
-            stub_request(:post, "https://#{custom_hosts[1]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{custom_hosts[1]}#{path}").to_return(&fallback_block)
           end
 
           let(:client_options) {
@@ -670,11 +666,11 @@ describe Ably::Rest::Client do
           }
 
           let!(:first_fallback_request_stub) do
-            stub_request(:post, "https://#{Ably::FALLBACK_HOSTS[0]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{Ably::FALLBACK_HOSTS[0]}#{path}").to_return(&fallback_block)
           end
 
           let!(:second_fallback_request_stub) do
-            stub_request(:post, "https://#{Ably::FALLBACK_HOSTS[1]}#{path}").with(basic_auth: [key_name, key_secret]).to_return(&fallback_block)
+            stub_request(:post, "https://#{api_key}@#{Ably::FALLBACK_HOSTS[1]}#{path}").to_return(&fallback_block)
           end
 
           let(:client_options) {
@@ -705,7 +701,7 @@ describe Ably::Rest::Client do
           let(:path) { '/channels/test/publish' }
 
           let!(:custom_host_request_stub) do
-            stub_request(:post, "https://#{custom_host}#{path}").with(basic_auth: [key_name, key_secret]).to_return do
+            stub_request(:post, "https://#{api_key}@#{custom_host}#{path}").to_return do
               raise Faraday::ConnectionFailed.new('connection failure error message')
             end
           end
@@ -844,12 +840,11 @@ describe Ably::Rest::Client do
             lib << Ably::VERSION
 
 
-            stub_request(:post, "#{client.endpoint.to_s.gsub('://', "://")}/channels/foo/publish").
+            stub_request(:post, "#{client.endpoint.to_s.gsub('://', "://#{api_key}@")}/channels/foo/publish").
               with(headers: {
                 'X-Ably-Version' => Ably::PROTOCOL_VERSION,
                 'X-Ably-Lib' => lib.join('-')
               }).
-              with(basic_auth: [key_name, key_secret]).
               to_return(status: 201, body: '{}', headers: { 'Content-Type' => 'application/json' })
           end
 

data/lib/submodules/ably-ruby/spec/acceptance/rest/presence_spec.rb

@@ -69,12 +69,14 @@ describe Ably::Rest::Presence do
             }
           end
           let(:endpoint) do
-            client.endpoint
+            client.endpoint.tap do |client_end_point|
+              client_end_point.user = key_name
+              client_end_point.password = key_secret
+            end
           end
           let!(:get_stub) {
             query_params = query_options.map { |k, v| "#{k}=#{v}" }.join('&')
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence?#{query_params}").
-              with(basic_auth: [key_name, key_secret]).
               to_return(:body => '{}', :headers => { 'Content-Type' => 'application/json' })
           }
           let(:channel_name) { random_str }
@@ -180,7 +182,10 @@ describe Ably::Rest::Presence do
         let(:user) { 'appid.keyuid' }
         let(:secret) { random_str(8) }
         let(:endpoint) do
-          client.endpoint
+          client.endpoint.tap do |client_end_point|
+            client_end_point.user = user
+            client_end_point.password = secret
+          end
         end
         let(:client) do
           Ably::Rest::Client.new(key: "#{user}:#{secret}")
@@ -196,7 +201,6 @@ describe Ably::Rest::Presence do
           let!(:history_stub) {
             query_params = history_options.map { |k, v| "#{k}=#{v}" }.join('&')
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence/history?#{query_params}").
-              with(basic_auth: [user, secret]).
               to_return(:body => '{}', :headers => { 'Content-Type' => 'application/json' })
           }
 
@@ -237,7 +241,6 @@ describe Ably::Rest::Presence do
               let!(:history_stub) {
                 query_params = history_options.map { |k, v| "#{k}=#{v}" }.join('&')
                 stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence/history?#{query_params}").
-                  with(basic_auth: [user, secret]).
                   to_return(:body => '{}', :headers => { 'Content-Type' => 'application/json' })
               }
 
@@ -307,7 +310,10 @@ describe Ably::Rest::Presence do
       let(:user) { 'appid.keyuid' }
       let(:secret) { random_str(8) }
       let(:endpoint) do
-        client.endpoint
+        client.endpoint.tap do |client_end_point|
+          client_end_point.user = user
+          client_end_point.password = secret
+        end
       end
       let(:client) do
         Ably::Rest::Client.new(client_options.merge(key: "#{user}:#{secret}"))
@@ -342,7 +348,6 @@ describe Ably::Rest::Presence do
         context '#get' do
           let!(:get_stub)   {
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence?limit=100").
-              with(basic_auth: [user, secret]).
               to_return(:body => serialized_encoded_message, :headers => { 'Content-Type' => content_type })
           }
 
@@ -360,7 +365,6 @@ describe Ably::Rest::Presence do
         context '#history' do
           let!(:history_stub)   {
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence/history?direction=backwards&limit=100").
-              with(basic_auth: [user, secret]).
               to_return(:body => serialized_encoded_message, :headers => { 'Content-Type' => content_type })
           }
 
@@ -391,7 +395,6 @@ describe Ably::Rest::Presence do
           let(:client_options) { default_options.merge(log_level: :fatal) }
           let!(:get_stub)   {
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence?limit=100").
-              with(basic_auth: [user, secret]).
               to_return(:body => serialized_encoded_message_with_invalid_encoding, :headers => { 'Content-Type' => content_type })
           }
           let(:presence_message) { presence.get.items.first }
@@ -416,7 +419,6 @@ describe Ably::Rest::Presence do
           let(:client_options) { default_options.merge(log_level: :fatal) }
           let!(:history_stub)   {
             stub_request(:get, "#{endpoint}/channels/#{Addressable::URI.encode(channel_name)}/presence/history?direction=backwards&limit=100").
-              with(basic_auth: [user, secret]).
               to_return(:body => serialized_encoded_message_with_invalid_encoding, :headers => { 'Content-Type' => content_type })
           }
           let(:presence_message) { presence.history.items.first }

data/lib/submodules/ably-ruby/spec/unit/modules/event_emitter_spec.rb

@@ -128,34 +128,17 @@ describe Ably::Modules::EventEmitter do
   end
 
   context '#on' do
-    context 'with event specified' do
-      it 'calls the block every time an event is emitted only' do
-        block_called = 0
-        subject.on('event') { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(3)
-      end
-
-      it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
-        subject.on(:event) { raise 'Intentional exception' }
-        subject.emit :event
-      end
+    it 'calls the block every time an event is emitted only' do
+      block_called = 0
+      subject.on('event') { block_called += 1 }
+      3.times { subject.emit 'event', 'data' }
+      expect(block_called).to eql(3)
     end
 
-    context 'with no event specified' do
-      it 'calls the block every time an event is emitted only' do
-        block_called = 0
-        subject.on { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(3)
-      end
-
-      it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
-        subject.on { raise 'Intentional exception' }
-        subject.emit :event
-      end
+    it 'catches exceptions in the provided block, logs the error and continues' do
+      expect(subject.logger).to receive(:error).with(/Intentional exception/)
+      subject.on(:event) { raise 'Intentional exception' }
+      subject.emit :event
     end
   end
 
@@ -174,50 +157,25 @@ describe Ably::Modules::EventEmitter do
   end
 
   context '#once' do
-    context 'with event specified' do
-      it 'calls the block the first time an event is emitted only' do
-        block_called = 0
-        subject.once('event') { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(1)
-      end
-
-      it 'does not remove other blocks after it is called' do
-        block_called = 0
-        subject.once('event') { block_called += 1 }
-        subject.on('event')   { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(4)
-      end
-
-      it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
-        subject.once(:event) { raise 'Intentional exception' }
-        subject.emit :event
-      end
+    it 'calls the block the first time an event is emitted only' do
+      block_called = 0
+      subject.once('event') { block_called += 1 }
+      3.times { subject.emit 'event', 'data' }
+      expect(block_called).to eql(1)
     end
 
-    context 'with no event specified' do
-      it 'calls the block the first time an event is emitted only' do
-        block_called = 0
-        subject.once { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(1)
-      end
-
-      it 'does not remove other blocks after it is called' do
-        block_called = 0
-        subject.once { block_called += 1 }
-        subject.on   { block_called += 1 }
-        3.times { subject.emit 'event', 'data' }
-        expect(block_called).to eql(4)
-      end
+    it 'does not remove other blocks after it is called' do
+      block_called = 0
+      subject.once('event') { block_called += 1 }
+      subject.on('event')   { block_called += 1 }
+      3.times { subject.emit 'event', 'data' }
+      expect(block_called).to eql(4)
+    end
 
-      it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
-        subject.once { raise 'Intentional exception' }
-        subject.emit :event
-      end
+    it 'catches exceptions in the provided block, logs the error and continues' do
+      expect(subject.logger).to receive(:error).with(/Intentional exception/)
+      subject.once(:event) { raise 'Intentional exception' }
+      subject.emit :event
     end
   end
 
@@ -238,57 +196,41 @@ describe Ably::Modules::EventEmitter do
   context '#off' do
     let(:callback) { Proc.new { |msg| obj.received_message msg } }
 
-    context 'with event specified in on handler' do
-      before do
-        subject.on(:message, &callback)
-      end
-
-      after do
-        subject.emit :message, msg
-      end
-
-      context 'with event names as arguments' do
-        it 'deletes matching callbacks' do
-          expect(obj).to_not receive(:received_message).with(msg)
-          subject.off(:message, &callback)
-        end
+    before do
+      subject.on(:message, &callback)
+    end
 
-        it 'deletes all callbacks if not block given' do
-          expect(obj).to_not receive(:received_message).with(msg)
-          subject.off(:message)
-        end
+    after do
+      subject.emit :message, msg
+    end
 
-        it 'continues if the block does not exist' do
-          expect(obj).to receive(:received_message).with(msg)
-          subject.off(:message) { true }
-        end
+    context 'with event names as arguments' do
+      it 'deletes matching callbacks' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.off(:message, &callback)
       end
 
-      context 'without any event names' do
-        it 'deletes all matching callbacks' do
-          expect(obj).to_not receive(:received_message).with(msg)
-          subject.off(&callback)
-        end
+      it 'deletes all callbacks if not block given' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.off(:message)
+      end
 
-        it 'deletes all callbacks if not block given' do
-          expect(obj).to_not receive(:received_message).with(msg)
-          subject.off
-        end
+      it 'continues if the block does not exist' do
+        expect(obj).to receive(:received_message).with(msg)
+        subject.off(:message) { true }
       end
     end
 
-    it 'removes handler added with no event specified' do
-      subject.on(&callback)
-      expect(obj).to_not receive(:received_message).with(msg)
-      subject.off(&callback)
-      subject.emit :message, msg
-    end
+    context 'without any event names' do
+      it 'deletes all matching callbacks' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.off(&callback)
+      end
 
-    it 'leaves handler when event specified' do
-      subject.on(&callback)
-      expect(obj).to receive(:received_message).with(msg)
-      subject.off(:foo, &callback)
-      subject.emit :message, msg
+      it 'deletes all callbacks if not block given' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.off
+      end
     end
   end
 end