twilio-ruby 4.13.0 → 5.0.0.alpha1

data/examples/examples.rb

@@ -1,83 +1,72 @@
-# examples version 3
+# examples version
 
-@account_sid = 'AC043dcf9844e04758bc3a36a84c29761'
-@auth_token = '62ea81de3a5b414154eb263595357c69'
+@account_sid = 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+@auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 # set up a client
 @client = Twilio::REST::Client.new(@account_sid, @auth_token)
 
 ################ ACCOUNTS ################
 
 # shortcut to grab your account object (account_sid is inferred from the client's auth credentials)
-@account = @client.account
+@account = @client.api.account
 
 # list your (sub)accounts
-@client.accounts.list
+@accounts = @client.api.accounts.each do |account|
+  puts(account)
+end
 
 # grab an account instance resource if you know the sid
-@account = @client.accounts.get(@account_sid)
-# http round trip happens here
-puts @account.friendly_name
+@account = @client.api.accounts(account_sid).fetch
+puts(@account.friendly_name)
 
 # update an account's friendly name
-@client.accounts.get(@account_sid).update(friendly_name: 'A Fabulous Friendly Name')
+@client.api.accounts(account_sid).update(friendly_name: 'A Fabulous Friendly Name')
 
 ################ CALLS ################
 
 # print a list of calls (all parameters optional)
-@account.calls.list(
-  page: 0,
-  page_size: 1000,
-  start_time: '2010-09-01'
-).each do |call|
+@client.calls.list(limit: 10, start_time: '2010-09-01').each do |call|
   puts call.sid
 end
 
 # get a particular call and list its recording urls
-@account.calls.get('CAXXXXXXX').recordings.list.each do |r|
+@client.calls('CAXXXXXXX').recordings.each do |r|
   puts r.wav
 end
 
 # make a new outgoing call. returns a call object just like calls.get
