ringcentral_sdk 1.3.4 → 2.0.0

data/test/test_base.rb

@@ -5,8 +5,8 @@ require 'test/unit'
 require 'mocha/test_unit'
 require 'ringcentral_sdk'
 
- RingCentralSdk.new(
-  'my_app_key',
-  'my_app_secret',
-  RingCentralSdk::RC_SERVER_SANDBOX
-)
+RingCentralSdk::REST::Client.new do |config|
+  config.app_key = 'my_app_key'
+  config.app_secret = 'my_app_secret'
+  config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+end

data/test/test_client.rb

@@ -5,53 +5,50 @@ require 'oauth2'
 
 class RingCentralSdkPlatformTest < Test::Unit::TestCase
   def setup
-    @rcsdk = RingCentralSdk.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_SANDBOX
-    )
+    @rcsdk = RingCentralSdk::REST::Client.new do |config|
+      config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+    end
   end
 
   def test_main
-    assert_equal "bXlfYXBwX2tleTpteV9hcHBfc2VjcmV0", @rcsdk.send(:get_api_key)
+    assert_equal 'bXlfYXBwX2tleTpteV9hcHBfc2VjcmV0', @rcsdk.send(:api_key)
   end
 
   def test_config
     redirect_url = 'http://localhost:4567/oauth'
-    client = RingCentralSdk.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_SANDBOX,
-      {
-        redirect_url: redirect_url
-      }
-    )
-    assert_equal redirect_url, client.app_config.redirect_url
+    client = RingCentralSdk::REST::Client.new do |config|
+      config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.redirect_url = redirect_url
+    end
+    assert_equal redirect_url, client.config.redirect_url
   end
 
   def test_set_client
-    rcsdk = new_client()
+    rcsdk = new_client
     assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client)
 
-    rcsdk.set_oauth2_client()
+    rcsdk.set_oauth2_client
     assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client)
 
-    rcsdk = new_client()
+    rcsdk = new_client
     oauth2client = OAuth2::Client.new(
       'my_app_key',
       'my_app_secret',
       site: RingCentralSdk::RC_SERVER_SANDBOX,
-      token_url: rcsdk.class::TOKEN_ENDPOINT)
-    rcsdk.set_oauth2_client(oauth2client)
-    assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client) 
+      token_url: rcsdk.class::TOKEN_ENDPOINT
+    )
+    rcsdk.set_oauth2_client oauth2client
+    assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client)
 
-    assert_raise do
-      @rcsdk.set_oauth2_client('test')
-    end
+    assert_raise { @rcsdk.set_oauth2_client('test') }
   end
 
   def test_set_token
-    token_data = {access_token: 'test_token'}
+    token_data = { access_token: 'test_token' }
 
     @rcsdk.set_token(token_data)
 
@@ -66,26 +63,27 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_url_default
-    rcsdk = RingCentralSdk.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_PRODUCTION,
-      {:redirect_url => 'http://localhost:4567/oauth'}
-    )
-    authorize_url = rcsdk.authorize_url()
+    rcsdk = RingCentralSdk::REST::Client.new do |config|
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.server_url = RingCentralSdk::RC_SERVER_PRODUCTION
+      config.redirect_url = 'http://localhost:4567/oauth'
+    end
+
+    authorize_url = rcsdk.authorize_url
 
     puts authorize_url
 
     assert_equal true, authorize_url.is_a?(String)
     assert_equal 0, authorize_url.index(RingCentralSdk::RC_SERVER_PRODUCTION)
-    assert_equal true, (authorize_url.index('localhost') > 0) ? true : false
+    assert_equal true, authorize_url.index('localhost') > 0 ? true : false
   end
 
   def test_authorize_url_explicit
-    authorize_url = @rcsdk.authorize_url({:redirect_uri => 'http://localhost:4567/oauth'})
+    authorize_url = @rcsdk.authorize_url(redirect_uri: 'http://localhost:4567/oauth')
 
     assert_equal 0, authorize_url.index(RingCentralSdk::RC_SERVER_SANDBOX)
