Tidy up #run

Author: rastating

lib/wpxf/wordpress/file_download.rb

@@ -66,20 +66,12 @@ def export_path
   # Run the module.
   # @return [Boolean] true if successful.
   def run
-    raise 'A value must be specified for #working_directory' unless working_directory
+    validate_implementation
 
     return false unless super
-    res = request_file
-
-    if res.nil? || res.timed_out?
-      emit_error 'Request timed out, try increasing the http_client_timeout'
-      return false
-    end
 
-    if res.code != 200
-      emit_error "Server responded with code #{res.code}"
-      return false
-    end
+    res = request_file
+    return false unless validate_result(res)
 
     if export_path.nil?
       emit_success "Result: \n#{res.body}"
@@ -92,26 +84,39 @@ def run
 
   private
 
+  def validate_implementation
+    raise 'A value must be specified for #working_directory' unless working_directory
+  end
+
+  def validate_result(res)
+    if res.nil? || res.timed_out?
+      emit_error 'Request timed out, try increasing the http_client_timeout'
+      return false
+    end
+
+    return true unless res.code != 200
+
+    emit_error "Server responded with code #{res.code}"
+    false
+  end
+
+  def core_request_opts
+    {
+      method: download_request_method,
+      url: downloader_url,
+      params: download_request_params,
+      body: download_request_body,
+      cookie: session_cookie
+    }
+  end
+
   def request_file
     if export_path.nil?
       emit_info 'Requesting file...'
-      return execute_request(
-        method: download_request_method,
-        url: downloader_url,
-        params: download_request_params,
-        body: download_request_body,
-        cookie: session_cookie
-      )
+      return execute_request(core_request_opts)
     else
       emit_info 'Downloading file...'
-      return download_file(
-        url: downloader_url,
-        method: download_request_method,
-        params: download_request_params,
-        local_filename: export_path,
-        body: download_request_body,
-        cookie: session_cookie
-      )
+      return download_file(core_request_opts.merge(local_filename: export_path))
     end
   end
 end