lib/flexirest/configuration.rb in flexirest-1.3.6 vs lib/flexirest/configuration.rb in flexirest-1.3.7

@@ -10,10 +10,12 @@
       @lazy_load = false
       @api_auth_access_id = nil
       @api_auth_secret_key = nil
 
       def base_url(value = nil)
+        @base_url ||= nil
+        @@base_url ||= nil
         if value.nil?
           value = if @base_url.nil?
             @@base_url
           else
             @base_url
@@ -33,10 +35,12 @@
         value = value.gsub(/\/+$/, '')
         @@base_url = value
       end
 
       def username(value = nil)
+        @username ||= nil
+        @@username ||= nil
         if value.nil?
           value = if @username.nil?
             @@username
           else
             @username
@@ -122,15 +126,16 @@
       def lazy_load!
         @lazy_load = true
       end
 
       def lazy_load?
-        @lazy_load || false
+        @lazy_load ||= false
       end
 
       def whiny_missing(value = nil)
-        value ? @whiny_missing = value : @whiny_missing || false
+        @whiny_missing ||= false
+        value ? @whiny_missing = value : @whiny_missing
       end
 
       def api_auth_credentials(access_id, secret_key)
         begin
           require 'api-auth'
@@ -145,10 +150,11 @@
       def using_api_auth?
         !self.api_auth_access_id.nil? && !self.api_auth_secret_key.nil?
       end
 
       def api_auth_access_id
+        @api_auth_access_id ||= nil
         if !@api_auth_access_id.nil?
           return @api_auth_access_id
         elsif self.superclass.respond_to?(:api_auth_access_id)
           return self.superclass.api_auth_access_id
         end
@@ -169,15 +175,17 @@
       def verbose!
         @verbose = true
       end
 
       def verbose(value = nil)
-        value ? @verbose = value : @verbose || false
+        @verbose ||= false
+        value ? @verbose = value : @verbose
       end
 
       def translator(value = nil)
         Flexirest::Logger.warn("DEPRECATION: The translator functionality of Flexirest has been replaced with proxy functionality, see https://github.com/andyjeffries/flexirest#proxying-apis for more information") unless value.nil?
-        value ? @translator = value : @translator || nil
+        @translator ||= nil
+        value ? @translator = value : @translator
       end
 
       def proxy(value = nil)
         @proxy ||= nil
         value ? @proxy = value : @proxy || nil