ably-rest 0.8.2 → 0.8.3

data/lib/submodules/ably-ruby/spec/unit/auth_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 require 'shared/protocol_msgbus_behaviour'
 
 describe Ably::Auth do
-  let(:client)    { double('client').as_null_object }
-  let(:client_id) { nil }
-  let(:options)   { { key: 'appid.keyuid:keysecret', client_id: client_id } }
+  let(:client)        { double('client').as_null_object }
+  let(:client_id)     { nil }
+  let(:auth_options)  { { key: 'appid.keyuid:keysecret', client_id: client_id } }
+  let(:token_params)  { { } }
 
   subject do
-    Ably::Auth.new(client, options)
+    Ably::Auth.new(client, auth_options, token_params)
   end
 
   describe 'client_id option' do
@@ -78,8 +79,8 @@ describe Ably::Auth do
       expect(Ably::Auth::TOKEN_DEFAULTS.fetch(:capability)).to eql(all_capabilities)
     end
 
-    it 'should only have defaults for :ttl and :capability' do
-      expect(Ably::Auth::TOKEN_DEFAULTS.keys).to contain_exactly(:ttl, :capability)
+    it 'should have defaults for :ttl and :capability' do
+      expect(Ably::Auth::TOKEN_DEFAULTS.keys).to include(:ttl, :capability)
     end
   end
 end

data/lib/submodules/ably-ruby/spec/unit/models/message_spec.rb

@@ -12,7 +12,7 @@ describe Ably::Models::Message do
   let(:protocol_message_timestamp) { as_since_epoch(Time.now) }
   let(:protocol_message) { Ably::Models::ProtocolMessage.new(action: 1, timestamp: protocol_message_timestamp) }
 
-  it_behaves_like 'a model', with_simple_attributes: %w(name client_id data encoding) do
+  it_behaves_like 'a model', with_simple_attributes: %w(id name client_id data encoding) do
     let(:model_args) { [protocol_message: protocol_message] }
   end
 
@@ -150,14 +150,6 @@ describe Ably::Models::Message do
       end
     end
 
-    context 'with invalid data' do
-      let(:model) { subject.new({ clientId: 'joe' }, protocol_message: protocol_message) }
-
-      it 'raises an exception' do
-        expect { model.to_json }.to raise_error RuntimeError, /cannot generate a valid Hash/
-      end
-    end
-
     context 'with binary data' do
       let(:data) { MessagePack.pack(random_str(32)) }
       let(:model) { subject.new({ name: 'test', data: data }, protocol_message: protocol_message) }

data/lib/submodules/ably-ruby/spec/unit/models/paginated_result_spec.rb

@@ -157,7 +157,7 @@ describe Ably::Models::PaginatedResult do
               subject.next do |paginated_result|
                 deferrable = subject.first
                 deferrable.errback do |error|
-                  expect(error).to be_a(Ably::Exceptions::InvalidPageError)
+                  expect(error).to be_a(Ably::Exceptions::PageMissing)
                   stop_reactor
                 end
               end
@@ -169,10 +169,6 @@ describe Ably::Models::PaginatedResult do
   end
 
   context 'with non paged http response' do
-    it 'is the first page' do
-      expect(subject).to be_first
-    end
-
     it 'is the last page' do
       expect(subject).to be_last
     end
@@ -207,10 +203,6 @@ describe Ably::Models::PaginatedResult do
       }
     end
 
-    it 'is the first page' do
-      expect(subject).to be_first
-    end
-
     it 'has next page' do
       expect(subject).to have_next
     end
@@ -256,10 +248,6 @@ describe Ably::Models::PaginatedResult do
         expect(subject.items[0][:id]).to eql(next_body[0][:id])
       end
 
-      it 'is not the first page' do
-        expect(subject).to_not be_first
-      end
-
       it 'does not have a next page' do
         expect(subject).to_not have_next
       end
@@ -286,12 +274,7 @@ describe Ably::Models::PaginatedResult do
         it 'retrieves the first page of results' do
           expect(subject.items.length).to eql(body.length)
         end
-
-        it 'is the first page' do
-          expect(subject).to be_first
-        end
       end
     end
   end
 end
-

data/lib/submodules/ably-ruby/spec/unit/models/presence_message_spec.rb

