Skip to content

Commit 98c87fe

Browse files
committed
Updated wsjcpp-core and wsjcpp-validators
1 parent 8a48ac2 commit 98c87fe

24 files changed

+702
-457
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# wsjcpp-geoip
22

3-
[![Build Status](https://api.travis-ci.org/wsjcpp/wsjcpp-geoip.svg?branch=master)](https://travis-ci.org/wsjcpp/wsjcpp-geoip) [![Github Stars](https://img.shields.io/github/stars/wsjcpp/wsjcpp-geoip.svg?label=github%20%E2%98%85)](https://github.com/wsjcpp/wsjcpp-geoip) [![Github Stars](https://img.shields.io/github/contributors/wsjcpp/wsjcpp-geoip.svg)](https://github.com/wsjcpp/wsjcpp-geoip) [![Github Forks](https://img.shields.io/github/forks/wsjcpp/wsjcpp-geoip.svg?label=github%20forks)](https://github.com/wsjcpp/wsjcpp-geoip/network/members)
3+
[![Build Status](https://api.travis-ci.com/wsjcpp/wsjcpp-geoip.svg?branch=master)](https://travis-ci.com/wsjcpp/wsjcpp-geoip) [![Github Stars](https://img.shields.io/github/stars/wsjcpp/wsjcpp-geoip.svg?label=github%20%E2%98%85)](https://github.com/wsjcpp/wsjcpp-geoip) [![Github Stars](https://img.shields.io/github/contributors/wsjcpp/wsjcpp-geoip.svg)](https://github.com/wsjcpp/wsjcpp-geoip) [![Github Forks](https://img.shields.io/github/forks/wsjcpp/wsjcpp-geoip.svg?label=github%20forks)](https://github.com/wsjcpp/wsjcpp-geoip/network/members)
44

55
C++. Call request to another services for get location coordinates by IP-address
66

@@ -19,7 +19,7 @@ or use a wsjcpp: `wsjcpp install https://github.com/wsjcpp/wsjcpp-geoip:master`
1919
## Example code usage:
2020

2121
```
22-
WSJCppGeoIPResult res = WSJCppGeoIP::requestToIpApiCom("1.1.1.1");
22+
WsjcppGeoIPResult res = WsjcppGeoIP::requestToIpApiCom("1.1.1.1");
2323
if (res.hasError()) {
2424
std::cout << "FAILED: " << res.getErrorDescription() << std::endl;
2525
} else {

src.wsjcpp/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Automaticly generated by wsjcpp@v0.0.1
22
cmake_minimum_required(VERSION 3.0)
33

4-
add_definitions(-DWSJCPP_VERSION="v0.0.2")
4+
add_definitions(-DWSJCPP_VERSION="v0.1.0")
55
add_definitions(-DWSJCPP_NAME="wsjcpp-geoip")
66

77
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -17,7 +17,7 @@ set (WSJCPP_SOURCES "")
1717
find_package(Threads REQUIRED)
1818
list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
1919

20-
# wsjcpp-core:v0.0.5
20+
# wsjcpp-core:v0.1.1
2121
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
2222
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
2323
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
@@ -26,14 +26,11 @@ list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
2626
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/nlohmann_json/")
2727
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/nlohmann_json/json.hpp")
2828

29-
# wsjcpp-validators:v0.0.3
29+
# wsjcpp-validators:v0.1.0
3030
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_validators/")
3131
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h")
3232
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp")
3333

34-
# required-libraries
35-
list (APPEND WSJCPP_LIBRARIES "-lpthread")
36-
3734
# required-pkg-config
3835
## CURL
3936
FIND_PACKAGE(CURL)

src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_cxx_standard: 11
33
cmake_minimum_required: 3.0
44

55
name: wsjcpp-core
6-
version: v0.0.5
6+
version: v0.1.1
77
description: Basic Utils for wsjcpp
88
issues: https://github.com/wsjcpp/wsjcpp-core/issues
99
repositories:
@@ -17,30 +17,22 @@ authors:
1717
- name: Evgenii Sopov
1818
email: mrseakg@gmail.com
1919

20-
required-libraries:
21-
- pthread
22-
2320
distribution:
2421
- source-file: src/wsjcpp_core.cpp
2522
target-file: wsjcpp_core.cpp
26-
sha1: "d892bfee196af88dcada57b39bc6bd65ce2ce075"
2723
type: "source-code"
2824
- source-file: src/wsjcpp_core.h
2925
target-file: wsjcpp_core.h
30-
sha1: "8f5e7b7ada06814ed123a08e49acffe2e12d398a"
3126
type: "source-code" # todo must be header-file
3227
- source-file: "src/wsjcpp_unit_tests.cpp"
3328
target-file: "wsjcpp_unit_tests.cpp"
3429
type: "unit-tests"
35-
sha1: "4208e039ec2923636655b3ada79ec223cca7bae2"
3630
- source-file: "src/wsjcpp_unit_tests.h"
3731
target-file: "wsjcpp_unit_tests.h"
3832
type: "unit-tests"
39-
sha1: "8d2ec886f23161a639bb2419bb5e4af48278f18b"
4033
- source-file: "src/wsjcpp_unit_tests_main.cpp"
4134
target-file: "wsjcpp_unit_tests_main.cpp"
4235
type: "unit-tests"
43-
sha1: "2c02fb58f51687eeac2076096b7df698cc246c9d"
4436

4537
unit-tests:
4638
cases:
@@ -54,3 +46,25 @@ unit-tests:
5446
description: "String to upper"
5547
- name: "CreateUuid"
5648
description: "Test generation uuids"
49+
- name: "GetEnv"
50+
description: "Test getEnv function"
51+
- name: "ToLower"
52+
description: "Test toLower"
53+
- name: "ReplaceAll"
54+
description: "Test replace all"
55+
- name: "DecodeUriComponent"
56+
description: "Check decoding"
57+
- name: "EncodeUriComponent"
58+
description: "Check encoding"
59+
- name: "Uint2HexString"
60+
description: "Test convert unsigned int to hex string"
61+
- name: "Split"
62+
description: "Test split function"
63+
- name: "CreateEmptyFile"
64+
description: "Test create empty file"
65+
- name: "ReadFileToBuffer"
66+
description: "test for readFileToBuffer"
67+
- name: "Join"
68+
description: "Test join function"
69+
- name: "getHumanSizeBytes"
70+
description: "Test function get human size in bytes"

0 commit comments

Comments
 (0)