twilio-ruby 5.0.0.rc21 → 5.0.0.rc22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37f870e4dc93660634ee065e3d21804db16b380
-  data.tar.gz: 95b5156b35166aaa495bfd9955a2af205568f072
+  metadata.gz: a2c8e79906d6c2b919f79c6c601c75481bb66342
+  data.tar.gz: e69a750e5a9a7c9d53bc6b189aee4e6c7c63101f
 SHA512:
-  metadata.gz: 5adc69016e3495368a5df9d08b39b61102317b5fdb86fad9689b34bb22c9f12387b0322b240c46e24efc18695b54afafbbd124af07b0b9adc2451ea1ab4d0025
-  data.tar.gz: 162a06e0b7d8e35971977cdff185219f17b824bd346bdc6e4c884fba909741e3552b92fd8ce2e6f29b879033c91354d939b8048faa5b257761f46a19e4ce58f1
+  metadata.gz: 7e875e788a5b26e9977069c54ff33cf15d08164561c221ecd1326819c97dcf795c20f5e7a8bd9c2f04f9d315511f7e6cffa1a1e01c536a05a7b08d8c0ca50d7b
+  data.tar.gz: 3aac6f5e112aae1202b67e5a71b21c84900d57fb735ee537a4eae948200f521f519908e686e247abeadfea223a60da130a0ce03dea56852a2ab6a5836c774d49

data/Makefile

@@ -7,6 +7,9 @@ test-install:
 test:
 	bundle exec rake spec
 
+docs:
+	yard doc
+
 authors:
 	echo "Authors\n=======\n\nA huge thanks to all of our contributors:\n\n" > AUTHORS.md
 	git log --raw | grep "^Author: " | cut -d ' ' -f2- | cut -d '<' -f1 | sed 's/^/- /' | sort | uniq >> AUTHORS.md

data/lib/twilio-ruby.rb

@@ -1,24 +1,28 @@
 require 'net/http'
 require 'net/https'
-require 'builder'
+require 'libxml'
 require 'cgi'
 require 'openssl'
 require 'base64'
 require 'forwardable'
 require 'jwt'
 require 'time'
+require 'json'
 
 require 'twilio-ruby/version' unless defined?(Twilio::VERSION)
 require 'rack/twilio_webhook_authentication'
 
 require 'twilio-ruby/util'
+require 'twilio-ruby/jwt/jwt'
 require 'twilio-ruby/jwt/access_token'
-require 'twilio-ruby/jwt/capability'
+require 'twilio-ruby/jwt/client_capability'
 require 'twilio-ruby/jwt/task_router'
 require 'twilio-ruby/security/request_validator'
 require 'twilio-ruby/util/configuration'
 
-require 'twilio-ruby/twiml/response'
+require 'twilio-ruby/twiml/twiml'
+require 'twilio-ruby/twiml/voice_response'
+require 'twilio-ruby/twiml/messaging_response'
 
 Dir[File.dirname(__FILE__) + '/twilio-ruby/http/**/*.rb'].each do |file|
   require file

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

