twilio-ruby 4.8.0.edge → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82aeb9620b927fba000fffc3241d26936bd5b4b4
-  data.tar.gz: 5a9c3caa6963d4011be9a1f32efd9b55ee59dfde
+  metadata.gz: 1039025067aafec54048cf0bf4ed28b884cc5242
+  data.tar.gz: 8238a181bcd6831902601e943102b468dcc08832
 SHA512:
-  metadata.gz: 437e0291c67669347cf5eb01a285e2c6ec4138e84ab8edd313e2e80b33a2d4fc025a41e40121de7d0e6628b3fea5b78e727ec0c004547a755a109dab8da95595
-  data.tar.gz: c4296910870d037ef667f4c71e753f9d6ac9987eb1eed4dc4c5d98f41dab1eee0bf3e60f665f25ddc60a5102506db702127d0d91de05338c4da0066501e7cf1a
+  metadata.gz: e5d9e4dd3a04bdb3283c9f56bbc33fe9d0dc23cc5726a062570c197722518c97573258b39d323cdfe6ab5376ce19b7dcd4102d90b26de8f00ad1d76c91859d8d
+  data.tar.gz: 31a0c13dad6d659a8fc1577d4f1802f78042b1eb10b3f4d971680ca694d6e89b7a5c5832cbe48de3f2a9a6484a223f7bda3949cff907a00fb02967c9579a3089

data/CHANGES.md

@@ -1,6 +1,41 @@
 twilio-ruby changelog
 =====================
 
+Version 4.8.0
+-------------
+
+Release December 8, 2015
+
+- Make nbf optional
+
+Version 4.7.0
+-------------
+
+Release December 3, 2015
+
+- Add access tokens
+
+Version 4.6.2
+-------------
+
+Release November 19, 2015
+
+- Fix Pricing Messages
+
+Version 4.6.1
+-------------
+
+Release November 10, 2015
+
+- Fix TrunkingClient references
+
+Version 4.6.0
+-------------
+
+Release October 28, 2015
+
+- Add /Keys endpoint
+
 Version 4.4.0
 -------------
 

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

@@ -10,7 +10,7 @@ module Twilio
           'Countries' => 'Country',
           'Feedback' => 'FeedbackInstance',
           'IpAddresses' => 'IpAddress',
-          'Media' => 'MediaInstance'
+          'Media' => 'MediaInstance',
         }
         @path, @client = path, client
         resource_name = self.class.name.split('::')[-1]
@@ -46,8 +46,7 @@ module Twilio
         raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @path, params, full_path
         resources = response[@list_key]
-        path = @frozen_path ? @frozen_path : @path
-        path = full_path ? path.split('.')[0] : path
+        path = full_path ? @path.split('.')[0] : @path
         resource_list = resources.map do |resource|
           @instance_class.new "#{path}/#{resource[@instance_id_key]}", @client,
             resource
@@ -81,7 +80,7 @@ module Twilio
       # attribute of the returned instance resource object, such as
       # its #date_created or #voice_url attributes.
       def get(sid)
-        @instance_class.new "#{@frozen_path || @path}/#{sid}", @client
+        @instance_class.new "#{@path}/#{sid}", @client
       end
       alias :find :get # for the ActiveRecord lovers
 

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

@@ -4,12 +4,11 @@ module Twilio
       def list(params={}, full_path=false)
         raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @path, params, full_path
-        list_key = response['meta']['key'] if response['meta']
+        list_key = response['meta']['key']
         raise "Couldn't find a list key in response meta" unless list_key
         resources = response[list_key]
-        path = @frozen_path ? @frozen_path : @path
         resource_list = resources.map do |resource|
-          @instance_class.new "#{path}/#{resource[@instance_id_key]}", @client,
+          @instance_class.new "#{@path}/#{resource[@instance_id_key]}", @client,
                               resource
         end
         client, list_class = @client, self.class

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

@@ -8,7 +8,7 @@ module Twilio
 
       API_VERSION = 'v1'
 
-      attr_reader :voice, :phone_numbers
+      attr_reader :voice, :phone_numbers, :messaging
 
       host 'pricing.twilio.com'
 

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

@@ -89,9 +89,9 @@ module Twilio
       protected
 
       ##
-      # Set up +voice+ and +phone_numbers+ attributes.
+      # Set up +trunks+ attribute.
       def set_up_subresources # :doc:
-        @voice = Twilio::REST::Trunking::Trunks.new "/#{API_VERSION}/Trunks", self
+        @trunks = Twilio::REST::Trunking::Trunks.new "/#{API_VERSION}/Trunks", self
       end
 
       ##

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

