ably-rest 0.8.15 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48424ef72497c2751ac21a896c3ccd2efeb4d565
-  data.tar.gz: 70c5800da531e11fe13ddf904be8aa1aaeb1d7eb
+  metadata.gz: 01450cb037d2de42c0761a71bcfcdbaef488dcd6
+  data.tar.gz: 9b6dae68df0d53227815a4dee62169f373e040ab
 SHA512:
-  metadata.gz: 609bc1f34bab805c54141889d429b341e2648cbc08591ba56f30b31246c175902eb7369156022f7e0d710e186dac04ce88e05b6c84e940e82d094609388fdaa6
-  data.tar.gz: 67fd51774c985327152ad7fda6d448e791d37d58ace59709615560899f56ddc531029c3873a21df8c1a4ff05cf8121cfc6f237a6c0e8b1154917cbcad5709442
+  metadata.gz: a8b94e3e03348bdd861e23c005de04bbf047d24f896e5c249a0bf7bc8edf9c13b1d63cf38d764fbacd027e3c5e1937f8d890d5b29a52979ac765f6abb3f36582
+  data.tar.gz: 36fae4dc9d10ec4b8bc8f5f1137b9d41f169d83b346edd7912288e72dd8533c0a3c9acec438d055b345b1c15c15d03f09cfab50d09f41b04255f9333f33bf636

data/lib/submodules/ably-ruby/CHANGELOG.md

@@ -1,52 +1,7 @@
 # Change Log
 
-## [v0.8.15](https://github.com/ably/ably-ruby/tree/v0.8.15)
+## [v0.8.14](https://github.com/ably/ably-ruby/tree/v0.8.14)
 
