lib/flexirest/configuration.rb in flexirest-1.2.2 vs lib/flexirest/configuration.rb in flexirest-1.2.3

@@ -11,15 +11,19 @@
       @api_auth_access_id = nil
       @api_auth_secret_key = nil
 
       def base_url(value = nil)
         if value.nil?
-          if @base_url.nil?
+          value = if @base_url.nil?
             @@base_url
           else
             @base_url
           end
+          if value.nil? && superclass.respond_to?(:base_url)
+            value = superclass.base_url
+          end
+          value
         else
           value = value.gsub(/\/$/, '')
           @base_url = value
         end
       end
@@ -30,15 +34,19 @@
         @@base_url = value
       end
 
       def username(value = nil)
         if value.nil?
-          if @username.nil?
+          value = if @username.nil?
             @@username
           else
             @username
           end
+          if value.nil? && superclass.respond_to?(:username)
+            value = superclass.username
+          end
+          value
         else
           value = CGI::escape(value) if value.present? && !value.include?("%")
           @username = value
         end
       end
@@ -49,15 +57,19 @@
         @@username = value
       end
 
       def password(value = nil)
         if value.nil?
-          if @password.nil?
+          value = if @password.nil?
             @@password
           else
             @password
           end
+          if value.nil? && superclass.respond_to?(:password)
+            value = superclass.password
+          end
+          value
         else
           value = CGI::escape(value) if value.present? && !value.include?("%")
           @password = value
         end
       end
@@ -69,11 +81,15 @@
       end
 
       def request_body_type(value = nil)
         if value.nil?
           if @request_body_type.nil?
-            @@request_body_type
+            if value.nil? && superclass.respond_to?(:request_body_type)
+              superclass.request_body_type
+            else
+              @@request_body_type || :form_encoded
+            end
           else
             @request_body_type
           end
         else
           @request_body_type = value
@@ -168,10 +184,9 @@
 
       def _reset_configuration!
         @base_url             = nil
         @@base_url            = nil
         @request_body_type    = nil
-        @@request_body_type   = :form_encoded
         @whiny_missing        = nil
         @lazy_load            = false
         @faraday_config       = default_faraday_config
         @adapter              = Faraday.default_adapter
         @api_auth_access_id   = nil