@@ -9,7 +9,7 @@ describe Ably::Models::PresenceMessage do
   let(:protocol_message_timestamp) { as_since_epoch(Time.now) }
   let(:protocol_message) { Ably::Models::ProtocolMessage.new(action: 1, timestamp: protocol_message_timestamp) }
 
-  it_behaves_like 'a model', with_simple_attributes: %w(client_id data encoding) do
+  it_behaves_like 'a model', with_simple_attributes: %w(id client_id data encoding) do
     let(:model_args) { [protocol_message] }
   end
 

data/lib/submodules/ably-ruby/spec/unit/models/protocol_message_spec.rb

@@ -11,7 +11,7 @@ describe Ably::Models::ProtocolMessage do
   end
 
   it_behaves_like 'a model',
-    with_simple_attributes: %w(id channel channel_serial connection_id),
+    with_simple_attributes: %w(id channel channel_serial connection_id connection_key),
     base_model_options: { action: 1 } do
 
     let(:model_args) { [] }
@@ -264,6 +264,26 @@ describe Ably::Models::ProtocolMessage do
         end
       end
     end
+
+    context '#messages' do
+      let(:protocol_message) { new_protocol_message(messages: [{ name: 'test' }]) }
+
+      it 'contains Message objects' do
+        expect(protocol_message.messages.count).to eql(1)
+        expect(protocol_message.messages.first).to be_a(Ably::Models::Message)
+        expect(protocol_message.messages.first.name).to eql('test')
+      end
+    end
+
+    context '#presence' do
+      let(:protocol_message) { new_protocol_message(presence: [{ action: 1, data: 'test' }]) }
+
+      it 'contains PresenceMessage objects' do
+        expect(protocol_message.presence.count).to eql(1)
+        expect(protocol_message.presence.first).to be_a(Ably::Models::PresenceMessage)
+        expect(protocol_message.presence.first.data).to eql('test')
+      end
+    end
   end
 
   context '#to_json', :api_private do

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

@@ -71,6 +71,7 @@ describe Ably::Realtime::Channel do
 
     before do
       allow(subject).to receive(:create_message).and_return('message_stubbed')
+      allow(subject).to receive(:attach).and_return(:true)
     end
 
     context 'as UTF_8 string' do
@@ -108,8 +109,8 @@ describe Ably::Realtime::Channel do
     context 'as Nil' do
       let(:encoded_value) { nil }
 
-      it 'raises an argument error' do
-        expect { subject.publish(encoded_value, 'data') }.to raise_error ArgumentError, /must be a String/
+      it 'is permitted' do
+        expect(subject.publish(encoded_value, 'data')).to eql('message_stubbed')
       end
     end
   end
@@ -159,6 +160,10 @@ describe Ably::Realtime::Channel do
     let(:blur_message) { instance_double('Ably::Models::Message', name: 'blur', encode: nil, decode: nil) }
 
     context '#subscribe' do
+      before do
+        allow(subject).to receive(:attach).and_return(:true)
+      end
+
       specify 'without a block raises an invalid ArgumentError' do
         expect { subject.subscribe }.to raise_error ArgumentError
       end
@@ -199,8 +204,10 @@ describe Ably::Realtime::Channel do
       let(:callback) do
         Proc.new { |message| message_history[:received] += 1 }
       end
+
       before do
-        subject.subscribe(click_event, &callback)
+        allow(subject).to receive(:attach).and_return(:true)
+        subject.subscribe click_event, &callback
       end
 
       specify 'with no event name specified unsubscribes that block from all events' do

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

@@ -10,15 +10,34 @@ describe Ably::Realtime::Channels do
   subject { Ably::Realtime::Channels.new(client) }
 
   context 'creating channels' do
-    it '#get creates a channel' do
-      expect(Ably::Realtime::Channel).to receive(:new).with(client, channel_name, options)
-      subject.get(channel_name, options)
-    end
+    context '#get' do
+      it 'creates a channel if it does not exist' do
+        expect(Ably::Realtime::Channel).to receive(:new).with(client, channel_name, options)
+        subject.get(channel_name, options)
+      end
 