@@ -15,7 +15,11 @@ module Twilio
       end
 
       def request(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
-        url = self.absolute_url(uri)
+        if uri.match(/^http/)
+          url = uri
+        else
+          url = self.absolute_url(uri)
+        end
 
         @client.request(
           @host,

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

@@ -50,9 +50,9 @@ module Twilio
 
       def previous_page_url
         if @payload['meta'] && @payload['meta']['previous_page_url']
-          return URI.parse(@payload['meta']['previous_page_url']).request_uri
+          return @version.domain.absolute_url(URI.parse(@payload['meta']['previous_page_url']).request_uri)
         elsif @payload['previous_page_uri']
-          return @payload['previous_page_uri']
+          return @version.domain.absolute_url(@payload['previous_page_uri'])
         end
 
         nil
@@ -60,9 +60,9 @@ module Twilio
 
       def next_page_url
         if @payload['meta'] && @payload['meta']['next_page_url']
-          return URI.parse(@payload['meta']['next_page_url']).request_uri
+          return @version.domain.absolute_url(URI.parse(@payload['meta']['next_page_url']).request_uri)
         elsif @payload['next_page_uri']
-          return @payload['next_page_uri']
+          return @version.domain.absolute_url(@payload['next_page_uri'])
         end
 
         nil

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

@@ -1,6 +1,8 @@
 module Twilio
   def self.serialize_iso8601(date)
-    if date
+    if date.eql?(:unset)
+      date
+    elsif date
       date.iso8601
     end
   end
@@ -19,7 +21,6 @@ module Twilio
 
   def self.serialize_object(object)
     if object.is_a?(Hash) or object.is_a?(Array)
-      require 'json'
       JSON.generate(object)
     else
       object

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

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

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

@@ -1,7 +1,6 @@
 module Twilio
   module REST
     class Version
-      MAX_PAGE_SIZE = 1000
 
       attr_accessor :domain
 
@@ -12,11 +11,10 @@ module Twilio
           @page = page
           @limit = limit
           @page_limit = page_limit
-
         end
 
         def each
-          current_record = 1
+          current_record = 0
           current_page = 1
 
           while @page
@@ -50,7 +48,7 @@ module Twilio
       def request(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
         url = self.relative_uri(uri)
         params = params.delete_if {|k,v| v.nil?}
-        data = data.delete_if {|k,v| v.nil?}
+        data = data
         @domain.request(
           method,
           url,
@@ -74,7 +72,7 @@ module Twilio
           code = response.body['code']
         end
 
-        return Twilio::REST::RestError.new(message, code, response.status_code)
+        Twilio::REST::RestError.new(message, code, response.status_code)
       end
 
       def fetch(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
@@ -136,7 +134,7 @@ module Twilio
 
         unless limit.nil?
           # If there is no user-specified page_size, pick the most network efficient size
-          page_size ||= [limit, MAX_PAGE_SIZE].min
+          page_size = limit
           page_limit = (limit / page_size.to_f).ceil
         end
 

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

@@ -1,221 +1,247 @@
 module Twilio
   module JWT
-    class AccessToken
+    class AccessToken < BaseJWT
       attr_accessor :account_sid,
                     :signing_key_id,
                     :secret,
-                    :ttl,
                     :identity,
-                    :nbf
-
-      def initialize(account_sid, key_sid, secret, ttl=3600, identity=nil, nbf=nil)
+                    :grants,
+                    :nbf,
+                    :ttl,
+                    :valid_until
+
+      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,
+              nbf: nbf,
+              ttl: ttl,
+              valid_until: valid_until)
         @account_sid = account_sid
-        @key_sid = key_sid
+        @signing_key_sid = signing_key_sid
         @secret = secret
-        @ttl = ttl
         @identity = identity
         @nbf = nbf
-        @grants = []
+        @grants = grants
+        @ttl = ttl
+        @valid_until = valid_until
       end
 
       def add_grant(grant)
         @grants.push(grant)
       end
 
-      def to_jwt(algorithm='HS256')
-        now = Time.now.to_i - 1
-        headers = {
-            cty: 'twilio-fpa;v=1'
-        }
+      def to_s
+        to_jwt
+      end
 
+      protected
+      def _generate_payload
+        now = Time.now.to_i
         grants = {}
         if @identity
           grants[:identity] = @identity
         end
 
-        @grants.each { |grant| grants[grant.key] = grant.payload }
+        @grants.each { |grant| grants[grant._key] = grant._generate_payload } unless @grants.empty?
 
         payload = {
-            jti: "#{@key_sid}-#{now}",
-            iss: @key_sid,
-            sub: @account_sid,
-            exp: now + @ttl,
+            jti: "#{@signing_key_sid}-#{now}",
             grants: grants
         }
 
-        payload[:nbf] = @nbf unless @nbf.nil?
-
-        ::JWT.encode payload, @secret, algorithm, headers
+        payload
       end
 
-      def to_s
-        to_jwt
+      protected
+      def _generate_headers
+        headers = {
+            cty: 'twilio-fpa;v=1'
+        }
+
+        headers
       end
+    end
 
-      class IpMessagingGrant
-        attr_accessor :service_sid,
-                      :endpoint_id,
-                      :deployment_role_sid,
-                      :push_credential_sid
+    module AccessTokenGrant
+      def _key
+        fail NotImplementedError
+      end
 
-        def key
-          'ip_messaging'
-        end
+      def _generate_payload
+        fail NotImplementedError
+      end
 
-        def payload
-          payload = {}
+    end
 
-          if service_sid
-            payload[:service_sid] = service_sid
-          end
+    class IpMessagingGrant
+      include AccessTokenGrant
+      attr_accessor :service_sid,
+                    :endpoint_id,
+                    :deployment_role_sid,
+                    :push_credential_sid
 
-          if endpoint_id
-            payload[:endpoint_id] = endpoint_id
-          end
 
-          if deployment_role_sid
-            payload[:deployment_role_sid] = deployment_role_sid
-          end
+      def _key
+        'ip_messaging'
+      end
 
-          if push_credential_sid
-            payload[:push_credential_sid] = push_credential_sid
-          end
+      def _generate_payload
+        payload = {}
 
-          payload
+        if service_sid
+          payload[:service_sid] = service_sid
         end
 
-      end
+        if endpoint_id
+          payload[:endpoint_id] = endpoint_id
+        end
 
-      class VoiceGrant
-        attr_accessor :outgoing_application_sid,
-                      :outgoing_application_params,
-                      :push_credential_sid,
-                      :endpoint_id
+        if deployment_role_sid
+          payload[:deployment_role_sid] = deployment_role_sid
+        end
 
-        def key
-          'voice'
+        if push_credential_sid
+          payload[:push_credential_sid] = push_credential_sid
         end
 
-        def payload
-          payload = {}
+        payload
+      end
 
-          if outgoing_application_sid
-            outgoing = {}
-            outgoing[:application_sid] = outgoing_application_sid
-            if outgoing_application_params
-              outgoing[:params] = outgoing_application_params
-            end
+    end
 
-            payload[:outgoing] = outgoing
-          end
+    class VoiceGrant
+      include AccessTokenGrant
+      attr_accessor :outgoing_application_sid,
+                    :outgoing_application_params,
+                    :push_credential_sid,
+                    :endpoint_id
 
-          if push_credential_sid
-            payload[:push_credential_sid] = push_credential_sid
-          end
+      def _key
+        'voice'
+      end
+
+      def _generate_payload
+        payload = {}
 
-          if endpoint_id
-            payload[:endpoint_id] = endpoint_id
+        if outgoing_application_sid
+          outgoing = {}
+          outgoing[:application_sid] = outgoing_application_sid
+          if outgoing_application_params
+            outgoing[:params] = outgoing_application_params
           end
 
-          payload
+          payload[:outgoing] = outgoing
         end
-      end
 
-      class SyncGrant
-        attr_accessor :service_sid,
-                      :endpoint_id
-
-        def key
-          'data_sync'
+        if push_credential_sid
+          payload[:push_credential_sid] = push_credential_sid
+        end
 
+        if endpoint_id
+          payload[:endpoint_id] = endpoint_id
         end
 
-        def payload
-          payload = {}
+        payload
+      end
+    end
 
-          if service_sid
-            payload['service_sid'] = service_sid
-          end
-          if endpoint_id
-            payload['endpoint_id'] = endpoint_id
-          end
+    class SyncGrant
+      include AccessTokenGrant
+      attr_accessor :service_sid,
+                    :endpoint_id
+
+      def _key
+        'data_sync'
 
-          payload
-        end
       end
 
-      class ConversationsGrant
-        attr_accessor :configuration_profile_sid
+      def _generate_payload
+        payload = {}
 
-        def key
-          'rtc'
+        if service_sid
+          payload['service_sid'] = service_sid
+        end
+        if endpoint_id
+          payload['endpoint_id'] = endpoint_id
         end
 
-        def payload
-          payload = {}
+        payload
+      end
+    end
 
-          if configuration_profile_sid
-            payload[:configuration_profile_sid] = configuration_profile_sid
-          end
+    class ConversationsGrant
+      include AccessTokenGrant
+      attr_accessor :configuration_profile_sid
 
-          payload
-        end
+      def _key
+        'rtc'
+      end
 
-       class << self
-         extend Gem::Deprecate
-         deprecate :new, 'VideoGrant.new', 2017, 5
-       end
-    
+      def _generate_payload
+        payload = {}
 
+        if configuration_profile_sid
+          payload[:configuration_profile_sid] = configuration_profile_sid
+        end
+
+        payload
       end
 
-      class VideoGrant
-        attr_accessor :room
+     class << self
+       extend Gem::Deprecate
+       deprecate :new, 'VideoGrant.new', 2017, 5
+     end
 
-        def key
-          'video'
-        end
 
-        def payload
-          payload = {}
+    end
 
-          if room
-            payload[:room] = room
-          end
+    class VideoGrant
+      include AccessTokenGrant
+      attr_accessor :room
 
-          payload
-        end
+      def _key
+        'video'
       end
 
-      class TaskRouterGrant
-        attr_accessor :workspace_sid,
-                      :worker_sid,
-                      :role
+      def _generate_payload
+        payload = {}
 
-        def key
-          'task_router'
+        if room
+          payload[:room] = room
         end
 
-        def payload
-          payload = {}
+        payload
+      end
+    end
 
-          if workspace_sid
-            payload[:workspace_sid] = workspace_sid
-          end
+    class TaskRouterGrant
+      include AccessTokenGrant
+      attr_accessor :workspace_sid,
+                    :worker_sid,
+                    :role
 
-          if worker_sid
-            payload[:worker_sid] = worker_sid
-          end
+      def _key
+        'task_router'
+      end
 
-          if role
-            payload[:role] = role
-          end
+      def _generate_payload
+        payload = {}
 
-          payload
+        if workspace_sid
+          payload[:workspace_sid] = workspace_sid
         end
-      end
 
+        if worker_sid
+          payload[:worker_sid] = worker_sid
+        end
+
+        if role
+          payload[:role] = role
+        end
 
+        payload
+      end
     end
   end
 end