twilio-ruby 4.6.1 → 6.9.0

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

@@ -1,7 +1,33 @@
+# frozen_string_literal: true
+
 module Twilio
   module Util
     class Configuration
-      attr_accessor :account_sid, :auth_token
+      attr_accessor :account_sid, :auth_token, :http_client, :region, :edge, :logger
+
+      def account_sid=(value)
+        @account_sid = value
+      end
+
+      def auth_token=(value)
+        @auth_token = value
+      end
+
+      def http_client=(value)
+        @http_client = value
+      end
+
+      def region=(value)
+        @region = value
+      end
+
+      def edge=(value)
+        @edge = value
+      end
+
+      def logger=(value)
+        @logger = value
+      end
     end
   end
 end

data/lib/twilio-ruby/util.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module Twilio
   module Util
     def url_encode(hash)
-      hash.to_a.map {|p| p.map {|e| CGI.escape get_string(e)}.join '='}.join '&'
+      warn "'Twilio::Util::url_encode has been deprecated."
+      hash.to_a.map { |p| p.map { |e| CGI.escape get_string(e) }.join '=' }.join '&'
     end
 
     def get_string(obj)
+      warn "'Twilio::Util::get_string has been deprecated."
       if obj.respond_to?(:strftime)
         obj.strftime('%Y-%m-%d')
       else

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '4.6.1'
+    VERSION = '6.9.0'
 end

data/lib/twilio-ruby.rb

@@ -1,112 +1,34 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'net/https'
-require 'builder'
-require 'multi_json'
 require 'cgi'
 require 'openssl'
 require 'base64'
 require 'forwardable'
-require 'jwt'
+require 'time'
+require 'json'
 
 require 'twilio-ruby/version' unless defined?(Twilio::VERSION)
+require 'rack/twilio_webhook_authentication' if defined?(Rack) && defined?(Rack::MediaType)
+
 require 'twilio-ruby/util'
-require 'twilio-ruby/util/client_config'
+require 'twilio-ruby/security/request_validator'
 require 'twilio-ruby/util/configuration'
-require 'twilio-ruby/util/request_validator'
-require 'twilio-ruby/util/capability'
-require 'twilio-ruby/twiml/response'
-require 'twilio-ruby/task_router'
-require 'twilio-ruby/task_router/capability'
-require 'twilio-ruby/task_router/workflow_builder'
-require 'twilio-ruby/rest/errors'
-require 'twilio-ruby/rest/utils'
-require 'twilio-ruby/rest/list_resource'
-require 'twilio-ruby/rest/next_gen_list_resource'
-require 'twilio-ruby/rest/instance_resource'
-require 'twilio-ruby/rest/sandbox'
-require 'twilio-ruby/rest/accounts'
-require 'twilio-ruby/rest/calls'
-require 'twilio-ruby/rest/call_feedback'
-require 'twilio-ruby/rest/call_feedback_summary'
-require 'twilio-ruby/rest/keys'
-require 'twilio-ruby/rest/pricing'
-require 'twilio-ruby/rest/pricing/countries'
-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/sms'
-require 'twilio-ruby/rest/sms/short_codes'
-require 'twilio-ruby/rest/sms/messages'
-require 'twilio-ruby/rest/sip'
-require 'twilio-ruby/rest/sip/domains'
-require 'twilio-ruby/rest/sip/domains/ip_access_control_list_mappings'
-require 'twilio-ruby/rest/sip/domains/credential_list_mappings'
-require 'twilio-ruby/rest/sip/credential_lists'
-require 'twilio-ruby/rest/sip/credential_lists/credentials'
-require 'twilio-ruby/rest/sip/ip_access_control_lists'
-require 'twilio-ruby/rest/sip/ip_access_control_lists/ip_addresses'
-require 'twilio-ruby/rest/task_router/statistics'
-require 'twilio-ruby/rest/task_router/activities'
-require 'twilio-ruby/rest/task_router/events'
-require 'twilio-ruby/rest/task_router/reservations'
-require 'twilio-ruby/rest/task_router/task_queues'
-require 'twilio-ruby/rest/task_router/task_queues_statistics'
-require 'twilio-ruby/rest/task_router/tasks'
-require 'twilio-ruby/rest/task_router/workers'
-require 'twilio-ruby/rest/task_router/workers_statistics'
-require 'twilio-ruby/rest/task_router/workflow_statistics'
-require 'twilio-ruby/rest/task_router/workflows'
-require 'twilio-ruby/rest/task_router/workspaces'
-require 'twilio-ruby/rest/task_router/workspace_statistics'
-require 'twilio-ruby/rest/trunking/credential_lists.rb'
-require 'twilio-ruby/rest/trunking/ip_access_control_lists.rb'
-require 'twilio-ruby/rest/trunking/origination_urls.rb'
-require 'twilio-ruby/rest/trunking/phone_numbers.rb'
-require 'twilio-ruby/rest/trunking/trunks.rb'
-require 'twilio-ruby/rest/lookups/phone_numbers'
-require 'twilio-ruby/rest/monitor/events'
-require 'twilio-ruby/rest/monitor/alerts'
-require 'twilio-ruby/rest/media'
-require 'twilio-ruby/rest/messages'
-require 'twilio-ruby/rest/applications'
-require 'twilio-ruby/rest/connect_apps'
-require 'twilio-ruby/rest/authorized_connect_apps'
-require 'twilio-ruby/rest/outgoing_caller_ids'
-require 'twilio-ruby/rest/incoming_phone_numbers'
-require 'twilio-ruby/rest/incoming_phone_numbers/local'
-require 'twilio-ruby/rest/incoming_phone_numbers/toll_free'
-require 'twilio-ruby/rest/incoming_phone_numbers/mobile'
-require 'twilio-ruby/rest/available_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/country'
-require 'twilio-ruby/rest/available_phone_numbers/local'
-require 'twilio-ruby/rest/available_phone_numbers/mobile'
-require 'twilio-ruby/rest/available_phone_numbers/toll_free'
-require 'twilio-ruby/rest/conferences'
-require 'twilio-ruby/rest/conferences/participants'
-require 'twilio-ruby/rest/queues'
-require 'twilio-ruby/rest/queues/members'
-require 'twilio-ruby/rest/usage'
-require 'twilio-ruby/rest/usage/records'
-require 'twilio-ruby/rest/usage/triggers'
-require 'twilio-ruby/rest/recordings'
-require 'twilio-ruby/rest/transcriptions'
-require 'twilio-ruby/rest/tokens'
-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/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 'rack/twilio_webhook_authentication'
+
+Dir[File.join(__dir__, 'twilio-ruby/framework/*.rb')].sort.each do |file|
+  require file
+end
 
 module Twilio
   extend SingleForwardable
 
