twilio-ruby 5.0.0.rc17 → 5.0.0.rc18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d05526526414e27419dd6cd3dfda926a98919ba
-  data.tar.gz: cc907c8f878a4fec508a99a4f8456e3cf428a4e0
+  metadata.gz: 65bf4f480d461395082b21dc0dea663fde225fde
+  data.tar.gz: 9c61dd3a358db1dafbcae422a23e4a3aa53a9f9f
 SHA512:
-  metadata.gz: 473a3e9c20d96a6f08187d0b4ad68f97b93d8efbe56a2b5e935b11ed7feb3dead667af3b856b7444481b226fe1d305f02d4f15cc695689dd28040532c36d8a65
-  data.tar.gz: 990b523d0131b092beef6cfef2b391a97c8c9878459dc4774a8ca5586de38db0f4517df2d61faf15b136e24fd3b0266464cc79eb33a9cd6d23819885620ac39a
+  metadata.gz: d6cebe289074228b30df754605c9bc9d8fa9a4e00bc0a0f9965e90e3f7f5f69dc6378dee0e1a8f41a1909ecf9ea9aaf474899afa54afb9d1132e3e113107e84f
+  data.tar.gz: 96a39ab02766a8d277c8387a02815149f4498a1ba3654ced411967f54411766e00017d56b8d979ba8c676d9c8bdf0952e745e59085456041b0ec5bfb632a0910

data/CHANGES.md

@@ -1,5 +1,11 @@
 twilio-ruby changelog
 =====================
+Version 5.0.0-rc18
+-------------
+
+Release April 17, 2017
+
+- Update VideoGrant access token to accept `room` instead of `configuration_profile_sid`
 
 Version 5.0.0-rc16
 -------------

data/lib/twilio-ruby/framework/exception.rb

@@ -23,7 +23,7 @@ module Twilio
       end
 
       def to_s
-        "[HTTP #{status_code}] #{code} : #{msg}"
+        "[HTTP #{status_code}] #{code} : #{message}"
       end
     end
   end

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

@@ -52,25 +52,6 @@ module Twilio
         to_jwt
       end
 
-      class ConversationsGrant
-        attr_accessor :configuration_profile_sid
-
-        def key
-          'rtc'
-        end
-
-        def payload
-          payload = {}
-
-          if configuration_profile_sid
-            payload[:configuration_profile_sid] = configuration_profile_sid
-          end
-
-          payload
-        end
-
-      end
-
       class IpMessagingGrant
         attr_accessor :service_sid,
                       :endpoint_id,
@@ -162,6 +143,26 @@ module Twilio
           payload
         end
       end
+
+      class VideoGrant
+        attr_accessor :room
+
+        def key
+          'video'
+        end
+
+        def payload
+          payload = {}
+
+          if room
+            payload[:room] = room
+          end
+
+          payload
+        end
+      end
+
+
     end
   end
 end

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '5.0.0.rc17'
+  VERSION = '5.0.0.rc18'
 end

data/spec/jwt/access_token_spec.rb

@@ -42,25 +42,6 @@ describe Twilio::JWT::AccessToken do
     expect(payload['grants']['identity']).to eq('abc')
   end
 
-  it 'should be able to add conversation grant' do
-    scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123','secret'
-    scat.add_grant(Twilio::JWT::AccessToken::ConversationsGrant.new)
-
-    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['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']['rtc']).not_to be_nil
-  end
-
   it 'should be able to add endpoint grants' do
     scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123','secret'
 
@@ -119,7 +100,7 @@ describe Twilio::JWT::AccessToken do
 
   it 'should add rest grants' do
     scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123','secret'
-    scat.add_grant(Twilio::JWT::AccessToken::ConversationsGrant.new)
+    scat.add_grant(Twilio::JWT::AccessToken::VideoGrant.new)
     scat.add_grant(Twilio::JWT::AccessToken::IpMessagingGrant.new)
 
     token = scat.to_s
@@ -134,7 +115,7 @@ describe Twilio::JWT::AccessToken do
     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
+    expect(payload['grants']['video']).not_to be_nil
     expect(payload['grants']['ip_messaging']).not_to be_nil
   end
 
@@ -163,4 +144,27 @@ describe Twilio::JWT::AccessToken do
     expect(payload['grants']['voice']['outgoing']['params']['foo']).to eq('bar')
   end
 
-end
+  it 'should add video grant' do
+    scat = Twilio::JWT::AccessToken.new 'AC123', 'SK123','secret'
+    vg = Twilio::JWT::AccessToken::VideoGrant.new
+    vg.room = 'room'
+
+    scat.add_grant(vg)
+
+    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['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']['video']).not_to be_nil
+    expect(payload['grants']['video']['room']).to eq('room')
+  end
+
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc17
+  version: 5.0.0.rc18
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !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: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !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
@@ -391,27 +391,27 @@ 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
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,