ably-rest 1.1.2 → 1.2.2

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/encoder.rb

@@ -5,7 +5,7 @@ module Ably
   module Rest
     module Middleware
       # Encode the body of the message according to the mime type
-      class Encoder < ::Faraday::Response::Middleware
+      class Encoder < Faraday::Middleware
         CONTENT_TYPE = 'Content-Type'.freeze unless defined? CONTENT_TYPE
 
         def call(env)

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/exceptions.rb

@@ -6,7 +6,7 @@ module Ably
     module Middleware
       # HTTP exceptions raised by Ably due to an error status code
       # Ably returns JSON/Msgpack error codes and messages so include this if possible in the exception messages
-      class Exceptions < Faraday::Response::Middleware
+      class Exceptions < Faraday::Middleware
         def on_complete(env)
           if env.status >= 400
             error_status_code = env.status

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/external_exceptions.rb

@@ -5,7 +5,7 @@ module Ably
     module Middleware
       # HTTP exceptions raised due to a status code error on a 3rd party site
       # Used by auth calls
-      class ExternalExceptions < Faraday::Response::Middleware
+      class ExternalExceptions < Faraday::Middleware
         def on_complete(env)
           if env.status >= 400
             error_status_code = env.status

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/fail_if_unsupported_mime_type.rb

@@ -4,10 +4,13 @@ require 'json'
 module Ably
   module Rest
     module Middleware
-      class FailIfUnsupportedMimeType < Faraday::Response::Middleware
+      class FailIfUnsupportedMimeType < Faraday::Middleware
         def on_complete(env)
           unless env.response_headers['Ably-Middleware-Parsed'] == true
-            unless  (500..599).include?(env.status)
+            # Ignore empty body with success status code for no body response
+            return if env.body.to_s.empty? && env.status == 204
+
+            unless (500..599).include?(env.status)
               raise Ably::Exceptions::InvalidResponseBody,
                     "Content Type #{env.response_headers['Content-Type']} is not supported by this client library"
             end

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/logger.rb

@@ -3,7 +3,7 @@ require 'faraday'
 module Ably
   module Rest
     module Middleware
-      class Logger < Faraday::Response::Middleware
+      class Logger < Faraday::Middleware
         extend Forwardable
 
         def initialize(app, logger = nil)

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/parse_json.rb

@@ -4,7 +4,7 @@ require 'json'
 module Ably
   module Rest
     module Middleware
-      class ParseJson < Faraday::Response::Middleware
+      class ParseJson < Faraday::Middleware
         def on_complete(env)
           if env.response_headers['Content-Type'] == 'application/json'
             env.body = parse(env.body) unless env.response_headers['Ably-Middleware-Parsed'] == true

data/lib/submodules/ably-ruby/lib/ably/rest/middleware/parse_message_pack.rb

@@ -4,7 +4,7 @@ require 'msgpack'
 module Ably
   module Rest
     module Middleware
-      class ParseMessagePack < Faraday::Response::Middleware
+      class ParseMessagePack < Faraday::Middleware
         def on_complete(env)
           if env.response_headers['Content-Type'] == 'application/x-msgpack'
             env.body = parse(env.body) unless env.response_headers['Ably-Middleware-Parsed'] == true

data/lib/submodules/ably-ruby/lib/ably/util/crypto.rb

@@ -30,7 +30,7 @@ module Ably::Util
     #    crypto.decrypt(decrypted) # => 'secret text'
     #
     def initialize(params)
-      @fixed_iv = params.delete(:fixed_iv) if params.kind_of?(Hash)
+      @fixed_iv = params[:fixed_iv]
       @cipher_params = Ably::Models::CipherParams(params)
     end
 

data/lib/submodules/ably-ruby/lib/ably/version.rb

@@ -1,18 +1,6 @@
 module Ably