@@ -19,13 +19,6 @@ module Twilio
 
       protected
 
-      # Freeze the base list path.
-      # Used on list resources so filters (such as /Local) do not affect the
-      # instance resource path.
-      def freeze_path
-        @frozen_path = @path
-      end
-
       def resource(*resources)
         custom_resource_names = { sms: 'SMS', sip: 'SIP' }
         resources.each do |r|
@@ -38,11 +31,7 @@ module Twilio
             Twilio::REST.const_get(@submodule)
           end
           resource_class = enclosing_module.const_get resource
-          resource_object = resource_class.new(path, @client)
-          instance_variable_set("@#{r}", resource_object)
-          if @frozen_path
-            resource_object.instance_variable_set(:@frozen_path, @frozen_path)
-          end
+          instance_variable_set("@#{r}", resource_class.new(path, @client))
         end
         self.class.instance_eval { attr_reader *resources }
       end

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

@@ -1,12 +1,20 @@
 module Twilio
   module Util
     class AccessToken
-      def initialize(account_sid, signing_key_id, secret, ttl=3600, identity=nil)
+      attr_accessor :account_sid,
+                    :signing_key_id,
+                    :secret,
+                    :ttl,
+                    :identity,
+                    :nbf
+
+      def initialize(account_sid, signing_key_id, secret, ttl=3600, identity=nil, nbf=nil)
         @account_sid = account_sid
         @signing_key_sid = signing_key_id
         @secret = secret
         @ttl = ttl
         @identity = identity
+        @nbf = nbf
         @grants = []
       end
 
@@ -32,10 +40,11 @@ module Twilio
             'jti' => "#{@signing_key_sid}-#{now}",
             'iss' => @signing_key_sid,
             'sub' => @account_sid,
-            'nbf' => now,
             'exp' => now + @ttl,
             'grants' => grants
         }
+        payload['nbf'] = @nbf unless @nbf.nil?
+
         JWT.encode payload, @secret, algorithm, headers
       end
 
@@ -64,7 +73,7 @@ module Twilio
       class IpMessagingGrant
         attr_accessor :service_sid,
                       :endpoint_id,
-                      :deployement_role_sid,
+                      :deployment_role_sid,
                       :push_credential_sid
 
         def key

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '4.8.0.edge'
+  VERSION = '4.8.0'
 end

data/lib/twilio-ruby.rb

@@ -36,17 +36,6 @@ 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/conversations/in_progress'
-require 'twilio-ruby/rest/conversations/completed'
-require 'twilio-ruby/rest/conversations/conversations'
-require 'twilio-ruby/rest/conversations/participants'
-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'
@@ -108,12 +97,11 @@ 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/conversations_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'
 
 module Twilio

data/spec/rest/pricing_client_spec.rb

@@ -42,4 +42,19 @@ describe Twilio::REST::PricingClient do
       '/v1/PhoneNumbers/Countries'
     )
   end
+
+  it 'should set up a messaging resources object' do
+    expect(@client).to respond_to(:messaging)
+    expect(@client.messaging.instance_variable_get('@path')).to eq(
+      '/v1/Messaging'
+    )
+  end
+
+  it 'should set up the country list resource on messaging' do
+    messaging = @client.messaging
+    expect(messaging).to respond_to(:countries)
+    expect(messaging.countries.instance_variable_get('@path')).to eq(
+      '/v1/Messaging/Countries'
+    )
+  end
 end

data/spec/util/access_token_spec.rb

@@ -10,15 +10,37 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(0)
   end
 
+  it 'should generate a nbf' do
+    now = Time.now.to_i
+    scat = Twilio::Util::AccessToken.new 'AC123', 'SK123','secret'
+    scat.identity = 'abc'
+    scat.nbf = now
+
+    token = scat.to_s
+    expect(token).not_to be_nil
+    payload, header = JWT.decode token, 'secret'
+
+    expect(payload['iss']).to eq('SK123')
+    expect(payload['sub']).to eq('AC123')
+    expect(payload['nbf']).not_to be_nil
+    expect(payload['nbf']).to eq(now)
+    expect(payload['exp']).not_to be_nil
+    expect(payload['exp']).to be >= Time.now.to_i
+    expect(payload['jti']).not_to be_nil
+    expect(payload['jti']).to start_with payload['iss']
+    expect(payload['grants']).not_to be_nil
+    expect(payload['grants'].count).to eq(1)
+    expect(payload['grants']['identity']).to eq('abc')
+  end
+
   it 'should be able to add conversation grant' do
     scat = Twilio::Util::AccessToken.new 'AC123', 'SK123','secret'
     scat.add_grant(Twilio::Util::AccessToken::ConversationsGrant.new)
