ringcentral_sdk 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce21745b447bf882a9636dcfd3a4bcf8f62c011
-  data.tar.gz: 8d3bbb5a2321d7b562b69b0ff03b2379c0432140
+  metadata.gz: 862737f88ab2fb10fb96c6f606b611bf74492107
+  data.tar.gz: 6d2fdc609db3b0f27b33e783989933bca33c25bc
 SHA512:
-  metadata.gz: 1c5329a5af10c38274942c3cf502e15ebf77f609e0408a14abf95d74693892a9efe90594f05e2765d42f7be92775b94f65af30348350bcf9e35cb0ee44cdca5f
-  data.tar.gz: 358783efa3adf397bc5edf845d04ad9cb3e464de876cebf8b2276a2f2c1204fc13280833f86a0e89e8ec7131db9b71a97a80ab98ee787b4356c8db98ce8eb5a5
+  metadata.gz: 8f458a48827b77691e2a35cb34e4bb587c4a756afe2849032d731be462d60816fe240265669e07ed24fe3d7e8da1f0b546051b954baf6abc60093e803a7f1e6e
+  data.tar.gz: 54d1f7f38b78b233dac0b41f39a5284970adbd0a6385f9b8ab30403ec917b31d41d327c5b6eaafee99875712e75e7fd4bae807a2933d02063fde890fd89ce8db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ringcentral_sdk (2.0.0)
+    ringcentral_sdk (2.0.1)
       dotenv (~> 2.1, >= 2.1.0)
       faraday (~> 0, >= 0)
       faraday_middleware (~> 0, >= 0)
@@ -81,7 +81,7 @@ GEM
       faraday (~> 0.9, >= 0.9)
       faraday_middleware (~> 0, >= 0)
     faraday_middleware-request-retry (0.1.0)
-      faraday (~> 0.9, >= 0.9)
+      faraday (~> 0, >= 0)
       faraday_middleware (~> 0, >= 0)
     hitimes (1.2.4)
     httpclient (2.8.3)

data/lib/ringcentral_sdk.rb

@@ -1,15 +1,9 @@
 # RingCentralSdk is a SDK for the RingCentral REST API
 module RingCentralSdk
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 
   RC_SERVER_PRODUCTION = 'https://platform.ringcentral.com'.freeze
   RC_SERVER_SANDBOX = 'https://platform.devtest.ringcentral.com'.freeze
 
   autoload :REST, 'ringcentral_sdk/rest'
-
-  class << self
-    def new(app_key, app_secret, server_url = RC_SERVER_SANDBOX, opts = {})
-      RingCentralSdk::REST::Client.new(app_key, app_secret, server_url, opts)
-    end
-  end
 end

data/lib/ringcentral_sdk/rest/client.rb

@@ -38,7 +38,6 @@ module RingCentralSdk
         yield config
         @config.inflate
 
-        @logger = @config.logger
         @oauth2client = new_oauth2_client
 
         unless @config.username.to_s.empty?

data/lib/ringcentral_sdk/rest/subscription.rb

@@ -18,7 +18,7 @@ module RingCentralSdk
       attr_reader :event_filters
 
       def initialize(client)
-        @_client = client
+        @client = client
         @event_filters = []
         @_timeout = nil
         @_subscription = nil_subscription
@@ -69,11 +69,11 @@ module RingCentralSdk
         raise 'Events are undefined' unless @event_filters.is_a?(Array) && !@event_filters.empty?
 
         begin
-          response = @_client.http.post do |req|
+          response = @client.http.post do |req|
             req.url 'subscription'
             req.headers['Content-Type'] = 'application/json'
             req.body = {
-              eventFilters: @_client.create_urls(@event_filters),
+              eventFilters: @client.create_urls(@event_filters),
               deliveryMode: { transportType: 'PubNub' }
             }
           end
@@ -98,7 +98,7 @@ module RingCentralSdk
         _clear_timeout
 
         begin
-          response = @_client.http.post do |req|
+          response = @client.http.post do |req|
             req.url uri_join(@_subscription['uri'], 'renew')
             req.headers['Content-Type'] = 'application/json'
           end
@@ -109,7 +109,7 @@ module RingCentralSdk
 
           return response
         rescue StandardError => e
-          @client.logger.warn "RingCentralSdk::REST::Subscription: RENEW_ERROR #{e}"
+          @client.config.logger.warn "RingCentralSdk::REST::Subscription: RENEW_ERROR #{e}"
           reset
           changed
           notify_observers e
@@ -121,7 +121,7 @@ module RingCentralSdk
         raise 'Subscription is not alive' unless alive?
 
         begin
-          response = @_client.http.delete do |req|
+          response = @client.http.delete do |req|
             req.url 'subscription/' + @_subscription['id'].to_s
           end
           reset