-  def_delegators :configuration, :account_sid, :auth_token
+  autoload :JWT, File.join(__dir__, 'twilio-ruby', 'jwt', 'jwt.rb')
+  autoload :TwiML, File.join(__dir__, 'twilio-ruby', 'twiml', 'twiml.rb')
+  autoload :HTTP, File.join(__dir__, 'twilio-ruby', 'http.rb')
+  autoload :REST, File.join(__dir__, 'twilio-ruby', 'rest.rb')
+
+  def_delegators :configuration, :account_sid, :auth_token, :http_client, :region, :edge, :logger
 
   ##
   # Pre-configure with account SID and auth token so that you don't need to
@@ -120,5 +42,6 @@ module Twilio
   def self.configuration
     @configuration ||= Util::Configuration.new
   end
+
   private_class_method :configuration
 end

data/sonar-project.properties

@@ -0,0 +1,13 @@
+sonar.projectKey=twilio_twilio-ruby
+sonar.projectName=twilio-ruby
+sonar.organization=twilio
+
+sonar.sources=lib/twilio-ruby
+# Exclude any auto-generated source code
+sonar.exclusions=lib/twilio-ruby/rest/**/*, lib/twilio-ruby/twiml/**
+sonar.tests=spec/
+# Exclude any auto-generated integration tests
+sonar.test.exclusions=spec/integration/**/*.spec.rb
+
+# For Code Coverage analysis
+sonar.ruby.coverage.reportPaths=coverage/coverage.json

data/twilio-ruby.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twilio-ruby/version'
@@ -6,29 +7,35 @@ require 'twilio-ruby/version'
 Gem::Specification.new do |spec|
   spec.name          = 'twilio-ruby'
   spec.version       = Twilio::VERSION
-  spec.authors       = ['Andrew Benton']
-  spec.email         = ['andrew@twilio.com']
-  spec.summary       = 'A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens'
-  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.authors       = ['Twilio API Team']
+  spec.summary       = 'The official library for communicating with the Twilio REST API, '\
+                       'building TwiML, and generating Twilio JWT Capability Tokens'
+  spec.description   = 'The official library for communicating with the Twilio REST API, '\
+                       'building TwiML, and generating Twilio JWT Capability Tokens'
+  spec.homepage      = 'https://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.files         = `git ls-files -z`.split("\x0").reject { |f| f.match?(%r{^(spec)/}) }
   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.extra_rdoc_files = ['README.md', 'LICENSE.md']
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.extra_rdoc_files = ['README.md', 'LICENSE']
   spec.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
 
-  spec.add_dependency('multi_json', '>= 1.3.0')
-  spec.add_dependency('builder', '>= 2.1.2')
-  spec.add_dependency('jwt', '~> 1.0')
-  spec.add_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
+  spec.add_dependency('jwt', '>= 1.5', '< 3.0')
+  spec.add_dependency('nokogiri', '>= 1.6', '< 2.0')
+  spec.add_dependency('faraday', '>= 0.9', '< 3.0')
   # Workaround for RBX <= 2.2.1, should be fixed in next version
   spec.add_dependency('rubysl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.extra_rdoc_files = ['README.md', 'LICENSE.md']
-  spec.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'twilio-ruby', '--main', 'README.md']
+  spec.add_development_dependency 'bundler', '>= 1.5', '< 3.0'
+  spec.add_development_dependency 'equivalent-xml', '~> 0.6'
+  spec.add_development_dependency 'fakeweb', '~> 1.3'
+  spec.add_development_dependency 'rack', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'yard', '~> 0.9.9'
+  spec.add_development_dependency 'logger', '~> 1.4.2'
 end