plivo 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e40aee214c51afcf19d3608b040700c981ab8a0
-  data.tar.gz: a14295562d527dfc2cd9edea1f0dd1a1d217d4c2
+  metadata.gz: 7f296f15e2c7d219428b9a954dc5620995b1798d
+  data.tar.gz: 73d8d41c4e24c27a4ff04a902d994b81bbb4d82d
 SHA512:
-  metadata.gz: 5eb1df48004961741c45bdf39aaad7affe2aa60385ea7eeb4c9559cd1a1f96d55da231986685dd48ec46a3c93502b9047012eb9d3e92ba4a3e32ef16f1373a5f
-  data.tar.gz: fd51dc6d46b96bd5727f19a1346401bb2eb1b7e8bdba55c031ea88cc00d9c241fdec3517fb2b6e98dd9e26ead75b2b408e26c3c76d328f4e9d0b4c6dc8df052e
+  metadata.gz: 965b2e048d740e13d67c620a5a23ef37ccdfb80925b78d2a48ab77b5763fcd1e57a5793a1f42faa73732f2ea794033fb29d99f32fc60d957cc9527f76deb38e1
+  data.tar.gz: 478dccd4ae808f814ea5a30fa5b70e4f466bbff948058acf53091b1ee04a2c555f079963ea01b580fc0018ec3ea9243d685d31e5b102c6ceb3b15d1489e01573

data/lib/plivo.rb

@@ -7,780 +7,789 @@ require 'openssl'
 require 'base64'
 
 module Plivo
-  class PlivoError < StandardError
-  end
+    class PlivoError < StandardError
+    end
 
-  class XPlivoSignature
-    attr_accessor :signature, :uri, :post_params, :auth_token
+    class XPlivoSignature
+        attr_accessor :signature, :uri, :post_params, :auth_token
 
-    def initialize(signature, uri, post_params, auth_token)
-      @signature = signature
-      @uri = uri
-      @post_params = post_params
-      @auth_token = auth_token
-    end
+        def initialize(signature, uri, post_params, auth_token)
+            @signature = signature
+            @uri = uri
+            @post_params = post_params
+            @auth_token = auth_token
+        end
+
+        def is_valid?
+            uri = @post_params.sort.reduce(@uri) {|_, (key, val)| _ += key + val}
+            return Base64.encode64(OpenSSL::HMAC.digest('sha1', @auth_token, uri)).chomp.eql? @signature
+        end
 
-    def is_valid?
-      uri = @post_params.sort.reduce(@uri) {|_, (key, val)| _ += key + val}
-      return Base64.encode64(OpenSSL::HMAC.digest('sha1', @auth_token, uri)).chomp.eql? @signature
     end
 
-  end
+    class RestAPI
+        attr_accessor :auth_id, :auth_token, :url, :version, :api, :headers, :rest
 
-  class RestAPI
-    attr_accessor :auth_id, :auth_token, :url, :version, :api, :headers, :rest
+        def initialize(auth_id, auth_token, url="https://api.plivo.com", version="v1")
+            @auth_id = auth_id
+            @auth_token = auth_token
+            @url = url.chomp('/')
+            @version = version
+            @api = @url + '/' + @version + '/Account/' + @auth_id
+            @headers = {"User-Agent" => "RubyPlivo"}
+            @rest = RestClient::Resource.new(@api, @auth_id, @auth_token)
+        end
 
-    def initialize(auth_id, auth_token, url="https://api.plivo.com", version="v1")
-      @auth_id = auth_id
-      @auth_token = auth_token
-      @url = url.chomp('/')
-      @version = version
-      @api = @url + '/' + @version + '/Account/' + @auth_id
-      @headers = {"User-Agent" => "RubyPlivo"}
-      @rest = RestClient::Resource.new(@api, @auth_id, @auth_token)
-    end
+        def hash_to_params(myhash)
+            return myhash.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
+        end
 
-    def hash_to_params(myhash)
-      return myhash.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
-    end
+        def request(method, path, params=nil)
+            if method == "POST"
+                if not params
+                    params = {}
+                end
+                begin
+                    r = @rest[path].post params.to_json, :content_type => 'application/json'
+                rescue => e
+                    response = e
+                end
+                if not response
+                    code = r.code
+                    raw = r.to_str
+                    response = JSON.parse(raw)
+                end
+                return [code, response]
+            elsif method == "GET"
+                if params
+                    path = path + '?' + hash_to_params(params)
+                end
+
+                begin
+                    r = @rest[path].get
+                rescue => e
+                    response = e
+                end
+                if not response
+                    code = r.code
+                    raw = r.to_str
+                    response = JSON.parse(raw)
+                end
+                return [code, response]
+            elsif method == "DELETE"
+                if params
+                    path = path + '?' + hash_to_params(params)
+                end
+                begin
+                    r = @rest[path].delete
+                rescue => e
+                    response = e
+                end
+                if not response
+                    code = r.code
+                end
+                return [code, ""]
+            end
+            return [405, 'Method Not Supported']
+        end
 
