twilio-ruby 4.0.0 → 4.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTVlYzExOGM0MDgwMzg3NmE4MTM0M2M1MjAyNTY1MmU5Yjk3NjY1Mw==
+    NzJmYWRjOTQwZDI1MDliYmNhNjYyOWZkMGQyZGMxN2FhNWZkZDE1Yg==
   data.tar.gz: !binary |-
-    MTBlYzkxM2NjYjViMzY2OGU5NzUyMjBhMjNjOGQ5ZWVmN2I5YTdjYw==
+    MTVhNzZiNWRiZTdjYTY5MTFkZDRlN2QxOWYzMzFiYjQyMzQ4ZjAzYg==
 SHA512:
   metadata.gz: !binary |-
-    Mjk0ZDNjYjIwYTc2NjZiYjAzNmM4NGQ4NWQ4NWJlNGM0NzA2NTI5NmI1OTI4
-    Y2E5ZDEzYzQ0MjNiNTEzM2Y0MWQ5MzBiMTFiM2MwNThmODNjMjY4NmE2MTdi
-    MDM4NWY3OWU0ZGY1NWI4YjU2MTM4NzRiZTRjNmQ4MzNjZDEyOWU=
+    YjVlYjExNGFiNDg3YzVlMDE3MWE4YTkxYzNkNzRlZGFiYTdlY2QyZDFiYjcx
+    MGIwYzQ2ZDgxYWVhN2FjZDMzYzgxMjIxZjRjNjdlZjFkMzgzMGNhYThkMjEz
+    N2ExYzBmNzBlNGEwNDcxYWY3NTAwNWRmMDhlNjBlNDFkNmQ2YjY=
   data.tar.gz: !binary |-
-    ODBhZjRmYWQ4ZTU3MTA3ZjE5MjEyNjYyODI2ZDk0Njk3Mjg3YjRjYTgyYTA4
-    NGEyMjExNzUzYjhjMGE3ZWM1YmI2MzM4YThmOGEwNGRkZTZmNzc5ZmMwMjli
-    OTNkMmE3YjY2NmIxZjRkZGRmMTc3OWE3NmM2ZjE5MGJmOTViN2E=
+    MDJkNzJmZWIzNWIyZDcyMjRhOGEwYjIzMjJiZDAwNTU4MTEyMmE0NmRlMTgx
+    OGI3M2NlYWUzM2EyMjBjNzBlOTYxNmZkYWJmMjY2NDMyNmI2NTg2Y2JjNzMx
+    ODMxODUyMWE3ZjVlNTNmZjE5M2U5YTI4NjNhMjM1ZDE3OWUzYzY=

data/CHANGES.md

@@ -1,6 +1,13 @@
 twilio-ruby changelog
 =====================
 
+Version 4.0.1
+-------------
+
+Released May 6, 2015
+
+- Add support for the new Pricing API
+
 Version 4.0.0
 -------------
 

data/README.md

