Change user_agent_header to user_agent. Tighten up implementation.

Author: cphrmky

lib/softlayer/service.rb

@@ -133,6 +133,9 @@ class Service
     # The base URL for requests that are passed to the server. Cannot be emtpy or nil.
     attr_accessor :endpoint_url
 
+    # The User-Agent header sent to SoftLayer API.
+    attr_accessor :user_agent
+
     # Initialize an instance of the Client class. You pass in the service name
     # and optionally hash arguments specifying how the client should access the
     # SoftLayer API.
@@ -162,23 +165,16 @@ def initialize(service_name, options = {})
       # public endpoint
       self.endpoint_url = options[:endpoint_url] || $SL_API_BASE_URL || API_PUBLIC_ENDPOINT
 
+      @user_agent = {"User-Agent" => options[:user_agent] || "SoftLayer API Ruby Client #{SoftLayer::VERSION}"}
+
       if($DEBUG)
         @method_missing_call_depth = 0
       end
     end #initalize
 
-    # User this to set or get a user agent string for this API client.
-    #
-    # user_agent_string()
-    # => "SoftLayer API Ruby Client #{SoftLayer::Version}"
-    #
-    # user_agent_string('agentName using this gem vX.Y.Z')
-    # => "agentName using this gem vX.Y.Z"
-    #
-    def user_agent_header(set=nil)
-      @user_agent_header = set unless set.nil?
-      @user_agent_header ||= "SoftLayer API Ruby Client #{SoftLayer::VERSION}"
-      {"User-Agent" => @user_agent_header}
+    # Use this to set the user agent string for this API client.
+    def user_agent=(set)
+      self.user_agent['User-Agent'] = set
     end
 
     # Use this as part of a method call chain to identify a particular
@@ -339,9 +335,9 @@ def http_request_for_method(method_name, method_url, request_body = nil)
       end
 
       if request_body && !request_body.empty?
-            url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header.merge(self.user_agent_header))
+            url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header.merge(self.user_agent))
       else
-          	url_request = Net::HTTP::Get.new(method_url.request_uri(), self.user_agent_header)
+          	url_request = Net::HTTP::Get.new(method_url.request_uri(), self.user_agent)
       end
 
       # This warning should be obsolete as we should be using POST if the user