twilio-ruby 4.10.0.edge → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb00225c470d6aa3ea0ba2a72c34f2078c3965a2
-  data.tar.gz: 32c48483bdd58ffa6e99fb842ad6fe82264300e2
+  metadata.gz: f56b075ef5818ca2ced57c7d290b906ecb127ff4
+  data.tar.gz: 015897333d39b31d3c686a029ce03204176e3108
 SHA512:
-  metadata.gz: cc126639b3455f0be6c0d3f69d82e02d91e6dbcc5e3e958dcf4a42993dfacf3ee06cd9b94f74fb79dfd442138acc6d027f4ef8f403eacd198314ebf15c62d5ed
-  data.tar.gz: 00ca225a65c495655c163dc85df394272f4c993077701b74c590d897b81669a42aa89103debc669776bbea882ea0018e7c5869a46fa9b47b635ae22e3d26ce37
+  metadata.gz: 0db9075c7cc7c104421e1de7e9723da9e3ac97a7eab52371fec20e1e47576e92ab91c65f1031d404f621871097550ef55c33efd01c86d792913fac392820f20f
+  data.tar.gz: c22a5908735e2c4e9cac22d45cd01d13c30c3f042cb33ef30f42ddf872aa1878dab19db97870f2576bb14fb5eecb8f9f2dce78d00492b868f243bf3c6a5a44be

data/CHANGES.md

@@ -1,7 +1,7 @@
 twilio-ruby changelog
 =====================
 
-Version 4.10.0-edge
+Version 4.10.0
 -------------
 
 Released January 28, 2016:

data/lib/twilio-ruby.rb

@@ -36,10 +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'
@@ -108,7 +104,6 @@ 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'

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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.10.0.edge
+  version: 4.10.0
 platform: ruby
 authors:
 - Andrew Benton
@@ -150,11 +150,6 @@ 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
@@ -240,7 +235,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,7 +243,6 @@ 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
@@ -307,9 +300,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.4.8
@@ -318,7 +311,6 @@ 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
@@ -327,7 +319,6 @@ 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

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/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