-    assert_equal true, (authorize_url.index('localhost') > 0) ? true : false
+    assert_equal true, authorize_url.index('localhost') > 0 ? true : false
   end
 
   def test_create_url
@@ -106,11 +104,11 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_code
-    rcsdk = new_client()
-    rcsdk.set_oauth2_client()
+    rcsdk = new_client
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.auth_code.stubs(:get_token).returns(stub_token)
 
@@ -118,11 +116,17 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_client({:redirect_uri => 'http://localhost:4567/oauth'})
-    rcsdk.set_oauth2_client()
+    rcsdk = RingCentralSdk::REST::Client.new do |config|
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+      config.redirect_url = 'http://localhost:4567/oauth'
+    end
+
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.auth_code.stubs(:get_token).returns(stub_token)
 
@@ -130,11 +134,11 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_client()
-    rcsdk.set_oauth2_client()
+    rcsdk = new_client
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.auth_code.stubs(:get_token).returns(stub_token)
 
@@ -142,25 +146,25 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_client()
-    rcsdk.set_oauth2_client()
+    rcsdk = new_client
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.auth_code.stubs(:get_token).returns(stub_token)
 
-    token = rcsdk.authorize_code('my_test_auth_code', {:redirect_uri => 'http://localhost:4567/oauth'})
+    token = rcsdk.authorize_code('my_test_auth_code', redirect_uri: 'http://localhost:4567/oauth')
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
   end
 
   def test_authorize_password_with_refresh
-    rcsdk = new_client()
-    rcsdk.set_oauth2_client()
+    rcsdk = new_client
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.password.stubs(:get_token).returns(stub_token)
 
@@ -171,11 +175,11 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_password_without_refresh
-    rcsdk = new_client()
-    rcsdk.set_oauth2_client()
+    rcsdk = new_client
+    rcsdk.set_oauth2_client
 
     stub_token_hash = data_auth_token_without_refresh
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.password.stubs(:get_token).returns(stub_token)
 
@@ -187,28 +191,28 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
 
   def test_request
     assert_raise do
-      @rcsdk.request()
+      @rcsdk.request
     end
 
-    client = new_client()
-    client.set_oauth2_client()
+    client = new_client
+    client.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(client.oauth2client, stub_token_hash)
 
     client.oauth2client.password.stubs(:get_token).returns(stub_token)
 
     client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
 
-    #@rcsdk.client.stubs(:post).returns(Faraday::Response.new)
+    # @rcsdk.client.stubs(:post).returns(Faraday::Response.new)
     Faraday::Connection.any_instance.stubs(:post).returns(Faraday::Response.new)
 
     fax = RingCentralSdk::REST::Request::Fax.new(
       # phone numbers are in E.164 format with or without leading '+'
-      :to            => '+16505551212',
-      :faxResolution => 'High',
-      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
-      :text          => 'RingCentral fax demo using Ruby SDK!'
+      to: '+16505551212',
+      faxResolution: 'High',
+      coverPageText: 'RingCentral fax demo using Ruby SDK!',
+      text: 'RingCentral fax demo using Ruby SDK!'
     )
     res = client.send_request(fax)
     assert_equal 'Faraday::Response', res.class.name
@@ -218,10 +222,10 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     end
 
     res = client.messages.fax.create(
-      :to            => '+16505551212',
-      :faxResolution => 'High',
-      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
-      :text          => 'RingCentral fax demo using Ruby SDK!'
+      to: '+16505551212',
+      faxResolution: 'High',
+      coverPageText: 'RingCentral fax demo using Ruby SDK!',
+      text: 'RingCentral fax demo using Ruby SDK!'
     )
     assert_equal 'Faraday::Response', res.class.name
 
@@ -247,9 +251,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     request = RingCentralSdk::REST::Request::Simple.new(
       method: 'put',
       url: 'account/~/extension/~/message-store/11111111',
-      body: {
-        readStatus: 'Read'
-      }
+      body: { readStatus: 'Read' }
     )
     assert_equal 'put', request.method
 