-  VERSION = '1.1.2'
-  PROTOCOL_VERSION = '1.1'
-
-  # Allow a variant to be configured for all instances of this client library
-  # such as ruby-rest-[VERSION]
-
-  # @api private
-  def self.lib_variant=(variant)
-    @lib_variant = variant
-  end
-
-  def self.lib_variant
-    @lib_variant
-  end
+  VERSION = '1.2.2'
+  PROTOCOL_VERSION = '1.2'
 
   # @api private
   def self.major_minor_version_numeric

data/lib/submodules/ably-ruby/lib/ably.rb

@@ -1,6 +1,7 @@
 require 'addressable/uri'
 
 require 'ably/version'
+require 'ably/agent'
 
 %w(modules util).each do |namespace|
   Dir.glob(File.expand_path("ably/#{namespace}/*.rb", File.dirname(__FILE__))).sort.each do |file|

data/lib/submodules/ably-ruby/spec/acceptance/realtime/auth_spec.rb

@@ -1058,7 +1058,7 @@ describe Ably::Realtime::Auth, :event_machine do
 
           it 'disconnected includes and invalid signature message' do
             client.connection.once(:disconnected) do |state_change|
-              expect(state_change.reason.message.match(/invalid signature/i)).to_not be_nil
+              expect(state_change.reason.message.match(/signature verification failed/i)).to_not be_nil
               expect(state_change.reason.code).to eql(40144)
               stop_reactor
             end
@@ -1111,7 +1111,7 @@ describe Ably::Realtime::Auth, :event_machine do
 
           it 'authentication fails and reason for disconnection is invalid signature' do
             client.connection.once(:disconnected) do |state_change|
-              expect(state_change.reason.message.match(/invalid signature/i)).to_not be_nil
+              expect(state_change.reason.message.match(/signature verification failed/i)).to_not be_nil
               expect(state_change.reason.code).to eql(40144)
               stop_reactor
             end
@@ -1143,7 +1143,7 @@ describe Ably::Realtime::Auth, :event_machine do
 
           it 'fails with an invalid signature error' do
             client.connection.once(:disconnected) do |state_change|
-              expect(state_change.reason.message.match(/invalid signature/i)).to_not be_nil
+              expect(state_change.reason.message.match(/signature verification failed/i)).to_not be_nil
               expect(state_change.reason.code).to eql(40144)
               stop_reactor
             end
@@ -1237,7 +1237,7 @@ describe Ably::Realtime::Auth, :event_machine do
         let(:basic_capability) { JSON.dump(channel_name => ['subscribe'], channel_with_publish_permissions => ['publish']) }
         let(:auth_callback) do
           lambda do |token_params|
-            Faraday.get("#{auth_url}?keyName=#{key_name}&keySecret=#{key_secret}&capability=#{URI.escape(basic_capability)}").body
+            Faraday.get("#{auth_url}?keyName=#{key_name}&keySecret=#{key_secret}&capability=#{URI::Parser.new.escape(basic_capability)}").body
           end
         end
         let(:client_options) { default_options.merge(auth_callback: auth_callback, log_level: :error) }

data/lib/submodules/ably-ruby/spec/acceptance/realtime/channel_history_spec.rb

@@ -183,6 +183,31 @@ describe Ably::Realtime::Channel, '#history', :event_machine do
         end
       end
 
+      context 'when channel receives update event after an attachment' do
+        before do
+          channel.on(:attached) do
+            channel.publish(event, message_after_attach) do
+              subsequent_serial = channel.properties.attach_serial.dup.tap { |serial| serial[-1] = '1' }
+              attached_message = Ably::Models::ProtocolMessage.new(action: 11, channel: channel_name, flags: 0, channel_serial: subsequent_serial)
+              client.connection.__incoming_protocol_msgbus__.publish :protocol_message, attached_message
+            end
+          end
+        end
+
+        it 'updates attach_serial' do
+          rest_channel.publish event, message_before_attach
+
+          channel.on(:update) do
+            channel.history(until_attach: true) do |messages|
+              expect(messages.items.count).to eql(2)
+              stop_reactor
+            end
+          end
+
+          channel.attach
+        end
+      end
+
       context 'and two pages of messages' do
         it 'retrieves two pages of messages before channel was attached' do
           10.times { rest_channel.publish event, message_before_attach }