twilio-ruby 5.0.0.alpha1 → 5.0.0.rc2

data/Rakefile

@@ -8,57 +8,3 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 task test: :spec
-
-task :authors do
-  `make authors`
-end
-
-task :deploy, [:version] => [:spec, :authors] do |t, args|
-  current_version = Twilio::VERSION
-
-  if args.version.nil?
-    version = Twilio::VERSION
-    version_parts = version.split('.')
-    increment = version_parts.pop
-    increment_prefix = increment.split(/\d/)[0]
-
-    increment = increment[increment_prefix.length..-1] if increment_prefix
-
-    increment = increment.to_i + 1
-    increment = "#{increment_prefix}#{increment}" if increment_prefix
-
-    version = [*version_parts, increment].join('.')
-  else
-    version = args.version
-  end
-
-  puts("Deploying #{version}")
-
-  # Update version.rb
-  version_file = <<SRC
-module Twilio
-  VERSION = '#{version}'
-end
-SRC
-  File.write('lib/twilio-ruby/version.rb', version_file)
-
-  # Update README.md
-  current_readme = File.read('README.md')
-  new_readme = current_readme.gsub(Regexp.new(current_version.gsub('.', '\.')), version)
-  File.write('README.md', new_readme)
-
-  # Make a git commit
-  `git commit -am "Bumping to version #{version}"`
-
-  # Do the gem deployment
-  `make gem`
-
-  # Push the branch back up
-  `git push`
-
-  # Tag the branch
-  `git tag #{version}`
-
-  # Push the tags
-  `git push --tags`
-end

data/examples/examples.rb

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

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

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'twilio-ruby'
 
 # print a list of all phone calls, what phone number each was to/from, and how
@@ -6,19 +7,18 @@ 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 = 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
+account_sid = 'AC043dcf9844e04758bc3a36a84c29761'
+auth_token = '62ea81de3a5b414154eb263595357c69'
 
 # set up a client
 client = Twilio::REST::Client.new(account_sid, auth_token)
 
-calls = client.calls.page
+calls = client.calls.list
 
-loop do
+begin
   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.to_s
+    puts call.sid + "\t" + call.from + "\t" + call.to + "\t" + price
   end
   calls = calls.next_page
-  break if calls.nil?
-end
+end while not calls.empty?

data/lib/rack/twilio_webhook_authentication.rb

@@ -25,22 +25,23 @@ 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::Security::RequestValidator.new(auth_token)
-      signature = env['HTTP_X_TWILIO_SIGNATURE'] || ''
+      validator = Twilio::Util::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,45 +1,44 @@
 require 'net/http'
 require 'net/https'
-require 'libxml'
+require 'builder'
 require 'cgi'
 require 'openssl'
 require 'base64'
 require 'forwardable'
 require 'jwt'
-require 'time'
-require 'json'
+require 'active_support/all'
 
 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/client_capability'
-require 'twilio-ruby/jwt/task_router'
-require 'twilio-ruby/security/request_validator'
+require 'twilio-ruby/util/capability'
+require 'twilio-ruby/util/client_config'
 require 'twilio-ruby/util/configuration'
+require 'twilio-ruby/util/request_validator'
+require 'twilio-ruby/util/access_token'
+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|
+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/framework/**/*.rb'].each do |file|
+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|
+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|
+Dir[File.dirname(__FILE__) + "/twilio-ruby/compatibility/**/*.rb"].each do |file|
   require file
 end
-Dir[File.dirname(__FILE__) + '/twilio-ruby/compatibility/**/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + "/twilio-ruby/task_router/**/*.rb"].each do |file|
   require file
 end
 
+
 module Twilio
   extend SingleForwardable
 

data/lib/twilio-ruby/compatibility/v2010/account/call/feedback.rb

@@ -0,0 +1,15 @@
+module Twilio
+  module Resources
+    module V2010
+      class AccountInstance < Twilio::REST::InstanceResource
+        class CallInstance < Twilio::REST::InstanceResource
+          class FeedbackList < Twilio::REST::ListResource
+            def get(sid=nil)
+              internal_get sid
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/compatibility/v2010/account/queue/member.rb

@@ -0,0 +1,23 @@
+module Twilio
+  module Resources
+    module V2010
+      class AccountInstance < Twilio::REST::InstanceResource
+        class QueueInstance < Twilio::REST::InstanceResource
+          class MemberList < Twilio::REST::ListResource
+            def front
+              get "Front"
+            end
+
+            def front!
+              front.refresh
+            end
+
+            def dequeue(url, method='POST')
+              front.dequeue url, method
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,8 +14,8 @@ module Twilio
         "#{@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)
+      def request(method, uri, params={}, data={}, headers={}, auth=nil, timeout=nil)
+        url = self.absolute_url(uri)
 
         @client.request(
           @host,

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

@@ -0,0 +1,14 @@
+module Twilio
+  module REST
+    class TwilioException < Exception
+      def initialize(msg, body = nil)
+        @msg = msg
+        @body = body
+      end
+
+      def to_s
+        "#{@msg}: #{@body || 'no body'}"
+      end
+    end
+  end
+end

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

@@ -6,4 +6,4 @@ module Twilio
       "#{left}/#{right}"
     end
   end
-end
+end