Fixed tests and README file

Author: JosephP91

CMakeLists.txt

@@ -15,7 +15,7 @@ include(GNUInstallDirs)
 
 option(BUILD_TEST "Build Tests" OFF)
 
-#if using an older VERSION of curl ocsp stapling can be disabled
+# if using an older VERSION of curl ocsp stapling can be disabled
 set(CURL_MIN_VERSION "7.28.0")
 
 set(DEFAULT_BUILD_TYPE "Release")

README.md

@@ -52,7 +52,7 @@ Here are some usage examples. You will find more examples in the test folder!
 Here's an example of a simple HTTP request to get google web page, using the curl_easy interface:
 
 `````c++
-#include "curl_easy.h"
+#include "curlcpp/curl_easy.h"
 
 using curl::curl_easy;
 using curl::curl_easy_exception;
@@ -82,9 +82,9 @@ int main() {
 If you want to get information about the current curl session, you could do:
 
 `````c++
-#include "curl_easy.h"
-#include "curl_ios.h"
-#include "curl_exception.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/curl_exception.h"
 
 using std::ostringstream;
 
@@ -140,10 +140,10 @@ Here's instead, the creation of an HTTPS POST login form:
 `````c++
 #include <string>
 
-#include "curl_easy.h"
-#include "curl_pair.h"
-#include "curl_form.h"
-#include "curl_exception.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_pair.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_exception.h"
 
 using std::string;
 
@@ -192,9 +192,9 @@ And if we would like to put the returned content in a file? Nothing easier than:
 #include <ostream>
 #include <fstream>
 
-#include "curl_easy.h"
-#include "curl_ios.h"
-#include "curl_exception.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/curl_exception.h"
 
 using std::cout;
 using std::endl;
@@ -241,10 +241,10 @@ Not interested in files? So let's put the request's output in a variable!
 #include <iostream>
 #include <ostream>
 
-#include "curl_easy.h"
-#include "curl_form.h"
-#include "curl_ios.h"
-#include "curl_exception.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/curl_exception.h"
 
 using std::cout;
 using std::endl;
@@ -291,12 +291,12 @@ buffers. For example, a very simple send/receiver would be:
 #include <iostream>
 #include <string>
 
-#include "curl_easy.h"
-#include "curl_form.h"
-#include "curl_pair.h"
-#include "curl_receiver.h"
-#include "curl_exception.h"
-#include "curl_sender.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_pair.h"
+#include "curlcpp/curl_receiver.h"
+#include "curlcpp/curl_exception.h"
+#include "curlcpp/curl_sender.h"
 
 using std::cout;
 using std::endl;

test/cookie.cpp

@@ -1,10 +1,10 @@
 #include <iostream>
 
-#include "curl_easy.h"
-#include "curl_exception.h"
-#include "curl_cookie.h"
-#include "curl_ios.h"
-#include "cookie_datetime.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_exception.h"
+#include "curlcpp/curl_cookie.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/cookie_datetime.h"
 
 using std::ostringstream;
 
@@ -57,17 +57,16 @@ int main() {
         // Delete all the memory helded cookies.
         cookie_object.erase();
 
-		// Print them all!
-		for (const auto& cook : cookies) {
-			std::cout<<cook<<std::endl;
-		}
-
+		    // Print them all!
+		    for (const auto& cook : cookies) {
+			      std::cout<<cook<<std::endl;
+		    }
     } catch (curl_easy_exception &error) {
-		// If you want to print the last error.
-		std::cerr<<error.what()<<std::endl;
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
 
-		// If you want to print the entire error stack you can do.
-		error.print_traceback();
+		    // If you want to print the entire error stack you can do.
+		    error.print_traceback();
     }
     return 0;
 }

test/custom_request.cpp

@@ -1,6 +1,6 @@
-#include "curl_easy.h"
-#include "curl_form.h"
-#include "curl_header.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_header.h"
 
 using curl::curl_easy;
 using curl::curl_easy_exception;
@@ -33,11 +33,11 @@ int main() {
         // Request execution
         easy.perform();
     } catch (curl_easy_exception &error) {
-		// If you want to print the last error.
-		std::cerr<<error.what()<<std::endl;
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
 
-		// If you want to print the entire error stack you can do
-		error.print_traceback();
+		    // If you want to print the entire error stack you can do
+		    error.print_traceback();
     }
     return 0;
 }

test/easy.cpp

@@ -1,4 +1,4 @@
-#include "curl_easy.h"
+#include "curlcpp/curl_easy.h"
 
 using curl::curl_easy;
 using curl::curl_easy_exception;
@@ -18,7 +18,7 @@ int main() {
     try {
         easy.perform();
     } catch (curl_easy_exception &error) {
-    	// If you want to print the last error.
+    	  // If you want to print the last error.
         std::cerr<<error.what()<<std::endl;
     }
     return 0;

test/easy_info.cpp

@@ -1,6 +1,6 @@
-#include "curl_easy.h"
-#include "curl_ios.h"
-#include "curl_exception.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/curl_exception.h"
 
 using std::ostringstream;
 
@@ -30,22 +30,22 @@ int main(int argc, const char **argv) {
     try {
         easy.perform();
 
-		// Retrieve information about curl current session.
-		auto x = easy.get_info<CURLINFO_CONTENT_TYPE>();
+		    // Retrieve information about curl current session.
+		    auto x = easy.get_info<CURLINFO_CONTENT_TYPE>();
 
-		/**
-		 * get_info returns a curl_easy_info object. With the get method we retrieve
-		 * the std::pair object associated with it: the first item is the return code of the
-		 * request. The second is the element requested by the specified libcurl macro.
-		 */
-		std::cout<<x.get()<<std::endl;
+		    /**
+		     * get_info returns a curl_easy_info object. With the get method we retrieve
+		     * the std::pair object associated with it: the first item is the return code of the
+		     * request. The second is the element requested by the specified libcurl macro.
+		     */
+		    std::cout<<x.get()<<std::endl;
 
     } catch (curl_easy_exception &error) {
-		// If you want to print the last error.
-		std::cerr<<error.what()<<std::endl;
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
 
-		// If you want to print the entire error stack you can do
-		error.print_traceback();
+		    // If you want to print the entire error stack you can do
+		    error.print_traceback();
     }
     return 0;
 }

test/header.cpp

@@ -1,6 +1,6 @@
-#include "curl_easy.h"
-#include "curl_form.h"
-#include "curl_header.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_header.h"
 
 using curl::curl_easy;
 using curl::curl_easy_exception;
@@ -14,8 +14,8 @@ int main() {
     // Easy object to handle the connection.
     curl_easy easy;
 
-	// Let's create an object which will contain a list of headers.
-	curl::curl_header header;
+	  // Let's create an object which will contain a list of headers.
+	  curl::curl_header header;
     header.add("Accept:");
     header.add("Another:yes");
     header.add("Host: example.com");
@@ -29,11 +29,11 @@ int main() {
     try {
         easy.perform();
     } catch (curl_easy_exception &error) {
-		// If you want to print the last error.
-		std::cerr<<error.what()<<std::endl;
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
 
-		// If you want to print the entire error stack you can do
-		error.print_traceback();
+		    // If you want to print the entire error stack you can do
+		    error.print_traceback();
     }
     return 0;
 }

test/output_variable.cpp

@@ -0,0 +1,48 @@
+#include <iostream>
+#include <ostream>
+
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
+#include "curlcpp/curl_ios.h"
+#include "curlcpp/curl_exception.h"
+
+using std::cout;
+using std::endl;
+using std::ostringstream;
+
+using curl::curl_easy;
+using curl::curl_ios;
+using curl::curl_easy_exception;
+using curl::curlcpp_traceback;
+
+
+/**
+ * This example shows how to put curl output inside a stream (a variable, for
+ * example)
+ */
+int main() {
+    // Create a stringstream object
+    ostringstream str;
+    // Create a curl_ios object, passing the stream object.
+    curl_ios<ostringstream> writer(str);
+    
+    // Pass the writer to the easy constructor and watch the content returned in that variable!
+    curl_easy easy(writer);
+    easy.add<CURLOPT_URL>("https://google.com");
+    easy.add<CURLOPT_FOLLOWLOCATION>(1L);
+
+    try {
+        easy.perform();
+        
+        // Print the content of ostringstream.
+        cout<<str.str()<<endl;
+    
+    } catch (curl_easy_exception &error) {
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
+
+		    // If you want to print the entire error stack you can do
+		    error.print_traceback();
+    }
+    return 0;
+}

test/recv_header.cpp

@@ -1,5 +1,5 @@
-#include "curl_easy.h"
-#include "curl_form.h"
+#include "curlcpp/curl_easy.h"
+#include "curlcpp/curl_form.h"
 
 using curl::curl_easy;
 using curl::curl_ios;
@@ -36,15 +36,15 @@ int main() {
     try {
         easy.perform();
 
-		// Let's print ONLY the headers.
-		std::cout<<header_var.str()<<std::endl;
+		    // Let's print ONLY the headers.
+		    std::cout<<header_var.str()<<std::endl;
 
     } catch (curl_easy_exception &error) {
-		// If you want to print the last error.
-		std::cerr<<error.what()<<std::endl;
+		    // If you want to print the last error.
+		    std::cerr<<error.what()<<std::endl;
 
-		// If you want to print the entire error stack you can do
-		error.print_traceback();
+		    // If you want to print the entire error stack you can do
+		    error.print_traceback();
     }
     return 0;
 }