@@ -261,7 +263,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     ######
     request = RingCentralSdk::REST::Request::Simple.new(
       method: 'delete',
-      url: 'account/~/extension/~/message-store/11111111',
+      url: 'account/~/extension/~/message-store/11111111'
     )
     assert_equal 'delete', request.method
 
@@ -270,11 +272,11 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_sms
-    client = new_client()
-    client.set_oauth2_client()
+    client = new_client
+    client.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(client.oauth2client, stub_token_hash)
 
     client.oauth2client.password.stubs(:get_token).returns(stub_token)
 
@@ -291,21 +293,20 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
       method: 'post',
       url: 'account/~/extension/~/sms',
       body: {
-        from: {phoneNumber: '+16505551212'},
-        to: {phoneNumber: '+14155551212'},
+        from: { phoneNumber: '+16505551212' },
+        to: { phoneNumber: '+14155551212' },
         text: 'Hi there!'
       }
     )
     assert_equal 'Faraday::Response', res.class.name
   end
 
-  def new_client(opts={})
-    return RingCentralSdk.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_PRODUCTION,
-      opts
-    )
+  def new_client
+    RingCentralSdk::REST::Client.new do |config|
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.server_url = RingCentralSdk::RC_SERVER_PRODUCTION
+    end
   end
 
   def data_auth_token_with_refresh
@@ -318,8 +319,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
   "owner_id": "1234567890"
       }'
-    data = JSON.parse(json, :symbolize_names=>true)
-    return data
+    JSON.parse(json, symbolize_names: true)
   end
 
   def data_auth_token_without_refresh
@@ -330,9 +330,8 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
   "owner_id": "1234567890"
       }'
-    data = JSON.parse(json, :symbolize_names=>true)
-    return data
+    JSON.parse(json, symbolize_names: true)
   end
 
-  alias_method :data_auth_token, :data_auth_token_with_refresh
+  alias data_auth_token data_auth_token_with_refresh
 end

data/test/test_event.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 class RingCentralSdkRESTEventTest < Test::Unit::TestCase
   def test_new_sms_count
-    data = data_test_json_sms()
+    data = data_test_json_sms
 
     event = RingCentralSdk::REST::Event.new data
 
@@ -13,7 +13,7 @@ class RingCentralSdkRESTEventTest < Test::Unit::TestCase
   end
 
   def test_new_fax_count
-    data = data_test_json_fax()
+    data = data_test_json_fax
 
     event = RingCentralSdk::REST::Event.new data
 
@@ -29,23 +29,40 @@ class RingCentralSdkRESTEventTest < Test::Unit::TestCase
 
   def test_new_failure
     assert_raise do
-      event = RingCentralSdk::REST::Event.new ''
+      RingCentralSdk::REST::Event.new ''
     end
   end
 
-  def data_test_hash(opts={})
-    json = data_test_json()
-    hash = MultiJson.decode(json, symbolize_keys: false)
-    return hash
+  def data_test_hash
+    json = data_test_json
+    MultiJson.decode json, symbolize_keys: false
   end
 
   def data_test_json_sms
-    json = '{"uuid":"11112222-3333-4444-5555-666677778888","event":"/restapi/v1.0/account/~/extension/22222222/message-store","timestamp":"2016-01-31T00:15:30.196Z","body":{"extensionId":22222222,"lastUpdated":"2016-01-31T00:15:15.923+0000","changes":[{"type":"SMS","newCount":1,"updatedCount":1}]}}'
-    MultiJson.decode(json, symbolize_keys: true)
+    json = '{
+      "uuid":"11112222-3333-4444-5555-666677778888",
+      "event":"/restapi/v1.0/account/~/extension/22222222/message-store",
+      "timestamp":"2016-01-31T00:15:30.196Z",
+      "body":{
+        "extensionId":22222222,
+        "lastUpdated":"2016-01-31T00:15:15.923+0000",
+        "changes":[{"type":"SMS","newCount":1,"updatedCount":1}]
+      }
+    }'
+    MultiJson.decode json, symbolize_keys: true
   end
 
   def data_test_json_fax