@@ -29,11 +51,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(1)
     expect(payload['grants']['rtc']).not_to be_nil
@@ -49,11 +70,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(1)
     expect(payload['grants']['ip_messaging']).not_to be_nil
@@ -70,11 +90,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(2)
     expect(payload['grants']['rtc']).not_to be_nil

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.8.0.edge
+  version: 4.8.0
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: A simple library for communicating with the Twilio REST API, building
@@ -76,8 +76,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS.md
 - CHANGES.md
 - Gemfile
@@ -150,25 +150,12 @@ files:
 - lib/twilio-ruby/rest/conferences.rb
 - lib/twilio-ruby/rest/conferences/participants.rb
 - lib/twilio-ruby/rest/connect_apps.rb
-- lib/twilio-ruby/rest/conversations/completed.rb
-- lib/twilio-ruby/rest/conversations/conversations.rb
-- lib/twilio-ruby/rest/conversations/in_progress.rb
-- lib/twilio-ruby/rest/conversations/participants.rb
-- lib/twilio-ruby/rest/conversations_client.rb
 - lib/twilio-ruby/rest/errors.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers/local.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers/mobile.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers/toll_free.rb
 - lib/twilio-ruby/rest/instance_resource.rb
-- lib/twilio-ruby/rest/ip-messaging/channels.rb
-- lib/twilio-ruby/rest/ip-messaging/credentials.rb
-- lib/twilio-ruby/rest/ip-messaging/members.rb
-- lib/twilio-ruby/rest/ip-messaging/messages.rb
-- lib/twilio-ruby/rest/ip-messaging/roles.rb
-- lib/twilio-ruby/rest/ip-messaging/services.rb
-- lib/twilio-ruby/rest/ip-messaging/users.rb
-- lib/twilio-ruby/rest/ip_messaging_client.rb
 - lib/twilio-ruby/rest/keys.rb
 - lib/twilio-ruby/rest/list_resource.rb
 - lib/twilio-ruby/rest/lookups/phone_numbers.rb
@@ -240,7 +227,6 @@ files:
 - lib/twilio-ruby/util/configuration.rb
 - lib/twilio-ruby/util/request_validator.rb
 - lib/twilio-ruby/version.rb
-- spec/conversations/conversations_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/rest/account_spec.rb
 - spec/rest/address_spec.rb
@@ -249,11 +235,7 @@ files:
 - spec/rest/call_spec.rb
 - spec/rest/client_spec.rb
 - spec/rest/conference_spec.rb
-- spec/rest/conversations_client_spec.rb
 - spec/rest/instance_resource_spec.rb
-- spec/rest/ip-messaging/channel_spec.rb
-- spec/rest/ip-messaging/service_spec.rb
-- spec/rest/ip_messaging_client_spec.rb
 - spec/rest/key_spec.rb
 - spec/rest/lookups/phone_number_spec.rb
 - spec/rest/message_spec.rb
@@ -291,33 +273,32 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - twilio-ruby
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,
   and generating Twilio Client Capability Tokens
 test_files:
-- spec/conversations/conversations_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/rest/account_spec.rb
 - spec/rest/address_spec.rb
@@ -326,11 +307,7 @@ test_files:
 - spec/rest/call_spec.rb
 - spec/rest/client_spec.rb
 - spec/rest/conference_spec.rb
-- spec/rest/conversations_client_spec.rb
 - spec/rest/instance_resource_spec.rb
-- spec/rest/ip-messaging/channel_spec.rb
-- spec/rest/ip-messaging/service_spec.rb
-- spec/rest/ip_messaging_client_spec.rb
 - spec/rest/key_spec.rb
 - spec/rest/lookups/phone_number_spec.rb
 - spec/rest/message_spec.rb

data/lib/twilio-ruby/rest/conversations/completed.rb

@@ -1,13 +0,0 @@
-module Twilio
-  module REST
-    module Conversations
-      class Completed < NextGenListResource
-        def initialize(path, client)
-          @path, @client = path, client
-          @instance_class = Twilio::REST::Conversations::Conversation
-          @instance_id_key = 'sid'
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-module Twilio
-  module REST
-    module Conversations
-      class Conversations < NextGenListResource
-        def initialize(path, client)
-          @path, @client = path, client
-          @submodule = :Conversations
-          freeze_path
-          resource :in_progress,
-                   :completed
-        end
-      end
-
-      class Conversation < InstanceResource
-        def initialize(path, client, params={})
-          super
-          @submodule = :Conversations
-          resource :participants
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/rest/conversations/in_progress.rb

