lib/runcible/base.rb in runcible-1.7.2 vs lib/runcible/base.rb in runcible-1.8.0

@@ -29,20 +29,20 @@
     def call(method, path, options = {})
       clone_config = self.config.clone
       #on occation path will already have prefix (sync cancel)
       path = clone_config[:api_path] + path unless path.start_with?(clone_config[:api_path])
 
-      RestClient.log    = []
+      RestClient.log = []
       headers = clone_config[:headers].clone
 
       get_params = options[:params] if options[:params]
       path = combine_get_params(path, get_params) if get_params
 
       client_options = {}
-      client_options[:timeout] =  clone_config[:timeout] if clone_config[:timeout]
-      client_options[:open_timeout] =  clone_config[:open_timeout] if clone_config[:open_timeout]
-      client_options[:verify_ssl] =  clone_config[:verify_ssl] unless clone_config[:verify_ssl].nil?
+      client_options[:timeout] = clone_config[:timeout] if clone_config[:timeout]
+      client_options[:open_timeout] = clone_config[:open_timeout] if clone_config[:open_timeout]
+      client_options[:verify_ssl] = clone_config[:verify_ssl] unless clone_config[:verify_ssl].nil?
 
       if clone_config[:oauth]
         headers = add_oauth_header(method, path, headers)
         headers['pulp-user'] = clone_config[:user]
       elsif clone_config[:cert_auth]
@@ -50,11 +50,11 @@
           fail Runcible::ConfigurationUndefinedError, "Missing SSL certificate or key configuration."
         end
         client_options[:ssl_client_cert] = clone_config[:cert_auth][:ssl_client_cert]
         client_options[:ssl_client_key] = clone_config[:cert_auth][:ssl_client_key]
       else
-        client_options[:user] =  clone_config[:user]
+        client_options[:user] = clone_config[:user]
         client_options[:password] = config[:http_auth][:password]
       end
 
       client_options[:ca_file] = config[:ca_cert_file] unless config[:ca_cert_file].nil?
       client = RestClient::Resource.new(clone_config[:url], client_options)
@@ -81,11 +81,11 @@
         return resp
       end
     end
 
     def combine_get_params(path, params)
-      query_string  = params.map do |k, v|
+      query_string = params.map do |k, v|
         if v.is_a? Array
           v.map { |y| "#{k}=#{y}" }.join('&')
         else
           "#{k}=#{v}"
         end
@@ -103,15 +103,15 @@
     end
 
     def format_payload_json(payload_hash)
       if payload_hash
         if payload_hash[:optional]
-          if payload_hash[:required]
-            payload = payload_hash[:required].merge(payload_hash[:optional])
-          else
-            payload = payload_hash[:optional]
-          end
+          payload = if payload_hash[:required]
+                      payload_hash[:required].merge(payload_hash[:optional])
+                    else
+                      payload_hash[:optional]
+                    end
         elsif payload_hash[:delta]
           payload = payload_hash
         else
           payload = payload_hash[:required]
         end
@@ -126,10 +126,10 @@
       begin
         body = response.body == "null" ? nil : JSON.parse(response.body)
         if body.respond_to? :with_indifferent_access
           body = body.with_indifferent_access
         elsif body.is_a? Array
-          body = body.map  do |i|
+          body = body.map do |i|
             i.respond_to?(:with_indifferent_access) ? i.with_indifferent_access : i
           end
         end
         response = rest_client_response(body, response.net_http_res, response.args)
       rescue JSON::ParserError