-@call = @account.calls.create(
+@call = @client.calls.create(
   from: '+14159341234',
   to: '+18004567890',
   url: 'http://example.com/call-handler'
 )
 
 # cancel the call if not already in progress
-@account.calls.get(@call.sid).update(status: 'canceled')
-# or equivalently
-@call.update(status: 'canceled')
-# or simply
-@call.cancel
+@client.calls(@call.sid).update(status: 'canceled')
 
 # redirect and then terminate a call
-@call = @account.calls.get('CA386025c9bf5d6052a1d1ea42b4d16662')
+@call = client.calls('CAXXXXXXX')
 @call.update(url: 'http://example.com/call-redirect')
 @call.update(status: 'completed')
-# or, use the aliases...
-@call.redirect_to('http://example.com/call-redirect')
-@call.hangup
 
 ################ SMS MESSAGES ################
 
-# print a list of messages
-@account.messages.list(date_sent: '2010-09-01').each do |message|
-  puts message.body
+@client.messages.list(date_sent: '2010-09-01').each do |message|
+  puts message.date_created
 end
 
 # print a particular sms message
-puts @account.messages.get('SMXXXXXXXX').body
+puts @client.messages('SMXXXXXXXX').fetch.body
 
 # send an sms
-@account.messages.create(
+@client.messages.create(
   from: '+14159341234',
   to: '+16105557069',
   body: 'Hey there!'
 )
 
 # send an mms
-@account.messages.create(
+@client.messages.create(
   from: '+14159341234',
   to: '+16105557069',
   media_urls: 'http://example.com/media.png'
@@ -86,63 +75,63 @@ puts @account.messages.get('SMXXXXXXXX').body
 ################ PHONE NUMBERS ################
 
 # get a list of supported country codes
-@account.available_phone_numbers.list
+@client.available_phone_numbers.list
 
 # print some available numbers
-@numbers = @account.available_phone_numbers.get('US').local.list(
-  contains: 'AWESOME'
-)
+@client.available_phone_numbers('US').local.list.each do |num|
+  puts num
+end
+
+@numbers = @client.available_phone_numbers('US').local.list(area_code: '908')
 @numbers.each { |num| puts num.phone_number }
 
 # buy the first one
-@account.incoming_phone_numbers.create(phone_number: @numbers[0].phone_number)
+@client.incoming_phone_numbers.create(phone_number: @numbers[0].phone_number)
 
 # update an existing phone number's voice url
-number = @account.incoming_phone_numbers.get('PNdba508c5616a7f5e141789f44f022cc3')
-number.update(voice_url: 'http://example.com/voice')
+@client.incoming_phone_numbers('PNxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx').update(voice_url: 'http://example.com/voice')
 
 # decommission an existing phone number
-numbers = @account.incoming_phone_numbers.list(
-  friendly_name: 'A Fabulous Friendly Name'
-)
-numbers[0].delete
+numbers = @client.incoming_phone_numbers.list(friendly_name: 'A Fabulous Friendly Name')
+number = numbers[0].sid
+@client.incoming_phone_numbers(number).delete
+
 ################ CONFERENCES  ################
 
 # get a particular conference's participants object and stash it
-conference = @account.conferences.get('CFbbe46ff1274e283f7e3ac1df0072ab39')
+conference = @client.conferences('CFxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx').fetch
 @participants = conference.participants
 
 # list participants
-@participants.list.each do |p|
+@participants.each do |p|
   puts p.sid
 end
 
 # update a conference participant
-@participants.get('CA386025c9bf5d6052a1d1ea42b4d16662').update(muted: 'true')
-# or an easier way
-@participants.get('CA386025c9bf5d6052a1d1ea42b4d16662').mute
-
-# and, since we're lazy loading, this would only incur one http request
-@account.conferences.get('CFbbe46ff1274e283f7e3ac1df0072ab39').participants
-  .get('CA386025c9bf5d6052a1d1ea42b4d16662').update(muted: 'true')
+@client
+  .conferences('CFxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  .participants('CAxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  .update(muted: 'true')
 
 ################ QUEUES ###################
 
 # create a new queue
-@queue = @account.queues.create(friendly_name: 'MyQueue', max_size: 50)
+@queue = @client.queues.create(friendly_name: 'MyQueue', max_size: 50)
 
 # get a list of queues for this account
-@queues = @account.queues.list
+@queues = @client.queues.list
 
 # get a particular queue and its members
-@queue = @account.queues.get("QQb6765b0458714964970a73dcaf55efd1")
+@queue = @client.queues('QQxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx').fetch
 @members = @queue.members
 
-#list members
+# list members
 @members.list.each do |m|
   puts m.wait_time
 end
 
 # dequeue a particular user and run twiml at a specific url
-@member = @members.get('CA386025c9bf5d6052a1d1ea42b4d16662')
-@member.dequeue('http://myapp.com/deque')
+@client
+  .queues('QQxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  .members('CAxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  .update(url: 'http://myapp.com/deque', method: 'POST')

data/examples/{print-call-log.rb → print_call_log.rb}

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'twilio-ruby'
 
 # print a list of all phone calls, what phone number each was to/from, and how
@@ -7,18 +6,19 @@ require 'twilio-ruby'
 # put your Twilio credentials here. you can find your AccountSid and AuthToken
 # at the top of your account dashboard page located at:
 #   https://www.twilio.com/user/account
-account_sid = 'AC043dcf9844e04758bc3a36a84c29761'
-auth_token = '62ea81de3a5b414154eb263595357c69'
+account_sid = 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
 
 # set up a client
 client = Twilio::REST::Client.new(account_sid, auth_token)
 
-calls = client.calls.list
+calls = client.calls.page
 
-begin
+loop do
   calls.each do |call|
     price = call.price || '0.00' # since apparently prices can be nil...
-    puts call.sid + "\t" + call.from + "\t" + call.to + "\t" + price
+    puts call.sid + "\t" + call.from + "\t" + call.to + "\t" + price.to_s
   end
   calls = calls.next_page
-end while not calls.empty?
+  break if calls.nil?
+end

data/lib/rack/twilio_webhook_authentication.rb

@@ -25,23 +25,22 @@ module Rack
     end
 
     def call(env)
-      return @app.call(env) unless env["PATH_INFO"].match(@path_regex)
+      return @app.call(env) unless env['PATH_INFO'].match(@path_regex)
       request = Rack::Request.new(env)
       original_url = request.url
       params = request.post? ? request.POST : {}
       auth_token = @auth_token || get_auth_token(params['AccountSid'])
-      validator = Twilio::Util::RequestValidator.new(auth_token)
-      signature = env['HTTP_X_TWILIO_SIGNATURE'] || ""
+      validator = Twilio::Security::RequestValidator.new(auth_token)
+      signature = env['HTTP_X_TWILIO_SIGNATURE'] || ''
       if validator.validate(original_url, params, signature)
         @app.call(env)
       else
         [
           403,
-          {'Content-Type' => 'text/plain'},
-          ["Twilio Request Validation Failed."]
+          { 'Content-Type' => 'text/plain' },
+          ['Twilio Request Validation Failed.']
         ]
       end
     end
   end
-
 end

data/lib/twilio-ruby.rb

@@ -1,116 +1,44 @@
 require 'net/http'
 require 'net/https'
-require 'builder'
-require 'multi_json'
+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/util/access_token'
-require 'twilio-ruby/util/client_config'
+require 'twilio-ruby/jwt/jwt'
+require 'twilio-ruby/jwt/access_token'
+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/util/request_validator'
-require 'twilio-ruby/util/capability'
-require 'twilio-ruby/twiml/response'
-require 'twilio-ruby/task_router'
-require 'twilio-ruby/task_router/capability'
-require 'twilio-ruby/task_router/workflow_builder'
-require 'twilio-ruby/rest/errors'
-require 'twilio-ruby/rest/utils'
-require 'twilio-ruby/rest/list_resource'
-require 'twilio-ruby/rest/next_gen_list_resource'
-require 'twilio-ruby/rest/instance_resource'
-require 'twilio-ruby/rest/sandbox'
-require 'twilio-ruby/rest/accounts'
-require 'twilio-ruby/rest/calls'
-require 'twilio-ruby/rest/call_feedback'
-require 'twilio-ruby/rest/call_feedback_summary'
-require 'twilio-ruby/rest/keys'
-require 'twilio-ruby/rest/pricing'
-require 'twilio-ruby/rest/pricing/countries'
-require 'twilio-ruby/rest/pricing/phone_numbers'
-require 'twilio-ruby/rest/pricing/voice/numbers'
-require 'twilio-ruby/rest/pricing/voice'
-require 'twilio-ruby/rest/pricing/messaging'
-require 'twilio-ruby/rest/ip-messaging/services'
-require 'twilio-ruby/rest/ip-messaging/channels'
-require 'twilio-ruby/rest/ip-messaging/members'
-require 'twilio-ruby/rest/ip-messaging/messages'
-require 'twilio-ruby/rest/ip-messaging/roles'
-require 'twilio-ruby/rest/ip-messaging/users'
-require 'twilio-ruby/rest/ip-messaging/credentials'
-require 'twilio-ruby/rest/sms'
-require 'twilio-ruby/rest/sms/short_codes'
-require 'twilio-ruby/rest/sms/messages'
-require 'twilio-ruby/rest/sip'
-require 'twilio-ruby/rest/sip/domains'
-require 'twilio-ruby/rest/sip/domains/ip_access_control_list_mappings'
-require 'twilio-ruby/rest/sip/domains/credential_list_mappings'
-require 'twilio-ruby/rest/sip/credential_lists'
-require 'twilio-ruby/rest/sip/credential_lists/credentials'
-require 'twilio-ruby/rest/sip/ip_access_control_lists'
-require 'twilio-ruby/rest/sip/ip_access_control_lists/ip_addresses'
-require 'twilio-ruby/rest/task_router/statistics'
-require 'twilio-ruby/rest/task_router/activities'
-require 'twilio-ruby/rest/task_router/events'
-require 'twilio-ruby/rest/task_router/reservations'
-require 'twilio-ruby/rest/task_router/task_queues'
-require 'twilio-ruby/rest/task_router/task_queues_statistics'
-require 'twilio-ruby/rest/task_router/tasks'
-require 'twilio-ruby/rest/task_router/workers'
-require 'twilio-ruby/rest/task_router/workers_statistics'
-require 'twilio-ruby/rest/task_router/workflow_statistics'
-require 'twilio-ruby/rest/task_router/workflows'
-require 'twilio-ruby/rest/task_router/workspaces'
-require 'twilio-ruby/rest/task_router/workspace_statistics'
-require 'twilio-ruby/rest/trunking/credential_lists.rb'
-require 'twilio-ruby/rest/trunking/ip_access_control_lists.rb'
-require 'twilio-ruby/rest/trunking/origination_urls.rb'
-require 'twilio-ruby/rest/trunking/phone_numbers.rb'
-require 'twilio-ruby/rest/trunking/trunks.rb'
-require 'twilio-ruby/rest/lookups/phone_numbers'
-require 'twilio-ruby/rest/monitor/events'
-require 'twilio-ruby/rest/monitor/alerts'
-require 'twilio-ruby/rest/media'
-require 'twilio-ruby/rest/messages'
-require 'twilio-ruby/rest/applications'
-require 'twilio-ruby/rest/connect_apps'
-require 'twilio-ruby/rest/authorized_connect_apps'
-require 'twilio-ruby/rest/outgoing_caller_ids'
-require 'twilio-ruby/rest/incoming_phone_numbers'
-require 'twilio-ruby/rest/incoming_phone_numbers/local'
-require 'twilio-ruby/rest/incoming_phone_numbers/toll_free'
-require 'twilio-ruby/rest/incoming_phone_numbers/mobile'
-require 'twilio-ruby/rest/available_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/country'
-require 'twilio-ruby/rest/available_phone_numbers/local'
-require 'twilio-ruby/rest/available_phone_numbers/mobile'
-require 'twilio-ruby/rest/available_phone_numbers/toll_free'
-require 'twilio-ruby/rest/conferences'
-require 'twilio-ruby/rest/conferences/participants'
-require 'twilio-ruby/rest/queues'
-require 'twilio-ruby/rest/queues/members'
-require 'twilio-ruby/rest/usage'
-require 'twilio-ruby/rest/usage/records'
-require 'twilio-ruby/rest/usage/triggers'
-require 'twilio-ruby/rest/recordings'
-require 'twilio-ruby/rest/transcriptions'
-require 'twilio-ruby/rest/tokens'
-require 'twilio-ruby/rest/notifications'
-require 'twilio-ruby/rest/addresses'
-require 'twilio-ruby/rest/addresses/dependent_phone_numbers'
-require 'twilio-ruby/rest/client'
-require 'twilio-ruby/rest/task_router_client'
-require 'twilio-ruby/rest/trunking_client'
-require 'twilio-ruby/rest/lookups_client'
-require 'twilio-ruby/rest/pricing_client'
-require 'twilio-ruby/rest/monitor_client'
-require 'twilio-ruby/rest/ip_messaging_client'
-require 'rack/twilio_webhook_authentication'
+
+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
+end
+Dir[File.dirname(__FILE__) + '/twilio-ruby/framework/**/*.rb'].each do |file|
+  require file
+end
+Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/*.rb'].each do |file|
+  require file
+end
+Dir[File.dirname(__FILE__) + '/twilio-ruby/rest/**/*.rb'].each do |file|
+  require file
+end
+Dir[File.dirname(__FILE__) + '/twilio-ruby/compatibility/**/*.rb'].each do |file|
+  require file
+end
 
 module Twilio
   extend SingleForwardable

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

@@ -0,0 +1,34 @@
+module Twilio
+  module REST
+    class Domain
+      attr_reader :client
+
+      def initialize(client)
+        @client = client
+        @host = nil
+        @base_url = nil
+        @port = nil
+      end
+
+      def absolute_url(uri)
+        "#{@base_url.chomp('/')}/#{uri.chomp('/').gsub(/^\//, '')}"
+      end
+
+      def request(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        url = uri.match(/^http/) ? uri : absolute_url(uri)
+
+        @client.request(
+          @host,
+          @port,
+          method,
+          url,
+          params,
+          data,
+          headers,
+          auth,
+          timeout
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Twilio
+  module REST
+    class TwilioError < StandardError
+      attr_reader :message, :body
+
+      def initialize(message, body = nil)
+        @message = message
+        @body = body
+      end
+
+      def to_s
+        "#{@message}: #{@body || 'no body'}"
+      end
+    end
+
+    class RestError < TwilioError
+      attr_reader :message, :code, :status_code
+
+      def initialize(message, code, status_code)
+        @message = message
+        @code = code
+        @status_code = status_code
+      end
+
+      def to_s
+        "[HTTP #{status_code}] #{code} : #{message}"
+      end
+    end
+  end
+end