@@ -1,13 +0,0 @@
-module Twilio
-  module REST
-    module Conversations
-      class InProgress < NextGenListResource
-        def initialize(path, client)
-          @path, @client = path, client
-          @instance_class = Twilio::REST::Conversations::Conversation
-          @instance_id_key = 'sid'
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/rest/conversations/participants.rb

@@ -1,8 +0,0 @@
-module Twilio
-  module REST
-    module Conversations
-      class Participants < NextGenListResource; end
-      class Participant < InstanceResource; end
-    end
-  end
-end

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

@@ -1,99 +0,0 @@
-require 'twilio-ruby/rest/base_client'
-module Twilio
-  module REST
-    class ConversationsClient < BaseClient
-      API_VERSION = 'v1'
-
-      attr_reader :conversations
-
-      host 'conversations.twilio.com'
-
-      ##
-      # Instantiate a new HTTP Conversations client to talk to Twilio. The parameters
-      # +account_sid+, +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: 'conversations.twilio.com'</tt>
-      #
-      # The domain to which you'd like the client to make HTTP requests. Useful
-      # for testing. Defaults to 'conversations.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 inspect # :nodoc:
-        "<Twilio::REST::ConversationsClient @account_sid=#{@account_sid}>"
-      end
-
-      protected
-
-      ##
-      # Create subresource properties
-      def set_up_subresources # :doc:
-        @conversations = Twilio::REST::Conversations::Conversations.new "/#{API_VERSION}/Conversations", 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/rest/ip-messaging/channels.rb

@@ -1,21 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Channels < NextGenListResource
-        def initialize(path, client)
-          @path, client = path, client
-          @submodule = :IpMessaging
-        end
-      end
-      class Channel < InstanceResource
-        def initialize(path, client, params={})
-          super
-          @submodule = :IpMessaging
-
-          resource :messages,
-                   :members
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/credentials.rb

@@ -1,22 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Credentials < NextGenListResource
-        def initialize(path, client)
-          @path, @client = path, client
-          @submodule = :IpMessaging
-        end
-      end
-
-      class Credential < InstanceResource
-        def initialize(path, client, params={})
-          super
-          @submodule = :IpMessaging
-          resource :channels,
-                   :users,
-                   :roles
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/members.rb

@@ -1,8 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Members < NextGenListResource; end
-      class Member < InstanceResource; end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/messages.rb

@@ -1,8 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Messages < NextGenListResource; end
-      class Message < InstanceResource; end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/roles.rb

@@ -1,8 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Roles < NextGenListResource; end
-      class Role < InstanceResource; end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/services.rb

@@ -1,22 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Services < NextGenListResource
-        def initialize(path, client)
-          @path, @client = path, client
-          @submodule = :IpMessaging
-        end
-      end
-
-      class Service < InstanceResource
-        def initialize(path, client, params={})
-          super
-          @submodule = :IpMessaging
-          resource :channels,
-                   :users,
-                   :roles
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/rest/ip-messaging/users.rb

@@ -1,8 +0,0 @@
-module Twilio
-  module REST
-    module IpMessaging
-      class Users < NextGenListResource; end
-      class User < InstanceResource; end
-    end
-  end
-end

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

@@ -1,100 +0,0 @@
-require 'twilio-ruby/rest/base_client'
-module Twilio
-  module REST
-    class IpMessagingClient < BaseClient
-      API_VERSION = 'v1'
-
-      attr_reader :services, :credentials
-
-      host 'ip-messaging.twilio.com'
-
-      ##
-      # Instantiate a new HTTP Conversations client to talk to Twilio. The parameters
-      # +account_sid+, +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: 'ip-messaging.twilio.com'</tt>
-      #
-      # The domain to which you'd like the client to make HTTP requests. Useful
-      # for testing. Defaults to 'ip-messaging.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 inspect # :nodoc:
-        "<Twilio::REST::IpMessagingClient @account_sid=#{@account_sid}>"
-      end
-
-      protected
-
-      ##
-      # Create subresource properties
-      def set_up_subresources # :doc:
-        @services = Twilio::REST::IpMessaging::Services.new "/#{API_VERSION}/Services", self
-        @credentials = Twilio::REST::IpMessaging::Credentials.new "/#{API_VERSION}/Credentials", 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/spec/conversations/conversations_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::REST::Conversations::Conversations do
-
-  it 'creates an in_progress property' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations).to respond_to(:in_progress)
-  end
-
-  it 'creates a completed property' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations).to respond_to(:completed)
-  end
-
-end
-
-describe Twilio::REST::Conversations::InProgress do
-  it 'gets constructed by conversations' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations.in_progress.instance_variable_get('@path')).to eq('/v1/Conversations/InProgress')
-  end
-  it 'uses Conversation as its instance class' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations.in_progress.instance_variable_get('@instance_class')).to eq(Twilio::REST::Conversations::Conversation)
-  end
-end
-
-describe Twilio::REST::Conversations::Completed do
-  it 'gets constructed by conversations' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations.completed.instance_variable_get('@path')).to eq('/v1/Conversations/Completed')
-  end
-  it 'uses Conversation as its instance class' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
-    expect(conversations.completed.instance_variable_get('@instance_class')).to eq(Twilio::REST::Conversations::Conversation)
-  end
-end
-
-describe Twilio::REST::Conversations::Conversation do
-  it 'has correct path when fetched from /InProgress' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversation = client.conversations.in_progress.get('CA123')
-    expect(conversation.instance_variable_get('@path')).to eq('/v1/Conversations/CA123')
-  end
-  it 'has correct path when fetched from /Completed' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversation = client.conversations.completed.get('CA123')
-    expect(conversation.instance_variable_get('@path')).to eq('/v1/Conversations/CA123')
-  end
-  it 'sets up participants subresource' do
-    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
-    conversation = Twilio::REST::Conversations::Conversation.new '/v1/Conversations/CA123', client
-    expect(conversation).to respond_to(:participants)
-  end
-end

