Implemented requestIpApiCom

Author: sea5kg

.travis.yml

@@ -13,6 +13,7 @@ addons:
     - make
     - g++
     - pkg-config
+    - libcurl4-openssl-dev
 
 # Build steps
 script:

README.md

@@ -6,4 +6,27 @@ C++. Call request to another services for get location coordinates by IP-address
 
 Example:
 ```
+WSJCppGeoIPResult res = WSJCppGeoIP::requestToIpApiCom("1.1.1.1");
+if (res.hasError()) {
+    std::cout << "FAILED: " << res.getErrorDescription() << std::endl;
+} else {
+    std::cout << "Service Name: " << res.getServiceName() << std::endl;
+    std::cout << "IP Address: " << res.getIpAddress() << std::endl;
+    std::cout << "Country: " << res.getCountry() << std::endl;
+    std::cout << "Region Name: " << res.getRegionName() << std::endl;
+    std::cout << "City: " << res.getCity() << std::endl;
+    std::cout << "Latitude: " << res.getLatitude() << std::endl;
+    std::cout << "Longitude: " << res.getLongitude() << std::endl;
+}
+```
+
+Output:
+```
+Service Name: ip-api.com
+IP Address: 1.1.1.1
+Country: Australia
+Region Name: New South Wales
+City: Sydney
+Latitude: -33.8688
+Longitude: 151.209
 ```

src.wsjcpp/CMakeLists.txt

@@ -14,10 +14,10 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# wsjcpp/wsjcpp-core:v0.0.4
-list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_wsjcpp_core/")
-list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp")
-list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.h")
+# wsjcpp-core:v0.0.4
+list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
 
 # nlohmann/json:v3.7.3
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/nlohmann_json/")

…wsjcpp/wsjcpp_wsjcpp_core/unit_tests.cpp src.wsjcpp/wsjcpp_core/unit_tests.cppsrc.wsjcpp/wsjcpp_wsjcpp_core/unit_tests.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests.cpp src.wsjcpp/wsjcpp_wsjcpp_core/unit_tests.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests.cpp

@@ -2,7 +2,7 @@ wsjcpp_version: v0.0.1
 cmake_cxx_standard: 11
 cmake_minimum_required: 3.0
 
-name: wsjcpp/wsjcpp-core
+name: wsjcpp-core
 version: v0.0.4
 description: Basic Utils for wsjcpp
 issues: https://github.com/wsjcpp/wsjcpp-core/issues

…c.wsjcpp/wsjcpp_wsjcpp_core/unit_tests.h src.wsjcpp/wsjcpp_core/unit_tests.hsrc.wsjcpp/wsjcpp_wsjcpp_core/unit_tests.h renamed to src.wsjcpp/wsjcpp_core/unit_tests.h src.wsjcpp/wsjcpp_wsjcpp_core/unit_tests.h renamed to src.wsjcpp/wsjcpp_core/unit_tests.h

@@ -413,7 +413,7 @@ std::string WSJCppCore::createUuid() {
 
 // ---------------------------------------------------------------------
 
-bool WSJCppCore::isIPv4(std::string& str) {
+bool WSJCppCore::isIPv4(const std::string& str) {
     int n = 0;
     std::string s[4] = {"", "", "", ""};
     for (int i = 0; i < str.length(); i++) {
@@ -443,7 +443,7 @@ bool WSJCppCore::isIPv4(std::string& str) {
 
 // ---------------------------------------------------------------------
 
-bool WSJCppCore::isIPv6(std::string& str) {
+bool WSJCppCore::isIPv6(const std::string& str) {
     unsigned char buf[sizeof(struct in6_addr)];
     bool isValid = inet_pton(AF_INET6, str.c_str(), buf);
     return isValid;

…p/wsjcpp_wsjcpp_core/unit_tests_main.cpp …c.wsjcpp/wsjcpp_core/unit_tests_main.cppsrc.wsjcpp/wsjcpp_wsjcpp_core/unit_tests_main.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests_main.cpp src.wsjcpp/wsjcpp_wsjcpp_core/unit_tests_main.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests_main.cpp

@@ -48,8 +48,8 @@ class WSJCppCore {
 
         static void initRandom();
         static std::string createUuid();
-        static bool isIPv4(std::string& str);
-        static bool isIPv6(std::string& str);
+        static bool isIPv4(const std::string& str);
+        static bool isIPv6(const std::string& str);
 };
 
 

…sjcpp/wsjcpp_wsjcpp_core/wsjcpp.hold.yml src.wsjcpp/wsjcpp_core/wsjcpp.hold.ymlsrc.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp.hold.yml renamed to src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp.hold.yml renamed to src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml

@@ -25,14 +25,24 @@ int main(int argc, const char* argv[]) {
         vArgs.push_back(std::string(argv[i]));
     }
 
-    /*if (vArgs.size() != 3) {
-        std::cout << "Usage: " << vArgs[0] << " <string1> <string2>" << std::endl;
+    if (vArgs.size() != 2) {
+        std::cout << "Usage: " << vArgs[0] << " <ip-adderss>" << std::endl;
         return -1;
     }
 
-    std::string s1 = vArgs[1];
-    std::string s2 = vArgs[2];
-    int nDistance = WSJCppLevenshtein::distance(s1,s2);
-    std::cout << "" << nDistance << std::endl;*/
+    std::string sIpAddress = vArgs[1];
+    WSJCppGeoIPResult res = WSJCppGeoIP::requestToIpApiCom(sIpAddress);
+    if (res.hasError()) {
+        std::cout << "FAILED: " << res.getErrorDescription() << std::endl;
+    } else {
+        std::cout << "Service Name: " << res.getServiceName() << std::endl;
+        std::cout << "IP Address: " << res.getIpAddress() << std::endl;
+        std::cout << "Country: " << res.getCountry() << std::endl;
+        std::cout << "Region Name: " << res.getRegionName() << std::endl;
+        std::cout << "City: " << res.getCity() << std::endl;
+        std::cout << "Latitude: " << res.getLatitude() << std::endl;
+        std::cout << "Longitude: " << res.getLongitude() << std::endl;
+    }
+    // std::cout << "" << nDistance << std::endl;
     return 0;
 }