-    def request(method, path, params=nil)
-      if method == "POST"
-        if not params
-          params = {}
-        end
-        begin
-          r = @rest[path].post params.to_json, :content_type => 'application/json'
-        rescue => e
-          response = e
-        end
-        if not response
-          code = r.code
-          raw = r.to_str
-          response = JSON.parse(raw)
-        end
-        return [code, response]
-      elsif method == "GET"
-        if params
-          path = path + '?' + hash_to_params(params)
-        end
-
-        begin
-          r = @rest[path].get
-        rescue => e
-          response = e
-        end
-        if not response
-          code = r.code
-          raw = r.to_str
-          response = JSON.parse(raw)
-        end
-        return [code, response]
-      elsif method == "DELETE"
-        if params
-          path = path + '?' + hash_to_params(params)
-        end
-        begin
-          r = @rest[path].delete
-        rescue => e
-          response = e
-        end
-        if not response
-          code = r.code
-        end
-        return [code, ""]
-      end
-      return [405, 'Method Not Supported']
-    end
+        ## Accounts ##
+        def get_account(params={})
+            return request('GET', "/", params)
+        end
 
-    ## Accounts ##
-    def get_account(params={})
-      return request('GET', "/", params)
-    end
+        def modify_account(params={})
+            return request('POST', "/", params)
+        end
 
-    def modify_account(params={})
-      return request('POST', "/", params)
-    end
+        def get_subaccounts(params={})
+            return request('GET', "/Subaccount/", params)
+        end
 
-    def get_subaccounts(params={})
-      return request('GET', "/Subaccount/", params)
-    end
+        def create_subaccount(params={})
+            return request('POST', "/Subaccount/", params)
+        end
 
-    def create_subaccount(params={})
-      return request('POST', "/Subaccount/", params)
-    end
+        def get_subaccount(params={})
+            subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
+            return request('GET', "/Subaccount/#{subauth_id}/", params)
+        end
 
-    def get_subaccount(params={})
-      subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
-      return request('GET', "/Subaccount/#{subauth_id}/", params)
-    end
+        def modify_subaccount(params={})
+            subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
+            return request('POST', "/Subaccount/#{subauth_id}/", params)
+        end
 
-    def modify_subaccount(params={})
-      subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
-      return request('POST', "/Subaccount/#{subauth_id}/", params)
-    end
+        def delete_subaccount(params={})
+            subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
+            return request('DELETE', "/Subaccount/#{subauth_id}/", params)
+        end
 
-    def delete_subaccount(params={})
-      subauth_id = params.delete("subauth_id") || params.delete(:subauth_id)
-      return request('DELETE', "/Subaccount/#{subauth_id}/", params)
-    end
+        ## Applications ##
+        def get_applications(params={})
+            return request('GET', "/Application/", params)
+        end
 
-    ## Applications ##
-    def get_applications(params={})
-      return request('GET', "/Application/", params)
-    end
+        def create_application(params={})
+            return request('POST', "/Application/", params)
+        end
 
-    def create_application(params={})
-      return request('POST', "/Application/", params)
-    end
+        def get_application(params={})
+            app_id = params.delete("app_id")
+            return request('GET', "/Application/#{app_id}/", params)
+        end
 
-    def get_application(params={})
-      app_id = params.delete("app_id")
-      return request('GET', "/Application/#{app_id}/", params)
-    end
+        def modify_application(params={})
+            app_id = params.delete("app_id")
+            return request('POST', "/Application/#{app_id}/", params)
+        end
 
-    def modify_application(params={})
-      app_id = params.delete("app_id")
-      return request('POST', "/Application/#{app_id}/", params)
-    end
+        def delete_application(params={})
+            app_id = params.delete("app_id")
+            return request('DELETE', "/Application/#{app_id}/", params)
+        end
 
-    def delete_application(params={})
-      app_id = params.delete("app_id")
-      return request('DELETE', "/Application/#{app_id}/", params)
-    end
+        ## Numbers ##
+        def search_phone_number(params={})
+            return request('GET', "/PhoneNumber/", params)
+        end
 
-    ## Numbers ##
-    def get_numbers(params={})
-      return request('GET', "/Number/", params)
-    end
+        def buy_phone_number(params={})
+            number = params.delete("number")
+            return request('POST', "/PhoneNumber/#{number}/", params)
+        end
 
-    def search_numbers(params={})
-      return request('GET', "/AvailableNumber/", params)
-    end
+        def get_numbers(params={})
+            return request('GET', "/Number/", params)
+        end
 
-    def get_number(params={})
-      number = params.delete("number")
-      return request('GET', "/Number/#{number}/", params)
-    end
+        def search_numbers(params={})
+            return request('GET', "/AvailableNumber/", params)
+        end
 
-    def rent_number(params={})
-      number = params.delete("number")
-      return request('POST', "/AvailableNumber/#{number}/", params)
-    end
+        def get_number(params={})
+            number = params.delete("number")
+            return request('GET', "/Number/#{number}/", params)
+        end
 
