twilio-ruby 4.9.0 → 4.9.1.edge

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41bd27229164a4057d478fc1bc3e630d997871f
-  data.tar.gz: d8409920627a61c7e705f95bbf0b561c0b84c7a2
+  metadata.gz: 628afbc2fae022bac83b8b6f58311748083676fe
+  data.tar.gz: 3013a7bd0dbca01bfa5b779f5e20bbae959c2f36
 SHA512:
-  metadata.gz: ff802ee347f6c9b86062ac035f66eda1ea4f22a4e4603db93e2e0edfa157a6550d80b259dc53755924230247a9c54ac4649de2a6155ffb6c93192252fd7e8e9d
-  data.tar.gz: 1843e518f0e1d2511e1cf53f37f6debb631372c2c7351310488dc9fe77f0d234f30d8e415d4358ebd98844b30744ac13941d8db18ab92e01f7cae5dc747958ee
+  metadata.gz: b73eb76821ab3af0943646285c5f4110683468f15e4f2c10f2ca653baa1c8de4a54dd4cb9cbb6956ac51fbcf919cd3c5cfc4546ee0453ab72db86486a8d8977e
+  data.tar.gz: 8a5754c43ad42dfb5c5b04b22d90ee10ceb64d650dedc6097ca9863c25c08cda9cd8cbeacca8f7d1ce3e17c1d267f72e0f988d03e66e649edfdd80b620628336

data/CHANGES.md

@@ -1,6 +1,13 @@
 twilio-ruby changelog
 =====================
 
+Version 4.9.1-edge
+-------------
+
+Release December 17, 2015
+
+- Fix ip-messaging grant issue
+
 Version 4.9.0
 -------------
 

data/lib/twilio-ruby.rb

@@ -36,6 +36,10 @@ 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'
@@ -104,6 +108,7 @@ 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/conversations/completed.rb

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,99 @@
+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/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,7 +46,8 @@ 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 = full_path ? @path.split('.')[0] : @path
+        path = @frozen_path ? @frozen_path : @path
+        path = full_path ? path.split('.')[0] : path
         resource_list = resources.map do |resource|
           @instance_class.new "#{path}/#{resource[@instance_id_key]}", @client,
             resource
@@ -80,7 +81,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 "#{@path}/#{sid}", @client
+        @instance_class.new "#{@frozen_path || @path}/#{sid}", @client
       end
       alias :find :get # for the ActiveRecord lovers
 

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

@@ -4,11 +4,12 @@ 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']
+        list_key = response['meta']['key'] if response['meta']
         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,6 +19,13 @@ 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|
@@ -31,7 +38,11 @@ module Twilio
             Twilio::REST.const_get(@submodule)
           end
           resource_class = enclosing_module.const_get resource
-          instance_variable_set("@#{r}", resource_class.new(path, @client))
+          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
         end
         self.class.instance_eval { attr_reader *resources }
       end

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

@@ -43,6 +43,7 @@ module Twilio
             'exp' => now + @ttl,
             'grants' => grants
         }
+
         payload['nbf'] = @nbf unless @nbf.nil?
 
         JWT.encode payload, @secret, algorithm, headers
@@ -88,10 +89,10 @@ module Twilio
           if @endpoint_id
             payload['endpoint_id'] = @endpoint_id
           end
-          if @role_sid
+          if @deployment_role_sid
             payload['deployment_role_sid'] = @deployment_role_sid
           end
-          if @credential_sid
+          if @push_credential_sid
             payload['push_credential_sid'] = @push_credential_sid
           end
 

data/lib/twilio-ruby/version.rb

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

data/spec/conversations/conversations_spec.rb

@@ -0,0 +1,61 @@
+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

@@ -0,0 +1,13 @@
+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/util/access_token_spec.rb

@@ -14,6 +14,7 @@ describe Twilio::Util::AccessToken do
     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['nbf']).to be_nil
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(0)
   end
@@ -62,7 +63,13 @@ describe Twilio::Util::AccessToken do
 
   it 'should be able to add endpoint grants' do
     scat = Twilio::Util::AccessToken.new 'AC123', 'SK123','secret'
-    scat.add_grant(Twilio::Util::AccessToken::IpMessagingGrant.new)
+
+    grant = Twilio::Util::AccessToken::IpMessagingGrant.new
+    grant.push_credential_sid = 'CR123'
+    grant.deployment_role_sid = 'DR123'
+    grant.service_sid = 'IS123'
+    grant.endpoint_id = 'EP123'
+    scat.add_grant(grant)   
 
     token = scat.to_s
     expect(token).not_to be_nil
@@ -77,6 +84,10 @@ describe Twilio::Util::AccessToken do
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(1)
     expect(payload['grants']['ip_messaging']).not_to be_nil
+    expect(payload['grants']['ip_messaging']['service_sid']).to eq('IS123')
+    expect(payload['grants']['ip_messaging']['endpoint_id']).to eq('EP123')
+    expect(payload['grants']['ip_messaging']['push_credential_sid']).to eq('CR123')
+    expect(payload['grants']['ip_messaging']['deployment_role_sid']).to eq('DR123')
   end
 
   it 'should add rest grants' do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1.edge
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-28 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,6 +150,11 @@ 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
@@ -235,6 +240,7 @@ 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
@@ -243,6 +249,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
@@ -284,24 +291,24 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -310,6 +317,7 @@ 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
@@ -318,6 +326,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