Merge branch 'master' of https://github.com/twilio/twilio-ruby

Author: codejudas

lib/rack/twilio_webhook_authentication.rb

@@ -10,15 +10,13 @@
 require 'json'
 
 require 'twilio-ruby/version' unless defined?(Twilio::VERSION)
-require 'rack/twilio_webhook_authentication'
 
 require 'twilio-ruby/util'
 require 'twilio-ruby/jwt/jwt'
 require 'twilio-ruby/jwt/access_token'
 require 'twilio-ruby/jwt/client_capability'
 require 'twilio-ruby/jwt/task_router'
 require 'twilio-ruby/security/request_validator'
-require 'twilio-ruby/util/configuration'
 
 require 'twilio-ruby/twiml/twiml'
 require 'twilio-ruby/twiml/voice_response'
@@ -42,20 +40,4 @@
 
 module Twilio
   extend SingleForwardable
-
-  def_delegators :configuration, :account_sid, :auth_token
-
-  ##
-  # Pre-configure with account SID and auth token so that you don't need to
-  # pass them to various initializers each time.
-  def self.configure(&block)
-    yield configuration
-  end
-
-  ##
-  # Returns an existing or instantiates a new configuration object.
-  def self.configuration
-    @configuration ||= Util::Configuration.new
-  end
-  private_class_method :configuration
 end

lib/twilio-ruby.rb

@@ -14,8 +14,8 @@ class Client
       ##
       # Initializes the Twilio Client
       def initialize(username=nil, password=nil, account_sid=nil, region=nil, http_client=Twilio::HTTP::Client.new)
-        @username = username || Twilio.account_sid
-        @password = password || Twilio.auth_token
+        @username = username
+        @password = password
         @region = region
         @account_sid = account_sid || @username
         @auth_token = @password
@@ -394,4 +394,4 @@ class TaskRouterClient < ObsoleteClient; end
     # Dummy client which provides no functionality. Please use Twilio::REST::Client instead.
     class TrunkingClient < ObsoleteClient; end
   end
-end
+end

lib/twilio-ruby/rest/client.rb

@@ -2,7 +2,7 @@ module Twilio
   module Security
     class RequestValidator
       def initialize(auth_token = nil)
-        @auth_token = auth_token || Twilio.auth_token
+        @auth_token = auth_token
         raise ArgumentError, 'Auth token is required' if @auth_token.nil?
       end
 

lib/twilio-ruby/security/request_validator.rb

@@ -1,34 +1,6 @@
 require 'spec_helper'
 
 describe Twilio::Security::RequestValidator do
-  describe 'configuration' do
-    after(:each) do
-      Twilio.instance_variable_set('@configuration', nil)
-    end
-
-    it 'should set the auth token from a configuration block' do
-      Twilio.configure do |config|
-        config.auth_token = 'someToken'
-      end
-
-      validator = Twilio::Security::RequestValidator.new
-      expect(validator.instance_variable_get('@auth_token')).to eq('someToken')
-    end
-
-    it 'should overwrite the auth token if passed to initializer' do
-      Twilio.configure do |config|
-        config.auth_token = 'someToken'
-      end
-
-      validator = Twilio::Security::RequestValidator.new 'otherToken'
-      expect(validator.instance_variable_get('@auth_token')).to eq('otherToken')
-    end
-
-    it 'should throw an argument error if the auth token isn\'t set' do
-      expect { Twilio::Security::RequestValidator.new }.to raise_error(ArgumentError)
-    end
-  end
-
   describe 'validations' do
     let(:token) { '2bd9e9638872de601313dc77410d3b23' }
 

lib/twilio-ruby/util/configuration.rb

@@ -1,15 +0,0 @@
-describe Twilio do
-  after(:each) do
-    Twilio.instance_variable_set('@configuration', nil)
-  end
-
-  it 'should set the account sid and auth token with a config block' do
-    Twilio.configure do |config|
-      config.account_sid = 'someSid'
-      config.auth_token = 'someToken'
-    end
-
-    expect(Twilio.account_sid).to eq('someSid')
-    expect(Twilio.auth_token).to eq('someToken')
-  end
-end