-    def unrent_number(params={})
-      number = params.delete("number")
-      return request('DELETE', "/Number/#{number}/", params)
-    end
+        def rent_number(params={})
+            number = params.delete("number")
+            return request('POST', "/AvailableNumber/#{number}/", params)
+        end
 
-    def link_application_number(params={})
-      number = params.delete("number")
-      return request('POST', "/Number/#{number}/", params)
-    end
+        def unrent_number(params={})
+            number = params.delete("number")
+            return request('DELETE', "/Number/#{number}/", params)
+        end
 
-    def unlink_application_number(params={})
-      number = params.delete("number")
-      params = {"app_id" => ""}
-      return request('POST', "/Number/#{number}/", params)
-    end
+        def link_application_number(params={})
+            number = params.delete("number")
+            return request('POST', "/Number/#{number}/", params)
+        end
 
-    def get_number_group(params={})
-      return request('GET', "/AvailableNumberGroup/", params)
-    end
+        def unlink_application_number(params={})
+            number = params.delete("number")
+            params = {"app_id" => ""}
+            return request('POST', "/Number/#{number}/", params)
+        end
 
-    def get_number_group_details(params={})
-      group_id = params.delete('group_id')
-      return request('GET', "/AvailableNumberGroup/#{group_id}/", params)
-    end
+        def get_number_group(params={})
+            return request('GET', "/AvailableNumberGroup/", params)
+        end
 
-    def rent_from_number_group(params={})
-      group_id = params.delete('group_id')
-      return request('POST', "/AvailableNumberGroup/#{group_id}/", params)
-    end
+        def get_number_group_details(params={})
+            group_id = params.delete('group_id')
+            return request('GET', "/AvailableNumberGroup/#{group_id}/", params)
+        end
 
-    ## Calls ##
-    def get_cdrs(params={})
-      return request('GET', "/Call/", params)
-    end
+        def rent_from_number_group(params={})
+            group_id = params.delete('group_id')
+            return request('POST', "/AvailableNumberGroup/#{group_id}/", params)
+        end
 
-    def get_cdr(params={})
-      record_id = params.delete('record_id')
-      return request('GET', "/Call/#{record_id}/", params)
-    end
+        ## Calls ##
+        def get_cdrs(params={})
+            return request('GET', "/Call/", params)
+        end
 
-    def get_live_calls(params={})
-      params["status"] = "live"
-      return request('GET', "/Call/", params)
-    end
+        def get_cdr(params={})
+            record_id = params.delete('record_id')
+            return request('GET', "/Call/#{record_id}/", params)
+        end
 
-    def get_live_call(params={})
-      call_uuid = params.delete('call_uuid')
-      params["status"] = "live"
-      return request('GET', "/Call/#{call_uuid}/", params)
-    end
+        def get_live_calls(params={})
+            params["status"] = "live"
+            return request('GET', "/Call/", params)
+        end
 
-    def make_call(params={})
-      return request('POST', "/Call/", params)
-    end
+        def get_live_call(params={})
+            call_uuid = params.delete('call_uuid')
+            params["status"] = "live"
+            return request('GET', "/Call/#{call_uuid}/", params)
+        end
 
-    def hangup_all_calls(params={})
-      return request('DELETE', "/Call/", params)
-    end
+        def make_call(params={})
+            return request('POST', "/Call/", params)
+        end
 
