ably-rest 0.9.3 → 1.0.0

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

@@ -83,13 +83,13 @@ describe Ably::Modules::EventEmitter do
           allow(obj).to receive(:received_message)
         end
 
-        it 'is unaffected and processes the prior event callbacks once' do
+        it 'is unaffected and processes the prior event callbacks once (#RTE6b)' do
           expect(obj).to receive(:received_message).with(msg).twice
           expect(obj).to_not receive(:received_message_from_new_callbacks).with(msg)
           subject.emit :message, msg
         end
 
-        it 'adds them for the next emitted event' do
+        it 'adds them for the next emitted event (#RTE6b)' do
           expect(obj).to receive(:received_message_from_new_callbacks).with(msg).twice
 
           # New callbacks are added in this emit
@@ -110,12 +110,12 @@ describe Ably::Modules::EventEmitter do
           end
         end
 
-        it 'is unaffected and processes the prior event callbacks once' do
+        it 'is unaffected and processes the prior event callbacks once (#RTE6b)' do
           expect(obj).to receive(:received_message).with(msg).twice
           subject.emit :message, msg
         end
 
-        it 'removes them for the next emitted event' do
+        it 'removes them for the next emitted event (#RTE6b)' do
           expect(obj).to receive(:received_message).with(msg).twice
 
           # Callbacks are removed in this emit
@@ -127,7 +127,7 @@ describe Ably::Modules::EventEmitter do
     end
   end
 
-  context '#on' do
+  context '#on (#RTE3)' do
     context 'with event specified' do
       it 'calls the block every time an event is emitted only' do
         block_called = 0
@@ -137,7 +137,9 @@ describe Ably::Modules::EventEmitter do
       end
 
       it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
+        expect(subject.logger).to receive(:error) do |*args, &block|
+          expect(args.concat([block ? block.call : nil]).join(',')).to match(/Intentional exception/)
+        end
         subject.on(:event) { raise 'Intentional exception' }
         subject.emit :event
       end
@@ -152,7 +154,9 @@ describe Ably::Modules::EventEmitter do
       end
 
       it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
+        expect(subject.logger).to receive(:error) do |*args, &block|
+          expect(args.concat([block ? block.call : nil]).join(',')).to match(/Intentional exception/)
+        end
         subject.on { raise 'Intentional exception' }
         subject.emit :event
       end
@@ -173,7 +177,7 @@ describe Ably::Modules::EventEmitter do
     end
   end
 
-  context '#once' do
+  context '#once (#RTE4)' do
     context 'with event specified' do
       it 'calls the block the first time an event is emitted only' do
         block_called = 0
@@ -191,7 +195,9 @@ describe Ably::Modules::EventEmitter do
       end
 
       it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
+        expect(subject.logger).to receive(:error) do |*args, &block|
+          expect(args.concat([block ? block.call : nil]).join(',')).to match(/Intentional exception/)
+        end
         subject.once(:event) { raise 'Intentional exception' }
         subject.emit :event
       end
@@ -214,7 +220,9 @@ describe Ably::Modules::EventEmitter do
       end
 
       it 'catches exceptions in the provided block, logs the error and continues' do
-        expect(subject.logger).to receive(:error).with(/Intentional exception/)
+        expect(subject.logger).to receive(:error) do |*args, &block|
+          expect(args.concat([block ? block.call : nil]).join(',')).to match(/Intentional exception/)
+        end
         subject.once { raise 'Intentional exception' }
         subject.emit :event
       end
@@ -248,12 +256,12 @@ describe Ably::Modules::EventEmitter do
       end
 
       context 'with event names as arguments' do
-        it 'deletes matching callbacks' do
+        it 'deletes matching callbacks when a block is provided' do
           expect(obj).to_not receive(:received_message).with(msg)
           subject.off(:message, &callback)
         end
 
-        it 'deletes all callbacks if not block given' do
+        it 'deletes all matching callbacks when a block is not provided' do
           expect(obj).to_not receive(:received_message).with(msg)
           subject.off(:message)
         end
@@ -277,18 +285,137 @@ describe Ably::Modules::EventEmitter do
       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
