ably 0.7.2 → 0.7.4

data/spec/unit/realtime/channels_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 describe Ably::Realtime::Channels do
-  let(:connection) { instance_double('Ably::Realtime::Connection', on: true) }
-  let(:client) { instance_double('Ably::Realtime::Client', connection: connection) }
+  let(:connection) { instance_double('Ably::Realtime::Connection', unsafe_on: true, on_resume: true) }
+  let(:client) { instance_double('Ably::Realtime::Client', connection: connection, client_id: 'clientId') }
   let(:channel_name) { 'unique' }
   let(:options) { { 'bizarre' => 'value' } }
 
@@ -41,7 +41,7 @@ describe Ably::Realtime::Channels do
   end
 
   context 'destroying channels' do
-    it '#release detatches and then releases the channel resoures' do
+    it '#release detaches and then releases the channel resources' do
       released_channel = subject.get(channel_name, options)
       expect(released_channel).to receive(:detach).and_yield
       subject.release(channel_name)

data/spec/unit/realtime/connection_spec.rb

@@ -30,4 +30,34 @@ describe Ably::Realtime::Connection do
 
   it_behaves_like 'an incoming protocol message bus'
   it_behaves_like 'an outgoing protocol message bus'
+
+  describe 'connection resume callbacks', api_private: true do
+    let(:callbacks) { [] }
+
+    describe '#resumed' do
+      it 'triggers callbacks' do
+        subject.on_resume { callbacks << true }
+        subject.resumed
+        expect(callbacks.count).to eql(1)
+      end
+    end
+
+    describe '#on_resume' do
+      it 'registers a callback' do
+        subject.on_resume { callbacks << true }
+        subject.resumed
+        expect(callbacks.count).to eql(1)
+      end
+    end
+
+    describe '#off_resume' do
+      it 'registers a callback' do
+        subject.on_resume { callbacks << true }
+        additional_proc = proc { raise 'This should not be called' }
+        subject.off_resume &additional_proc
+        subject.resumed
+        expect(callbacks.count).to eql(1)
+      end
+    end
+  end
 end

data/spec/unit/realtime/presence_spec.rb

@@ -28,7 +28,7 @@ describe Ably::Realtime::Presence do
       Ably::Models::PresenceMessage.new({
         'action' => 0,
         'connection_id' => random_str,
-      }, instance_double('Ably::Models::ProtocolMessage'))
+      }, protocol_message: instance_double('Ably::Models::ProtocolMessage'))
     end
     let(:msgbus) { subject.__incoming_msgbus__ }
 
@@ -47,63 +47,89 @@ describe Ably::Realtime::Presence do
 
   context 'subscriptions' do
     let(:message_history) { Hash.new { |hash, key| hash[key] = 0 } }
-    let(:presence_action) { Ably::Models::PresenceMessage::ACTION.Enter }
-    let(:message) do
-      instance_double('Ably::Models::PresenceMessage', action: presence_action, connection_id: random_str, decode: true, member_key: random_str)
+    let(:enter_action) { Ably::Models::PresenceMessage::ACTION.Enter }
+    let(:enter_message) do
+      instance_double('Ably::Models::PresenceMessage', action: enter_action, connection_id: random_str, decode: true, member_key: random_str)
+    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)
+    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)
     end
 
     context '#subscribe' do
-      before do
-        subject.sync_completed
+      specify 'without a block raises an invalid ArgumentError' do
+        expect { subject.subscribe }.to raise_error ArgumentError
       end
 
-      specify 'to all presence state actions' do
+      specify 'with no action specified subscribes the provided block to all action' do
         subject.subscribe { |message| message_history[:received] += 1}
-        subject.__incoming_msgbus__.publish(:presence, message)
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(1)
       end
 
-      specify 'to specific presence state actions' do
-        subject.subscribe(presence_action) { |message| message_history[:received] += 1 }
+      specify 'with a single action argument subscribes that block to matching actions' do
+        subject.subscribe(enter_action) { |message| message_history[:received] += 1 }
         subject.subscribe(:leave)  { |message| message_history[:received] += 1 }
-        subject.__incoming_msgbus__.publish(:presence, message)
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(1)
       end
-    end
 
-    context '#unsubscribe' do
-      before do
-        subject.sync_completed
+      specify 'with a multiple action arguments subscribes that block to all of those actions' do
+        subject.subscribe(:leave, enter_action) { |message| message_history[:received] += 1 }
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
+        expect(message_history[:received]).to eql(1)
+        subject.__incoming_msgbus__.publish(:presence, leave_message)
+        expect(message_history[:received]).to eql(2)
+
+        # This message should be ignored as subscribed to :leave and :enter
+        subject.__incoming_msgbus__.publish(:presence, update_message)
+        expect(message_history[:received]).to eql(2)
       end
 
+      specify 'with a multiple duplicate action arguments subscribes that block to all of those unique actions once' do
+        subject.subscribe(enter_action, enter_action) { |message| message_history[:received] += 1 }
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
+        expect(message_history[:received]).to eql(1)
+      end
+    end
+
+    context '#unsubscribe' do
       let(:callback) do
         Proc.new { |message| message_history[:received] += 1 }
       end
       before do
-        subject.subscribe(presence_action, &callback)
+        subject.subscribe(enter_action, &callback)
       end
 
-      specify 'to all presence state actions' do
+      specify 'with no action specified unsubscribes that block from all events' do
         subject.unsubscribe &callback