data/spec/rest/conversations_client_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::REST::ConversationsClient do
-  before do
-    @client = Twilio::REST::ConversationsClient.new('AC123', 'foobar')
-  end
-
-  it 'should set up an conversations resources object' do
-    expect(@client).to respond_to(:conversations)
-    expect(@client.conversations.instance_variable_get('@path')).to eq('/v1/Conversations')
-  end
-
-end

data/spec/rest/ip-messaging/channel_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::REST::IpMessaging::Channels do
-  it 'sets up a members resources object' do
-    client = Twilio::REST::IpMessagingClient.new 'otherSid', 'otherToken'
-    service = Twilio::REST::IpMessaging::Channel.new '/v1/Services/1/Channels/1', client
-    expect(service).to respond_to(:members)
-    expect(service.members.instance_variable_get('@path')).to eq(
-      '/v1/Services/1/Channels/1/Members'
-    )
-  end
-
-  it 'sets up a messages resources object' do
-    client = Twilio::REST::IpMessagingClient.new 'otherSid', 'otherToken'
-    service = Twilio::REST::IpMessaging::Channel.new '/v1/Services/1/Channels/1', client
-    expect(service).to respond_to(:messages)
-    expect(service.messages.instance_variable_get('@path')).to eq(
-      '/v1/Services/1/Channels/1/Messages'
-    )
-  end
-end

data/spec/rest/ip-messaging/service_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::REST::IpMessaging::Services do
-  it 'sets up a channels resources object' do
-    client = Twilio::REST::IpMessagingClient.new 'otherSid', 'otherToken'
-    service = Twilio::REST::IpMessaging::Service.new '/v1/Services', client
-    expect(service).to respond_to(:channels)
-    expect(service.channels.instance_variable_get('@path')).to eq(
-      '/v1/Services/Channels'
-    )
-  end
-
-  it 'sets up a roles resources object' do
-    client = Twilio::REST::IpMessagingClient.new 'otherSid', 'otherToken'
-    service = Twilio::REST::IpMessaging::Service.new '/v1/Services', client
-    expect(service).to respond_to(:roles)
-    expect(service.roles.instance_variable_get('@path')).to eq(
-      '/v1/Services/Roles'
-    )
-  end
-
-  it 'sets up a users resources object' do
-    client = Twilio::REST::IpMessagingClient.new 'otherSid', 'otherToken'
-    service = Twilio::REST::IpMessaging::Service.new '/v1/Services', client
-    expect(service).to respond_to(:users)
-    expect(service.users.instance_variable_get('@path')).to eq(
-      '/v1/Services/Users'
-    )
-  end
-end

data/spec/rest/ip_messaging_client_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::REST::IpMessagingClient do
-  before do
-    @client = Twilio::REST::IpMessagingClient.new('AC123', 'foobar')
-  end
-
-  it 'should set up a services resources object' do
-    expect(@client).to respond_to(:services)
-    expect(@client.services.instance_variable_get('@path')).to eq(
-      '/v1/Services'
-    )
-  end
-
-  it 'should set up a credentials resources object' do
-    expect(@client).to respond_to(:credentials)
-    expect(@client.credentials.instance_variable_get('@path')).to eq(
-      '/v1/Credentials'
-    )
-  end
-end