plivo 4.7.1 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e78b1d3b0da475d5b7bc48985460db5a7fee0b
-  data.tar.gz: efd5113cd127bb099449f365c30406fdf35ead96
+  metadata.gz: c368bc21255a5a1cef319179fbf0bf066375b1f6
+  data.tar.gz: 929a607f7200f8060263b697680dcb610471632d
 SHA512:
-  metadata.gz: 99d38e6766b25aa3d0be69122f287df3760b06b177ad06e1efa3d6bf52673154aa39dd901c4463e5bfc68384366cf67c52246dacae56b28a92036697fe8c0f1a
-  data.tar.gz: 8b9a013b00f5aae92c63947b2c4f75be3093357e3e2029ea7f971019d2484ccb8dce71d90d1d2cc695d7ce67155b0b0c8b1599aa81353c462027eb5c120b6974
+  metadata.gz: 718383feb89c897a7a3d0d91094ab09d4885b9d0054b05983b63d507678bcf152247fcfbe04ef69ecbcf8c6f3c59807240cf32a3616991c6175f35643ef0c2d8
+  data.tar.gz: 6f8b7b343a0b26f7b59259d8eea063ec1e15a41c2283316342d204a4f341cc5757e38a8f50ba78daa6515ab38972731f976a8779ab537b1e9db2ab7826f1eb48

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [4.10.0](https://github.com/plivo/plivo-ruby/releases/tag/v4.10.0) (2020-09-04)
+- Add ConferenceUuid & CallState for Get Details of a Call API 
+- Upgrade faraday & faraday_middleware dependencies
+
+## [4.9.1](https://github.com/plivo/plivo-ruby/releases/tag/v4.9.1) (2020-08-19)
+- Internal changes in Phlo for MultiPartyCall component
+
+## [4.9.0](https://github.com/plivo/plivo-ruby/releases/tag/v4.9.0) (2020-07-23)
+- Add retries to multiple regions for voice requests.
+
+## [4.8.1](https://github.com/plivo/plivo-ruby/releases/tag/v4.8.1) (2020-06-05)
+- Fix Record a Conference API response.
+
+## [4.8.0](https://github.com/plivo/plivo-ruby/releases/tag/v4.8.0) (2020-05-28)
+- Add JWT helper functions.
+
 ## [4.7.1](https://github.com/plivo/plivo-ruby/releases/tag/v4.7.1) (2020-05-06)
 - Fix Send MMS with existing media_ids.
 

data/README.md

@@ -8,7 +8,7 @@ The Plivo Ruby SDK makes it simpler to integrate communications into your Ruby a
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'plivo', '>= 4.7.1'
+gem 'plivo', '>= 4.10.0'
 ```
 
 And then execute:

data/examples/jwt.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'plivo'
+
+include Plivo
+
+AUTH_ID = 'MADADADADADADADADADA'
+AUTH_TOKEN = 'AUTH_TOKEN'
+
+begin
+  acctkn = Plivo::Token::AccessToken.new(
+    AUTH_ID,
+    AUTH_TOKEN,
+    '{username}',
+    '{uid}'
+  )
+  # update token validity (from, lifetime)
+  acctkn.update_validity(Time.now, 300)
+  # add voice grants (incoming, outgoing)
+  acctkn.add_voice_grants(Plivo::Token::VoiceGrants.new(true, true))
+  puts acctkn.to_jwt
+
+  # update token validity (from, nil, till)
+  acctkn.update_validity(Time.now, nil, Time.now + 300)
+  # add voice grants (incoming, outgoing)
+  acctkn.add_voice_grants(Plivo::Token::VoiceGrants.new(true, true))
+  puts acctkn.to_jwt
+rescue ValidationError => e
+  puts 'Exception: ' + e.message
+end
+
+# Sample Response:
+#

data/lib/plivo.rb

@@ -5,6 +5,7 @@ require_relative 'plivo/base'
 require_relative 'plivo/resources'
 require_relative 'plivo/rest_client'
 require_relative 'plivo/xml'
+require_relative 'plivo/jwt'
 require_relative 'plivo/phlo_client'
 require_relative 'plivo/base_client'
 

data/lib/plivo/base.rb

@@ -5,6 +5,11 @@ require_relative 'base/response'
 module Plivo
   module Base
     PLIVO_API_URL = 'https://api.plivo.com'.freeze
+
+    API_VOICE = 'https://voice.plivo.com'.freeze
+    API_VOICE_FALLBACK_1 = 'https://voice-usw1.plivo.com'.freeze
+    API_VOICE_FALLBACK_2 = 'https://voice-use1.plivo.com'.freeze
+
     CALLINSIGHTS_API_URL = 'https://stats.plivo.com'.freeze
     PHLO_API_URL = 'https://phlorunner.plivo.com'.freeze
   end

data/lib/plivo/base/resource.rb

@@ -8,6 +8,7 @@ module Plivo
         configure_client(client)
         configure_options(options) if options
         configure_resource_uri
+        @_is_voice_request = false
       end
 
       private
@@ -56,7 +57,7 @@ module Plivo
           'without an identifier')
         end
 
-        response_json = @_client.send_request(@_resource_uri, 'POST', params, nil, use_multipart_conn)
+        response_json = @_client.send_request(@_resource_uri, 'POST', params, nil, use_multipart_conn, is_voice_request: @_is_voice_request)
 
         parse_and_set(params)
         parse_and_set(response_json)
@@ -65,7 +66,7 @@ module Plivo
 
       def perform_action(action = nil, method = 'GET', params = nil, parse = false)
         resource_path = action ? @_resource_uri + action + '/' : @_resource_uri
-        response = @_client.send_request(resource_path, method, params)
+        response = @_client.send_request(resource_path, method, params,nil,false,is_voice_request: @_is_voice_request)
         parse ? parse_and_set(response) : self
         method == 'POST' ? parse_and_set(params) : self
         self
@@ -73,7 +74,7 @@ module Plivo
       
       def perform_custome_action(action = nil, method = 'GET', params = nil, parse = false)
         resource_path = action ? @_resource_uri + action + '/' : @_resource_uri
-        response = @_client.send_request(resource_path, method, params)
+        response = @_client.send_request(resource_path, method, params,nil,false,is_voice_request: @_is_voice_request)
         parse ? parse_and_set(response) : self
         method == 'POST' ? parse_and_set(params) : self
         self
@@ -81,7 +82,7 @@ module Plivo
 
       def perform_action_apiresponse(action = nil, method = 'GET', params = nil, parse = false)
         resource_path = action ? @_resource_uri + action + '/' : @_resource_uri
-        response = @_client.send_request(resource_path, method, params)
+        response = @_client.send_request(resource_path, method, params,nil,false,is_voice_request: @_is_voice_request)
         parse ? parse_and_set(response) : self
         method == 'POST' ? parse_and_set(params) : self
         method == 'DELETE' ? parse_and_set(params) : self
@@ -90,7 +91,7 @@ module Plivo
 
       def perform_custom_action_apiresponse(action = nil, method = 'GET', params = nil, parse = false)
         resource_path = action ? '/v1/Account/' + @_client.auth_id + '/'+ action + '/' : @_resource_uri
-        response = @_client.send_request(resource_path, method, params)
+        response = @_client.send_request(resource_path, method, params,nil,false,is_voice_request: @_is_voice_request)
         parse ? parse_and_set(response) : self
         method == 'POST' ? parse_and_set(params) : self
         method == 'DELETE' ? parse_and_set(params) : self
@@ -103,12 +104,12 @@ module Plivo
           'without an identifier')
         end
 
-        Response.new(@_client.send_request(@_resource_uri, 'DELETE', params),
+        Response.new(@_client.send_request(@_resource_uri, 'DELETE', params, nil, false, is_voice_request: @_is_voice_request),
                      @_identifier_string)
       end
 
       def perform_run(params)
-        response_json = @_client.send_request(@_resource_uri, 'POST', params, nil)
+        response_json = @_client.send_request(@_resource_uri, 'POST', params, nil,false,is_voice_request: @_is_voice_request)
         parse_and_set(response_json)
         Response.new(response_json, @_identifier_string)
       end

data/lib/plivo/base/resource_interface.rb

@@ -6,6 +6,7 @@ module Plivo
         configure_client(client)
         configure_resource_uri
         parse_and_set(resource_list_json) if resource_list_json
+        @_is_voice_request = false
       end
 
       private
@@ -41,25 +42,25 @@ module Plivo
 
       def perform_get(identifier, params = nil)
         valid_param?(:identifier, identifier, [String, Symbol], true)
-        response_json = @_client.send_request(@_resource_uri + identifier.to_s + '/', 'GET', params)
+        response_json = @_client.send_request(@_resource_uri + identifier.to_s + '/', 'GET', params, nil, false, is_voice_request: @_is_voice_request)
         @_resource_type.new(@_client, resource_json: response_json)
       end
 
       def perform_get_without_identifier(params)
         valid_param?(:params, params, Hash, true)
-        response_json = @_client.send_request(@_resource_uri, 'GET', params)
+        response_json = @_client.send_request(@_resource_uri, 'GET', params, nil, false, is_voice_request: @_is_voice_request)
         @_resource_type.new(@_client, resource_json: response_json)
       end
 
       def perform_create(params, use_multipart_conn=false)
         Response.new(
-          @_client.send_request(@_resource_uri, 'POST', params, nil, use_multipart_conn),
+          @_client.send_request(@_resource_uri, 'POST', params, nil, use_multipart_conn, is_voice_request: @_is_voice_request),
           @_identifier_string
         )
       end
 
       def perform_post(params)
-        response_json = @_client.send_request(@_resource_uri, 'POST', params)
+        response_json = @_client.send_request(@_resource_uri, 'POST', params, nil, false, is_voice_request: @_is_voice_request)
 
         parse_and_set(response_json)
         self
@@ -74,7 +75,7 @@ module Plivo
       end
 
       def perform_list(params = nil)
-        response_json = @_client.send_request(@_resource_uri, 'GET', params)
+        response_json = @_client.send_request(@_resource_uri, 'GET', params, nil, false, is_voice_request: @_is_voice_request)
         parse_and_set(response_json)
         {
           api_id: @api_id,
@@ -85,14 +86,14 @@ module Plivo
       
       def perform_action(action = nil, method = 'GET', params = nil, parse = false)
         resource_path = action ? @_resource_uri + action + '/' : @_resource_uri
-        response = @_client.send_request(resource_path, method, params)
+        response = @_client.send_request(resource_path, method, params, nil, false, is_voice_request: @_is_voice_request)
         parse ? parse_and_set(response) : self
         method == 'POST' ? parse_and_set(params) : self
         self
       end
 
       def perform_list_without_object(params = nil)
-        response_json = @_client.send_request(@_resource_uri, 'GET', params)
+        response_json = @_client.send_request(@_resource_uri, 'GET', params, nil, false, is_voice_request: @_is_voice_request)
         parse_and_set(response_json)
         response_json
       end

data/lib/plivo/base_client.rb

@@ -13,7 +13,7 @@ module Plivo
   class BaseClient
     # Base stuff
     attr_reader :headers, :auth_credentials
-
+    @@voice_retry_count = 0
     def initialize(auth_id = nil, auth_token = nil, proxy_options = nil, timeout=5)
       configure_credentials(auth_id, auth_token)
       configure_proxies(proxy_options)
@@ -36,21 +36,42 @@ module Plivo
       elsif !([200, 201, 202, 207].include? response[:status])
         raise Exceptions::PlivoRESTError, "Received #{response[:status]} for #{method}"
       end
-
+      @@voice_retry_count = 0
       response[:body]
     end
 
-    def send_request(resource_path, method = 'GET', data = {}, timeout = nil, use_multipart_conn = false)
+    def send_request(resource_path, method = 'GET', data = {}, timeout = nil, use_multipart_conn = false, options = nil)
       timeout ||= @timeout
 
-      response = case method
-                 when 'GET' then send_get(resource_path, data, timeout)
-                 when 'POST' then send_post(resource_path, data, timeout, use_multipart_conn)
-                 when 'DELETE' then send_delete(resource_path, data, timeout)
-                 else raise_invalid_request("#{method} not supported by Plivo, yet")
-                 end
+      if options[:is_voice_request] == true
+        response = case method
+                   when 'GET' then send_get(resource_path, data, timeout, is_voice_request: options[:is_voice_request], voice_retry_count: @@voice_retry_count)
+                   when 'POST' then send_post(resource_path, data, timeout, use_multipart_conn, is_voice_request: options[:is_voice_request], voice_retry_count: @@voice_retry_count)
+                   when 'DELETE' then send_delete(resource_path, data, timeout, is_voice_request: options[:is_voice_request], voice_retry_count: @@voice_retry_count)
+                   else raise_invalid_request("#{method} not supported by Plivo, yet")
+                   end
+
+        if response.status >= 500
+          @@voice_retry_count += 1
+          if @@voice_retry_count > 2
+            return process_response(method, response.to_hash)
+          end
+          is_voice_request = true
+          send_request(resource_path, method, data, timeout, use_multipart_conn, is_voice_request: is_voice_request)
+        else
+          process_response(method, response.to_hash)
+        end
 
-      process_response(method, response.to_hash)
+      else
+        response = case method
+                   when 'GET' then send_get(resource_path, data, timeout)
+                   when 'POST' then send_post(resource_path, data, timeout, use_multipart_conn)
+                   when 'DELETE' then send_delete(resource_path, data, timeout)
+                   else raise_invalid_request("#{method} not supported by Plivo, yet")
+                   end
+
+        process_response(method, response.to_hash)
+      end
     end
     
     private
@@ -118,6 +139,45 @@ module Plivo
         faraday.adapter Faraday.default_adapter
       end
 
+      @voice_conn_no_retry = Faraday.new(@voice_base_uri) do |faraday|
+        faraday.headers = @headers
+
+        # DANGER: Basic auth should always come after headers, else
+        # The headers will replace the basic_auth
+
+        faraday.basic_auth(auth_id, auth_token)
+
+        faraday.proxy=@proxy_hash if @proxy_hash
+        faraday.response :json, content_type: /\bjson$/
+        faraday.adapter Faraday.default_adapter
+      end
+
+      @voice_conn_retry_1 = Faraday.new(@voice_base_uri_fallback_1) do |faraday|
+        faraday.headers = @headers
+
+        # DANGER: Basic auth should always come after headers, else
+        # The headers will replace the basic_auth
+
+        faraday.basic_auth(auth_id, auth_token)
+
+        faraday.proxy=@proxy_hash if @proxy_hash
+        faraday.response :json, content_type: /\bjson$/
+        faraday.adapter Faraday.default_adapter
+      end
+
+      @voice_conn_retry_2 = Faraday.new(@voice_base_uri_fallback_2) do |faraday|
+        faraday.headers = @headers
+
+        # DANGER: Basic auth should always come after headers, else
+        # The headers will replace the basic_auth
+
+        faraday.basic_auth(auth_id, auth_token)
+
+        faraday.proxy=@proxy_hash if @proxy_hash
+        faraday.response :json, content_type: /\bjson$/
+        faraday.adapter Faraday.default_adapter
+      end
+
       @callinsights_conn = Faraday.new(@callinsights_base_uri) do |faraday|
         faraday.headers = @headers
 
@@ -133,15 +193,34 @@ module Plivo
 
     end
 
-    def send_get(resource_path, data, timeout)
-      response = @conn.get do |req|
-        req.url resource_path, data
-        req.options.timeout = timeout if timeout
+    def send_get(resource_path, data, timeout, options = nil)
+      if options
+        if options[:voice_retry_count] == 0 and options[:is_voice_request] == true
+          response = @voice_conn_no_retry.get do |req|
+            req.url resource_path, data
+            req.options.timeout = timeout if timeout
+          end
+        elsif options[:voice_retry_count] == 1 and options[:is_voice_request] == true
+          response = @voice_conn_retry_1.get do |req|
+            req.url resource_path, data
+            req.options.timeout = timeout if timeout
+          end
+        elsif options[:voice_retry_count] == 2 and options[:is_voice_request] == true
+          response = @voice_conn_retry_2.get do |req|
+            req.url resource_path, data
+            req.options.timeout = timeout if timeout
+          end
+        end
+      else
+        response = @conn.get do |req|
+          req.url resource_path, data
+          req.options.timeout = timeout if timeout
+        end
       end
       response
     end
 
-    def send_post(resource_path, data, timeout, use_multipart_conn)
+    def send_post(resource_path, data, timeout, use_multipart_conn, options = nil)
       if use_multipart_conn
         multipart_conn = Faraday.new(@base_uri) do |faraday|
           faraday.headers = {
@@ -178,7 +257,26 @@ module Plivo
             req.options.timeout = timeout if timeout
             req.body = JSON.generate(data) if data
           end
-
+        elsif options
+          if options[:voice_retry_count] == 0 and options[:is_voice_request] == true
+            response = @voice_conn_no_retry.post do |req|
+              req.url resource_path
+              req.options.timeout = timeout if timeout
+              req.body = JSON.generate(data) if data
+            end
+          elsif options[:voice_retry_count] == 1 and options[:is_voice_request] == true
+            response = @voice_conn_retry_1.post do |req|
+              req.url resource_path
+              req.options.timeout = timeout if timeout
+              req.body = JSON.generate(data) if data
+            end
+          elsif options[:voice_retry_count] == 2 and options[:is_voice_request] == true
+            response = @voice_conn_retry_2.post do |req|
+              req.url resource_path
+              req.options.timeout = timeout if timeout
+              req.body = JSON.generate(data) if data
+            end
+          end
         else
           response = @conn.post do |req|
             req.url resource_path
@@ -190,11 +288,33 @@ module Plivo
       response
     end
 
-    def send_delete(resource_path, data, timeout)
-      response = @conn.delete do |req|
-        req.url resource_path
-        req.options.timeout = timeout if timeout
-        req.body = JSON.generate(data) if data
+    def send_delete(resource_path, data, timeout, options = nil)
+      if options
+        if options[:voice_retry_count] == 0 and options[:is_voice_request] == true
+          response = @voice_conn_no_retry.delete do |req|
+            req.url resource_path
+            req.options.timeout = timeout if timeout
+            req.body = JSON.generate(data) if data
+          end
+        elsif options[:voice_retry_count] == 1 and options[:is_voice_request] == true
+          response = @voice_conn_retry_1.delete do |req|
+            req.url resource_path
+            req.options.timeout = timeout if timeout
+            req.body = JSON.generate(data) if data
+          end
+        elsif options[:voice_retry_count] == 2 and options[:is_voice_request] == true
+          response = @voice_conn_retry_2.delete do |req|
+            req.url resource_path
+            req.options.timeout = timeout if timeout
+            req.body = JSON.generate(data) if data
+          end
+        end
+      else
+        response = @conn.delete do |req|
+          req.url resource_path
+          req.options.timeout = timeout if timeout
+          req.body = JSON.generate(data) if data
+        end
       end
       response
     end

data/lib/plivo/jwt.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'openssl'
+require 'uri'
+require 'base64'
+require 'date'
+require 'jwt'
+
+module Plivo
+  module Token
+    include Utils
+
+    class VoiceGrants
+      attr_reader :incoming_allow, :outgoing_allow
+
+      def initialize(incoming = nil, outgoing = nil)
+        Utils.valid_param?(:incoming, incoming, [TrueClass, FalseClass], false)
+        Utils.valid_param?(:outgoing, outgoing, [TrueClass, FalseClass], false)
+        @incoming_allow = incoming
+        @outgoing_allow = outgoing
+      end
+
+      def to_hash
+        hash = {}
+        instance_variables.each { |var| hash[var.to_s.delete('@')] = instance_variable_get(var) }
+        hash
+      end
+    end
+
+    class AccessToken
+      attr_reader :uid, :username, :valid_from, :lifetime, :grants
+      def initialize(auth_id = nil, auth_token = nil, username = nil, uid = nil)
+        configure_credentials(auth_id, auth_token)
+        Utils.valid_param?(:username, username, [String, Symbol], true)
+        @username = username
+
+        Utils.valid_param?(:uid, uid, [String, Symbol], false)
+        uid ||= username + '-' + Time.now.to_i
+        @uid = uid
+        update_validity
+      end
+
+      def update_validity(valid_from = nil, lifetime = nil, valid_till = nil)
+        Utils.valid_param?(:valid_from, valid_from, [Time, Integer], false)
+        Utils.valid_param?(:lifetime, lifetime, [Integer], false)
+        Utils.valid_param?(:valid_till, valid_till, [Time, Integer], false)
+
+        if valid_from.nil?
+          @lifetime = lifetime || 84_600
+          @valid_from = if valid_till.nil?
+                          Time.now
+                        else
+                          Time.at(valid_till.to_i - @lifetime).utc
+                        end
+
+        elsif valid_till.nil?
+          @lifetime = lifetime || 84_600
+          @valid_from = valid_from
+        else
+          unless lifetime.nil?
+            raise Exceptions::ValidationError, 'use any 2 of valid_from, lifetime and valid_till'
+          end
+
+          @valid_from = valid_from
+          @lifetime = valid_till.to_i - valid_from.to_i
+        end
+
+        return unless @lifetime < 180 || @lifetime > 84_600
+
+        raise Exceptions::ValidationError, 'validity out of [180, 84600] seconds'
+      end
+
+      def auth_id
+        @auth_credentials[:auth_id]
+      end
+
+      def add_voice_grants(grants)
+        Utils.valid_param?(:grants, grants, [VoiceGrants], true)
+        @grants = grants
+      end
+
+      def to_jwt
+        payload = {
+          jti: uid,
+          sub: username,
+          iss: auth_id,
+          nbf: valid_from.to_i,
+          exp: valid_from.to_i + lifetime,
+          grants: {
+            voice: grants.to_hash || {}
+          }
+        }
+        JWT.encode payload, key, 'HS256', {typ: 'JWT', cty: 'plivo;v=1'}
+      end
+
+      private
+
+      def key
+        @auth_credentials[:auth_token]
+      end
+
+      def configure_credentials(auth_id, auth_token)
+        # Fetches and sets the right credentials
+        auth_id ||= ENV['PLIVO_AUTH_ID']
+        auth_token ||= ENV['PLIVO_AUTH_TOKEN']
+
+        raise Exceptions::AuthenticationError, 'Couldn\'t find auth credentials' unless
+          auth_id && auth_token
+
+        raise Exceptions::AuthenticationError, "Invalid auth_id: '#{auth_id}'" unless
+          Utils.valid_account?(auth_id)
+
+        @auth_credentials = {
+          auth_id: auth_id,
+          auth_token: auth_token
+        }
+      end
+    end
+  end
+end

data/lib/plivo/resources.rb

@@ -12,7 +12,7 @@ require_relative 'resources/addresses'
 require_relative 'resources/identities'
 require_relative 'resources/phlos'
 require_relative 'resources/nodes'
-require_relative 'resources/member'
+require_relative 'resources/phlo_member'
 require_relative 'resources/call_feedback'
 require_relative 'resources/media'
 

data/lib/plivo/resources/applications.rb

@@ -8,6 +8,7 @@ module Plivo
         @_name = 'Application'
         @_identifier_string = 'app_id'
         super
+        @_is_voice_request = true
       end
 
       # @param [Hash] options
@@ -109,6 +110,7 @@ module Plivo
         @_resource_type = Application
         @_identifier_string = 'app_id'
         super
+        @_is_voice_request = true
       end
 
       # @param [String] app_id

data/lib/plivo/resources/calls.rb

@@ -6,6 +6,7 @@ module Plivo
         @_name = 'Call'
         @_identifier_string = 'call_uuid'
         super
+        @_is_voice_request = true
       end
 
       def update(options)
@@ -199,7 +200,7 @@ module Plivo
 
       def cancel_request
         resource_path = @_resource_uri.sub('Call', 'Request')
-        @_client.send_request(resource_path, 'DELETE', nil)
+        @_client.send_request(resource_path, 'DELETE', nil, nil, false , is_voice_request: @_is_voice_request)
       end
 
       def to_s
@@ -211,7 +212,9 @@ module Plivo
           call_direction: @call_direction,
           call_duration: @call_duration,
           call_status: @call_status,
+          call_state: @call_state,
           call_uuid: @call_uuid,
+          conference_uuid: @conference_uuid,
           end_time: @end_time,
           from_number: @from_number,
           initiation_time: @initiation_time,
@@ -240,6 +243,7 @@ module Plivo
         @_resource_type = Call
         @_identifier_string = 'call_uuid'
         super
+        @_is_voice_request = true
       end
 
       ##
@@ -288,9 +292,9 @@ module Plivo
           answer_method: answer_method
         }
 
-        return perform_create(params) if options.nil?
+        return perform_create(params, false) if options.nil?
 
-        perform_create(params.merge(options))
+        perform_create(params.merge(options), false)
       end
 
       ##
@@ -397,7 +401,7 @@ module Plivo
       #                                     - To filter out those numbers that contain a particular number sequence, use to_number={ sequence}
       #                                     - To filter out a number that matches an exact number, use to_number={ exact_number}
       def list_live(options = nil)
-        
+
         if options.nil?
           options = {}
         else

data/lib/plivo/resources/conferences.rb

@@ -6,6 +6,7 @@ module Plivo
         @_name = 'Conference'
         @_identifier_string = 'conference_name'
         super
+        @_is_voice_request = true
       end
 
       def delete
@@ -186,18 +187,12 @@ module Plivo
       end
 
       def to_s
-        unless @members.nil?
-          members_json = @members.map do |member|
-            JSON.parse(to_json_member(member))
-          end
+        response_json = {}
+        response_variables = self.instance_variables.drop(5)
+        response_variables.each do |variable|
+          response_json[variable.to_s[1..-1]] = self.instance_variable_get(variable)
         end
-        {
-          conference_name: @conference_name,
-          conference_run_time: @conference_run_time,
-          conference_member_count: @conference_member_count,
-          members: members_json,
-          api_id: @api_id
-        }.to_s
+        return response_json.to_s
       end
 
       def to_json_member(member)
@@ -221,6 +216,7 @@ module Plivo
         @_resource_type = Conference
         @_identifier_string = 'conference_name'
         super
+        @_is_voice_request = true
       end
 
       def get(conference_name)

data/lib/plivo/resources/endpoints.rb

@@ -6,6 +6,7 @@ module Plivo
         @_name = 'Endpoint'
         @_identifier_string = 'endpoint_id'
         super
+        @_is_voice_request = true
       end
 
       # @param [Hash] options
@@ -71,6 +72,7 @@ module Plivo
         @_resource_type = Endpoint
         @_identifier_string = 'endpoint_id'
         super
+        @_is_voice_request = true
       end
 
       # @param [String] endpoint_id

data/lib/plivo/resources/nodes.rb

@@ -15,7 +15,7 @@ module Plivo
       def configure_node_type(node_type)
         case node_type
         when 'multi_party_call'
-          MultiPartyCall
+          PhloMultiPartyCall
         # when 'conference_bridge'
         #   ConferenceBridge
         end
@@ -42,7 +42,7 @@ module Plivo
 
       def member(member_address)
         options = {'member_address' => member_address, 'node_id' => @id, 'phlo_id' => @phlo_id, 'node_type' => @node_type}
-        Member.new(@_client, {resource_json: options})
+        PhloMember.new(@_client, {resource_json: options})
       end
 
       private
@@ -51,7 +51,7 @@ module Plivo
       end
     end
 
-    class MultiPartyCall < Node
+    class PhloMultiPartyCall < Node
       def initialize(client,options=nil)
         @_name = 'multi_party_call'
         super

data/lib/plivo/resources/{member.rb → phlo_member.rb}

@@ -1,6 +1,6 @@
 module Plivo
   module Resources
-    class Member < Base::Resource
+    class PhloMember < Base::Resource
       def initialize(client, options)
         @_name = 'member'
         @_identifier_string = 'member_address'

data/lib/plivo/resources/recordings.rb

@@ -6,6 +6,7 @@ module Plivo
         @_name = 'Recording'
         @_identifier_string = 'recording_id'
         super
+        @_is_voice_request = true
       end
 
       def delete
@@ -36,6 +37,7 @@ module Plivo
         @_resource_type = Recording
         @_identifier_string = 'recording_id'
         super
+        @_is_voice_request = true
       end
 
       # @param [Hash] options

data/lib/plivo/rest_client.rb

@@ -24,6 +24,9 @@ module Plivo
 
     def configure_base_uri
       @base_uri = Base::PLIVO_API_URL
+      @voice_base_uri = Base::API_VOICE
+      @voice_base_uri_fallback_1 = Base::API_VOICE_FALLBACK_1
+      @voice_base_uri_fallback_2 = Base::API_VOICE_FALLBACK_2
       @callinsights_base_uri = Base::CALLINSIGHTS_API_URL
     end
 

data/lib/plivo/version.rb

@@ -1,3 +1,3 @@
 module Plivo
-  VERSION = '4.7.1'.freeze
+  VERSION = '4.10.0'.freeze
 end

data/plivo.gemspec

@@ -31,9 +31,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'faraday', '~> 0.9'
-  spec.add_dependency 'faraday_middleware', '~> 0.12.2'
+  spec.add_dependency 'faraday', '~> 1.0.1'
+  spec.add_dependency 'faraday_middleware', '~> 1.0.0'
   spec.add_dependency 'htmlentities'
+  spec.add_dependency 'jwt'
 
   spec.add_development_dependency 'bundler', '>= 1.14', '<3.0'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plivo
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.10.0
 platform: ruby
 authors:
 - The Plivo SDKs Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - Rakefile
 - ci/config.yml
 - examples/conference_bridge.rb
+- examples/jwt.rb
 - examples/multi_party_call.rb
 - examples/phlos.rb
 - lib/plivo.rb
@@ -159,6 +174,7 @@ files:
 - lib/plivo/base/response.rb
 - lib/plivo/base_client.rb
 - lib/plivo/exceptions.rb
+- lib/plivo/jwt.rb
 - lib/plivo/phlo_client.rb
 - lib/plivo/resources.rb
 - lib/plivo/resources/accounts.rb
@@ -170,10 +186,10 @@ files:
 - lib/plivo/resources/endpoints.rb
 - lib/plivo/resources/identities.rb
 - lib/plivo/resources/media.rb
-- lib/plivo/resources/member.rb
 - lib/plivo/resources/messages.rb
 - lib/plivo/resources/nodes.rb
 - lib/plivo/resources/numbers.rb
+- lib/plivo/resources/phlo_member.rb
 - lib/plivo/resources/phlos.rb
 - lib/plivo/resources/powerpacks.rb
 - lib/plivo/resources/pricings.rb