-    def transfer_call(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('POST', "/Call/#{call_uuid}/", params)
-    end
+        def hangup_all_calls(params={})
+            return request('DELETE', "/Call/", params)
+        end
 
-    def hangup_call(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('DELETE', "/Call/#{call_uuid}/", params)
-    end
+        def transfer_call(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('POST', "/Call/#{call_uuid}/", params)
+        end
 
-    def record(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('POST', "/Call/#{call_uuid}/Record/", params)
-    end
+        def hangup_call(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('DELETE', "/Call/#{call_uuid}/", params)
+        end
 
-    def stop_record(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('DELETE', "/Call/#{call_uuid}/Record/", params)
-    end
+        def record(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('POST', "/Call/#{call_uuid}/Record/", params)
+        end
 
-    def play(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('POST', "/Call/#{call_uuid}/Play/", params)
-    end
+        def stop_record(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('DELETE', "/Call/#{call_uuid}/Record/", params)
+        end
 
-    def stop_play(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('DELETE', "/Call/#{call_uuid}/Play/", params)
-    end
+        def play(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('POST', "/Call/#{call_uuid}/Play/", params)
+        end
 
-    def speak(params={})
-      call_uuid = params.delete('call_uuid')
-      params.update({"text" => HTMLEntities.new(:html4).encode(params['text'], :decimal)})
-      return request('POST', "/Call/#{call_uuid}/Speak/", params)
-    end
+        def stop_play(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('DELETE', "/Call/#{call_uuid}/Play/", params)
+        end
 
-    def stop_speak(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('DELETE', "/Call/#{call_uuid}/Speak/", params)
-    end
+        def speak(params={})
+            call_uuid = params.delete('call_uuid')
+            params.update({"text" => HTMLEntities.new(:html4).encode(params['text'], :decimal)})
+            return request('POST', "/Call/#{call_uuid}/Speak/", params)
+        end
 
-    def send_digits(params={})
-      call_uuid = params.delete('call_uuid')
-      return request('POST', "/Call/#{call_uuid}/DTMF/", params)
-    end
+        def stop_speak(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('DELETE', "/Call/#{call_uuid}/Speak/", params)
+        end
 
-    ## Calls requests ##
-    def hangup_request(params={})
-      request_uuid = params.delete('request_uuid')
-      return request('DELETE', "/Request/#{request_uuid}/", params)
-    end
+        def send_digits(params={})
+            call_uuid = params.delete('call_uuid')
+            return request('POST', "/Call/#{call_uuid}/DTMF/", params)
+        end
 
-    ## Conferences ##
-    def get_live_conferences(params={})
-      return request('GET', "/Conference/", params)
-    end
+        ## Calls requests ##
+        def hangup_request(params={})
+            request_uuid = params.delete('request_uuid')
+            return request('DELETE', "/Request/#{request_uuid}/", params)
+        end
 
-    def hangup_all_conferences(params={})
-      return request('DELETE', "/Conference/", params)
-    end
+        ## Conferences ##
+        def get_live_conferences(params={})
+            return request('GET', "/Conference/", params)
+        end
 
-    def get_live_conference(params={})
-      conference_name = params.delete('conference_name')
-      return request('GET', "/Conference/#{conference_name}/", params)
-    end
+        def hangup_all_conferences(params={})
+            return request('DELETE', "/Conference/", params)
+        end
 
-    def hangup_conference(params={})
-      conference_name = params.delete('conference_name')
-      return request('DELETE', "/Conference/#{conference_name}/", params)
-    end
+        def get_live_conference(params={})
+            conference_name = params.delete('conference_name')
+            return request('GET', "/Conference/#{conference_name}/", params)
+        end
 
-    def hangup_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/", params)
-    end
+        def hangup_conference(params={})
+            conference_name = params.delete('conference_name')
+            return request('DELETE', "/Conference/#{conference_name}/", params)
+        end
 
-    def play_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Play/", params)
-    end
+        def hangup_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/", params)
+        end
 
-    def stop_play_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Play/", params)
-    end
+        def play_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Play/", params)
+        end
 
-    def speak_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      params.update({"text" => HTMLEntities.new(:html4).encode(params['text'], :decimal)})
-      return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Speak/", params)
-    end
+        def stop_play_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Play/", params)
+        end
 
-    def deaf_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Deaf/", params)
-    end
+        def speak_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            params.update({"text" => HTMLEntities.new(:html4).encode(params['text'], :decimal)})
+            return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Speak/", params)
+        end
 
-    def undeaf_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Deaf/", params)
-    end
+        def deaf_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Deaf/", params)
+        end
 
-    def mute_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Mute/", params)
-    end
+        def undeaf_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Deaf/", params)
+        end
 
-    def unmute_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Mute/", params)
-    end
+        def mute_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Mute/", params)
+        end
 
-    def kick_member(params={})
-      conference_name = params.delete('conference_name')
-      member_id = params.delete('member_id')
-      return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Kick/", params)
-    end
+        def unmute_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('DELETE', "/Conference/#{conference_name}/Member/#{member_id}/Mute/", params)
+        end
 
-    def record_conference(params={})
-      conference_name = params.delete('conference_name')
-      return request('POST', "/Conference/#{conference_name}/Record/", params)
-    end
+        def kick_member(params={})
+            conference_name = params.delete('conference_name')
+            member_id = params.delete('member_id')
+            return request('POST', "/Conference/#{conference_name}/Member/#{member_id}/Kick/", params)
+        end
 
-    def stop_record_conference(params={})
-      conference_name = params.delete('conference_name')
-      return request('DELETE', "/Conference/#{conference_name}/Record/", params)
-    end
+        def record_conference(params={})
+            conference_name = params.delete('conference_name')
+            return request('POST', "/Conference/#{conference_name}/Record/", params)
+        end
 
-    ## Recordings ##
-    def get_recordings(params={})
-      return request('GET', "/Recording/", params)
-    end
+        def stop_record_conference(params={})
+            conference_name = params.delete('conference_name')
+            return request('DELETE', "/Conference/#{conference_name}/Record/", params)
+        end
 
-    def get_recording(params={})
-      recording_id = params.delete('recording_id')
-      return request('GET', "/Recording/#{recording_id}/", params)
-    end
+        ## Recordings ##
+        def get_recordings(params={})
+            return request('GET', "/Recording/", params)
+        end
 
-    def delete_recording(params={})
-      recording_id = params.delete('recording_id')
-      return request('DELETE', "/Recording/#{recording_id}/", params)
-    end
+        def get_recording(params={})
+            recording_id = params.delete('recording_id')
+            return request('GET', "/Recording/#{recording_id}/", params)
+        end
 
-    ## Endpoints ##
-    def get_endpoints(params={})
-      return request('GET', "/Endpoint/", params)
-    end
+        def delete_recording(params={})
+            recording_id = params.delete('recording_id')
+            return request('DELETE', "/Recording/#{recording_id}/", params)
+        end
 
-    def create_endpoint(params={})
-      return request('POST', "/Endpoint/", params)
-    end
+        ## Endpoints ##
+        def get_endpoints(params={})
+            return request('GET', "/Endpoint/", params)
+        end
 
-    def get_endpoint(params={})
-      endpoint_id = params.delete('endpoint_id')
-      return request('GET', "/Endpoint/#{endpoint_id}/", params)
-    end
+        def create_endpoint(params={})
+            return request('POST', "/Endpoint/", params)
+        end
 
-    def modify_endpoint(params={})
-      endpoint_id = params.delete('endpoint_id')
-      return request('POST', "/Endpoint/#{endpoint_id}/", params)
-    end
+        def get_endpoint(params={})
+            endpoint_id = params.delete('endpoint_id')
+            return request('GET', "/Endpoint/#{endpoint_id}/", params)
+        end
 
-    def delete_endpoint(params={})
-      endpoint_id = params.delete('endpoint_id')
-      return request('DELETE', "/Endpoint/#{endpoint_id}/", params)
-    end
+        def modify_endpoint(params={})
+            endpoint_id = params.delete('endpoint_id')
+            return request('POST', "/Endpoint/#{endpoint_id}/", params)
+        end
 
-    ## Incoming Carriers ##
-    def get_incoming_carriers(params={})
-      return request('GET', "/IncomingCarrier/", params)
-    end
+        def delete_endpoint(params={})
+            endpoint_id = params.delete('endpoint_id')
+            return request('DELETE', "/Endpoint/#{endpoint_id}/", params)
+        end
 
-    def create_incoming_carrier(params={})
-      return request('POST', "/IncomingCarrier/", params)
-    end
+        ## Incoming Carriers ##
+        def get_incoming_carriers(params={})
+            return request('GET', "/IncomingCarrier/", params)
+        end
 
-    def get_incoming_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('GET', "/IncomingCarrier/#{carrier_id}/", params)
-    end
+        def create_incoming_carrier(params={})
+            return request('POST', "/IncomingCarrier/", params)
+        end
 
-    def modify_incoming_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('POST', "/IncomingCarrier/#{carrier_id}/", params)
-    end
+        def get_incoming_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('GET', "/IncomingCarrier/#{carrier_id}/", params)
+        end
 
-    def delete_incoming_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('DELETE', "/IncomingCarrier/#{carrier_id}/", params)
-    end
+        def modify_incoming_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('POST', "/IncomingCarrier/#{carrier_id}/", params)
+        end
 
-    ## Outgoing Carriers ##
-    def get_outgoing_carriers(params={})
-      return request('GET', "/OutgoingCarrier/", params)
-    end
+        def delete_incoming_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('DELETE', "/IncomingCarrier/#{carrier_id}/", params)
+        end
 
-    def create_outgoing_carrier(params={})
-      return request('POST', "/OutgoingCarrier/", params)
-    end
+        ## Outgoing Carriers ##
+        def get_outgoing_carriers(params={})
+            return request('GET', "/OutgoingCarrier/", params)
+        end
 
-    def get_outgoing_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('GET', "/OutgoingCarrier/#{carrier_id}/", params)
-    end
+        def create_outgoing_carrier(params={})
+            return request('POST', "/OutgoingCarrier/", params)
+        end
 
-    def modify_outgoing_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('POST', "/OutgoingCarrier/#{carrier_id}/", params)
-    end
+        def get_outgoing_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('GET', "/OutgoingCarrier/#{carrier_id}/", params)
+        end
 
-    def delete_outgoing_carrier(params={})
-      carrier_id = params.delete('carrier_id')
-      return request('DELETE', "/OutgoingCarrier/#{carrier_id}/", params)
-    end
+        def modify_outgoing_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('POST', "/OutgoingCarrier/#{carrier_id}/", params)
+        end
 
-    ## Outgoing Carrier Routings ##
-    def get_outgoing_carrier_routings(params={})
-      return request('GET', "/OutgoingCarrierRouting/", params)
-    end
+        def delete_outgoing_carrier(params={})
+            carrier_id = params.delete('carrier_id')
+            return request('DELETE', "/OutgoingCarrier/#{carrier_id}/", params)
+        end
 
-    def create_outgoing_carrier_routing(params={})
-      return request('POST', "/OutgoingCarrierRouting/", params)
-    end
+        ## Outgoing Carrier Routings ##
+        def get_outgoing_carrier_routings(params={})
+            return request('GET', "/OutgoingCarrierRouting/", params)
+        end
 
-    def get_outgoing_carrier_routing(params={})
-      routing_id = params.delete('routing_id')
-      return request('GET', "/OutgoingCarrierRouting/#{routing_id}/", params)
-    end
+        def create_outgoing_carrier_routing(params={})
+            return request('POST', "/OutgoingCarrierRouting/", params)
+        end
 
-    def modify_outgoing_carrier_routing(params={})
-      routing_id = params.delete('routing_id')
-      return request('POST', "/OutgoingCarrierRouting/#{routing_id}/", params)
-    end
+        def get_outgoing_carrier_routing(params={})
+            routing_id = params.delete('routing_id')
+            return request('GET', "/OutgoingCarrierRouting/#{routing_id}/", params)
+        end
 
-    def delete_outgoing_carrier_routing(params={})
-      routing_id = params.delete('routing_id')
-      return request('DELETE', "/OutgoingCarrierRouting/#{routing_id}/", params)
-    end
+        def modify_outgoing_carrier_routing(params={})
+            routing_id = params.delete('routing_id')
+            return request('POST', "/OutgoingCarrierRouting/#{routing_id}/", params)
+        end
 
-    ## Pricing ##
-    def pricing(params={})
-      return request('GET', "/Pricing/", params)
-    end
+        def delete_outgoing_carrier_routing(params={})
+            routing_id = params.delete('routing_id')
+            return request('DELETE', "/OutgoingCarrierRouting/#{routing_id}/", params)
+        end
 
-    ## Outgoing Carrier ##
+        ## Pricing ##
+        def pricing(params={})
+            return request('GET', "/Pricing/", params)
+        end
 
-    ## To be added here ##
+        ## Outgoing Carrier ##
 
-    ## Message ##
-    def send_message(params={})
-      return request('POST', "/Message/", params)
-    end
+        ## To be added here ##
 
-    def get_messages(params={})
-      return request('GET', "/Message/", params)
-    end
+        ## Message ##
+        def send_message(params={})
+            return request('POST', "/Message/", params)
+        end
+
+        def get_messages(params={})
+            return request('GET', "/Message/", params)
+        end
 
-    def get_message(params={})
-      record_id = params.delete('record_id')
-      return request('GET', "/Message/#{record_id}/", params)
+        def get_message(params={})
+            record_id = params.delete('record_id')
+            return request('GET', "/Message/#{record_id}/", params)
+        end
     end
-  end
 
 
 
-  class Element
-    class << self
-      attr_accessor :valid_attributes, :nestables
-    end
-    @nestables = []
-    @valid_attributes = []
-
-    attr_accessor :node, :name
-
-    def initialize(body=nil, attributes={}, &block)
-      @name = self.class.name.split('::')[1]
-      @body = body
-      @node = REXML::Element.new @name
-      attributes.each do |k, v|
-        if self.class.valid_attributes.include?(k.to_s)
-          @node.attributes[k.to_s] = convert_value(v)
-        else
-          raise PlivoError, "invalid attribute #{k.to_s} for #{@name}"
-        end
-      end
-
-      if @body
-        @node.text = @body
-      end
-
-      # Allow for nested "nestable" elements using a code block
-      # ie
-      # Plivo::Response.new do |r|
-      #   r.Dial do |n|
-      #     n.Number '+15557779999'
-      #   end
-      # end
-      yield(self) if block_given?
-    end
+    class Element
+        class << self
+            attr_accessor :valid_attributes, :nestables
+        end
+        @nestables = []
+        @valid_attributes = []
+
+        attr_accessor :node, :name
+
+        def initialize(body=nil, attributes={}, &block)
+            @name = self.class.name.split('::')[1]
+            @body = body
+            @node = REXML::Element.new @name
+            attributes.each do |k, v|
+                if self.class.valid_attributes.include?(k.to_s)
+                    @node.attributes[k.to_s] = convert_value(v)
+                else
+                    raise PlivoError, "invalid attribute #{k.to_s} for #{@name}"
+                end
+            end
+
+            if @body
+                @node.text = @body
+            end
+
+            # Allow for nested "nestable" elements using a code block
+            # ie
+            # Plivo::Response.new do |r|
+            #   r.Dial do |n|
+            #     n.Number '+15557779999'
+            #   end
+            # end
+            yield(self) if block_given?
+        end
 
-    def method_missing(method, *args, &block)
-      # Handle the addElement methods
-      method = $1.to_sym if method.to_s =~ /^add(.*)/
-      # Add the element
-      add(Plivo.const_get(method).new(*args, &block))
-    end
+        def method_missing(method, *args, &block)
+            # Handle the addElement methods
+            method = $1.to_sym if method.to_s =~ /^add(.*)/
+                # Add the element
+                add(Plivo.const_get(method).new(*args, &block))
+        end
 
 
-    def convert_value(v)
-      if v == true
-        return "true"
-      elsif v == false
-        return "false"
-      elsif v == nil
-        return "none"
-      elsif v == "get"
-        return "GET"
-      elsif v == "post"
-        return "POST"
-      else
-        return v
-      end
-    end
+        def convert_value(v)
+            if v == true
+                return "true"
+            elsif v == false
+                return "false"
+            elsif v == nil
+                return "none"
+            elsif v == "get"
+                return "GET"
+            elsif v == "post"
+                return "POST"
+            else
+                return v
+            end
+        end
 
-    def add(element)
-      if not element
-        raise PlivoError, "invalid element"
-      end
-      if self.class.nestables.include?(element.name)
-        @node.elements << element.node
-        return element
-      else
-        raise PlivoError, "#{element.name} not nestable in #{@name}"
-      end
-    end
+        def add(element)
+            if not element
+                raise PlivoError, "invalid element"
+            end
+            if self.class.nestables.include?(element.name)
+                @node.elements << element.node
+                return element
+            else
+                raise PlivoError, "#{element.name} not nestable in #{@name}"
+            end
+        end
 
-    def to_xml
-      return @node.to_s
-    end
+        def to_xml
+            return @node.to_s
+        end
 
-    def to_s
-      return @node.to_s
+        def to_s
+            return @node.to_s
+        end
     end
-  end
 
 
-  class Response < Element
-    @nestables = ['Speak', 'Play', 'GetDigits', 'Record', 'Dial', 'Message',
-                  'Redirect', 'Wait', 'Hangup', 'PreAnswer', 'Conference', 'DTMF']
-    @valid_attributes = []
+    class Response < Element
+        @nestables = ['Speak', 'Play', 'GetDigits', 'Record', 'Dial', 'Message',
+            'Redirect', 'Wait', 'Hangup', 'PreAnswer', 'Conference', 'DTMF']
+        @valid_attributes = []
 
-    def initialize()
-      super(nil, {})
-    end
+        def initialize()
+            super(nil, {})
+        end
 
-    def to_xml()
-      return '<?xml version="1.0" encoding="utf-8" ?>' + super()
-    end
+        def to_xml()
+            return '<?xml version="1.0" encoding="utf-8" ?>' + super()
+        end
 
-    def to_s()
-      return '<?xml version="1.0" encoding="utf-8" ?>' + super()
+        def to_s()
+            return '<?xml version="1.0" encoding="utf-8" ?>' + super()
+        end
     end
-  end
 
 
-  class Speak < Element
-    @nestables = []
-    @valid_attributes = ['voice', 'language', 'loop']
+    class Speak < Element
+        @nestables = []
+        @valid_attributes = ['voice', 'language', 'loop']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No text set for Speak'
-      else
-        body = HTMLEntities.new(:html4).encode(body, :decimal)
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No text set for Speak'
+            else
+                body = HTMLEntities.new(:html4).encode(body, :decimal)
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class Play < Element
-    @nestables = []
-    @valid_attributes = ['loop']
+    class Play < Element
+        @nestables = []
+        @valid_attributes = ['loop']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError 'No url set for Play'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError 'No url set for Play'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class Wait < Element
-    @nestables = []
-    @valid_attributes = ['length', 'silence', 'min_silence']
+    class Wait < Element
+        @nestables = []
+        @valid_attributes = ['length', 'silence', 'min_silence']
 
-    def initialize(attributes={})
-      super(nil, attributes)
+        def initialize(attributes={})
+            super(nil, attributes)
+        end
     end
-  end
 
 
-  class Redirect < Element
-    @nestables = []
-    @valid_attributes = ['method']
+    class Redirect < Element
+        @nestables = []
+        @valid_attributes = ['method']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError 'No url set for Redirect'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError 'No url set for Redirect'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class Hangup < Element
-    @nestables = []
-    @valid_attributes = ['schedule', 'reason']
+    class Hangup < Element
+        @nestables = []
+        @valid_attributes = ['schedule', 'reason']
 
-    def initialize(attributes={})
-      super(nil, attributes)
+        def initialize(attributes={})
+            super(nil, attributes)
+        end
     end
-  end
 
 
-  class GetDigits < Element
-    @nestables = ['Speak', 'Play', 'Wait']
-    @valid_attributes = ['action', 'method', 'timeout', 'digitTimeout',
-                         'numDigits', 'retries', 'invalidDigitsSound',
-                         'validDigits', 'playBeep', 'redirect', "finishOnKey",
-                         'digitTimeout', 'log']
+    class GetDigits < Element
+        @nestables = ['Speak', 'Play', 'Wait']
+        @valid_attributes = ['action', 'method', 'timeout', 'digitTimeout',
+            'numDigits', 'retries', 'invalidDigitsSound',
+            'validDigits', 'playBeep', 'redirect', "finishOnKey",
+            'digitTimeout', 'log']
 
-    def initialize(attributes={}, &block)
-      super(nil, attributes, &block)
+        def initialize(attributes={}, &block)
+            super(nil, attributes, &block)
+        end
     end
-  end
 
 
-  class Number < Element
-    @nestables = []
-    @valid_attributes = ['sendDigits', 'sendOnPreanswer']
+    class Number < Element
+        @nestables = []
+        @valid_attributes = ['sendDigits', 'sendOnPreanswer']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No number set for Number'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No number set for Number'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class User < Element
-    @nestables = []
-    @valid_attributes = ['sendDigits', 'sendOnPreanswer', 'sipHeaders']
+    class User < Element
+        @nestables = []
+        @valid_attributes = ['sendDigits', 'sendOnPreanswer', 'sipHeaders']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No user set for User'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No user set for User'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class Dial < Element
-    @nestables = ['Number', 'User']
-    @valid_attributes = ['action','method','timeout','hangupOnStar',
-                         'timeLimit','callerId', 'callerName', 'confirmSound',
-                         'dialMusic', 'confirmKey', 'redirect',
-                         'callbackUrl', 'callbackMethod', 'digitsMatch',
-                         'sipHeaders']
+    class Dial < Element
+        @nestables = ['Number', 'User']
+        @valid_attributes = ['action','method','timeout','hangupOnStar',
+            'timeLimit','callerId', 'callerName', 'confirmSound',
+            'dialMusic', 'confirmKey', 'redirect',
+            'callbackUrl', 'callbackMethod', 'digitsMatch',
+            'sipHeaders']
 
-    def initialize(attributes={}, &block)
-      super(nil, attributes, &block)
+        def initialize(attributes={}, &block)
+            super(nil, attributes, &block)
+        end
     end
-  end
-
-
-  class Conference < Element
-    @nestables = []
-    @valid_attributes = ['muted','beep','startConferenceOnEnter',
-                         'endConferenceOnExit','waitSound','enterSound', 'exitSound',
-                         'timeLimit', 'hangupOnStar', 'maxMembers',
-                         'record', 'recordFileFormat', 'action', 'method', 'redirect',
-                         'digitsMatch', 'callbackUrl', 'callbackMethod',
-                         'stayAlone', 'floorEvent',
-                         'transcriptionType', 'transcriptionUrl',
-                         'transcriptionMethod', 'recordWhenAlone', 'relayDTMF']
-
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No conference name set for Conference'
-      end
-      super(body, attributes)
+
+
+    class Conference < Element
+        @nestables = []
+        @valid_attributes = ['muted','beep','startConferenceOnEnter',
+            'endConferenceOnExit','waitSound','enterSound', 'exitSound',
+            'timeLimit', 'hangupOnStar', 'maxMembers',
+            'record', 'recordFileFormat', 'action', 'method', 'redirect',
+            'digitsMatch', 'callbackUrl', 'callbackMethod',
+            'stayAlone', 'floorEvent',
+            'transcriptionType', 'transcriptionUrl',
+            'transcriptionMethod', 'recordWhenAlone', 'relayDTMF']
+
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No conference name set for Conference'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 
-  class Record < Element
-    @nestables = []
-    @valid_attributes = ['action', 'method', 'timeout','finishOnKey',
-                         'maxLength', 'playBeep', 'recordSession',
-                         'startOnDialAnswer', 'redirect', 'fileFormat',
-                         'callbackUrl', 'callbackMethod',
-                         'transcriptionType', 'transcriptionUrl',
-                         'transcriptionMethod']
+    class Record < Element
+        @nestables = []
+        @valid_attributes = ['action', 'method', 'timeout','finishOnKey',
+            'maxLength', 'playBeep', 'recordSession',
+            'startOnDialAnswer', 'redirect', 'fileFormat',
+            'callbackUrl', 'callbackMethod',
+            'transcriptionType', 'transcriptionUrl',
+            'transcriptionMethod']
 
-    def initialize(attributes={})
-      super(nil, attributes)
+        def initialize(attributes={})
+            super(nil, attributes)
+        end
     end
-  end
 
 
-  class PreAnswer < Element
-    @nestables = ['Play', 'Speak', 'GetDigits', 'Wait', 'Redirect', 'Message', 'DTMF']
-    @valid_attributes = []
+    class PreAnswer < Element
+        @nestables = ['Play', 'Speak', 'GetDigits', 'Wait', 'Redirect', 'Message', 'DTMF']
+        @valid_attributes = []
 
-    def initialize(attributes={}, &block)
-      super(nil, attributes, &block)
+        def initialize(attributes={}, &block)
+            super(nil, attributes, &block)
+        end
     end
-  end
 
 
-  class Message < Element
-    @nestables = []
-    @valid_attributes = ['src', 'dst', 'type', 'callbackUrl', 'callbackMethod']
+    class Message < Element
+        @nestables = []
+        @valid_attributes = ['src', 'dst', 'type', 'callbackUrl', 'callbackMethod']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No text set for Message'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No text set for Message'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
-  class DTMF < Element
-    @nestables = []
-    @valid_attributes = ['async']
+    class DTMF < Element
+        @nestables = []
+        @valid_attributes = ['async']
 
-    def initialize(body, attributes={})
-      if not body
-        raise PlivoError, 'No digits set for DTMF'
-      end
-      super(body, attributes)
+        def initialize(body, attributes={})
+            if not body
+                raise PlivoError, 'No digits set for DTMF'
+            end
+            super(body, attributes)
+        end
     end
-  end
 
 end