rename to httpclient

igagis · igagis · commit 3bcce5d54224 · 2025-07-03T15:27:50.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 curl-7.70.0/*
+**/out/*
diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-:name: httpc
+:name: httpclient
 
 = {name}
 
diff --git a/build/debian/control.in b/build/debian/control.in
@@ -1,4 +1,4 @@
-Source: libhttpc
+Source: libhttpclient
 Section: libs
 Priority: extra
 Maintainer: Ivan Gagis <igagis@gmail.com>
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), prorab, prorab-extra, myci, pkg-config,
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.2
 
-Package: libhttpc$(soname)
+Package: libhttpclient$(soname)
 Section: libs
 Architecture: any
 Depends:
@@ -25,39 +25,39 @@ Depends:
 Description: cross-platform HTTP client library in C++.
 	Cross-platform HTTP/HTTPS client library in C++. Mainly, this is a wrapper above libcurl.
 
-Package: libhttpc-dbg$(soname)
+Package: libhttpclient-dbg$(soname)
 Section: libs
 Architecture: any
 Depends:
 	${shlibs:Depends},
 	${misc:Depends}
 Description: cross-platform HTTP client library in C++.
-	Debug version of libhttpc.
+	Debug version of libhttpclient.
 
-Package: libhttpc-dev
+Package: libhttpclient-dev
 Section: libdevel
 Architecture: any
 Depends:
-	libhttpc$(soname) (= ${binary:Version}),
-	libhttpc-dbg$(soname) (= ${binary:Version}),
+	libhttpclient$(soname) (= ${binary:Version}),
+	libhttpclient-dbg$(soname) (= ${binary:Version}),
 	${misc:Depends}
 	libhttpmodel-dev
-Suggests: libhttpc-doc
+Suggests: libhttpclient-doc
 Description: cross-platform HTTP client library in C++, development files.
-	Development files for libhttpc$(soname).
+	Development files for libhttpclient$(soname).
 
-Package: libhttpc$(soname)-dbgsrc
+Package: libhttpclient$(soname)-dbgsrc
 Section: debug
 Architecture: all
 Depends:
-	libhttpc$(soname)-dbgsym (= ${binary:Version}),
-	libhttpc-dbg$(soname)-dbgsym (= ${binary:Version}),
+	libhttpclient$(soname)-dbgsym (= ${binary:Version}),
+	libhttpclient-dbg$(soname)-dbgsym (= ${binary:Version}),
 	${misc:Depends}
-Description: debugging sources for libhttpc$(soname) package.
+Description: debugging sources for libhttpclient$(soname) package.
 
-Package: libhttpc-doc
+Package: libhttpclient-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: documentation for libhttpc-dev package.
-	For more details see description to libhttpc-dev package.
+Description: documentation for libhttpclient-dev package.
+	For more details see description to libhttpclient-dev package.
diff --git a/build/debian/libhttpc$(soname).install.in b/build/debian/libhttpc$(soname).install.in
diff --git a/build/debian/libhttpclient$(soname)-dbgsrc.install.in b/build/debian/libhttpclient$(soname)-dbgsrc.install.in
diff --git a/build/debian/libhttpclient$(soname).install.in b/build/debian/libhttpclient$(soname).install.in
@@ -0,0 +1 @@
+usr/lib/libhttpclient.so.*
diff --git a/build/debian/libhttpclient-dbg$(soname).install.in b/build/debian/libhttpclient-dbg$(soname).install.in
diff --git a/build/debian/libhttpclient-dev.install b/build/debian/libhttpclient-dev.install
diff --git a/build/debian/libhttpclient-doc.install b/build/debian/libhttpclient-doc.install
diff --git a/build/homebrew/libhttpclient.rb.in b/build/homebrew/libhttpclient.rb.in
@@ -1,7 +1,7 @@
-class Libhttpc < Formula
+class Libhttpclient < Formula
   desc "C++ cross-platform HTTP client library."
-  homepage "https://github.com/cppfw/httpc"
-  url "https://github.com/cppfw/httpc/archive/$(version).tar.gz"
+  homepage "https://github.com/cppfw/httpclient"
+  url "https://github.com/cppfw/httpclient/archive/$(version).tar.gz"
   sha256 "$(sha256)"
 
   depends_on "prorab" => :build
diff --git a/build/msys2/PKGBUILD.in b/build/msys2/PKGBUILD.in
@@ -17,7 +17,7 @@ else
 	exit 1
 fi
 
-packageName=httpc
+packageName=httpclient
 
 pkgname="${pkgPrefix}${packageName}"
 pkgver=$(version)
diff --git a/doc/makefile b/doc/makefile
@@ -1,7 +1,7 @@
 include prorab.mk
 include prorab-doxygen.mk
 
-this_name := httpc
+this_name := httpclient
 this_out_dir := out
 this_version := $(shell myci-deb-version.sh)
 
diff --git a/pkg-config/httpclient.pc.in b/pkg-config/httpclient.pc.in
@@ -1,9 +1,9 @@
-Name: httpc   # human-readable name
+Name: httpclient   # human-readable name
 Description: HTTP client C++ library # human-readable description
 Version: $(version)
-URL: https://github.com/cppfw/httpc
+URL: https://github.com/cppfw/httpclient
 Requires:
 Conflicts:
-Libs: -lhttpc
+Libs: -lhttpclient
 Libs.private:
 Cflags:
diff --git a/src/httpclient/init_guard.cpp b/src/httpclient/init_guard.cpp
@@ -33,7 +33,7 @@ SOFTWARE.
 #include <nitki/queue.hpp>
 #include <nitki/semaphore.hpp>
 
-using namespace httpc;
+using namespace httpclient;
 
 decltype(init_guard::instance) init_guard::instance;
 
diff --git a/src/httpclient/init_guard.hpp b/src/httpclient/init_guard.hpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include "request.hpp"
 
-namespace httpc {
+namespace httpclient {
 
 class init_guard : public utki::intrusive_singleton<init_guard>
 {
@@ -50,4 +50,4 @@ class init_guard : public utki::intrusive_singleton<init_guard>
 	~init_guard() noexcept;
 };
 
-} // namespace httpc
+} // namespace httpclient
diff --git a/src/httpclient/request.cpp b/src/httpclient/request.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 
 #include "init_guard.hpp"
 
-using namespace httpc;
+using namespace httpclient;
 
 size_t request::write_data(void* buffer, size_t size, size_t nmemb, void* userp)
 {
diff --git a/src/httpclient/request.hpp b/src/httpclient/request.hpp
@@ -35,7 +35,7 @@ SOFTWARE.
 #include <httpmodel/response.hpp>
 #include <utki/span.hpp>
 
-namespace httpc {
+namespace httpclient {
 
 enum class status_code {
 	undefined, // TODO: remove
@@ -100,4 +100,4 @@ class request : public std::enable_shared_from_this<request>
 	);
 };
 
-} // namespace httpc
+} // namespace httpclient
diff --git a/src/httpclient/util.cpp b/src/httpclient/util.cpp
@@ -31,9 +31,9 @@ SOFTWARE.
 #include <curl/curl.h>
 #include <utki/util.hpp>
 
-using namespace httpc;
+using namespace httpclient;
 
-std::string httpc::escape(const std::string& str)
+std::string httpclient::escape(const std::string& str)
 {
 	auto curl = curl_easy_init();
 	utki::scope_exit curl_scope_exit([curl]() {
diff --git a/src/httpclient/util.hpp b/src/httpclient/util.hpp
@@ -28,8 +28,8 @@ SOFTWARE.
 
 #include <string>
 
-namespace httpc {
+namespace httpclient {
 
 std::string escape(const std::string& str);
 
-} // namespace httpc
+} // namespace httpclient
diff --git a/src/makefile b/src/makefile
@@ -5,7 +5,7 @@ include prorab-clang-format.mk
 
 $(eval $(call prorab-config, ../config))
 
-this_src_dir := httpc
+this_src_dir := httpclient
 
 this_name := $(this_src_dir)$(this_dbg)
 
diff --git a/tests/unit/application.cpp b/tests/unit/application.cpp
@@ -1,10 +1,10 @@
 #include <tst/application.hpp>
 
-#include "../../src/httpc/init_guard.hpp"
+#include "../../src/httpclient/init_guard.hpp"
 
 namespace{
 class application : public tst::application{
-    httpc::init_guard httpc_init_guard;
+    httpclient::init_guard httpc_init_guard;
 public:
     application() :
             tst::application(std::string(), std::string())
diff --git a/tests/unit/basic.cpp b/tests/unit/basic.cpp
@@ -8,8 +8,8 @@
 #include <thread>
 #include <optional>
 
-#include "../../src/httpc/request.hpp"
-#include "../../src/httpc/init_guard.hpp"
+#include "../../src/httpclient/request.hpp"
+#include "../../src/httpclient/init_guard.hpp"
 
 namespace{
 tst::set set("basic", [](tst::suite& suite){
@@ -20,9 +20,9 @@ tst::set set("basic", [](tst::suite& suite){
 
             std::vector<uint8_t> data;
 
-            httpc::status_code req_status = httpc::status_code::undefined;
+            httpclient::status_code req_status = httpclient::status_code::undefined;
 
-            auto r = std::make_shared<httpc::request>([&](httpc::status_code sc, httpc::request& r){
+            auto r = std::make_shared<httpclient::request>([&](httpclient::status_code sc, httpclient::request& r){
                 // this callback is run from separate thread, so do not use tst::check() inside
                 req_status = sc;
                 data = std::move(r.get_response().body);
@@ -35,7 +35,7 @@ tst::set set("basic", [](tst::suite& suite){
 
             completed.wait();
 
-            tst::check(req_status == httpc::status_code::ok, SL) << "status = " << unsigned(req_status);
+            tst::check(req_status == httpclient::status_code::ok, SL) << "status = " << unsigned(req_status);
 
             LOG([&](auto&o){o << "body.size() = " << data.size() << std::endl;});
             LOG([&](auto&o){o << utki::make_string(data) << std::endl;});
@@ -45,7 +45,7 @@ tst::set set("basic", [](tst::suite& suite){
     suite.add(
         "cancel_non_active_request",
         [](){
-            auto r = std::make_shared<httpc::request>([](httpc::status_code sc, httpc::request& r){});
+            auto r = std::make_shared<httpclient::request>([](httpclient::status_code sc, httpclient::request& r){});
 
             r->set_url("http://izdelie.icu");
 
@@ -60,9 +60,9 @@ tst::set set("basic", [](tst::suite& suite){
 
             nitki::semaphore sema;
 
-            httpc::status_code req_status = httpc::status_code::undefined;
+            httpclient::status_code req_status = httpclient::status_code::undefined;
 
-            auto r = std::make_shared<httpc::request>([&](httpc::status_code sc, httpc::request& req){
+            auto r = std::make_shared<httpclient::request>([&](httpclient::status_code sc, httpclient::request& req){
                 completed = true;
                 auto r = req.get_response();
                 LOG([&](auto&o){
@@ -109,7 +109,7 @@ tst::set set("basic", [](tst::suite& suite){
 
             // since we are cancelling the requet, we expect that request completed handler was not called,
             // so the request status should remain undefined
-            tst::check(req_status == httpc::status_code::undefined, SL) << "req_status = " << unsigned(req_status);
+            tst::check(req_status == httpclient::status_code::undefined, SL) << "req_status = " << unsigned(req_status);
         }
     );
 
@@ -120,10 +120,10 @@ tst::set set("basic", [](tst::suite& suite){
 
             std::vector<uint8_t> data;
 
-            auto req_status = httpc::status_code::undefined;
+            auto req_status = httpclient::status_code::undefined;
             std::optional<httpmodel::status> resp_code;
 
-            auto r = std::make_shared<httpc::request>([&](httpc::status_code sc, httpc::request& r){
+            auto r = std::make_shared<httpclient::request>([&](httpclient::status_code sc, httpclient::request& r){
                 req_status = sc;
                 resp_code = r.get_response().status;
                 data = std::move(r.get_response().body);
@@ -144,7 +144,7 @@ tst::set set("basic", [](tst::suite& suite){
 
             completed.wait();
 
-            tst::check(req_status == httpc::status_code::ok, SL) << "req_status = " << unsigned(req_status);
+            tst::check(req_status == httpclient::status_code::ok, SL) << "req_status = " << unsigned(req_status);
             tst::check(resp_code.has_value(), SL);
             tst::check(resp_code.value() == httpmodel::status::http_200_ok, SL) << "http_code = " << unsigned(resp_code.value());
 
diff --git a/tests/unit/makefile b/tests/unit/makefile
@@ -11,7 +11,7 @@ this_ldlibs += -lnitki
 this_ldlibs += -lutki
 this_ldlibs += -ltst
 
-this_ldlibs += ../../src/out/$(c)/libhttpc$(this_dbg)$(dot_so)
+this_ldlibs += ../../src/out/$(c)/libhttpclient$(this_dbg)$(dot_so)
 
 this_no_install := true
 
diff --git a/tests/unit/util.cpp b/tests/unit/util.cpp
@@ -3,14 +3,14 @@
 
 #include <string>
 
-#include "../../src/httpc/util.hpp"
+#include "../../src/httpclient/util.hpp"
 
 using namespace std::string_literals;
 
 namespace{
 tst::set set("util", [](tst::suite& suite){
 	suite.add("url_escaping", [](){
-		auto res = httpc::escape("Hello World!");
+		auto res = httpclient::escape("Hello World!");
 		tst::check_eq(res, "Hello%20World%21"s, SL);
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-:name: httpc`
	`1`	`+:name: httpclient`
`2`	`2`
`3`	`3`	`= {name}`
`4`	`4`