twilio-ruby 5.0.0.rc21 → 5.0.0.rc22

data/twilio-ruby.gemspec

@@ -12,16 +12,17 @@ Gem::Specification.new do |spec|
   spec.description   = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
   spec.homepage      = 'http://github.com/twilio/twilio-ruby'
   spec.license       = 'MIT'
+  spec.metadata["yard.run"] = "yri" # use "yard" to build full HTML docs.
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
   spec.extra_rdoc_files = ['README.md', 'LICENSE.md']
   spec.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
 
-  spec.add_dependency('builder', '>= 2.1.2')
+  spec.add_dependency('libxml-ruby', '3.0.0')
   spec.add_dependency('jwt', '~> 1.5')
   spec.add_dependency('faraday', '~>0.9')
   spec.add_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
@@ -29,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('rubysl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'yard', '~> 0.9.9'
   spec.extra_rdoc_files = ['README.md', 'LICENSE.md']
   spec.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc21
+  version: 5.0.0.rc22
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 description: A simple library for communicating with the Twilio REST API, building
   TwiML, and generating Twilio Client Capability Tokens
 email:
@@ -91,8 +105,6 @@ files:
 - examples/print-call-log.rb
 - lib/rack/twilio_webhook_authentication.rb
 - lib/twilio-ruby.rb
-- lib/twilio-ruby/compatibility/v2010/account/call/feedback.rb
-- lib/twilio-ruby/compatibility/v2010/account/queue/member.rb
 - lib/twilio-ruby/framework/domain.rb
 - lib/twilio-ruby/framework/error.rb
 - lib/twilio-ruby/framework/helper.rb
@@ -100,10 +112,12 @@ files:
 - lib/twilio-ruby/framework/resource.rb
 - lib/twilio-ruby/framework/serialize.rb
 - lib/twilio-ruby/framework/twilio_response.rb
+- lib/twilio-ruby/framework/values.rb
 - lib/twilio-ruby/framework/version.rb
 - lib/twilio-ruby/http/http_client.rb
 - lib/twilio-ruby/jwt/access_token.rb
-- lib/twilio-ruby/jwt/capability.rb
+- lib/twilio-ruby/jwt/client_capability.rb
+- lib/twilio-ruby/jwt/jwt.rb
 - lib/twilio-ruby/jwt/task_router.rb
 - lib/twilio-ruby/rest/accounts.rb
 - lib/twilio-ruby/rest/accounts/v1.rb
@@ -335,7 +349,9 @@ files:
 - lib/twilio-ruby/rest/wireless/v1/sim.rb
 - lib/twilio-ruby/rest/wireless/v1/sim/usage_record.rb
 - lib/twilio-ruby/security/request_validator.rb
-- lib/twilio-ruby/twiml/response.rb
+- lib/twilio-ruby/twiml/messaging_response.rb
+- lib/twilio-ruby/twiml/twiml.rb
+- lib/twilio-ruby/twiml/voice_response.rb
 - lib/twilio-ruby/util.rb
 - lib/twilio-ruby/util/configuration.rb
 - lib/twilio-ruby/version.rb
@@ -532,24 +548,23 @@ files:
 - spec/integration/wireless/v1/sim/usage_record_spec.rb
 - spec/integration/wireless/v1/sim_spec.rb
 - spec/jwt/access_token_spec.rb
-- spec/jwt/capability_spec.rb
+- spec/jwt/client_capability_spec.rb
 - spec/jwt/task_router_spec.rb
-- spec/jwt/task_router_taskqueue_spec.rb
-- spec/jwt/task_router_worker_spec.rb
-- spec/jwt/task_router_workspace_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/security/request_validator_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
 - spec/twilio_spec.rb
-- spec/twiml/twiml_response_spec.rb
+- spec/twiml/messaging_response_spec.rb
+- spec/twiml/voice_response_spec.rb
 - spec/util/configuration_spec.rb
 - spec/util/url_encode_spec.rb
 - twilio-ruby.gemspec
 homepage: http://github.com/twilio/twilio-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  yard.run: yri
 post_install_message: 
 rdoc_options:
 - "--line-numbers"
@@ -564,7 +579,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -771,16 +786,14 @@ test_files:
 - spec/integration/wireless/v1/sim/usage_record_spec.rb
 - spec/integration/wireless/v1/sim_spec.rb
 - spec/jwt/access_token_spec.rb
-- spec/jwt/capability_spec.rb
+- spec/jwt/client_capability_spec.rb
 - spec/jwt/task_router_spec.rb
-- spec/jwt/task_router_taskqueue_spec.rb
-- spec/jwt/task_router_worker_spec.rb
-- spec/jwt/task_router_workspace_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/security/request_validator_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
 - spec/twilio_spec.rb
-- spec/twiml/twiml_response_spec.rb
+- spec/twiml/messaging_response_spec.rb
+- spec/twiml/voice_response_spec.rb
 - spec/util/configuration_spec.rb
 - spec/util/url_encode_spec.rb

data/lib/twilio-ruby/compatibility/v2010/account/call/feedback.rb

@@ -1,15 +0,0 @@
-module Twilio
-  module Resources
-    module V2010
-      class AccountInstance < Twilio::REST::InstanceResource
-        class CallInstance < Twilio::REST::InstanceResource
-          class FeedbackList < Twilio::REST::ListResource
-            def get(sid=nil)
-              internal_get sid
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/twilio-ruby/compatibility/v2010/account/queue/member.rb

@@ -1,23 +0,0 @@
-module Twilio
-  module Resources
-    module V2010
-      class AccountInstance < Twilio::REST::InstanceResource
-        class QueueInstance < Twilio::REST::InstanceResource
-          class MemberList < Twilio::REST::ListResource
-            def front
-              get "Front"
-            end
-
-            def front!
-              front.refresh
-            end
-
-            def dequeue(url, method='POST')
-              front.dequeue url, method
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,64 +0,0 @@
-module Twilio
-  module JWT
-    class Capability
-
-      include Twilio::Util
-
-      def initialize(account_sid = nil, auth_token = nil)
-        @account_sid = account_sid || Twilio.account_sid
-        @auth_token = auth_token || Twilio.auth_token
-        if @account_sid.nil? || @auth_token.nil?
-          raise ArgumentError, 'Account SID and auth token are required'
-        end
-        @capabilities = []
-      end
-
-      def allow_client_incoming(client_name)
-        @client_name = client_name # stash for use in outgoing
-        scope_params = { clientName: client_name }
-        @capabilities << scope_uri_for('client', 'incoming', scope_params)
-      end
-
-      def allow_client_outgoing(app_sid, params = {})
-        @allow_client_outgoing = true
-        @outgoing_scope_params = { appSid: app_sid }
-        unless params.empty?
-          @outgoing_scope_params['appParams'] = url_encode params
-        end
-      end
-
-      def allow_event_stream(filters = {})
-        scope_params = { path: '/2010-04-01/Events' }
-        scope_params[:params] = filters unless filters.empty?
-        @capabilities << scope_uri_for('stream', 'subscribe', scope_params)
-      end
-
-      def scope_uri_for(service, privilege, params = {})
-        scope_uri = "scope:#{service}:#{privilege}"
-        scope_uri << "?#{url_encode(params)}" unless params.empty?
-      end
-
-      def generate(ttl = 3600)
-
-        capabilities = @capabilities.clone # we need a local copy to work on
-
-        # build the outgoing scope lazily so that we can use @client_name
-        if @allow_client_outgoing
-          params = @outgoing_scope_params
-          params.merge!('clientName' => @client_name) if @client_name
-          capabilities << scope_uri_for('client', 'outgoing', params)
-        end
-
-        payload = {
-          scope: capabilities.join(' '),
-          iss: @account_sid,
-          exp: (Time.now.to_i + ttl),
-        }
-
-        ::JWT.encode payload, @auth_token
-
-      end
-
-    end
-  end
-end

data/lib/twilio-ruby/twiml/response.rb

@@ -1,16 +0,0 @@
-module Twilio
-  module TwiML
-    class Response
-
-      attr_reader :text
-      alias_method :to_xml , :text
-
-      def initialize(&block)
-        xml = Builder::XmlMarkup.new
-        xml.instruct!
-        @text = xml.Response &block
-      end
-
-    end
-  end
-end

data/spec/jwt/capability_spec.rb

@@ -1,186 +0,0 @@
-require 'spec_helper'
-
-describe Twilio::JWT::Capability do
-  describe 'config' do
-    after(:each) do
-      Twilio.instance_variable_set('@configuration', nil)
-    end
-
-    it 'should set the account sid and auth token from a configuration block' do
-      Twilio.configure do |config|
-        config.account_sid = 'someSid'
-        config.auth_token = 'someToken'
-      end
-
-      capability = Twilio::JWT::Capability.new
-      expect(capability.instance_variable_get('@account_sid')).to eq('someSid')
-      expect(capability.instance_variable_get('@auth_token')).to eq('someToken')
-    end
-
-    it 'should overwrite account sid and auth token if passed to initializer' do
-      Twilio.configure do |config|
-        config.account_sid = 'someSid'
-        config.auth_token = 'someToken'
-      end
-
-      capability = Twilio::JWT::Capability.new'otherSid', 'otherToken'
-      expect(capability.instance_variable_get('@account_sid')).to eq('otherSid')
-      expect(capability.instance_variable_get('@auth_token')).to eq('otherToken')
-    end
-
-    it 'should overwrite the account sid if only the sid is given' do
-      Twilio.configure do |config|
-        config.account_sid = 'someSid'
-        config.auth_token = 'someToken'
-      end
-
-      capability = Twilio::JWT::Capability.new 'otherSid'
-      expect(capability.instance_variable_get('@account_sid')).to eq('otherSid')
-      expect(capability.instance_variable_get('@auth_token')).to eq('someToken')
-    end
-
-    it 'should throw an argument error if the sid and token isn\'t set' do
-      expect { Twilio::JWT::Capability.new }.to raise_error(ArgumentError)
-    end
-
-    it 'should throw an argument error if only the account_sid is set' do
-      expect { Twilio::JWT::Capability.new 'someSid' }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe 'with a capability' do
-    before :each do
-      @capability = Twilio::JWT::Capability.new 'myAccountSid', 'myAuthToken'
-    end
-
-    def queries(q)
-      q.scan(/scope:client:(incoming|outgoing)\?(\S+)/).map{|(type, query)| [type, Rack::Utils.parse_query(query)]}
-    end
-
-    it 'should return a valid jwt when #generate is called' do
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(decoded['scope']).not_to be_nil
-      expect(decoded['iss']).not_to be_nil
-      expect(decoded['exp']).not_to be_nil
-    end
-
-    it 'should properly set the iss key in the payload' do
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(decoded['iss']).to eq('myAccountSid')
-    end
-
-    it 'should properly set the exp key based on the default hour ttl' do
-      seconds = Time.now.to_i
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(decoded['exp']).to eq(seconds + 3600)
-    end
-
-    it 'should properly set the exp key based on the ttl passed to #generate' do
-      ttl = rand 10000
-      seconds = Time.now.to_i
-      token = @capability.generate ttl
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(decoded['exp']).to eq(seconds + ttl)
-    end
-
-    it 'should generate a proper incoming client scope string' do
-      @capability.allow_client_incoming 'andrew'
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([['incoming', {'clientName' => 'andrew'}]])
-    end
-
-    it 'should generate multiple proper incoming client scope strings' do
-      @capability.allow_client_incoming 'andrew'
-      @capability.allow_client_incoming 'bridget'
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([
-                                                  ['incoming', {'clientName' => 'andrew'}],
-                                                  ['incoming', {'clientName' => 'bridget'}]
-                                              ])
-    end
-
-    it 'should generate a proper outgoing client scope string' do
-      @capability.allow_client_outgoing 'myAppSid'
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([['outgoing', {'appSid' => 'myAppSid'}]])
-    end
-
-    it 'should generate a proper outgoing client scope string with parameters' do
-      app_params_hash = {'key' => 'a value', :foo => 'bar/baz'}
-      @capability.allow_client_outgoing 'myAppSid', app_params_hash
-      app_params = @capability.instance_eval {url_encode(app_params_hash)}
-      params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params}
-      @capability.instance_eval {url_encode(params_hash)}
-      token = @capability.generate
-      decoded, header= JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([['outgoing', params_hash]])
-    end
-
-    it 'should generate a proper outgoing client scope string based on the ' +
-           'client name when calling #allow_client_incoming first' do
-      @capability.allow_client_incoming 'andrew'
-      @capability.allow_client_outgoing 'myAppSid'
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([
-                                                  ['incoming', {'clientName' => 'andrew'}],
-                                                  ['outgoing', {'clientName' => 'andrew', 'appSid' => 'myAppSid'}]
-                                              ])
-    end
-
-    it 'should generate a proper outgoing client scope string based on the ' +
-           'client name when calling #allow_client_incoming second' do
-      @capability.allow_client_outgoing 'myAppSid'
-      @capability.allow_client_incoming 'andrew'
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      expect(queries(decoded['scope'])).to eq([["incoming", {"clientName"=>"andrew"}], ["outgoing", {"clientName"=>"andrew", "appSid"=>"myAppSid"}]])
-    end
-
-    it 'should generate a proper outgoing client scope string with parameters ' +
-           'and a client name when calling #allow_client_incoming first' do
-      @capability.allow_client_incoming 'andrew'
-      app_params_hash = {'key' => 'a value', :foo => 'bar/baz'}
-      @capability.allow_client_outgoing 'myAppSid', app_params_hash
-      app_params = @capability.instance_eval {url_encode(app_params_hash)}
-      params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params, 'clientName' => 'andrew'}
-      @capability.instance_eval {url_encode(params_hash)}
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      scopes = queries(decoded['scope'])
-      expect(scopes.shift).to eq(["incoming", {"clientName"=>"andrew"}])
-      scope = scopes.shift
-      expect(scope.first).to eq('outgoing')
-      expect(Rack::Utils.parse_query(scope.last['appParams'])).to eq({'key' => 'a value', 'foo' => 'bar/baz'})
-      expect(scope.last["clientName"]).to eq("andrew")
-      expect(scope.last["appSid"]).to eq("myAppSid")
-      expect(scopes).to be_empty
-    end
-
-    it 'should generate a proper outgoing client scope string with parameters ' +
-           'and a client name when calling #allow_client_incoming second' do
-      app_params_hash = {'key' => 'a value', :foo => 'bar/baz'}
-      @capability.allow_client_outgoing 'myAppSid', app_params_hash
-      @capability.allow_client_incoming 'andrew'
-      app_params = @capability.instance_eval {url_encode(app_params_hash)}
-      params_hash = {'appSid' => 'myAppSid', 'appParams' => app_params, 'clientName' => 'andrew'}
-      @capability.instance_eval {url_encode(params_hash)}
-      token = @capability.generate
-      decoded, header = JWT.decode token, 'myAuthToken'
-      scopes = queries(decoded['scope'])
-      expect(scopes.shift).to eq(["incoming", {"clientName"=>"andrew"}])
-      scope = scopes.shift
-      expect(scope.first).to eq('outgoing')
-      expect(Rack::Utils.parse_query(scope.last['appParams'])).to eq({'key' => 'a value', 'foo' => 'bar/baz'})
-      expect(scope.last["clientName"]).to eq("andrew")
-      expect(scope.last["appSid"]).to eq("myAppSid")
-      expect(scopes).to be_empty
-    end
-  end
-end