twilio-ruby 5.0.0.rc26 → 5.0.0

data/lib/twilio-ruby/framework/resource.rb

@@ -8,13 +8,13 @@ module Twilio
 
     class InstanceContext
       def initialize(version)
-          @version = version
+        @version = version
       end
     end
 
     class InstanceResource
       def initialize(version)
-          @version = version
+        @version = version
       end
     end
   end

data/lib/twilio-ruby/framework/serialize.rb

@@ -24,32 +24,26 @@ module Twilio
   end
 
   def self.deserialize_rfc2822(date)
-    unless date.nil?
-      Time.rfc2822(date)
-    end
+    Time.rfc2822(date) unless date.nil?
   end
 
   def self.deserialize_iso8601_date(date)
-    unless date.nil?
-      Date.parse(date)
-    end
+    Date.parse(date) unless date.nil?
   end
 
   def self.deserialize_iso8601_datetime(date)
-    unless date.nil?
-      Time.parse(date)
-    end
+    Time.parse(date) unless date.nil?
   end
 
   def self.serialize_object(object)
-    if object.is_a?(Hash) or object.is_a?(Array)
+    if object.is_a?(Hash) || object.is_a?(Array)
       JSON.generate(object)
     else
       object
     end
   end
 
-  def self.flatten(map, result={}, previous=[])
+  def self.flatten(map, result = {}, previous = [])
     map.each do |key, value|
       if value.is_a? Hash
         self.flatten(value, result, previous + [key])
@@ -73,5 +67,4 @@ module Twilio
 
     result
   end
-
 end

data/lib/twilio-ruby/framework/twilio_response.rb

@@ -7,7 +7,7 @@ module Twilio
       body = '{}' if !body || body.empty?
       @body = JSON.parse(body)
     end
-    
+
     def to_s
       "[#{status_code}] #{body}"
     end

data/lib/twilio-ruby/framework/values.rb

@@ -1,7 +1,7 @@
 module Twilio
   class Values
     def self.of(hash)
-      hash.delete_if { |_,v| v.eql?(:unset)}
+      hash.delete_if { |_, v| v.eql?(:unset) }
     end
   end
-end
+end

data/lib/twilio-ruby/framework/version.rb

@@ -1,7 +1,6 @@
 module Twilio
   module REST
     class Version
-
       attr_accessor :domain
 
       class RecordStream
@@ -21,10 +20,10 @@ module Twilio
             @page.each do |record|
               yield record
               current_record += 1
-              return if @limit && @limit <= current_record
+              return nil if @limit && @limit <= current_record
             end
 
-            return if @page_limit && @page_limit <= current_page
+            return nil if @page_limit && @page_limit <= current_page
 
             @page = @page.next_page
             current_page += 1
@@ -38,45 +37,35 @@ module Twilio
       end
 
       def absolute_url(uri)
-        @domain.absolute_url(self.relative_uri(uri))
+        @domain.absolute_url(relative_uri(uri))
       end
 
       def relative_uri(uri)
         "#{@version.chomp('/').gsub(/^\//, '')}/#{uri.chomp('/').gsub(/^\//, '')}"
       end
 
