ably 0.8.3 → 0.8.4

data/spec/acceptance/rest/channel_spec.rb

@@ -22,6 +22,15 @@ describe Ably::Rest::Channel do
           expect(channel.history.items.first.name).to eql(name)
           expect(channel.history.items.first.data).to eql(data)
         end
+
+        context 'and additional attributes' do
+          let(:client_id) { random_str }
+
+          it 'publishes the message with the attributes and return true indicating success' do
+            expect(channel.publish(name, data, client_id: client_id)).to eql(true)
+            expect(channel.history.items.first.client_id).to eql(client_id)
+          end
+        end
       end
 
       context 'with an array of Hash objects with :name and :data attributes' do

data/spec/acceptance/rest/client_spec.rb

@@ -63,6 +63,16 @@ describe Ably::Rest::Client do
         end
       end
 
+      context 'with an :auth_callback Proc (clientId provided in library options instead of as a token_request param)' do
+        let(:client) { Ably::Rest::Client.new(client_options.merge(client_id: client_id, auth_callback: Proc.new { token_request })) }
+        let(:token_request) { client.auth.create_token_request(key_name: key_name, key_secret: key_secret) }
+
+        it 'correctly sets the clientId on the token' do
+          expect { client.channel('channel_name').publish('event', 'message') }.to change { client.auth.current_token_details }
+          expect(client.auth.current_token_details.client_id).to eql(client_id)
+        end
+      end
+
       context 'with an auth URL' do
         let(:client_options)    { default_options.merge(key: api_key, auth_url: token_request_url, auth_method: :get) }
         let(:token_request_url) { 'http://get.token.request.com/' }

data/spec/unit/models/channel_state_change_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'shared/model_behaviour'
+
+describe Ably::Models::ChannelStateChange do
+  let(:unique) { random_str }
+
+  subject { Ably::Models::ChannelStateChange }
+
+  context '#current' do
+    it 'is required' do
+      expect { subject.new(previous: true) }.to raise_error ArgumentError
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(current: unique, previous: true).current).to eql(unique)
+    end
+  end
+
+  context '#previous' do
+    it 'is required' do
+      expect { subject.new(current: true) }.to raise_error ArgumentError
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(previous: unique, current: true).previous).to eql(unique)
+    end
+  end
+
+  context '#reason' do
+    it 'is not required' do
+      expect { subject.new(previous: true, current: true) }.to_not raise_error
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(reason: unique, previous: unique, current: true).reason).to eql(unique)
+    end
+  end
+
+  context 'invalid attributes' do
+    it 'raises an argument error' do
+      expect { subject.new(invalid: true, current: true, previous: true) }.to raise_error ArgumentError
+    end
+  end
+end

data/spec/unit/models/connection_state_change_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'shared/model_behaviour'
+
+describe Ably::Models::ConnectionStateChange do
+  let(:unique) { random_str }
+
+  subject { Ably::Models::ConnectionStateChange }
+
+  context '#current' do
+    it 'is required' do
+      expect { subject.new(previous: true) }.to raise_error ArgumentError
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(current: unique, previous: true).current).to eql(unique)
+    end
+  end
+
+  context '#previous' do
+    it 'is required' do
+      expect { subject.new(current: true) }.to raise_error ArgumentError
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(previous: unique, current: true).previous).to eql(unique)
+    end
+  end
+
+  context '#retry_in' do
+    it 'is not required' do
+      expect { subject.new(previous: true, current: true) }.to_not raise_error
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(retry_in: unique, previous: unique, current: true).retry_in).to eql(unique)
+    end
+  end
+
+  context '#reason' do
+    it 'is not required' do
+      expect { subject.new(previous: true, current: true) }.to_not raise_error
+    end
+
+    it 'is an attribute' do
+      expect(subject.new(reason: unique, previous: unique, current: true).reason).to eql(unique)
+    end
+  end
+
+  context 'invalid attributes' do
+    it 'raises an argument error' do
+      expect { subject.new(invalid: true, current: true, previous: true) }.to raise_error ArgumentError
+    end
+  end
+end

data/spec/unit/util/crypto_spec.rb

@@ -21,6 +21,24 @@ describe Ably::Util::Crypto do
     end
   end
 
+  context 'get_default_params' do
+    it 'uses the defaults and generates a key if not provided' do
+      expect(Ably::Util::Crypto.get_default_params[:algorithm]).to eql('AES')
+      expect(Ably::Util::Crypto.get_default_params[:mode]).to eql('CBC')
+      expect(Ably::Util::Crypto.get_default_params[:key_length]).to eql(128)
+      expect(Ably::Util::Crypto.get_default_params[:key].unpack('b*').first.length).to eql(128)
+    end
+
+    it 'uses the defaults and sets the key size when key is provided' do
+      key_192 = '123456781234567812345678'
+      params = Ably::Util::Crypto.get_default_params(key_192)
+      expect(params[:algorithm]).to eql('AES')
+      expect(params[:mode]).to eql('CBC')
+      expect(params[:key_length]).to eql(192)
+      expect(params[:key]).to eql(key_192)
+    end
+  end
+
   context 'encrypts & decrypt' do
     let(:string) { random_str }
     let(:byte_array) { random_str.to_msgpack.unpack('C*') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ably
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Lewis Marshall
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -244,6 +244,8 @@ files:
 - lib/ably/auth.rb
 - lib/ably/exceptions.rb
 - lib/ably/logger.rb
+- lib/ably/models/channel_state_change.rb
+- lib/ably/models/connection_state_change.rb
 - lib/ably/models/error_info.rb
 - lib/ably/models/idiomatic_ruby_wrapper.rb
 - lib/ably/models/message.rb
@@ -350,6 +352,8 @@ files:
 - spec/support/test_app.rb
 - spec/unit/auth_spec.rb
 - spec/unit/logger_spec.rb
+- spec/unit/models/channel_state_change_spec.rb
+- spec/unit/models/connection_state_change_spec.rb
 - spec/unit/models/error_info_spec.rb
 - spec/unit/models/idiomatic_ruby_wrapper_spec.rb
 - spec/unit/models/message_encoders/base64_spec.rb
@@ -446,6 +450,8 @@ test_files:
 - spec/support/test_app.rb
 - spec/unit/auth_spec.rb
 - spec/unit/logger_spec.rb
+- spec/unit/models/channel_state_change_spec.rb
+- spec/unit/models/connection_state_change_spec.rb
 - spec/unit/models/error_info_spec.rb
 - spec/unit/models/idiomatic_ruby_wrapper_spec.rb
 - spec/unit/models/message_encoders/base64_spec.rb