+    context 'when on callback is configured for all events' do
+      before do
+        subject.on(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      context 'with event names as arguments' do
+        it 'does not remove the all events callback when a block is provided' do
+          expect(obj).to receive(:received_message).with(msg)
+          subject.off(:message, &callback)
+        end
+
+        it 'does not remove the all events callback when a block is not provided' do
+          expect(obj).to receive(:received_message).with(msg)
+          subject.off(:message)
+        end
+
+        it 'does not remove the all events callback when the block does not match' do
+          expect(obj).to receive(:received_message).with(msg)
+          subject.off(:message) { true }
+        end
+      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
+        end
+      end
     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
+    context 'with unsafe_on subscribers' do
+      before do
+        subject.unsafe_on(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'does not deregister them' do
+        expect(obj).to receive(:received_message).with(msg)
+        subject.off
+      end
+    end
+
+    context 'with unsafe_once subscribers' do
+      before do
+        subject.unsafe_once(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'does not deregister them' do
+        expect(obj).to receive(:received_message).with(msg)
+        subject.off
+      end
+    end
+  end
+
+  context '#unsafe_off' do
+    let(:callback) { Proc.new { |msg| obj.received_message msg } }
+
+    context 'with unsafe_on subscribers' do
+      before do
+        subject.unsafe_on(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'deregisters them' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.unsafe_off
+      end
+    end
+
+    context 'with unsafe_once subscribers' do
+      before do
+        subject.unsafe_once(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'deregister them' do
+        expect(obj).to_not receive(:received_message).with(msg)
+        subject.unsafe_off
+      end
+    end
+
+    context 'with on subscribers' do
+      before do
+        subject.on(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'does not deregister them' do
+        expect(obj).to receive(:received_message).with(msg)
+        subject.unsafe_off
+      end
+    end
+
+    context 'with once subscribers' do
+      before do
+        subject.once(&callback)
+      end
+
+      after do
+        subject.emit :message, msg
+      end
+
+      it 'does not deregister them' do
+        expect(obj).to receive(:received_message).with(msg)
+        subject.unsafe_off
+      end
     end
   end
 end

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

@@ -269,14 +269,18 @@ describe Ably::Modules::StateEmitter do
 
       context 'success block' do
         it 'catches exceptions in the provided block, logs the error and continues' do
-          expect(subject.logger).to receive(:error).with(/Success exception/)
+          expect(subject.logger).to receive(:error) do |*args, &block|
+            expect(args.concat([block ? block.call : nil]).join(',')).to match(/Success exception/)
+          end
           subject.change_state target_state
         end
       end
 
       context 'failure block' do
         it 'catches exceptions in the provided block, logs the error and continues' do
-          expect(subject.logger).to receive(:error).with(/Failure exception/)
+          expect(subject.logger).to receive(:error) do |*args, &block|
+            expect(args.concat([block ? block.call : nil]).join(',')).to match(/Failure exception/)
+          end
           subject.change_state :connecting
         end
       end
@@ -343,7 +347,9 @@ describe Ably::Modules::StateEmitter do
 
     it 'catches exceptions in the provided block, logs the error and continues' do
       subject.once_state_changed { raise 'Intentional exception' }
-      expect(subject.logger).to receive(:error).with(/Intentional exception/)
+      expect(subject.logger).to receive(:error) do |*args, &block|
+        expect(args.concat([block ? block.call : nil]).join(',')).to match(/Intentional exception/)
+      end
       subject.change_state :connected
     end
   end

data/lib/submodules/ably-ruby/spec/unit/realtime/client_spec.rb

@@ -14,7 +14,7 @@ describe Ably::Realtime::Client do
 
     it 'passes on the options to the initializer' do
       rest_client = instance_double('Ably::Rest::Client', auth: instance_double('Ably::Auth'), options: client_options)
-      expect(Ably::Rest::Client).to receive(:new).with(client_options).and_return(rest_client)
+      expect(Ably::Rest::Client).to receive(:new).with(hash_including(client_options)).and_return(rest_client)
       subject
     end
 

data/lib/submodules/ably-ruby/spec/unit/realtime/connection_spec.rb

@@ -5,7 +5,10 @@ describe Ably::Realtime::Connection do
   let(:client) { instance_double('Ably::Realtime::Client', logger: double('logger').as_null_object) }
 
   subject do
-    Ably::Realtime::Connection.new(client, {})
+    Ably::Realtime::Connection.new(client, {}).tap do |connection|
+      connection.__incoming_protocol_msgbus__.unsubscribe
+      connection.__outgoing_protocol_msgbus__.unsubscribe
+    end
   end
 
   before do
@@ -34,10 +37,10 @@ describe Ably::Realtime::Connection do
   describe 'connection resume callbacks', api_private: true do
     let(:callbacks) { [] }
 
-    describe '#resumed' do
+    describe '#trigger_resumed' do
       it 'executes the callbacks' do
         subject.on_resume { callbacks << true }
-        subject.resumed
+        subject.trigger_resumed
         expect(callbacks.count).to eql(1)
       end
     end
@@ -45,7 +48,7 @@ describe Ably::Realtime::Connection do
     describe '#on_resume' do
       it 'registers a callback' do
         subject.on_resume { callbacks << true }
-        subject.resumed
+        subject.trigger_resumed
         expect(callbacks.count).to eql(1)
       end
     end
@@ -55,7 +58,7 @@ describe Ably::Realtime::Connection do
         subject.on_resume { callbacks << true }
         additional_proc = proc { raise 'This should not be called' }
         subject.off_resume(&additional_proc)
-        subject.resumed
+        subject.trigger_resumed
         expect(callbacks.count).to eql(1)
       end
     end

data/lib/submodules/ably-ruby/spec/unit/realtime/incoming_message_dispatcher_spec.rb

@@ -5,7 +5,7 @@ describe Ably::Realtime::Client::IncomingMessageDispatcher, :api_private do
     Ably::Util::PubSub.new
   end
   let(:connection) do
-    instance_double('Ably::Realtime::Connection', __incoming_protocol_msgbus__: msgbus, configure_new: true, id: nil)
+    instance_double('Ably::Realtime::Connection', __incoming_protocol_msgbus__: msgbus, configure_new: true, id: nil, set_connection_confirmed_alive: nil)
   end
   let(:client) do
     instance_double('Ably::Realtime::Client', channels: {})

data/lib/submodules/ably-ruby/spec/unit/realtime/presence_spec.rb

@@ -48,14 +48,15 @@ describe Ably::Realtime::Presence do
   context 'subscriptions' do
     let(:message_history) { Hash.new { |hash, key| hash[key] = 0 } }
     let(:enter_action) { Ably::Models::PresenceMessage::ACTION.Enter }
+    let(:clone) { instance_double('Ably::Models::PresenceMessage', member_key: random_str, connection_id: random_str) }
     let(:enter_message) do
-      instance_double('Ably::Models::PresenceMessage', action: enter_action, connection_id: random_str, decode: true, member_key: random_str)
+      instance_double('Ably::Models::PresenceMessage', action: enter_action, connection_id: random_str, decode: true, member_key: random_str, shallow_clone: clone)
     end
     let(:leave_message) do
-      instance_double('Ably::Models::PresenceMessage', action: Ably::Models::PresenceMessage::ACTION.Leave, connection_id: random_str, decode: true, member_key: random_str)
+      instance_double('Ably::Models::PresenceMessage', action: Ably::Models::PresenceMessage::ACTION.Leave, connection_id: random_str, decode: true, member_key: random_str, shallow_clone: clone)
     end
     let(:update_message) do
-      instance_double('Ably::Models::PresenceMessage', action: Ably::Models::PresenceMessage::ACTION.Update, connection_id: random_str, decode: true, member_key: random_str)
+      instance_double('Ably::Models::PresenceMessage', action: Ably::Models::PresenceMessage::ACTION.Update, connection_id: random_str, decode: true, member_key: random_str, shallow_clone: clone)
     end
 
     context '#subscribe' do

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

@@ -14,7 +14,7 @@ describe Ably::Rest::Client do
       context 'disabled' do
         let(:client_options) { { key: 'appid.keyuid:keysecret', tls: false } }
 
-        it 'fails for any operation with basic auth and attempting to send an API key over a non-secure connection' do
+        it 'fails for any operation with basic auth and attempting to send an API key over a non-secure connection (#RSA1)' do
           expect { subject.channel('a').publish('event', 'message') }.to raise_error(Ably::Exceptions::InsecureRequest)
         end
       end

data/lib/submodules/ably-ruby/spec/unit/util/crypto_spec.rb

@@ -100,7 +100,7 @@ describe Ably::Util::Crypto do
     let(:encryption_data_128) { JSON.parse(File.read(File.join(resources_root, 'crypto-data-128.json'))) }
     let(:encryption_data_256) { JSON.parse(File.read(File.join(resources_root, 'crypto-data-256.json'))) }
 
-    shared_examples 'an Ably encrypter and decrypter' do
+    shared_examples 'an Ably encrypter and decrypter (#RTL7d)' do
       let(:algorithm)      { data['algorithm'].upcase }
       let(:mode)           { data['mode'].upcase }
       let(:key_length)     { data['keylength'] }
@@ -126,13 +126,13 @@ describe Ably::Util::Crypto do
     context 'with AES-128-CBC' do
       let(:data) { encryption_data_128 }
 
-      it_behaves_like 'an Ably encrypter and decrypter'
+      it_behaves_like 'an Ably encrypter and decrypter (#RTL7d)'
     end
 
     context 'with AES-256-CBC' do
       let(:data) { encryption_data_256 }
 
-      it_behaves_like 'an Ably encrypter and decrypter'
+      it_behaves_like 'an Ably encrypter and decrypter (#RTL7d)'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ably-rest
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/submodules/ably-ruby/lib/ably/auth.rb
 - lib/submodules/ably-ruby/lib/ably/exceptions.rb
 - lib/submodules/ably-ruby/lib/ably/logger.rb
+- lib/submodules/ably-ruby/lib/ably/models/auth_details.rb
 - lib/submodules/ably-ruby/lib/ably/models/channel_state_change.rb
 - lib/submodules/ably-ruby/lib/ably/models/cipher_params.rb
 - lib/submodules/ably-ruby/lib/ably/models/connection_details.rb
@@ -354,6 +355,7 @@ files:
 - lib/submodules/ably-ruby/spec/support/test_app.rb
 - lib/submodules/ably-ruby/spec/unit/auth_spec.rb
 - lib/submodules/ably-ruby/spec/unit/logger_spec.rb
+- lib/submodules/ably-ruby/spec/unit/models/auth_details_spec.rb
 - lib/submodules/ably-ruby/spec/unit/models/channel_state_change_spec.rb
 - lib/submodules/ably-ruby/spec/unit/models/cipher_params_spec.rb
 - lib/submodules/ably-ruby/spec/unit/models/connection_details_spec.rb
@@ -419,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Ruby REST only client library for ably.io realtime messaging