-        subject.__incoming_msgbus__.publish(:presence, message)
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
+        expect(message_history[:received]).to eql(0)
+      end
+
+      specify 'with a single action argument unsubscribes the provided block with the matching action' do
+        subject.unsubscribe enter_action, &callback
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(0)
       end
 
-      specify 'to specific presence state actions' do
-        subject.unsubscribe presence_action, &callback
-        subject.__incoming_msgbus__.publish(:presence, message)
+      specify 'with multiple action arguments unsubscribes each of those matching actions with the provided block' do
+        subject.unsubscribe :update, :leave, enter_action, &callback
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(0)
       end
 
-      specify 'to specific non-matching presence state actions' do
+      specify 'with a non-matching action argument has no effect' do
         subject.unsubscribe :leave, &callback
-        subject.__incoming_msgbus__.publish(:presence, message)
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(1)
       end
 
-      specify 'all callbacks by not providing a callback' do
-        subject.unsubscribe presence_action
-        subject.__incoming_msgbus__.publish(:presence, message)
+      specify 'with no block argument unsubscribes all blocks for the action argument' do
+        subject.unsubscribe enter_action
+        subject.__incoming_msgbus__.publish(:presence, enter_message)
         expect(message_history[:received]).to eql(0)
       end
     end

data/spec/unit/realtime/safe_deferrable_spec.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'shared/safe_deferrable_behaviour'
+require 'ably/realtime'
+
+[Ably::Models::ProtocolMessage, Ably::Models::Message, Ably::Models::PresenceMessage].each do |model_klass|
+  describe model_klass do
+    subject { model_klass.new(action: 1) }
+
+    it_behaves_like 'a safe Deferrable'
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ably
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
+  prerelease: 
 platform: ruby
 authors:
 - Lewis Marshall
@@ -9,202 +10,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: msgpack-ably
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby client library for ably.io, the real-time messaging service
@@ -215,10 +244,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version.old"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -252,8 +280,11 @@ files:
 - lib/ably/modules/event_emitter.rb
 - lib/ably/modules/event_machine_helpers.rb
 - lib/ably/modules/http_helpers.rb
+- lib/ably/modules/message_emitter.rb
 - lib/ably/modules/message_pack.rb
 - lib/ably/modules/model_common.rb
+- lib/ably/modules/safe_deferrable.rb
+- lib/ably/modules/safe_yield.rb
 - lib/ably/modules/state_emitter.rb
 - lib/ably/modules/state_machine.rb
 - lib/ably/modules/statesman_monkey_patch.rb
@@ -272,6 +303,9 @@ files:
 - lib/ably/realtime/connection/websocket_transport.rb
 - lib/ably/realtime/models/nil_channel.rb
 - lib/ably/realtime/presence.rb
+- lib/ably/realtime/presence/members_map.rb
+- lib/ably/realtime/presence/presence_manager.rb
+- lib/ably/realtime/presence/presence_state_machine.rb
 - lib/ably/rest.rb
 - lib/ably/rest/channel.rb
 - lib/ably/rest/channels.rb
@@ -286,6 +320,7 @@ files:
 - lib/ably/rest/presence.rb
 - lib/ably/util/crypto.rb
 - lib/ably/util/pub_sub.rb
+- lib/ably/util/safe_deferrable.rb
 - lib/ably/version.rb
 - spec/acceptance/realtime/channel_history_spec.rb
 - spec/acceptance/realtime/channel_spec.rb
@@ -313,6 +348,7 @@ files:
 - spec/shared/client_initializer_behaviour.rb
 - spec/shared/model_behaviour.rb
 - spec/shared/protocol_msgbus_behaviour.rb
+- spec/shared/safe_deferrable_behaviour.rb
 - spec/spec_helper.rb
 - spec/support/api_helper.rb
 - spec/support/event_machine_helper.rb
@@ -348,6 +384,7 @@ files:
 - spec/unit/realtime/incoming_message_dispatcher_spec.rb
 - spec/unit/realtime/presence_spec.rb
 - spec/unit/realtime/realtime_spec.rb
+- spec/unit/realtime/safe_deferrable_spec.rb
 - spec/unit/realtime/websocket_transport_spec.rb
 - spec/unit/rest/channel_spec.rb
 - spec/unit/rest/channels_spec.rb
@@ -358,26 +395,33 @@ files:
 homepage: http://github.com/ably/ably-ruby
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3024375831519817759
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3024375831519817759
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Ruby client library for ably.io, the real-time messaging service
 test_files:
 - spec/acceptance/realtime/channel_history_spec.rb
@@ -406,6 +450,7 @@ test_files:
 - spec/shared/client_initializer_behaviour.rb
 - spec/shared/model_behaviour.rb
 - spec/shared/protocol_msgbus_behaviour.rb
+- spec/shared/safe_deferrable_behaviour.rb
 - spec/spec_helper.rb
 - spec/support/api_helper.rb
 - spec/support/event_machine_helper.rb
@@ -441,6 +486,7 @@ test_files:
 - spec/unit/realtime/incoming_message_dispatcher_spec.rb
 - spec/unit/realtime/presence_spec.rb
 - spec/unit/realtime/realtime_spec.rb
+- spec/unit/realtime/safe_deferrable_spec.rb
 - spec/unit/realtime/websocket_transport_spec.rb
 - spec/unit/rest/channel_spec.rb
 - spec/unit/rest/channels_spec.rb