lib/twitter/client.rb in twitter-6.1.0 vs lib/twitter/client.rb in twitter-6.2.0

@@ -3,32 +3,27 @@
 require 'twitter/version'
 
 module Twitter
   class Client
     include Twitter::Utils
-    attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret, :proxy
+    attr_accessor :access_token, :access_token_secret, :consumer_key, :consumer_secret, :proxy, :timeouts
     attr_writer :user_agent
-    deprecate_alias :oauth_token, :access_token
-    deprecate_alias :oauth_token=, :access_token=
-    deprecate_alias :oauth_token_secret, :access_token_secret
-    deprecate_alias :oauth_token_secret=, :access_token_secret=
 
     # Initializes a new Client object
     #
     # @param options [Hash]
     # @return [Twitter::Client]
     def initialize(options = {})
       options.each do |key, value|
         instance_variable_set("@#{key}", value)
       end
       yield(self) if block_given?
-      validate_credentials!
     end
 
     # @return [Boolean]
     def user_token?
-      !!(access_token && access_token_secret)
+      !(blank?(access_token) || blank?(access_token_secret))
     end
 
     # @return [String]
     def user_agent
       @user_agent ||= "TwitterRubyGem/#{Twitter::Version}"
@@ -39,29 +34,20 @@
       {
         consumer_key: consumer_key,
         consumer_secret: consumer_secret,
         token: access_token,
         token_secret: access_token_secret,
-        ignore_extra_keys: true,
       }
     end
 
     # @return [Boolean]
     def credentials?
-      credentials.values.all?
+      credentials.values.none? { |v| blank?(v) }
     end
 
   private
 
-    # Ensures that all credentials set during configuration are of a
-    # valid type. Valid types are String and Boolean.
-    #
-    # @raise [Twitter::Error::ConfigurationError] Error is raised when
-    #   supplied twitter credentials are not a String or Boolean.
-    def validate_credentials!
-      credentials.each do |credential, value|
-        next if value.nil? || value == true || value == false || value.is_a?(String)
-        raise(Twitter::Error::ConfigurationError.new("Invalid #{credential} specified: #{value.inspect} must be a String."))
-      end
+    def blank?(s)
+      s.respond_to?(:empty?) ? s.empty? : !s
     end
   end
 end