@@ -11,7 +11,7 @@ A module for using the Twilio REST API and generating valid [TwiML](http://www.t
 To install using [Bundler][bundler] grab the latest stable version:
 
 ```ruby
-gem 'twilio-ruby', '~> 4.0.0'
+gem 'twilio-ruby', '~> 4.0.1'
 ```
 
 To manually install `twilio-ruby` via [Rubygems][rubygems] simply gem install:
@@ -192,6 +192,12 @@ implementations:
 - [JRuby][jruby]
 - [Rubinius][rubinius]
 
+## Getting help
+
+If you need help installing or using the library, please contact Twilio Support at help@twilio.com first. Twilio's Support staff are well-versed in all of the Twilio Helper Libraries, and usually reply within 24 hours.
+
+If you've instead found a bug in the library or would like new features added, go ahead and open issues or pull requests against this repo!
+
 ## More Information
 
 There are more detailed examples in the included [examples][examples]

data/docs/index.rst

@@ -54,6 +54,7 @@ Query the Twilio REST API to create phone calls, send SMS/MMS messages and more!
     usage/caller-ids
     usage/queues
     usage/sip
+    usage/pricing
 
 
 TaskRouter

data/docs/usage/pricing.rst

@@ -0,0 +1,169 @@
+.. module:: twilio.rest.pricing
+
+======================================
+Accessing Twilio Pricing API Resources
+======================================
+
+To access Twilio Pricing resources, you'll first need to instantiate a
+:class:`Twilio::REST::PricingClient`.
+
+
+Authentication
+--------------
+
+The :class:`Twilio::REST::PricingClient` needs your Twilio credentials. To get
+your credentials, visit `your Twilio account portal
+<https://www.twilio.com/user/account>`_. If you don't have a Twilio account
+yet, go `here <https://www.twilio.com/try-twilio>`_ to get started.
+
+Once you have your credentials, you can create create a new :class:`PricingClient` and get started.
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+
+You can also configure the client using the top level configure method, like so:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    Twilio.configure do |config|
+      config.account_sid = "ACXXXXXXXXXXXXXXXXX"
+      config.auth_token = "YYYYYYYYYYYYYYYYYY"
+    end
+
+    @client = Twilio::REST::PricingClient.new
+
+
+=============
+Voice Pricing
+=============
+
+Twilio Voice pricing information is available by country and by phone number.
+
+Voice calls are priced per minute and reflect the current Twilio list price
+and any discounts available to the requesting account at the time of the
+request.
+
+Voice Countries
+---------------
+
+To retrieve a list of countries where Twilio Voice services are available:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+    @countries = @client.voice.countries.list
+    @countries.each do |c|
+        puts c.country
+    end
+
+Note that the country objects in the returned list will not have pricing
+information populated; you will need to retrieve the specific information
+for each country you are interested in individually:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+    @country = @client.voice.countries.get('US')
+    puts @country.iso_country
+    puts @country.price_unit
+
+    # A list of price rates for inbound calls to each type of Twilio Number
+    # available in this country
+    @country.inbound_call_prices.each do |p|
+        puts p.number_type
+        puts p.base_price # List price per minute
+        puts p.current_price # Discounted price per minute
+    end
+
+    # A list of price rates for outbound calls to number, organized
+    # by prefix.
+    @country.outbound_prefix_prices.each do |p|
+        puts p.prefixes # List of one or more prefixes this price applies to
+        puts p.base_price # Base price per minute
+        puts p.current_price # Discounted price per minute
+
+Voice Numbers
+-------------
+
+To retrieve pricing information for Twilio Voice calls to and from a specific
+number:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+    @number = @client.voice.phone_numbers.get('+15105551234')
+    puts @number.iso_country
+    puts @number.price_unit
+    puts @number.outbound_call_price.base_price
+    puts @number.inbound_call_price.number_type # inbound_call_price will be nil if the number is not Twilio-hosted
+
+
+Phone Number Pricing
+====================
+
+To retrieve a list of countries where Twilio phone numbers are available:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+    @countries = @client.phone_numbers.countries.list
+    @countries.each do |c|
+        puts c.country
+    end
+
+
+Note that the country objects in the returned list will not have pricing
+information populated; you will need to retrieve the specific information for
+each country you are interested in individually:
+
+.. code-block:: ruby
+
+    require 'twilio-ruby'
+
+    # To find these visit https://www.twilio.com/user/account
+    account_sid = "ACXXXXXXXXXXXXXXXXX"
+    auth_token = "YYYYYYYYYYYYYYYYYY"
+
+    @client = Twilio::REST::PricingClient.new account_sid, auth_token
+    @country = @client.phone_numbers.countries.get('US')
+    puts @country.iso_country
+    puts @country.price_unit
+
+    @country.phone_number_prices.each do |p|
+        puts p.number_type # 'local', 'mobile', 'national', or 'toll_free'
+        puts p.base_price # Price per month before any discounts have been applied
+        puts p.current_price # Price per month after any available discounts from the requesting account have applied
+

data/lib/twilio-ruby.rb

@@ -83,6 +83,7 @@ require 'twilio-ruby/rest/addresses/dependent_phone_numbers'
 require 'twilio-ruby/rest/client'
 require 'twilio-ruby/rest/task_router_client'
 require 'twilio-ruby/rest/lookups_client'
+require 'twilio-ruby/rest/pricing_client'
 require 'rack/twilio_webhook_authentication'
 
 module Twilio

data/lib/twilio-ruby/rest/base_client.rb

@@ -110,13 +110,16 @@ module Twilio
           if response.kind_of? Net::HTTPServerError
             raise Twilio::REST::ServerError
           end
-        rescue Exception
+        rescue
           raise if request.class == Net::HTTP::Post
           if retries_left > 0 then retries_left -= 1; retry else raise end
         end
         if response.body and !response.body.empty?
           object = MultiJson.load response.body
+        elsif response.kind_of? Net::HTTPBadRequest
+          object = { message: 'Bad request', code: 400 }
         end
+
         if response.kind_of? Net::HTTPClientError
           raise Twilio::REST::RequestError.new object['message'], object['code']
         end

data/lib/twilio-ruby/rest/client.rb

@@ -1,4 +1,5 @@
 require 'twilio-ruby/rest/base_client'
+
 module Twilio
   module REST
     ##
@@ -50,7 +51,6 @@ module Twilio
     # ListResource#get to grab a particular account once you know its sid.
     class Client < BaseClient
       API_VERSION = '2010-04-01'
-
       attr_reader :account, :accounts
 
       host 'api.twilio.com'

data/lib/twilio-ruby/rest/list_resource.rb

@@ -6,10 +6,11 @@ module Twilio
       def initialize(path, client)
         custom_names = {
           'Activities' => 'Activity',
-          'Media' => 'MediaInstance',
-          'IpAddresses' => 'IpAddress',
+          'Addresses' => 'Address',
+          'Countries' => 'Country',
           'Feedback' => 'FeedbackInstance',
-          'Addresses' => 'Address'
+          'IpAddresses' => 'IpAddress',
+          'Media' => 'MediaInstance',
         }
         @path, @client = path, client
         resource_name = self.class.name.split('::')[-1]

data/lib/twilio-ruby/rest/pricing.rb

@@ -0,0 +1,6 @@
+module Twilio
+  module REST
+    module Pricing
+    end
+  end
+end

data/lib/twilio-ruby/rest/pricing/countries.rb

@@ -0,0 +1,21 @@
+module Twilio
+  module REST
+    module Pricing
+      class Countries < NextGenListResource
+        def initialize(path, client)
+          super
+          @list_key = 'countries'
+          @instance_id_key = 'iso_country'
+          @submodule = :Pricing
+        end
+      end
+
+      class Country < InstanceResource
+        def initialize(path, client, params={})
+          super
+          @submodule = :Pricing
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/pricing/phone_numbers.rb

@@ -0,0 +1,14 @@
+module Twilio
+  module REST
+    module Pricing
+      class PhoneNumbers < InstanceResource
+
+        def initialize(path, client, params={})
+          super
+          @submodule = :Pricing
+          resource :countries
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/pricing/voice.rb

@@ -0,0 +1,18 @@
+require 'twilio-ruby/rest/pricing/countries'
+require 'twilio-ruby/rest/pricing/voice/numbers'
+
+module Twilio
+  module REST
+    module Pricing
+      class Voice < InstanceResource
+
+        def initialize(path, client, params={})
+          super
+          @submodule = :Pricing
+          resource :countries, :numbers
+        end
+
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/pricing/voice/numbers.rb

@@ -0,0 +1,19 @@
+module Twilio
+  module REST
+    module Pricing
+      class Numbers < NextGenListResource
+        def initialize(path, client)
+          super
+          @submodule = :Pricing
+        end
+      end
+
+      class Number < InstanceResource
+        def initialize(path, client)
+          super
+          @submodule = :Pricing
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/pricing_client.rb

@@ -0,0 +1,110 @@
+require 'twilio-ruby/rest/base_client'
+require 'twilio-ruby/rest/pricing'
+require 'twilio-ruby/rest/pricing/voice'
+require 'twilio-ruby/rest/pricing/phone_numbers'
+
+module Twilio
+  module REST
+    class PricingClient < BaseClient
+      include Twilio::Util
+      include Twilio::REST::Utils
+
+      API_VERSION = 'v1'
+
+      attr_reader :voice, :phone_numbers
+
+      host 'pricing.twilio.com'
+
+      ##
+      # Instantiate a new HTTP client to talk to Twilio's Pricing API. The
+      # parameters +account_sid+ and +auth_token+ are required, unless you have
+      # configured them already using the block configure syntax, and used to
+      # generate the HTTP basic auth header in each request. The +options+
+      # parameter is a hash of connection configuration options. the following
+      # keys are supported:
+      #
+      # === <tt>host: 'pricing.twilio.com'</tt>
+      #
+      # The domain to which you'd like the client to make HTTP requests. Useful
+      # for testing. Defaults to 'pricing.twilio.com'.
+      #
+      # === <tt>port: 443</tt>
+      #
+      # The port on which to connect to the above domain. Defaults to 443 and
+      # should be left that way except in testing environments.
+      #
+      # === <tt>use_ssl: true</tt>
+      #
+      # Declare whether ssl should be used for connections to the above domain.
+      # Defaults to true and should be left alone except when testing.
+      #
+      # === <tt>ssl_verify_peer: true</tt>
+      #
+      # Declare whether to verify the host's ssl cert when setting up the
+      # connection to the above domain. Defaults to true, but can be turned off
+      # to avoid ssl certificate verification failures in environments without
+      # the necessary ca certificates.
+      #
+      # === <tt>ssl_ca_file: '/path/to/ca/file'</tt>
+      #
+      # Specify the path to the certificate authority bundle you'd like to use
+      # to verify Twilio's SSL certificate on each request. If not specified, a
+      # certificate bundle extraced from Firefox is packaged with the gem and
+      # used by default.
+      #
+      # === <tt>timeout: 30</tt>
+      #
+      # Set the time in seconds to wait before timing out the HTTP request.
+      # Defaults to 30 seconds. If you aren't fetching giant pages of call or
+      # SMS logs you can safely decrease this to something like 3 seconds or
+      # lower. In paricular if you are sending SMS you can set this to 1 second
+      # or less and swallow the exception if you don't care about the response.
+      #
+      # === <tt>proxy_addr: 'proxy.host.domain'</tt>
+      #
+      # The domain of a proxy through which you'd like the client to make HTTP
+      # requests. Defaults to nil.
+      #
+      # === <tt>proxy_port: 3128</tt>
+      #
+      # The port on which to connect to the above proxy. Defaults to nil.
+      #
+      # === <tt>proxy_user: 'username'</tt>
+      #
+      # The user name to use for authentication with the proxy. Defaults to nil.
+      #
+      # === <tt>proxy_pass: 'password'</tt>
+      #
+      # The password to use for authentication with the proxy. Defaults to nil.
+      #
+      # === <tt>retry_limit: 1</tt>
+      #
+      # The number of times to retry a request that has failed before throwing
+      # an exception. Defaults to one.
+      def initialize(*args)
+        super(*args)
+      end
+
+      def inspect # :nodoc:
+        "<Twilio::REST::PricingClient @account_sid=#{@account_sid}>"
+      end
+
+      protected
+
+      ##
+      # Set up +voice+ and +phone_numbers+ attributes.
+      def set_up_subresources # :doc:
+        @voice = Twilio::REST::Pricing::Voice.new "/#{API_VERSION}/Voice", self
+        @phone_numbers = Twilio::REST::Pricing::PhoneNumbers.new "/#{API_VERSION}/PhoneNumbers", self
+      end
+
+      ##
+      # Builds up full request path
+      def build_full_path(path, params, method)
+        path = path.dup
+        path << "?#{url_encode(params)}" if method == :get && !params.empty?
+        path
+      end
+    end
+  end
+end

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/spec/rest/client_spec.rb

@@ -255,4 +255,23 @@ describe Twilio::REST::Client do
       expect(client.send(method)).to eq(client.workspace.send(method))
     end
   end
+
+end
+
+describe Twilio::REST::PricingClient do
+  it 'should have its host set to pricing.twilio.com' do
+    client = Twilio::REST::PricingClient.new('sid', 'token')
+    connection = client.instance_variable_get('@connection')
+    expect(connection.address).to eq('pricing.twilio.com')
+  end
+
+  it 'should set up a voice resource object' do
+    client = Twilio::REST::PricingClient.new('sid', 'token')
+    expect(client).to respond_to(:voice)
+  end
+
+  it 'should set up a phone numbers resource object' do
+    client = Twilio::REST::PricingClient.new('sid', 'token')
+    expect(client).to respond_to(:phone_numbers)
+  end
 end

data/spec/rest/pricing_client_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Twilio::REST::PricingClient do
+  before do
+    @client = Twilio::REST::PricingClient.new('AC123', 'foobar')
+  end
+
+  it 'should set up a voice resources object' do
+    expect(@client).to respond_to(:voice)
+    expect(@client.voice.instance_variable_get('@path')).to eq(
+      '/v1/Voice'
+    )
+  end
+
+  it 'should set up the country list resource on voice' do
+    voice = @client.voice
+    expect(voice).to respond_to(:countries)
+    expect(voice.countries.instance_variable_get('@path')).to eq(
+      '/v1/Voice/Countries'
+    )
+  end
+
+  it 'should set up the numbers resource on voice' do
+    voice = @client.voice
+    expect(voice).to respond_to(:numbers)
+    expect(voice.numbers.instance_variable_get('@path')).to eq(
+      '/v1/Voice/Numbers'
+    )
+  end
+
+  it 'should set up a phone numbers resource object' do
+    expect(@client).to respond_to(:phone_numbers)
+    expect(@client.phone_numbers.instance_variable_get('@path')).to eq(
+      '/v1/PhoneNumbers'
+    )
+  end
+
+  it 'should set up a countries list on phone numbers' do
+    numbers = @client.phone_numbers
+    expect(numbers).to respond_to(:countries)
+    expect(numbers.countries.instance_variable_get('@path')).to eq(
+      '/v1/PhoneNumbers/Countries'
+    )
+  end
+end

data/spec/util/request_validator_spec.rb

@@ -29,65 +29,85 @@ describe Twilio::Util::RequestValidator do
     end
   end
 
-  it 'should properly validate a Twilio Voice request' do
-    token = '2bd9e9638872de601313dc77410d3b23'
-    validator = Twilio::Util::RequestValidator.new token
-    url = 'http://twiliotests.heroku.com/validate/voice'
-    params = {
-      'ToState' => 'California',
-      'CalledState' => 'California',
-      'Direction' => 'inbound',
-      'FromState' => 'CA',
-      'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
-      'Caller' => '+14153595711',
-      'CallerZip' => '94108',
-      'CallerCountry' => 'US',
-      'From' => '+14153595711',
-      'FromCity' => 'SAN FRANCISCO',
-      'CallerCity' => 'SAN FRANCISCO',
-      'To' => '+14157669926',
-      'FromZip' => '94108',
-      'FromCountry' => 'US',
-      'ToCity' => '',
-      'CallStatus' => 'ringing',
-      'CalledCity' => '',
-      'CallerState' => 'CA',
-      'CalledZip' => '',
-      'ToZip' => '',
-      'ToCountry' => 'US',
-      'CallSid' => 'CA136d09cd59a3c0ec8dbff44da5c03f31',
-      'CalledCountry' => 'US',
-      'Called' => '+14157669926',
-      'ApiVersion' => '2010-04-01',
-      'ApplicationSid' => 'AP44efecad51364e80b133bb7c07eb8204'
-    }
-    signature = 'oVb2kXoVy8GEfwBDjR8bk/ZZ6eA='
-    expect(validator.validate(url, params, signature)).to eq(true)
-  end
+  describe 'validations' do
+    let(:token) { '2bd9e9638872de601313dc77410d3b23' }
+
+    let(:validator) { Twilio::Util::RequestValidator.new token }
+
+    let(:voice_url) { 'http://twiliotests.heroku.com/validate/voice' }
+
+    let(:sms_url) { 'http://twiliotests.heroku.com/validate/sms' }
+
+    let(:voice_params) do
+      {
+        'ToState' => 'California',
+        'CalledState' => 'California',
+        'Direction' => 'inbound',
+        'FromState' => 'CA',
+        'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
+        'Caller' => '+14153595711',
+        'CallerZip' => '94108',
+        'CallerCountry' => 'US',
+        'From' => '+14153595711',
+        'FromCity' => 'SAN FRANCISCO',
+        'CallerCity' => 'SAN FRANCISCO',
+        'To' => '+14157669926',
+        'FromZip' => '94108',
+        'FromCountry' => 'US',
+        'ToCity' => '',
+        'CallStatus' => 'ringing',
+        'CalledCity' => '',
+        'CallerState' => 'CA',
+        'CalledZip' => '',
+        'ToZip' => '',
+        'ToCountry' => 'US',
+        'CallSid' => 'CA136d09cd59a3c0ec8dbff44da5c03f31',
+        'CalledCountry' => 'US',
+        'Called' => '+14157669926',
+        'ApiVersion' => '2010-04-01',
+        'ApplicationSid' => 'AP44efecad51364e80b133bb7c07eb8204'
+      }
+    end
+
+    let(:sms_params) do
+      {
+        'ToState' => 'CA',
+        'FromState' => 'CA',
+        'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
+        'SmsMessageSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787',
+        'Body' => 'Orly',
+        'From' => '+14159354345',
+        'FromCity' => 'SAN FRANCISCO',
+        'SmsStatus' => 'received',
+        'FromZip' => '94107',
+        'FromCountry' => 'US',
+        'To' => '+14158141819',
+        'ToCity' => 'SAN FRANCISCO',
+        'ToZip' => '94105',
+        'ToCountry' => 'US',
+        'ApiVersion' => '2010-04-01',
+        'SmsSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787'
+      }
+    end
 
-  it 'should properly validate a Twilio SMS request' do
-    token = '2bd9e9638872de601313dc77410d3b23'
-    validator = Twilio::Util::RequestValidator.new token
-    url = 'http://twiliotests.heroku.com/validate/sms'
-    params = {
-      'ToState' => 'CA',
-      'FromState' => 'CA',
-      'AccountSid' => 'ACba8bc05eacf94afdae398e642c9cc32d',
-      'SmsMessageSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787',
-      'Body' => 'Orly',
-      'From' => '+14159354345',
-      'FromCity' => 'SAN FRANCISCO',
-      'SmsStatus' => 'received',
-      'FromZip' => '94107',
-      'FromCountry' => 'US',
-      'To' => '+14158141819',
-      'ToCity' => 'SAN FRANCISCO',
-      'ToZip' => '94105',
-      'ToCountry' => 'US',
-      'ApiVersion' => '2010-04-01',
-      'SmsSid' => 'SM2003cbd5e6a3701999aa3e5f20ff2787'
-    }
-    signature = 'mxeiv65lEe0b8L6LdVw2jgJi8yw='
-    expect(validator.validate(url, params, signature)).to eq(true)
+    it 'should validate an authentic Twilio Voice request' do
+      signature = 'oVb2kXoVy8GEfwBDjR8bk/ZZ6eA='
+      expect(validator.validate(voice_url, voice_params, signature)).to eq(true)
+    end
+
+    it 'should validate an authentic Twilio SMS request' do
+      signature = 'mxeiv65lEe0b8L6LdVw2jgJi8yw='
+      expect(validator.validate(sms_url, sms_params, signature)).to eq(true)
+    end
+
+    it 'should not validate a Twilio Voice request with wrong signature' do
+      signature = 'foo'
+      expect(validator.validate(voice_url, voice_params, signature)).to eq(false)
+    end
+
+    it 'should not validate a Twilio SMS request with wrong signature' do
+      signature = 'bar'
+      expect(validator.validate(sms_url, sms_params, signature)).to eq(false)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -116,6 +116,7 @@ files:
 - docs/usage/notifications.rst
 - docs/usage/phone-calls.rst
 - docs/usage/phone-numbers.rst
+- docs/usage/pricing.rst
 - docs/usage/queues.rst
 - docs/usage/recordings.rst
 - docs/usage/sip.rst
@@ -161,6 +162,12 @@ files:
 - lib/twilio-ruby/rest/next_gen_list_resource.rb
 - lib/twilio-ruby/rest/notifications.rb
 - lib/twilio-ruby/rest/outgoing_caller_ids.rb
+- lib/twilio-ruby/rest/pricing.rb
+- lib/twilio-ruby/rest/pricing/countries.rb
+- lib/twilio-ruby/rest/pricing/phone_numbers.rb
+- lib/twilio-ruby/rest/pricing/voice.rb
+- lib/twilio-ruby/rest/pricing/voice/numbers.rb
+- lib/twilio-ruby/rest/pricing_client.rb
 - lib/twilio-ruby/rest/queues.rb
 - lib/twilio-ruby/rest/queues/members.rb
 - lib/twilio-ruby/rest/recordings.rb
@@ -217,6 +224,7 @@ files:
 - spec/rest/lookups/phone_number_spec.rb
 - spec/rest/message_spec.rb
 - spec/rest/numbers_spec.rb
+- spec/rest/pricing_client_spec.rb
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
 - spec/rest/sms/message_spec.rb
@@ -279,6 +287,7 @@ test_files:
 - spec/rest/lookups/phone_number_spec.rb
 - spec/rest/message_spec.rb
 - spec/rest/numbers_spec.rb
+- spec/rest/pricing_client_spec.rb
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
 - spec/rest/sms/message_spec.rb