-      def request(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        url = self.relative_uri(uri)
-        params = params.delete_if {|k,v| v.nil?}
+      def request(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        url = relative_uri(uri)
+        params = params.delete_if { |_k, v| v.nil? }
         data = data
-        @domain.request(
-          method,
-          url,
-          params,
-          data,
-          headers,
-          auth,
-          timeout
-        )
+        @domain.request(method, url, params, data, headers, auth, timeout)
       end
 
       def exception(response, header)
         message = header
         code = response.status_code
 
-        if response.body.has_key?('message')
+        if response.body.key?('message')
           message += ": #{response.body['message']}"
         end
 
-        if response.body.has_key?('code')
-          code = response.body['code']
-        end
+        code = response.body['code'] if response.body.key?('code')
 
         Twilio::REST::RestError.new(message, code, response.status_code)
       end
 
-      def fetch(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        response = self.request(
+      def fetch(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        response = request(
           method,
           uri,
           params,
@@ -94,7 +83,7 @@ module Twilio
       end
 
       def update(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
-        response = self.request(
+        response = request(
           method,
           uri,
           params,
@@ -111,8 +100,8 @@ module Twilio
         response.body
       end
 
-      def delete(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        response = self.request(
+      def delete(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        response = request(
           method,
           uri,
           params,
@@ -129,7 +118,7 @@ module Twilio
         response.status_code == 204
       end
 
-      def read_limits(limit=nil, page_size=nil)
+      def read_limits(limit = nil, page_size = nil)
         page_limit = nil
 
         unless limit.nil?
@@ -141,12 +130,12 @@ module Twilio
         {
           limit: limit || nil,
           page_size: page_size || nil,
-          page_limit: page_limit,
+          page_limit: page_limit
         }
       end
 
-      def page(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        self.request(
+      def page(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        request(
           method,
           uri,
           params,
@@ -162,14 +151,7 @@ module Twilio
       end
 
       def create(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
-        response = self.request(
-                    method,
-                    uri,
-                    params,
-                    data,
-                    headers,
-                    auth,
-                    timeout)
+        response = request(method, uri, params, data, headers, auth, timeout)
 
         if response.status_code < 200 || response.status_code >= 300
           raise exception(response, 'Unable to create record')

data/lib/twilio-ruby/http/http_client.rb

@@ -5,7 +5,7 @@ module Twilio
     class Client
       attr_accessor :adapter
 
-      def initialize(proxy_addr=nil, proxy_port=nil, proxy_user=nil, proxy_pass=nil, ssl_ca_file=nil)
+      def initialize(proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil, ssl_ca_file = nil)
         @proxy_addr = proxy_addr
         @proxy_port = proxy_port
         @proxy_user = proxy_user
@@ -17,14 +17,14 @@ module Twilio
         Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
       end
 
-      def request(host, port, method, url, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        @connection = Faraday.new(url: host + ":" + port.to_s, ssl: {verify: true}) do |f|
+      def request(host, port, method, url, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        @connection = Faraday.new(url: host + ':' + port.to_s, ssl: { verify: true }) do |f|
           f.request :url_encoded
           f.adapter @adapter
           f.headers = headers
           f.basic_auth(auth[0], auth[1])
           if @proxy_addr
-            f.proxy "#{@proxy_user}:#{@proxy_pass}@#{@proxy_addr}:#{@proxy_port}"
+            f.proxy '#{@proxy_user}:#{@proxy_pass}@#{@proxy_addr}:#{@proxy_port}'
           end
           f.options.open_timeout = timeout
           f.options.timeout = timeout
@@ -33,7 +33,7 @@ module Twilio
         response = @connection.send(method.downcase.to_sym, url, method == 'GET' ? params : data)
 
         @last_response = response
-        if response.body and !response.body.empty?
+        if response.body && !response.body.empty?
           object = response.body
         elsif response.status == 400
           object = { message: 'Bad request', code: 400 }.to_json
@@ -42,6 +42,5 @@ module Twilio
         TwilioResponse.new(response.status, object)
       end
     end
-
   end
 end

data/lib/twilio-ruby/jwt/access_token.rb

@@ -2,11 +2,11 @@ module Twilio
   module JWT
     module AccessTokenGrant
       def _key
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def _generate_payload
-        fail NotImplementedError
+        raise NotImplementedError
       end
     end
 
@@ -20,7 +20,16 @@ module Twilio
                     :ttl,
                     :valid_until
 
-      def initialize(account_sid, signing_key_sid, secret, grants=[], identity: nil, nbf: nil, ttl: 3600, valid_until: nil)
+      def initialize(
+        account_sid,
+        signing_key_sid,
+        secret,
+        grants = [],
+        identity: nil,
+        nbf: nil,
+        ttl: 3600,
+        valid_until: nil
+      )
         super(secret_key: secret,
               issuer: signing_key_sid,
               subject: account_sid,
@@ -46,27 +55,27 @@ module Twilio
       end
 
       protected
+
       def _generate_payload
         now = Time.now.to_i
         grants = {}
-        if @identity
-          grants[:identity] = @identity
-        end
+        grants[:identity] = @identity if @identity
 
         @grants.each { |grant| grants[grant._key] = grant._generate_payload } unless @grants.empty?
 
         payload = {
-            jti: "#{@signing_key_sid}-#{now}",
-            grants: grants
+          jti: "#{@signing_key_sid}-#{now}",
+          grants: grants
         }
 
         payload
       end
 
       protected
+
       def _generate_headers
         headers = {
-            cty: 'twilio-fpa;v=1'
+          cty: 'twilio-fpa;v=1'
         }
 
         headers
@@ -79,7 +88,6 @@ module Twilio
                       :deployment_role_sid,
                       :push_credential_sid
 
-
         def _key
           'ip_messaging'
         end
@@ -87,13 +95,9 @@ module Twilio
         def _generate_payload
           payload = {}
 
-          if service_sid
-            payload[:service_sid] = service_sid
-          end
+          payload[:service_sid] = service_sid if service_sid
 
-          if endpoint_id
-            payload[:endpoint_id] = endpoint_id
-          end
+          payload[:endpoint_id] = endpoint_id if endpoint_id
 
           if deployment_role_sid
             payload[:deployment_role_sid] = deployment_role_sid
@@ -105,7 +109,6 @@ module Twilio
 
           payload
         end
-
       end
 
       class VoiceGrant
@@ -136,9 +139,7 @@ module Twilio
             payload[:push_credential_sid] = push_credential_sid
           end
 
-          if endpoint_id
-            payload[:endpoint_id] = endpoint_id
-          end
+          payload[:endpoint_id] = endpoint_id if endpoint_id
 
           payload
         end
@@ -151,18 +152,13 @@ module Twilio
 
         def _key
           'data_sync'
-
         end
 
         def _generate_payload
           payload = {}
 
-          if service_sid
-            payload['service_sid'] = service_sid
-          end
-          if endpoint_id
-            payload['endpoint_id'] = endpoint_id
-          end
+          payload['service_sid'] = service_sid if service_sid
+          payload['endpoint_id'] = endpoint_id if endpoint_id
 
           payload
         end
@@ -190,8 +186,6 @@ module Twilio
           extend Gem::Deprecate
           deprecate :new, 'VideoGrant.new', 2017, 5
         end
-
-
       end
 
       class VideoGrant
@@ -205,9 +199,7 @@ module Twilio
         def _generate_payload
           payload = {}
 
-          if room
-            payload[:room] = room
-          end
+          payload[:room] = room if room
 
           payload
         end
@@ -226,17 +218,11 @@ module Twilio
         def _generate_payload
           payload = {}
 
-          if workspace_sid
-            payload[:workspace_sid] = workspace_sid
-          end
+          payload[:workspace_sid] = workspace_sid if workspace_sid
 
-          if worker_sid
-            payload[:worker_sid] = worker_sid
-          end
+          payload[:worker_sid] = worker_sid if worker_sid
 
-          if role
-            payload[:role] = role
-          end
+          payload[:role] = role if role
 
           payload
         end

data/lib/twilio-ruby/jwt/client_capability.rb

@@ -12,6 +12,8 @@ module Twilio
                     :client_name,
                     :scopes
 
+      alias to_s to_jwt
+
       def initialize(account_sid, auth_token, scopes: [], nbf: nil, ttl: 3600, valid_until: nil)
         super(secret_key: auth_token, issuer: account_sid, nbf: nbf, ttl: ttl, valid_until: valid_until)
         @account_sid = account_sid
@@ -24,20 +26,14 @@ module Twilio
         @scopes.push(scope)
       end
 
-      def to_s
-        self.to_jwt
-      end
-
       protected
-      def _generate_payload
 
+      def _generate_payload
         scope = ''
-        unless @scopes.empty?
-          scope = @scopes.map {|scope| scope._generate_payload}.join(' ')
-        end
+        scope = @scopes.map(&:_generate_payload).join(' ') unless @scopes.empty?
 
         payload = {
-            scope: scope
+          scope: scope
         }
 
         payload
@@ -51,12 +47,11 @@ module Twilio
         end
 
         def _generate_payload
-          prefix = "scope:client:incoming"
-          suffix = "clientName=" + CGI.escape("#{@client_name}")
+          prefix = 'scope:client:incoming'
+          suffix = 'clientName=' + CGI.escape(@client_name.to_s)
 
           [prefix, suffix].join('?')
         end
-
       end
 
       class OutgoingClientScope
@@ -69,13 +64,13 @@ module Twilio
         end
 
         def _generate_payload
-          prefix = "scope:client:outgoing"
+          prefix = 'scope:client:outgoing'
           application_sid = "appSid=#{CGI.escape(@application_sid)}"
           unless @client_name.nil?
             client_name = "clientName=#{CGI.escape(@client_name)}"
           end
           unless @params.empty?
-            params = "appParams=" + @params.map {|k, v| CGI.escape("#{k}=#{v}")}.join('&')
+            params = 'appParams=' + @params.map { |k, v| CGI.escape("#{k}=#{v}") }.join('&')
           end
 
           suffix = [application_sid, client_name, params].compact.join('&')
@@ -92,10 +87,10 @@ module Twilio
         end
 
         def _generate_payload
-          prefix = "scope:stream:subscribe"
+          prefix = 'scope:stream:subscribe'
           path = "path=#{CGI.escape(@path)}"
           unless @filters.empty?
-            filters = "params=" + @filters.map {|k, v| CGI.escape("#{k}=#{v}")}.join('&')
+            filters = 'params=' + @filters.map { |k, v| CGI.escape("#{k}=#{v}") }.join('&')
           end
 
           suffix = [path, filters].compact.join('&')