Merge branch 'release/v0.1.2'

mrtazz · mrtazz · commit df8f0eb21095 · 2011-03-22T22:10:50.000+01:00
diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@ This is a simple REST client for C++. It wraps libcurl for HTTP requests.
 ## Usage
 I tried to keep usage close to the [ruby rest-client][]. So the basic usage is:
 
-    restclient::method(url, content-type, params);
+    RestClient::method(url, content-type, params);
 
 Examples:
 
     #include "restclient.h"
 
-    RestClient::get("http://url.com")
-    RestClient::post("http://url.com/post", "text/json", "{"foo": "bla"}")
-    RestClient::put("http://url.com/put", "text/json", "{"foo": "bla"}")
-    RestClient::del("http://url.com/delete")
+    RestClient::response r = RestClient::get("http://url.com")
+    RestClient::response r = RestClient::post("http://url.com/post", "text/json", "{"foo": "bla"}")
+    RestClient::response r = RestClient::put("http://url.com/put", "text/json", "{"foo": "bla"}")
+    RestClient::response r = RestClient::del("http://url.com/delete")
 
 The response is of type RestClient::response and has two attributes:
 
@@ -28,6 +28,21 @@ The response is of type RestClient::response and has two attributes:
 - [gtest][] for development
 
 
+## Development
+- [Issues][]
+- [Tracker][]
+
+## Contribute
+- Fork the project.
+- Make your feature addition or bug fix.
+- Add tests for it. This is important so I don't break it in a future version
+  unintentionally.
+- Commit, do not mess with version
+- Send me a pull request. Bonus points for topic branches.
+
+
 [libcurl]: http://curl.haxx.se/libcurl/
 [ruby rest-client]: http://github.com/archiloque/rest-client
 [gtest]: http://code.google.com/p/googletest/
+[Issues]: https://github.com/mrtazz/restclient-cpp/issues
+[Tracker]: https://www.pivotaltracker.com/projects/255177/stories
diff --git a/include/meta.h b/include/meta.h
@@ -8,7 +8,7 @@
 #define INCLUDE_META_H_
 
 // version string normally set from makefile
-#define VERSION "0.1.1"
+#define VERSION "0.1.2"
 
 #endif  // INCLUDE_META_H_
 
diff --git a/include/restclient.h b/include/restclient.h
@@ -11,6 +11,7 @@
 
 #include <curl/curl.h>
 #include <string>
+#include <cstdlib>
 #include "meta.h"
 
 class RestClient
diff --git a/source/restclient.cpp b/source/restclient.cpp
@@ -9,6 +9,7 @@
   ========================*/
 #include "include/restclient.h"
 
+#include <cstring>
 #include <string>
 #include <iostream>
 
@@ -45,9 +46,9 @@ RestClient::response RestClient::get(const std::string& url)
     res = curl_easy_perform(curl);
     if (res != 0)
     {
-      std::cerr << "Failed to query " << url << ":"
-          << std::endl << curl_easy_strerror(res) << std::endl << std::flush;
-      exit(1);
+      ret.body = "Failed to query.";
+      ret.code = -1;
+      return ret;
     }
     long http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -109,9 +110,9 @@ RestClient::response RestClient::post(const std::string& url,
     res = curl_easy_perform(curl);
     if (res != 0)
     {
-      std::cerr << "Failed to query " << url << ":"
-          << std::endl << curl_easy_strerror(res) << std::endl << std::flush;
-      exit(1);
+      ret.body = "Failed to query.";
+      ret.code = -1;
+      return ret;
     }
     long http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -179,9 +180,9 @@ RestClient::response RestClient::put(const std::string& url,
     res = curl_easy_perform(curl);
     if (res != 0)
     {
-      std::cerr << "Failed to query " << url << ":"
-          << std::endl << curl_easy_strerror(res) << std::endl << std::flush;
-      exit(1);
+      ret.body = "Failed to query.";
+      ret.code = -1;
+      return ret;
     }
     long http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -228,9 +229,9 @@ RestClient::response RestClient::del(const std::string& url)
     res = curl_easy_perform(curl);
     if (res != 0)
     {
-      std::cerr << "Failed to query " << url << ":"
-          << std::endl << curl_easy_strerror(res) << std::endl << std::flush;
-      exit(1);
+      ret.body = "Failed to query.";
+      ret.code = -1;
+      return ret;
     }
     long http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
diff --git a/test/test_restclient_delete.cpp b/test/test_restclient_delete.cpp
@@ -42,3 +42,10 @@ TEST_F(RestClientDeleteTest, TestRestClientDeleteCode)
   RestClient::response res = RestClient::del(url);
   EXPECT_EQ(200, res.code);
 }
+// check for failure
+TEST_F(RestClientDeleteTest, TestRestClientFailureCode)
+{
+  std::string u = "http://nonexistent";
+  RestClient::response res = RestClient::del(u);
+  EXPECT_EQ(-1, res.code);
+}
diff --git a/test/test_restclient_get.cpp b/test/test_restclient_get.cpp
@@ -42,3 +42,10 @@ TEST_F(RestClientGetTest, TestRestClientGETCode)
   RestClient::response res = RestClient::get(url);
   EXPECT_EQ(200, res.code);
 }
+// check for failure
+TEST_F(RestClientGetTest, TestRestClientFailureCode)
+{
+  std::string u = "http://nonexistent";
+  RestClient::response res = RestClient::get(u);
+  EXPECT_EQ(-1, res.code);
+}
diff --git a/test/test_restclient_post.cpp b/test/test_restclient_post.cpp
@@ -56,3 +56,10 @@ TEST_F(RestClientPostTest, TestRestClientPOSTBody)
                                               ctype, data);
   EXPECT_EQ(data, res.body);
 }
+// check for failure
+TEST_F(RestClientPostTest, TestRestClientFailureCode)
+{
+  std::string u = "http://nonexistent";
+  RestClient::response res = RestClient::post(u, ctype, data);
+  EXPECT_EQ(-1, res.code);
+}
diff --git a/test/test_restclient_put.cpp b/test/test_restclient_put.cpp
@@ -54,3 +54,10 @@ TEST_F(RestClientPutTest, TestRestClientPUTBody)
   RestClient::response res = RestClient::put(url+"/body", ctype, data);
   EXPECT_EQ(data, res.body);
 }
+// check for failure
+TEST_F(RestClientPutTest, TestRestClientFailureCode)
+{
+  std::string u = "http://nonexistent";
+  RestClient::response res = RestClient::put(u, ctype, data);
+  EXPECT_EQ(-1, res.code);
+}