-    it '#get will reuse the channel object' do
-      channel = subject.get(channel_name, options)
-      expect(channel).to be_a(Ably::Realtime::Channel)
-      expect(subject.get(channel_name, options).object_id).to eql(channel.object_id)
+      context 'when an existing channel exists' do
+        it 'will reuse a channel object if it exists' do
+          channel = subject.get(channel_name, options)
+          expect(channel).to be_a(Ably::Realtime::Channel)
+          expect(subject.get(channel_name, options).object_id).to eql(channel.object_id)
+        end
+
+        it 'will update the options on the channel if provided' do
+          channel = subject.get(channel_name, options)
+          expect(channel.options).to eql(options)
+          expect(channel.options).to_not include(:encrypted)
+          subject.get(channel_name, encrypted: true)
+          expect(channel.options[:encrypted]).to eql(true)
+        end
+
+        it 'will leave the options intact on the channel if not provided' do
+          channel = subject.get(channel_name, options)
+          expect(channel.options).to eql(options)
+          subject.get(channel_name)
+          expect(channel.options).to eql(options)
+        end
+      end
     end
 
     it '[] creates a channel' do

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

@@ -97,13 +97,5 @@ describe Ably::Rest::Channel do
         expect { subject.publish(encoded_value, 'data') }.to raise_error ArgumentError, /must be a String/
       end
     end
-
-    context 'as Nil' do
-      let(:encoded_value) { nil }
-
-      it 'raises an argument error' do
-        expect { subject.publish(encoded_value, 'data') }.to raise_error ArgumentError, /must be a String/
-      end
-    end
   end
 end

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

@@ -15,35 +15,35 @@ describe Ably::Rest::Client 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
-          expect { subject.channel('a').publish('event', 'message') }.to raise_error(Ably::Exceptions::InsecureRequestError)
+          expect { subject.channel('a').publish('event', 'message') }.to raise_error(Ably::Exceptions::InsecureRequest)
         end
       end
     end
 
     context ':use_token_auth' do
       context 'set to false' do
-        context 'with an key with :tls => false' do
+        context 'with a key and :tls => false' do
           let(:client_options) { { use_token_auth: false, 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
-            expect { subject.channel('a').publish('event', 'message') }.to raise_error(Ably::Exceptions::InsecureRequestError)
+            expect { subject.channel('a').publish('event', 'message') }.to raise_error(Ably::Exceptions::InsecureRequest)
           end
         end
 
-        context 'without an key' do
+        context 'without a key' do
           let(:client_options) { { use_token_auth: false } }
 
-          it 'fails as an key is required if not using token auth' do
+          it 'fails as a key is required if not using token auth' do
             expect { subject.channel('a').publish('event', 'message') }.to raise_error(ArgumentError)
           end
         end
       end
 
       context 'set to true' do
-        context 'without an key or token' do
+        context 'without a key or token' do
           let(:client_options) { { use_token_auth: true, key: true } }
 
-          it 'fails as an key is required to issue tokens' do
+          it 'fails as a key is required to issue tokens' do
             expect { subject.channel('a').publish('event', 'message') }.to raise_error(ArgumentError)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ably-rest
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -222,6 +222,7 @@ files:
 - lib/submodules/ably-ruby/lib/ably/modules/statesman_monkey_patch.rb
 - lib/submodules/ably-ruby/lib/ably/modules/uses_state_machine.rb
 - lib/submodules/ably-ruby/lib/ably/realtime.rb
+- lib/submodules/ably-ruby/lib/ably/realtime/auth.rb
 - lib/submodules/ably-ruby/lib/ably/realtime/channel.rb
 - lib/submodules/ably-ruby/lib/ably/realtime/channel/channel_manager.rb
 - lib/submodules/ably-ruby/lib/ably/realtime/channel/channel_state_machine.rb
@@ -254,8 +255,10 @@ files:
 - lib/submodules/ably-ruby/lib/ably/util/pub_sub.rb
 - lib/submodules/ably-ruby/lib/ably/util/safe_deferrable.rb
 - lib/submodules/ably-ruby/lib/ably/version.rb
+- lib/submodules/ably-ruby/spec/acceptance/realtime/auth_spec.rb
 - lib/submodules/ably-ruby/spec/acceptance/realtime/channel_history_spec.rb
 - lib/submodules/ably-ruby/spec/acceptance/realtime/channel_spec.rb
+- lib/submodules/ably-ruby/spec/acceptance/realtime/channels_spec.rb
 - lib/submodules/ably-ruby/spec/acceptance/realtime/client_spec.rb
 - lib/submodules/ably-ruby/spec/acceptance/realtime/connection_failures_spec.rb
 - lib/submodules/ably-ruby/spec/acceptance/realtime/connection_spec.rb