-    json = '{"uuid":"11112222-3333-4444-5555-666677778888","event":"/restapi/v1.0/account/~/extension/22222222/message-store","timestamp":"2016-02-07T14:28:29.010Z","body":{"extensionId":22222222,"lastUpdated":"2016-02-07T14:28:21.961+0000","changes":[{"type":"Fax","newCount":1,"updatedCount":0}]}}'
-    MultiJson.decode(json, symbolize_keys: false)
+    json = '{
+      "uuid":"11112222-3333-4444-5555-666677778888",
+      "event":"/restapi/v1.0/account/~/extension/22222222/message-store",
+      "timestamp":"2016-02-07T14:28:29.010Z",
+      "body":{
+        "extensionId":22222222,
+        "lastUpdated":"2016-02-07T14:28:21.961+0000",
+        "changes":[{"type":"Fax","newCount":1,"updatedCount":0}]
+      }
+    }'
+    MultiJson.decode json, symbolize_keys: false
   end
 end

data/test/test_extension_presence.rb

@@ -2,50 +2,59 @@ require './test/test_base.rb'
 
 class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
   def new_client
-    client = RingCentralSdk::REST::Client.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_SANDBOX
-    )
-    return client
+    RingCentralSdk::REST::Client.new do |config|
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+    end
   end
 
   def test_department_calls_enable