-[Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.14...v0.8.15)
-
-**Implemented enhancements:**
-
-- Fix HttpRequest & HttpRetry timeouts [\#110](https://github.com/ably/ably-ruby/issues/110)
-- Logger should take blocks [\#107](https://github.com/ably/ably-ruby/issues/107)
-- 0.9: Use separate internal/external listeners [\#106](https://github.com/ably/ably-ruby/issues/106)
-- Add reuse library test [\#83](https://github.com/ably/ably-ruby/issues/83)
-- 0.8 final spec check [\#71](https://github.com/ably/ably-ruby/issues/71)
-- Use connection\#id not connection\#key to determine if connection has been resumed [\#62](https://github.com/ably/ably-ruby/issues/62)
-- Channel Presence suspended state [\#41](https://github.com/ably/ably-ruby/issues/41)
-- Attach / detach timeouts + protocol error handling for Channel [\#38](https://github.com/ably/ably-ruby/issues/38)
-- Connection retry and timeout needs to be configurable [\#6](https://github.com/ably/ably-ruby/issues/6)
-
-**Fixed bugs:**
-
-- Subscribing to all connection state changes doesn't work [\#103](https://github.com/ably/ably-ruby/issues/103)
-- Ensure DETACHED or DISCONNECTED with error is non-fatal [\#93](https://github.com/ably/ably-ruby/issues/93)
-- Incorrect assumption for channel errors [\#91](https://github.com/ably/ably-ruby/issues/91)
-- authCallback assumes a blocking callback, even in EM [\#89](https://github.com/ably/ably-ruby/issues/89)
-- Token Reauth error codes [\#86](https://github.com/ably/ably-ruby/issues/86)
-- Do not persist authorise attributes force & timestamp [\#72](https://github.com/ably/ably-ruby/issues/72)
-- 0.8 final spec check [\#71](https://github.com/ably/ably-ruby/issues/71)
-- Receiving CONNECTED when already connected [\#69](https://github.com/ably/ably-ruby/issues/69)
-- Connection\#connect callback may not be called as expected [\#68](https://github.com/ably/ably-ruby/issues/68)
-- nodename nor servname provided [\#65](https://github.com/ably/ably-ruby/issues/65)
-- Channel Presence suspended state [\#41](https://github.com/ably/ably-ruby/issues/41)
-- Intermittent test fixes [\#33](https://github.com/ably/ably-ruby/issues/33)
-
-**Closed issues:**
-
-- Remove deprecated ProtocolMessage\#connectionKey [\#108](https://github.com/ably/ably-ruby/issues/108)
-- 0.9 Extras field [\#105](https://github.com/ably/ably-ruby/issues/105)
-- 0.9 UPDATE spec [\#104](https://github.com/ably/ably-ruby/issues/104)
-- Token issue bug [\#75](https://github.com/ably/ably-ruby/issues/75)
-- Ensure client\_id provided is string or cast to string in Auth request\_token [\#74](https://github.com/ably/ably-ruby/issues/74)
-- Standardise timeouts [\#64](https://github.com/ably/ably-ruby/issues/64)
-- Ensure RSpec retry compatibility is used [\#54](https://github.com/ably/ably-ruby/issues/54)
-- Spec validation [\#43](https://github.com/ably/ably-ruby/issues/43)
-
-**Merged pull requests:**
-
-- From encoded [\#101](https://github.com/ably/ably-ruby/pull/101) ([mattheworiordan](https://github.com/mattheworiordan))
-
-## [v0.8.14](https://github.com/ably/ably-ruby/tree/v0.8.14) (2016-09-30)
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.13...v0.8.14)
 
 **Fixed bugs:**
@@ -62,6 +17,7 @@
 - Fallback host improvements [\#97](https://github.com/ably/ably-ruby/pull/97) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.13](https://github.com/ably/ably-ruby/tree/v0.8.13) (2016-09-29)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.12...v0.8.13)
 
 **Merged pull requests:**
@@ -69,6 +25,7 @@
 - Ensure interoperability with other libraries with JSON protocol [\#94](https://github.com/ably/ably-ruby/pull/94) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.12](https://github.com/ably/ably-ruby/tree/v0.8.12) (2016-05-23)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.11...v0.8.12)
 
 **Fixed bugs:**
@@ -80,6 +37,7 @@
 - Reauthorise [\#90](https://github.com/ably/ably-ruby/pull/90) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.11](https://github.com/ably/ably-ruby/tree/v0.8.11) (2016-04-05)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.10...v0.8.11)
 
 **Merged pull requests:**
@@ -87,14 +45,17 @@
 - Ensure message emitter callbacks are safe \(i.e. cannot break the EM\) [\#85](https://github.com/ably/ably-ruby/pull/85) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.10](https://github.com/ably/ably-ruby/tree/v0.8.10) (2016-04-01)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.9...v0.8.10)
 
 ## [v0.8.9](https://github.com/ably/ably-ruby/tree/v0.8.9) (2016-03-01)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.8...v0.8.9)
 
 **Fixed bugs:**
 
 - Support enter\(data\) [\#79](https://github.com/ably/ably-ruby/issues/79)
+
 - Update documentation to hide private API methods [\#77](https://github.com/ably/ably-ruby/issues/77)
 
 **Closed issues:**
@@ -104,9 +65,11 @@
 **Merged pull requests:**
 
 - Various fixes for open issues [\#82](https://github.com/ably/ably-ruby/pull/82) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - Encryption spec update [\#81](https://github.com/ably/ably-ruby/pull/81) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.8](https://github.com/ably/ably-ruby/tree/v0.8.8) (2016-01-26)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.7...v0.8.8)
 
 **Closed issues:**
@@ -114,18 +77,23 @@
 - Support :key in ClientOptions and deprecate :api\_key [\#73](https://github.com/ably/ably-ruby/issues/73)
 
 ## [v0.8.7](https://github.com/ably/ably-ruby/tree/v0.8.7) (2015-12-31)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.6...v0.8.7)
 
 ## [v0.8.6](https://github.com/ably/ably-ruby/tree/v0.8.6) (2015-12-02)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.5...v0.8.6)
 
 **Merged pull requests:**
 
 - Some intermittent test fixes & enable tests that were blocked [\#70](https://github.com/ably/ably-ruby/pull/70) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - Output detailed log for any text failures [\#67](https://github.com/ably/ably-ruby/pull/67) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - 0.8 final spec \(98% compliance\) [\#66](https://github.com/ably/ably-ruby/pull/66) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.5](https://github.com/ably/ably-ruby/tree/v0.8.5) (2015-10-08)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.4...v0.8.5)
 
 **Implemented enhancements:**
@@ -135,7 +103,9 @@
 **Fixed bugs:**
 
 - Switch arity of auth methods [\#61](https://github.com/ably/ably-ruby/issues/61)
+
 - Add test: Message published, connection dropped, then restores to point before last message was published [\#56](https://github.com/ably/ably-ruby/issues/56)
+
 - Documentation for constructor is incorrect [\#49](https://github.com/ably/ably-ruby/issues/49)
 
 **Merged pull requests:**
@@ -143,30 +113,41 @@
 - Ensure connections are always closed in tests [\#63](https://github.com/ably/ably-ruby/pull/63) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.4](https://github.com/ably/ably-ruby/tree/v0.8.4) (2015-09-08)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.3...v0.8.4)
 
 **Implemented enhancements:**
 
 - Add compatibility support for default Crypto params [\#53](https://github.com/ably/ably-ruby/issues/53)
+
 - EventEmitter on connection [\#52](https://github.com/ably/ably-ruby/issues/52)
+
 - Add test for connectionId attribute for a message sent over REST [\#50](https://github.com/ably/ably-ruby/issues/50)
 
 **Merged pull requests:**
 
 - Spec update to fix a number of issues [\#60](https://github.com/ably/ably-ruby/pull/60) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - Allow clientId to be provided on init if using externally created token [\#58](https://github.com/ably/ably-ruby/pull/58) ([SimonWoolf](https://github.com/SimonWoolf))
 
 ## [v0.8.3](https://github.com/ably/ably-ruby/tree/v0.8.3) (2015-08-19)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.2...v0.8.3)
 
 **Implemented enhancements:**
 
 - Implement :queue\_messages option [\#36](https://github.com/ably/ably-ruby/issues/36)
+
 - Check that a non 200-299 status code for REST requests uses fallback hosts [\#35](https://github.com/ably/ably-ruby/issues/35)
+
 - Move stats fixtures into ably-common [\#34](https://github.com/ably/ably-ruby/issues/34)
+
 - Add tests for messages with no data or name fields [\#21](https://github.com/ably/ably-ruby/issues/21)
+
 - Namespace MsgPack as MsgPack5 because compliance is not merged in [\#12](https://github.com/ably/ably-ruby/issues/12)
+
 - Add test coverage for receiving messages more than once i.e. historical messages resent somehow on reconnect [\#11](https://github.com/ably/ably-ruby/issues/11)
+
 - Add async methods for Authentication in the realtime library [\#8](https://github.com/ably/ably-ruby/issues/8)
 
 **Fixed bugs:**
@@ -176,28 +157,37 @@
 **Closed issues:**
 
 - Scope default token params in arguments [\#55](https://github.com/ably/ably-ruby/issues/55)
+
 - Channel options can be reset when accessing a channel with \#get [\#46](https://github.com/ably/ably-ruby/issues/46)
 
 **Merged pull requests:**
 
 - Separate token params for auth [\#57](https://github.com/ably/ably-ruby/pull/57) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - Ensure files are required in a consistent order [\#51](https://github.com/ably/ably-ruby/pull/51) ([SimonWoolf](https://github.com/SimonWoolf))
 
 ## [v0.8.2](https://github.com/ably/ably-ruby/tree/v0.8.2) (2015-05-20)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.1...v0.8.2)
 
 **Implemented enhancements:**
 
 - Ensure Array object can be used in place of Hash for payload [\#44](https://github.com/ably/ably-ruby/issues/44)
+
 - Change connect\_automatically option to auto\_connect for consistency [\#42](https://github.com/ably/ably-ruby/issues/42)
+
 - Rename PaginatedResource to PaginatedResult for consistency [\#40](https://github.com/ably/ably-ruby/issues/40)
+
 - EventEmitter should use `emit` not `trigger` to be consistent with other libs [\#31](https://github.com/ably/ably-ruby/issues/31)
+
 - Add exceptions when data attribute for messages/presence is not String, Binary or JSON data [\#4](https://github.com/ably/ably-ruby/issues/4)
+
 - Auth Callback and Auth URL should support tokens as well as token requests [\#2](https://github.com/ably/ably-ruby/issues/2)
 
 **Closed issues:**
 
 - Realtime Presence\#get does not wait by default [\#47](https://github.com/ably/ably-ruby/issues/47)
+
 - No implicit attach when accessing channel.presence [\#45](https://github.com/ably/ably-ruby/issues/45)
 
 **Merged pull requests:**
@@ -205,9 +195,11 @@
 - Reject invalid payload type [\#48](https://github.com/ably/ably-ruby/pull/48) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.8.1](https://github.com/ably/ably-ruby/tree/v0.8.1) (2015-04-23)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.8.0...v0.8.1)
 
 ## [v0.8.0](https://github.com/ably/ably-ruby/tree/v0.8.0) (2015-04-23)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.6...v0.8.0)
 
 **Merged pull requests:**
@@ -215,15 +207,18 @@
 - Token naming refactor [\#29](https://github.com/ably/ably-ruby/pull/29) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.7.6](https://github.com/ably/ably-ruby/tree/v0.7.6) (2015-04-17)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.5...v0.7.6)
 
 **Implemented enhancements:**
 
 - Rename Stat to Stats for consistency [\#32](https://github.com/ably/ably-ruby/issues/32)
+
 - Stats objects [\#24](https://github.com/ably/ably-ruby/issues/24)
+
 - Need a test to handle errors in callbacks [\#13](https://github.com/ably/ably-ruby/issues/13)
+
 - Allow token ID or API key in the client constructor [\#5](https://github.com/ably/ably-ruby/issues/5)
-- Typed stats similar to Java library + zero default for empty stats [\#25](https://github.com/ably/ably-ruby/pull/25) ([mattheworiordan](https://github.com/mattheworiordan))
 
 **Fixed bugs:**
 
@@ -236,14 +231,19 @@
 **Merged pull requests:**
 
 - Test encoded presence fixture data for \#get & \#history [\#28](https://github.com/ably/ably-ruby/pull/28) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - Add coveralls.io coverage reporting [\#27](https://github.com/ably/ably-ruby/pull/27) ([mattheworiordan](https://github.com/mattheworiordan))
+
 - New paginated resource [\#26](https://github.com/ably/ably-ruby/pull/26) ([mattheworiordan](https://github.com/mattheworiordan))
-- History since attach [\#22](https://github.com/ably/ably-ruby/pull/22) ([mattheworiordan](https://github.com/mattheworiordan))
+
+- Typed stats similar to Java library + zero default for empty stats [\#25](https://github.com/ably/ably-ruby/pull/25) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.7.5](https://github.com/ably/ably-ruby/tree/v0.7.5) (2015-03-21)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.4...v0.7.5)
 
 ## [v0.7.4](https://github.com/ably/ably-ruby/tree/v0.7.4) (2015-03-21)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.2...v0.7.4)
 
 **Merged pull requests:**
@@ -251,6 +251,7 @@
 - Presence Member Map [\#14](https://github.com/ably/ably-ruby/pull/14) ([mattheworiordan](https://github.com/mattheworiordan))
 
 ## [v0.7.2](https://github.com/ably/ably-ruby/tree/v0.7.2) (2015-02-10)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.1...v0.7.2)
 
 **Implemented enhancements:**
@@ -260,12 +261,15 @@
 **Merged pull requests:**
 
 - Update README to include various missing snippets for core features [\#9](https://github.com/ably/ably-ruby/pull/9) ([kouno](https://github.com/kouno))
+
 - Fix connection retry frequency [\#7](https://github.com/ably/ably-ruby/pull/7) ([kouno](https://github.com/kouno))
 
 ## [v0.7.1](https://github.com/ably/ably-ruby/tree/v0.7.1) (2015-01-18)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.7.0...v0.7.1)
 
 ## [v0.7.0](https://github.com/ably/ably-ruby/tree/v0.7.0) (2015-01-12)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.6.2...v0.7.0)
 
 **Closed issues:**
@@ -273,30 +277,39 @@
 - JSON encoder should only append utf-8 before a cipher encoder is applied [\#1](https://github.com/ably/ably-ruby/issues/1)
 
 ## [v0.6.2](https://github.com/ably/ably-ruby/tree/v0.6.2) (2014-12-10)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.2.0...v0.6.2)
 
 ## [v0.2.0](https://github.com/ably/ably-ruby/tree/v0.2.0) (2014-12-09)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.6...v0.2.0)
 
 ## [v0.1.6](https://github.com/ably/ably-ruby/tree/v0.1.6) (2014-10-31)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.5...v0.1.6)
 
 ## [v0.1.5](https://github.com/ably/ably-ruby/tree/v0.1.5) (2014-10-23)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.4...v0.1.5)
 
 ## [v0.1.4](https://github.com/ably/ably-ruby/tree/v0.1.4) (2014-09-27)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.3...v0.1.4)
 
 ## [v0.1.3](https://github.com/ably/ably-ruby/tree/v0.1.3) (2014-09-26)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.2...v0.1.3)
 
 ## [v0.1.2](https://github.com/ably/ably-ruby/tree/v0.1.2) (2014-09-25)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.1...v0.1.2)
 
 ## [v0.1.1](https://github.com/ably/ably-ruby/tree/v0.1.1) (2014-09-23)
+
 [Full Changelog](https://github.com/ably/ably-ruby/compare/v0.1.0...v0.1.1)
 
 ## [v0.1.0](https://github.com/ably/ably-ruby/tree/v0.1.0) (2014-09-23)
 
 
+
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/submodules/ably-ruby/README.md

@@ -24,12 +24,6 @@ And then install this Bundler dependency:
 Or install it yourself as:
 
     $ gem install ably
-    
-### Using with Rails or Sinatra
-
-This `ably` gem provides both a [Realtime](http://www.ably.io/documentation/realtime/usage) and [REST](http://www.ably.io/documentation/rest/usage) version of the Ably library. Realtime depends on EventMachine to provide an asynchronous evented framework to run the library in, whereas the REST library depends only on synchronous libraries such as Faraday.
-
-If you are using Ably within your Rails or Sinatra apps, more often than not, you probably want to use the REST only version of the library that has no dependency on EventMachine and provides a synchronous API that you will be used to using within Rails and Sinatra. [See the REST only Ruby version of the Ably library](https://github.com/ably/ably-ruby-rest).
 
 ## Using the Realtime API
 

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

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2.0' # version lock, see config.around(:example, :event_machine) in event_machine_helper.rb
   spec.add_development_dependency 'rspec-retry'
   spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'webmock', '~> 2.3.0'
+  spec.add_development_dependency 'webmock'
 
   spec.add_development_dependency 'coveralls'
 

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

@@ -65,8 +65,6 @@ module Ably
       @token_params        = token_params.dup
       @token_option        = options[:token] || options[:token_details]
 
-      @options.delete :force # Forcing token auth for every request is not a valid default
-
       if options[:key] && (options[:key_secret] || options[:key_name])
         raise ArgumentError, 'key and key_name or key_secret are mutually exclusive. Provider either a key or key_name & key_secret'
       end
@@ -88,11 +86,11 @@ module Ably
       end
 
       # If a token details object or token string is provided in the initializer
-      # then the client can be authorised immediately using this token
+      # then the client can be authorized immediately using this token
       if token_option
         token_details = convert_to_token_details(token_option)
         if token_details
-          token_details = authorise_with_token(token_details)
+          token_details = authorize_with_token(token_details)
           logger.debug "Auth: new token passed in to the initializer: #{token_details}"
         end
       end
@@ -107,7 +105,6 @@ module Ably
     #
     # @param [Hash, nil] token_params the token params used for future token requests. When nil, previously configured token params are used
     # @param [Hash, nil] auth_options the authentication options used for future token requests. When nil, previously configure authentication options are used
-    # @option auth_options [Boolean]   :force   obtains a new token even if the current token is valid. If the provided +auth_options+ Hash contains only this +:force+ attribute, the existing configured authentication options are not overwriten
     # @option (see #request_token)
     #
     # @return (see #create_token_request)
@@ -115,19 +112,17 @@ module Ably
     # @example
     #    # will issue a simple token request using basic auth
     #    client = Ably::Rest::Client.new(key: 'key.id:secret')
-    #    token_details = client.auth.authorise
+    #    token_details = client.auth.authorize
     #
-    #    # will use token request from block to authorise if not already authorised
-    #    token_details = client.auth.authorise {}, auth_callback: Proc.new do
+    #    # will use token request from block to authorize if not already authorized
+    #    token_details = client.auth.authorize {}, auth_callback: Proc.new do
     #      # create token_request object
     #      token_request
     #    end
     #
-    def authorise(token_params = nil, auth_options = nil)
-      if auth_options == { force: true }
-        auth_options = options.merge(force: true)
-      elsif auth_options.nil?
-        auth_options = options
+    def authorize(token_params = nil, auth_options = nil)
+      if auth_options.nil?
+        auth_options = options # Use default options
       else
         ensure_valid_auth_attributes auth_options
 
@@ -146,34 +141,35 @@ module Ably
 
         @options = auth_options.clone
 
-        # Force reauth and query the server time only happens once
-        # the otpions remain in auth_options though so they are passed to request_token
+        # Query the server time only happens once
+        # the options remain in auth_options though so they are passed to request_token
         @options.delete(:query_time)
-        @options.delete(:force)
 
         @options.freeze
       end
 
+      # Unless provided, defaults are used
       unless token_params.nil?
         @token_params = token_params
         @token_params.freeze
       end
 
-      if current_token_details && !auth_options[:force]
-        return current_token_details unless current_token_details.expired?
-      end
-
-      authorise_with_token(request_token(@token_params, auth_options)).tap do |new_token_details|
+      authorize_with_token(request_token(@token_params, auth_options)).tap do |new_token_details|
         logger.debug "Auth: new token following authorisation: #{new_token_details}"
 
-        # If authorise was forced allow a block to be called so that the realtime library
-        # can force upgrade the authorisation
-        if auth_options[:force] && block_given?
+        # If authorize the realtime library required auth, then yield the token in a block
+        if block_given?
           yield new_token_details
         end
       end
     end
 
+    # @deprecated Use {#authorize} instead
+    def authorise(*args, &block)
+      logger.warn "Auth#authorise is deprecated and will be removed in 1.0. Please use Auth#authorize instead"
+      authorize(*args, &block)
+    end
+
     # Request a {Ably::Models::TokenDetails} which can be used to make authenticated token based requests
     #
     # @param [Hash] auth_options (see #create_token_request)
@@ -347,7 +343,7 @@ module Ably
     end
 
     # Auth header string used in HTTP requests to Ably
-    # Will reauthorise implicitly if required and capable
+    # Will reauthorize implicitly if required and capable
     #
     # @return [String] HTTP authentication value used in HTTP_AUTHORIZATION header
     def auth_header
@@ -359,7 +355,7 @@ module Ably
     end
 
     # Auth params used in URI endpoint for Realtime connections
-    # Will reauthorise implicitly if required and capable
+    # Will reauthorize implicitly if required and capable
     #
     # @return [Hash] Auth params for a new Realtime connection
     def auth_params
@@ -449,6 +445,14 @@ module Ably
       @token_option
     end
 
+    def authorize_when_necessary
+      if current_token_details && !current_token_details.expired?
+        return current_token_details
+      else
+        authorize
+      end
+    end
+
     # Returns the current device clock time unless the
     # the server time has previously been requested with query_time: true
     # and the @server_time_offset is configured
@@ -530,16 +534,17 @@ module Ably
       @key_secret = options.delete(:key_secret)
     end
 
-    # Returns the current token if it exists or authorises and retrieves a token
+    # Returns the current token if it exists or authorizes and retrieves a token
     def token_auth_string
       if !current_token_details && token_option
+        logger.debug "Auth: Token auth string missing, authorizing implicitly now"
         # A TokenRequest was configured in the ClientOptions +:token field+ and no current token exists
         # Note: If a Token or TokenDetails is provided in the initializer, the token is stored in +current_token_details+
-        authorise_with_token send_token_request(token_option)
+        authorize_with_token send_token_request(token_option)
         current_token_details.token
       else
-        # Authorise will use the current token if one exists and is not expired, otherwise a new token will be issued
-        authorise.token
+        # Authorize will use the current token if one exists and is not expired, otherwise a new token will be issued
+        authorize_when_necessary.token
       end
     end
 
@@ -615,7 +620,7 @@ module Ably
     end
 
     # Use the provided token to authenticate immediately and store the token details in +current_token_details+
-    def authorise_with_token(new_token_details)
+    def authorize_with_token(new_token_details)
       if new_token_details && !new_token_details.from_token_string?
         if !token_client_id_allowed?(new_token_details.client_id)
           raise Ably::Exceptions::IncompatibleClientId.new("Client ID '#{new_token_details.client_id}' in the token is incompatible with the current client ID '#{client_id}'", 400, 40012)
@@ -645,7 +650,7 @@ module Ably
 
       response = client.post("/keys/#{token_request.key_name}/requestToken",
                              token_request.attributes, send_auth_header: false,
-                             disable_automatic_reauthorise: true)
+                             disable_automatic_reauthorize: true)
 
       Ably::Models::TokenDetails.new(response.body)
     end