@@ -179,19 +179,19 @@ module RingCentralSdk
 
         callback = Pubnub::SubscribeCallback.new(
           message: ->(envelope) {
-            @_client.logger.debug "MESSAGE: #{envelope.result[:data]}"
+            @client.config.logger.debug "MESSAGE: #{envelope.result[:data]}"
             _notify envelope.result[:data][:message]
             changed
           },
           presence: ->(envelope) {
-            @_client.logger.info "PRESENCE: #{envelope.result[:data]}"
+            @client.config.logger.info "PRESENCE: #{envelope.result[:data]}"
           },
           status: lambda do |envelope|
-            @_client.logger.info "\n\n\n#{envelope.status}\n\n\n"
+            @client.config.logger.info "\n\n\n#{envelope.status}\n\n\n"
             if envelope.error?
-              @_client.logger.info "ERROR! #{envelope.status[:category]}"
+              @client.config.logger.info "ERROR! #{envelope.status[:category]}"
             elsif envelope.status[:last_timetoken] == 0 # Connected!
-              @_client.logger.info('CONNECTED!')
+              @client.config.logger.info('CONNECTED!')
             end
           end
         )
@@ -201,12 +201,12 @@ module RingCentralSdk
         @_pubnub.subscribe(
           channels: @_subscription['deliveryMode']['address']
         )
-        @_client.logger.debug('SUBSCRIBED')
+        @client.config.logger.debug('SUBSCRIBED')
       end
 
       def _notify(message)
         count = count_observers
-        @_client.logger.debug("RingCentralSdk::REST::Subscription NOTIFYING '#{count}' observers")
+        @client.config.logger.debug("RingCentralSdk::REST::Subscription NOTIFYING '#{count}' observers")
 
         message = _decrypt message
         changed

data/test/test_base.rb

@@ -10,3 +10,57 @@ RingCentralSdk::REST::Client.new do |config|
   config.app_secret = 'my_app_secret'
   config.server_url = RingCentralSdk::RC_SERVER_SANDBOX
 end
+
+module RingCentralSdk
+  module Test
+    class ClientUtil
+      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)
+
+        client.oauth2client.password.stubs(:get_token).returns(stub_token)
+
+        client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+      end
+
+      def client_stub_auth(client)
+        client.set_oauth2_client
+
+        stub_token_hash = data_auth_token_with_refresh
+        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')
+        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"
+          }'
+        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"
+          }'
+        JSON.parse(json, symbolize_names: true)
+      end
+    end
+  end
+end

data/test/test_event.rb

@@ -9,7 +9,7 @@ class RingCentralSdkRESTEventTest < Test::Unit::TestCase
 
     assert_equal '11112222-3333-4444-5555-666677778888', event.doc.getAttr('uuid')
     assert_equal 1, event.new_sms_count
-    assert_equal -1, event.new_fax_count
+    assert_equal (-1), event.new_fax_count
   end
 
   def test_new_fax_count
@@ -18,7 +18,7 @@ class RingCentralSdkRESTEventTest < Test::Unit::TestCase
     event = RingCentralSdk::REST::Event.new data
 
     assert_equal '11112222-3333-4444-5555-666677778888', event.doc.getAttr('uuid')
-    assert_equal -1, event.new_sms_count
+    assert_equal (-1), event.new_sms_count
     assert_equal 1, event.new_fax_count
   end
 

data/test/test_extension_presence.rb

@@ -12,17 +12,6 @@ class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
   def test_department_calls_enable
     presence = RingCentralSdk::REST::ExtensionPresence.new(111_111)
 
-    new_statuses = {
-      enable: {
-        'DoNotAcceptAnyCalls' => 'TakeDepartmentCallsOnly',
-        'DoNotAcceptDepartmentCalls' => 'TakeAllCalls'
-      },
-      disable: {
-        'TakeAllCalls' => 'DoNotAcceptDepartmentCalls',
-        'TakeDepartmentCallsOnly' => 'DoNotAcceptAnyCalls'
-      }
-    }
-
     cur_status = 'TakeAllCalls'
     assert_equal \
       'DoNotAcceptDepartmentCalls', \

data/test/test_subscription.rb

@@ -81,8 +81,7 @@ class RingCentralSdkSubscriptionTest < Test::Unit::TestCase
     stub_token = OAuth2::AccessToken.from_hash(rcsdk.oauth2client, stub_token_hash)
 
     rcsdk.oauth2client.password.stubs(:get_token).returns(stub_token)
-
-    token = rcsdk.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+    rcsdk.authorize('my_test_username', 'my_test_extension', 'my_test_password')
     rcsdk
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringcentral_sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - John Wang