-    presence = RingCentralSdk::REST::ExtensionPresence.new(111111)
+    presence = RingCentralSdk::REST::ExtensionPresence.new(111_111)
 
     new_statuses = {
-      :enable => {
+      enable: {
         'DoNotAcceptAnyCalls' => 'TakeDepartmentCallsOnly',
         'DoNotAcceptDepartmentCalls' => 'TakeAllCalls'
       },
-      :disable => {
+      disable: {
         'TakeAllCalls' => 'DoNotAcceptDepartmentCalls',
         'TakeDepartmentCallsOnly' => 'DoNotAcceptAnyCalls'
       }
     }
 
     cur_status = 'TakeAllCalls'
-    assert_equal 'DoNotAcceptDepartmentCalls', \
+    assert_equal \
+      'DoNotAcceptDepartmentCalls', \
       presence.new_status_dnd_department_calls(cur_status, false)
-    assert_equal 'TakeAllCalls', \
+
+    assert_equal \
+      'TakeAllCalls', \
       presence.new_status_dnd_department_calls(cur_status, true)
 
     cur_status = 'TakeDepartmentCallsOnly'
-    assert_equal 'DoNotAcceptAnyCalls', \
+    assert_equal \
+      'DoNotAcceptAnyCalls', \
       presence.new_status_dnd_department_calls(cur_status, false)
-    assert_equal 'TakeDepartmentCallsOnly', \
+    assert_equal \
+      'TakeDepartmentCallsOnly', \
       presence.new_status_dnd_department_calls(cur_status, true)
 
     cur_status = 'DoNotAcceptAnyCalls'
-    assert_equal 'DoNotAcceptAnyCalls', \
+
+    assert_equal \
+      'DoNotAcceptAnyCalls', \
       presence.new_status_dnd_department_calls(cur_status, false)
-    assert_equal 'TakeDepartmentCallsOnly', \
+    assert_equal \
+      'TakeDepartmentCallsOnly', \
       presence.new_status_dnd_department_calls(cur_status, true)
 
     cur_status = 'DoNotAcceptDepartmentCalls'
-    assert_equal 'DoNotAcceptDepartmentCalls', \
+    assert_equal \
+      'DoNotAcceptDepartmentCalls', \
       presence.new_status_dnd_department_calls(cur_status, false)
-    assert_equal 'TakeAllCalls', \
+    assert_equal \
+      'TakeAllCalls', \
       presence.new_status_dnd_department_calls(cur_status, true)
   end
 
@@ -57,16 +66,16 @@ class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
     Faraday::Connection.any_instance.stubs(:get).returns(Faraday::Response.new)
     Faraday::Connection.any_instance.stubs(:put).returns(Faraday::Response.new)
 
-    presence = RingCentralSdk::REST::ExtensionPresence.new(111111, :client => client)
-    presence.retrieve()
+    presence = RingCentralSdk::REST::ExtensionPresence.new(111_111, client: client)
+    presence.retrieve
     presence.presence_data = stub_presence
 
     assert_equal 'TakeAllCalls', presence.presence_data['dndStatus']
 
     assert_equal true, presence.department_calls_enabled?
 
-    #new_status = presence.department_calls_enable false
-    #assert_equal 'DoNotAcceptDepartmentCalls', new_status
+    # new_status = presence.department_calls_enable false
+    # assert_equal 'DoNotAcceptDepartmentCalls', new_status
 
     presence.extension_id = 'abc'
     assert_raise do
@@ -77,7 +86,7 @@ class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
       presence.update nil
     end
 
-    presence.update({:dndStatus=>'TakeAllCalls'})
+    presence.update(dndStatus: 'TakeAllCalls')
 
     ######
     # Test with good data
@@ -104,59 +113,52 @@ class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
   "ringOnMonitoredCall": false,
   "pickUpCallsOnHold": false
 }'
-    data = JSON.parse(json, :symbolize_names=>false)
-    return data
+    JSON.parse json, symbolize_names: false
   end
 end
 
 class RingCentralSdkTestSubAuth
-
   def new_client
-    client = RingCentralSdk::REST::Client.new(
-      'my_app_key',
-      'my_app_secret',
-      RingCentralSdk::RC_SERVER_SANDBOX
-    )
-    return client
+    RingCentralSdk::REST::Client.new do |config|
+      config.app_key = 'my_app_key'
+      config.app_secret = 'my_app_secret'
+      config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
+    end
   end
 
-  def new_client_with_auth()
-    client = new_client()
-    client.set_oauth2_client()
+  def new_client_with_auth
+    client = new_client
+    client.set_oauth2_client
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken.from_hash(client.oauth2client, stub_token_hash)
 
     client.oauth2client.password.stubs(:get_token).returns(stub_token)
-
-    token = client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
-    return client
+    client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+    client
   end
 
-    def data_auth_token_with_refresh
-      json = '{
-  "access_token": "my_test_access_token_with_refresh",
-  "token_type": "bearer",
-  "expires_in": 3599,
-  "refresh_token": "my_test_refresh_token",
-  "refresh_token_expires_in": 604799,
-  "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
-  "owner_id": "1234567890"
+  def data_auth_token_with_refresh
+    json = '{
+      "access_token": "my_test_access_token_with_refresh",
+      "token_type": "bearer",
+      "expires_in": 3599,
+      "refresh_token": "my_test_refresh_token",
+      "refresh_token_expires_in": 604799,
+      "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
+      "owner_id": "1234567890"
       }'
-      data = JSON.parse(json, :symbolize_names=>true)
-      return data
-    end
+    JSON.parse(json, symbolize_names: true)
+  end
 
-    def data_auth_token_without_refresh
-      json = '{
-  "access_token": "my_test_access_token_without_refresh",
-  "token_type": "bearer",
-  "expires_in": 3599,
-  "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
-  "owner_id": "1234567890"
+  def data_auth_token_without_refresh
+    json = '{
+      "access_token": "my_test_access_token_without_refresh",
+      "token_type": "bearer",
+      "expires_in": 3599,
+      "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
+      "owner_id": "1234567890"
       }'
-      data = JSON.parse(json, :symbolize_names=>true)
-      return data
-    end
-
-end
+    JSON.parse(json, symbolize_names: true)
+  end
+end