liburlparser 1.4.4__tar.gz → 1.4.6__tar.gz

{liburlparser-1.4.4 → liburlparser-1.4.6}/.github/workflows/wheels.yml

@@ -5,16 +5,15 @@ on:
   pull_request:
   push:
     branches:
-     - master
-  release:
-    types:
-      - published
+      - master
+    tags:
+      - "v*"
 
 env:
   FORCE_COLOR: 3
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: github.workflow−{{ github.workflow }}-{{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -54,7 +53,7 @@ jobs:
         submodules: true
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.13.1
+      uses: pypa/cibuildwheel@v2.16.5
       env:
 #          CIBW_ARCHS_MACOS: universal2
 #          CIBW_ARCHS_WINDOWS: auto ARM64
@@ -71,11 +70,11 @@ jobs:
         path: wheelhouse/*.whl
 
 
-  upload_all:
-    name: Upload if release
+  release:
+    name: Release Assets and Upload to PyPI
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && github.event.action == 'published'
+    if: startsWith(github.ref, 'refs/tags/')
 
     steps:
     - uses: actions/setup-python@v4
@@ -87,13 +86,13 @@ jobs:
         name: artifact
         path: dist
 
-    - uses: pypa/gh-action-pypi-publish@release/v1
+    - name: Release with assets
+      uses: softprops/action-gh-release@v1
+      with:
+        files: dist/*
+
+    - name: Publishing to PyPi
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_PASSWORD }}
         user: ${{ secrets.PYPI_USERNAME }}
-
-#    - name: Release
-#      uses: softprops/action-gh-release@v1
-#      if: startsWith(github.ref, 'refs/tags/')
-#      with:
-#        files: dist/*

{liburlparser-1.4.4 → liburlparser-1.4.6}/CMakeLists.txt

@@ -5,6 +5,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
+include(PyProject)
+message(STATUS "Project: ${PyProject_NAME}@v${PyProject_VERSION}")
+
+
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE Release)
 endif()
@@ -14,27 +20,28 @@ endif()
 #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 
 
-if(MSVC)
-  # Microsoft Visual Studio compiler
-  set(MSVC_FLAGS "/O2")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_FLAGS}")
-elseif(CMAKE_COMPILER_IS_GNUCXX)
-  # GCC or Clang compiler
-  set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} -O3")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # Linux
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-  else()
-    # Other OS
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=generic")
-  endif()
-endif()
+#if(MSVC)
+#  # Microsoft Visual Studio compiler
+#  set(MSVC_FLAGS "/O2")
+#  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_FLAGS}")
+#elseif(CMAKE_COMPILER_IS_GNUCXX)
+#  # GCC or Clang compiler
+#  set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+#  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+#    # Linux
+#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+#  else()
+#    # Other OS
+#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=generic")
+#  endif()
+#endif()
 
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
 
-project(liburlparser LANGUAGES CXX)
+project(${PyProject_NAME} LANGUAGES CXX)
+
 
 # Download the public suffix list file from the internet
 set(PUBLIC_SUFFIX_LIST_URL "https://publicsuffix.org/list/public_suffix_list.dat")
@@ -43,12 +50,17 @@ if(NOT DEFINED SKBUILD)
     set(PUBLIC_SUFFIX_LIST_DAT "${CMAKE_CURRENT_BINARY_DIR}/${PUBLIC_SUFFIX_LIST_DAT}")
 endif()
 
+# Download the public suffix list file from the internet if not already exists
 if(EXISTS "${PUBLIC_SUFFIX_LIST_DAT}")
-      message(STATUS "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is found.")
+    message(STATUS "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is found.")
 else()
-  message(STATUS "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is not found. Trying to download it.")
-  file(DOWNLOAD "${PUBLIC_SUFFIX_LIST_URL}" ${PUBLIC_SUFFIX_LIST_DAT})
-  message(STATUS "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is downloaded.")
+    message(WARNING "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is not found. Trying to download it.")
+    file(DOWNLOAD "${PUBLIC_SUFFIX_LIST_URL}" ${PUBLIC_SUFFIX_LIST_DAT})
+    if(EXISTS "${PUBLIC_SUFFIX_LIST_DAT}")
+        message(STATUS "[DATA] ${PUBLIC_SUFFIX_LIST_DAT} is downloaded.")
+    else()
+        message(FATAL_ERROR "[DATA] Failed to download ${PUBLIC_SUFFIX_LIST_DAT}.")
+    endif()
 endif()
 
 file(GLOB SOURCES ${PROJECT_SOURCE_DIR}/src/*.cpp)
@@ -85,9 +97,6 @@ if(DEFINED SKBUILD)
         src/binding/main.cpp
     )
 
-#    set(PYBIND11_NEWPYTHON ON)
-#    find_package(pybind11 CONFIG REQUIRED)
-#    pybind11_add_module(_core src/${SKBUILD_PROJECT_NAME}/main.cpp)
     target_sources(_core PRIVATE ${SOURCES})
     target_include_directories(_core PRIVATE include src)
     target_compile_definitions(_core PRIVATE VERSION_INFO=${SKBUILD_PROJECT_VERSION})
@@ -133,7 +142,7 @@ install(TARGETS urlparser
 
 
 enable_testing()
-add_subdirectory(third_party/googletest)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest)
 file(GLOB TEST_SOURCES ${PROJECT_SOURCE_DIR}/tests/cpp/*.cpp)
 
 add_executable(test_liburlparser ${TEST_SOURCES})
@@ -150,13 +159,7 @@ message(STATUS "Doxygen_FOUND : ${Doxygen_FOUND}")
 # Find Doxygen package
 if (Doxygen_FOUND)
     # Configure Doxyfile.in template
-    configure_file(docs/Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile @ONLY)
-
-    # Add target to generate Doxyfile
-    add_custom_target(generate_doxyfile
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-        COMMENT "Generating Doxyfile"
-    )
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 
     # Add target to generate documentation
     add_custom_target(docs

{liburlparser-1.4.4 → liburlparser-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: liburlparser
-Version: 1.4.4
+Version: 1.4.6
 Summary: Fastest Url parser in the world
 Author-Email: Mohammad Raziei <mohammadraziei1375@gmail.com>
 Classifier: Development Status :: 4 - Beta
@@ -37,9 +37,29 @@ Description-Content-Type: text/markdown
   </h4>
 </p>
 
-![license](https://img.shields.io/badge/MIT-License-green)
-![Python]( https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-![Python]( https://img.shields.io/badge/C++-17-yellow)
+[![mohammadraziei - liburlparser](https://img.shields.io/static/v1?label=mohammadraziei&message=liburlparser&color=white&logo=github)](https://github.com/mohammadraziei/liburlparser "Go to GitHub repo")
+[![stars - liburlparser](https://img.shields.io/github/stars/mohammadraziei/liburlparser?style=social)](https://github.com/mohammadraziei/liburlparser)
+[![forks - liburlparser](https://img.shields.io/github/forks/mohammadraziei/liburlparser?style=social)](https://github.com/mohammadraziei/liburlparser)
+
+[![PyPi](https://img.shields.io/pypi/v/liburlparser.svg)](https://pypi.org/project/liburlparser/)
+![Python](https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
+![Cpp](https://img.shields.io/badge/C++-17-blue)
+
+
+[![GitHub release](https://img.shields.io/github/release/mohammadraziei/liburlparser?include_prereleases=&sort=semver&color=purple)](https://github.com/mohammadraziei/liburlparser/releases/)
+[![License](https://img.shields.io/badge/License-MIT-purple)](#license)
+[![issues - liburlparser](https://img.shields.io/github/issues/mohammadraziei/liburlparser)](https://github.com/mohammadraziei/liburlparser/issues)
+
+
+[![SonarCloud](https://sonarcloud.io/images/project_badges/sonarcloud-white.svg)](https://sonarcloud.io/summary/new_code?id=MohammadRaziei_liburlparser)
+
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=MohammadRaziei_liburlparser&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=MohammadRaziei_liburlparser)
+[![snyk.io](https://snyk.io/advisor/python/liburlparser/badge.svg)](https://snyk.io/advisor/python/liburlparser)
+
+[//]: # ([![View site - GH Pages]&#40;https://img.shields.io/badge/View_site-GH_Pages-2ea44f?style=for-the-badge&#41;]&#40;https://mohammadraziei.github.io/liburlparser/&#41;)
+
+
+
 <!--
 ![Build](https://github.com/Intsights/PyDomainExtractor/workflows/Build/badge.svg)
 [![PyPi](https://img.shields.io/pypi/v/PyDomainExtractor.svg)](https://pypi.org/project/PyDomainExtractor/)
@@ -65,13 +85,42 @@ Description-Content-Type: text/markdown
 
 ## About The Project
 
+**liburlparser** is a powerful domain extractor library written in C++ with Python bindings. It provides efficient URL parsing capabilities for both C++ and Python, making it a valuable tool for projects that involve working with web addresses.
+
 ### Features
+
+
+Here are some key features of **liburlparser**:
+
+1. **Multiple Language Support**:
+   - liburlparser can be used in multiple programming languages, including `Python`, `C++`, and `Shell`.
+   - It offers an intuitive interface that remains consistent across both C++ and Python.
+
+2. **Clean Code Design**:
+   - The library provides two separate classes: `Url` and `Host`.
+   - This separation allows for cleaner and more organized code when dealing with URLs.
+
+3. **Public Suffix List Support**:
+   - liburlparser supports known combinatorial suffixes (e.g., "ac.ir") using the public_suffix_list.
+   - It can also handle unknown suffixes (e.g., "comm" in "google.comm").
+
+4. **Automatic Public Suffix List Updates**:
+   - Before each build and deployment, liburlparser updates the public_suffix_list automatically.
+
+5. **Host Properties**:
+   - The `Host` class includes properties such as subdomain, domain, domain name, and suffix.
+
+6. **URL Properties**:
+   - The `Url` class provides properties like protocol, userinfo, host (and all host properties), port, path, query parameters, and fragment.
+
+
+<!--
 * Multiple programming language supported such as `Python`, `C++` and `Shell`
 * Intuitive interface and identical in C++ and Python
 * Provide two seperated class Url and Host for the purpose of clean code
 * Also support [public_suffix_list](https://publicsuffix.org/list/public_suffix_list.dat) for known combinatorial suffix such as "ac.ir"
 * Support unknown suffix like "google.comm" (it detect "comm" as suffix)
-* Update public_suffix_list automatically before each build and deploy  
+* Update public_suffix_list automatically before each build and deploy
 * Host properties:
   * subdomain
   * domain
@@ -86,54 +135,7 @@ Description-Content-Type: text/markdown
   * query
   * params
   * fragment
-
-
-## Setup
-### C++:
-
-#### build steps:
-```sh
-git clone https://github.com/mohammadraziei/liburlparser
-mkdir -p build; cd build
-cmake ..
-# Build the project:
-make
-# [Optional] run tests:
-make test
-# [Optional] make documents:
-make docs
-# [Optional] Run examples:
-./example
-# Make install
-sudo make install
-```
-
-
-
-### Python and Command Line:
-Be aware that it required `python>=3.8`
-#### Installation
-###### pip by [pypi](https://pypi.org/project/liburlparser/)
-```sh
-pip install liburlparser
-```
-if you want to use psl.update to update the public suffix list, you must install the `online` version
-```sh
-pip install "liburlparser[online]"
-```
-
-
-Or
-###### pip by [git](https://github.com/mohammadraziei/liburlparser)
-```sh
-pip install git+https://github.com/mohammadraziei/liburlparser
-```
-Or
-###### manually
-```sh
-git clone https://github.com/mohammadraziei/liburlparser
-pip install ./liburlparser
-```
+-->
 
 ## Usage
 
@@ -215,6 +217,56 @@ TLD::Host host = TLD::Host::fromUrl("https://ee.aut.ac.ir/about");
 you can see all methods in python we can use in c++ very easily
 
 
+
+## Installation
+### C++:
+
+#### build steps:
+```sh
+git clone https://github.com/mohammadraziei/liburlparser
+mkdir -p build; cd build
+cmake ..
+# Build the project:
+make
+# [Optional] run tests:
+make test
+# [Optional] make documents:
+make docs
+# [Optional] Run examples:
+./example
+# Make install
+sudo make install
+```
+
+
+
+### Python and Command Line:
+Be aware that it required `python>=3.8`
+#### Installation
+###### pip by [pypi](https://pypi.org/project/liburlparser/)
+```sh
+pip install liburlparser
+```
+if you want to use psl.update to update the public suffix list, you must install the `online` version
+```sh
+pip install "liburlparser[online]"
+```
+
+
+Or
+###### pip by [git](https://github.com/mohammadraziei/liburlparser)
+```sh
+pip install git+https://github.com/mohammadraziei/liburlparser
+```
+Or
+###### manually
+```sh
+git clone https://github.com/mohammadraziei/liburlparser
+pip install ./liburlparser
+```
+
+
+
 ### Performance
 
 
@@ -254,10 +306,10 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more information.
 
 <!-- Gal Ben David - gal@intsights.com -->
 
-Project Link: 
+Project Link:
 - [https://github.com/mohammadraziei/liburlparser](https://github.com/mohammadraziei/liburlparser)
 - [https://pypi.org/project/liburlparser](https://pypi.org/project/liburlparser)
 
 
 
-[license-shield]: https://img.shields.io/github/license/othneildrew/Best-README-Template.svg?style=flat-square
+[license-shield]: https://img.shields.io/github/license/othneildrew/Best-README-Template.svg?style=flat-square

{liburlparser-1.4.4 → liburlparser-1.4.6}/README.md

@@ -10,9 +10,29 @@
   </h4>
 </p>
 
-![license](https://img.shields.io/badge/MIT-License-green)
-![Python]( https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-![Python]( https://img.shields.io/badge/C++-17-yellow)
+[![mohammadraziei - liburlparser](https://img.shields.io/static/v1?label=mohammadraziei&message=liburlparser&color=white&logo=github)](https://github.com/mohammadraziei/liburlparser "Go to GitHub repo")
+[![stars - liburlparser](https://img.shields.io/github/stars/mohammadraziei/liburlparser?style=social)](https://github.com/mohammadraziei/liburlparser)
+[![forks - liburlparser](https://img.shields.io/github/forks/mohammadraziei/liburlparser?style=social)](https://github.com/mohammadraziei/liburlparser)
+
+[![PyPi](https://img.shields.io/pypi/v/liburlparser.svg)](https://pypi.org/project/liburlparser/)
+![Python](https://img.shields.io/badge/Python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
+![Cpp](https://img.shields.io/badge/C++-17-blue)
+
+
+[![GitHub release](https://img.shields.io/github/release/mohammadraziei/liburlparser?include_prereleases=&sort=semver&color=purple)](https://github.com/mohammadraziei/liburlparser/releases/)
+[![License](https://img.shields.io/badge/License-MIT-purple)](#license)
+[![issues - liburlparser](https://img.shields.io/github/issues/mohammadraziei/liburlparser)](https://github.com/mohammadraziei/liburlparser/issues)
+
+
+[![SonarCloud](https://sonarcloud.io/images/project_badges/sonarcloud-white.svg)](https://sonarcloud.io/summary/new_code?id=MohammadRaziei_liburlparser)
+
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=MohammadRaziei_liburlparser&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=MohammadRaziei_liburlparser)
+[![snyk.io](https://snyk.io/advisor/python/liburlparser/badge.svg)](https://snyk.io/advisor/python/liburlparser)
+
+[//]: # ([![View site - GH Pages]&#40;https://img.shields.io/badge/View_site-GH_Pages-2ea44f?style=for-the-badge&#41;]&#40;https://mohammadraziei.github.io/liburlparser/&#41;)
+
+
+
 <!--
 ![Build](https://github.com/Intsights/PyDomainExtractor/workflows/Build/badge.svg)
 [![PyPi](https://img.shields.io/pypi/v/PyDomainExtractor.svg)](https://pypi.org/project/PyDomainExtractor/)
@@ -38,13 +58,42 @@
 
 ## About The Project
 
+**liburlparser** is a powerful domain extractor library written in C++ with Python bindings. It provides efficient URL parsing capabilities for both C++ and Python, making it a valuable tool for projects that involve working with web addresses.
+
 ### Features
+
+
+Here are some key features of **liburlparser**:
+
+1. **Multiple Language Support**:
+   - liburlparser can be used in multiple programming languages, including `Python`, `C++`, and `Shell`.
+   - It offers an intuitive interface that remains consistent across both C++ and Python.
+
+2. **Clean Code Design**:
+   - The library provides two separate classes: `Url` and `Host`.
+   - This separation allows for cleaner and more organized code when dealing with URLs.
+
+3. **Public Suffix List Support**:
+   - liburlparser supports known combinatorial suffixes (e.g., "ac.ir") using the public_suffix_list.
+   - It can also handle unknown suffixes (e.g., "comm" in "google.comm").
+
+4. **Automatic Public Suffix List Updates**:
+   - Before each build and deployment, liburlparser updates the public_suffix_list automatically.
+
+5. **Host Properties**:
+   - The `Host` class includes properties such as subdomain, domain, domain name, and suffix.
+
+6. **URL Properties**:
+   - The `Url` class provides properties like protocol, userinfo, host (and all host properties), port, path, query parameters, and fragment.
+
+
+<!--
 * Multiple programming language supported such as `Python`, `C++` and `Shell`
 * Intuitive interface and identical in C++ and Python
 * Provide two seperated class Url and Host for the purpose of clean code
 * Also support [public_suffix_list](https://publicsuffix.org/list/public_suffix_list.dat) for known combinatorial suffix such as "ac.ir"
 * Support unknown suffix like "google.comm" (it detect "comm" as suffix)
-* Update public_suffix_list automatically before each build and deploy  
+* Update public_suffix_list automatically before each build and deploy
 * Host properties:
   * subdomain
   * domain
@@ -59,54 +108,7 @@
   * query
   * params
   * fragment
-
-
-## Setup
-### C++:
-
-#### build steps:
-```sh
-git clone https://github.com/mohammadraziei/liburlparser
-mkdir -p build; cd build
-cmake ..
-# Build the project:
-make
-# [Optional] run tests:
-make test
-# [Optional] make documents:
-make docs
-# [Optional] Run examples:
-./example
-# Make install
-sudo make install
-```
-
-
-
-### Python and Command Line:
-Be aware that it required `python>=3.8`
-#### Installation
-###### pip by [pypi](https://pypi.org/project/liburlparser/)
-```sh
-pip install liburlparser
-```
-if you want to use psl.update to update the public suffix list, you must install the `online` version
-```sh
-pip install "liburlparser[online]"
-```
-
-
-Or
-###### pip by [git](https://github.com/mohammadraziei/liburlparser)
-```sh
-pip install git+https://github.com/mohammadraziei/liburlparser
-```
-Or
-###### manually
-```sh
-git clone https://github.com/mohammadraziei/liburlparser
-pip install ./liburlparser
-```
+-->
 
 ## Usage
 
@@ -188,6 +190,56 @@ TLD::Host host = TLD::Host::fromUrl("https://ee.aut.ac.ir/about");
 you can see all methods in python we can use in c++ very easily
 
 
+
+## Installation
+### C++:
+
+#### build steps:
+```sh
+git clone https://github.com/mohammadraziei/liburlparser
+mkdir -p build; cd build
+cmake ..
+# Build the project:
+make
+# [Optional] run tests:
+make test
+# [Optional] make documents:
+make docs
+# [Optional] Run examples:
+./example
+# Make install
+sudo make install
+```
+
+
+
+### Python and Command Line:
+Be aware that it required `python>=3.8`
+#### Installation
+###### pip by [pypi](https://pypi.org/project/liburlparser/)
+```sh
+pip install liburlparser
+```
+if you want to use psl.update to update the public suffix list, you must install the `online` version
+```sh
+pip install "liburlparser[online]"
+```
+
+
+Or
+###### pip by [git](https://github.com/mohammadraziei/liburlparser)
+```sh
+pip install git+https://github.com/mohammadraziei/liburlparser
+```
+Or
+###### manually
+```sh
+git clone https://github.com/mohammadraziei/liburlparser
+pip install ./liburlparser
+```
+
+
+
 ### Performance
 
 
@@ -227,10 +279,10 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more information.
 
 <!-- Gal Ben David - gal@intsights.com -->
 
-Project Link: 
+Project Link:
 - [https://github.com/mohammadraziei/liburlparser](https://github.com/mohammadraziei/liburlparser)
 - [https://pypi.org/project/liburlparser](https://pypi.org/project/liburlparser)
 
 
 
-[license-shield]: https://img.shields.io/github/license/othneildrew/Best-README-Template.svg?style=flat-square
+[license-shield]: https://img.shields.io/github/license/othneildrew/Best-README-Template.svg?style=flat-square

liburlparser-1.4.6/cmake/modules/PyProject.cmake

@@ -0,0 +1,28 @@
+# cmake/modules/PyProject.cmake
+function(extract_pyproject_info)
+    set(filename "${CMAKE_CURRENT_SOURCE_DIR}/pyproject.toml")
+    set(PyProject_TOML_PATH ${filename} PARENT_SCOPE)
+
+    # Read lines from the file into a list
+    file(STRINGS ${filename} Lines)
+
+    # Iterate over the list to find the version line
+    foreach(Line ${Lines})
+        # Use a regular expression to extract the version number
+        if(Line MATCHES "version = \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
+            set(PyProject_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE)
+        endif()
+
+        # Extract the project name
+        if(Line MATCHES "name = \"([A-Za-z0-9_-]+)\"")
+            set(PyProject_NAME "${CMAKE_MATCH_1}" PARENT_SCOPE)
+        endif()
+
+        # Extract the project description
+        if(Line MATCHES "description = \"([A-Za-z0-9_ -]+)\"")
+            set(PyProject_DESCRIPTION "${CMAKE_MATCH_1}" PARENT_SCOPE)
+        endif()
+    endforeach()
+endfunction()
+
+extract_pyproject_info()

{liburlparser-1.4.4 → liburlparser-1.4.6}/docs/Doxyfile.in

@@ -2,7 +2,7 @@
 
 # Project information
 PROJECT_NAME           = @PROJECT_NAME@
-PROJECT_VERSION        = 1.0
+PROJECT_VERSION        = @PyProject_VERSION@
 OUTPUT_DIRECTORY       = docs
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO

{liburlparser-1.4.4 → liburlparser-1.4.6}/examples/main.cpp

@@ -3,9 +3,8 @@
 //
 #include <iostream>
 #include "common.h"
-#include "urlparser.h"
+#include "urlparser.h" \
 
-// #undef URL_INITIALIZE_PSL
 
 #define show_attr(url, attr) \
     std::cout << std::boolalpha << #attr << " : " << url.attr() << std::endl

liburlparser-1.4.6/include/urlparser.h

@@ -0,0 +1,209 @@
+/**
+* @file urlparser.h
+* @brief Defines classes for parsing and handling URLs and hosts.
+*
+* This file contains the declaration of the Url and Host classes, which provide
+* functionality for parsing and managing URLs and hosts within them. The Url class
+* allows extraction and manipulation of various components of a URL, while the Host
+* class focuses on handling and extracting domain-related information from a host.
+*
+* The Url class encapsulates a URL and provides methods to access its components
+* such as protocol, subdomain, domain, suffix, query, fragment, userinfo, port,
+* and parameters. Additionally, it offers methods for constructing a URL string and
+* obtaining specific parts of the URL.
+*
+* The Host class represents a host part of a URL and offers functionalities for
+* extracting domain-related details such as suffix, domain, subdomain, and the full
+* domain. It also supports the removal of 'www' from the host and provides methods
+* to obtain domain-specific information.
+*
+* Example Usage:
+* @code
+*   // Creating a URL object and accessing its methods
+*   TLD::Url url("https://www.example.com/path/to/resource");
+*   std::cout << "URL Protocol: " << url.protocol() << std::endl;
+*   std::cout << "URL Domain: " << url.domain() << std::endl;
+*   std::cout << "URL Suffix: " << url.suffix() << std::endl;
+*   std::cout << "URL Query: " << url.query() << std::endl;
+*
+*   // Creating a Host object and calling its methods
+*   TLD::Host host("www.example.com");
+*   std::cout << "Host Domain: " << host.domain() << std::endl;
+*   std::cout << "Host Suffix: " << host.suffix() << std::endl;
+*   std::cout << "Host Subdomain: " << host.subdomain() << std::endl;
+* @endcode
+*/
+
+#ifndef TLD_URLPARSER_H
+#define TLD_URLPARSER_H
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
+#ifndef PUBLIC_SUFFIX_LIST_DAT
+#define PUBLIC_SUFFIX_LIST_DAT "public_suffix_list.dat"
+#endif
+
+namespace TLD {
+constexpr bool DEFAULT_IGNORE_WWW = false;
+
+using QueryParams = std::vector<std::string>;
+
+class Host;
+
+/**
+ * @brief Represents a URL.
+ *
+ * The Url class provides functionalities for parsing and managing URLs. It
+ * allows access to various components of a URL such as protocol, subdomain,
+ * domain, suffix, query, fragment, userinfo, port, and parameters.
+ */
+class Url {
+   public:
+    /**
+     * @brief Check if the Public Suffix List (PSL) is loaded.
+     * @return true if the PSL is loaded, false otherwise.
+     */
+    static bool isPslLoaded() noexcept;
+    /**
+     * @brief Extract the host from a given URL.
+     * @param url The URL from which to extract the host.
+     * @return The extracted host.
+     */
+    static std::string extractHost(const std::string& url) noexcept;
+
+   public:
+    /**
+     * @brief Construct a Url object from a given URL string.
+     * @param url The URL string.
+     * @param ignore_www Whether to ignore the "www" subdomain.
+     */
+    Url(const std::string& url, const bool ignore_www = DEFAULT_IGNORE_WWW);
+    /**
+     * @brief Default constructor for the Url class.
+     */
+    Url() noexcept = default;
+
+    bool operator==(const Url&) const;
+
+    std::string str() const noexcept;
+    /**
+     * @brief Get the protocol of the URL.
+     * @return str Protocol of the URL.
+     */
+    const std::string& protocol() const noexcept;
+    /**
+     * @brief Get the Subdomain of the URL.
+     * @return str Subdomain of the URL.
+     */
+    const std::string& subdomain() const noexcept;
+    /**
+     * @brief Get the Domain of the URL.
+     * @return str Domain of the URL.
+     */
+    const std::string& domain() const noexcept;
+    /**
+     * @brief Get the Suffix of the URL.
+     * @return str Suffix of the URL.
+     */
+    const std::string& suffix() const noexcept;
+    /**
+     * @brief Get the Query of the URL.
+     * @return str Query of the URL.
+     */
+    const std::string& query() const noexcept;
+    /**
+     * @brief Get the Fragment of the URL.
+     * @return str Fragment of the URL.
+     */
+    const std::string& fragment() const noexcept;
+    /**
+     * @brief Get the Userinfo of the URL.
+     * @return str Userinfo of the URL.
+     */
+    const std::string& userinfo() const noexcept;
+    /**
+     * @brief Get the abspath of the URL.
+     * @return str abspath of the URL.
+     */
+    std::string abspath() const noexcept;
+    /**
+     * @brief Get the domain name of the URL.
+     * it is the same as domain() + "." + subdomain().
+     * @return str port of the URL.
+     */
+    std::string domainName() const noexcept;
+    /**
+     * @brief Get the full domain of the URL.
+     * @return str full domain of the URL.
+     */
+    const std::string& fulldomain() const noexcept;
+    /**
+     * @brief Get the port of the URL.
+     * @return int port of the URL.
+     */
+    const int port() const noexcept;
+    /**
+     * @brief Get the parameters of the URL.
+     * @return QueryParams parameters of the URL.
+     */
+    QueryParams params() const noexcept;
+    /**
+     * @brief Get the host of the URL.
+     * @return TLD::Host object of the URL.
+     */
+    const Host& host() const;
+
+   private:
+    class Impl;
+    std::shared_ptr<Impl> impl; // since all methods are constants
+};
+
+/**
+ * @brief Represents a Host part of a URL.
+ *
+ * The Host class encapsulates functionalities for handling the host component
+ * of a URL. It provides methods to extract domain-specific details such as
+ * suffix, domain, subdomain, and the full domain.
+ */
+class Host {
+   public:
+    static Host fromUrl(const std::string& url,
+                        const bool ignore_www = DEFAULT_IGNORE_WWW);
+    static void loadPslFromPath(const std::string& filepath);
+    static void loadPslFromString(const std::string& filestr);
+    /**
+     * @brief Check if the Public Suffix List (PSL) is loaded.
+     * @return true if the PSL is loaded, false otherwise.
+     */
+    static bool isPslLoaded() noexcept;
+    static std::string_view removeWWW(const std::string_view&) noexcept;
+
+   public:
+    Host(const std::string& host, const bool ignore_www = DEFAULT_IGNORE_WWW);
+    Host() = default;
+
+    bool operator==(const Host&) const;
+    bool operator==(const std::string&) const;
+
+    const std::string& suffix() const noexcept;
+    const std::string& domain() const noexcept;
+    std::string domainName() const noexcept;
+    const std::string& subdomain() const noexcept;
+    const std::string& fulldomain() const noexcept;
+    const std::string& str() const noexcept;
+
+   private:
+    class Impl;
+    std::shared_ptr<Impl> impl; // since all methods are constants
+};
+}  // namespace TLD
+
+std::ostream& operator<<(std::ostream& os, const TLD::QueryParams& dt);
+
+std::ostream& operator<<(std::ostream& os, const TLD::Url& dt);
+
+std::ostream& operator<<(std::ostream& os, const TLD::Host& dt);
+#endif  // TLD_URLPARSER_H

{liburlparser-1.4.4 → liburlparser-1.4.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "liburlparser"
-version = "1.4.4"
+version = "1.4.6"
 description = "Fastest Url parser in the world"
 readme = "README.md"
 authors = [

liburlparser-1.4.4/include/urlparser.h

@@ -1,85 +0,0 @@
-#ifndef DOMAINEXTRACTOR_URLPARSER_H
-#define DOMAINEXTRACTOR_URLPARSER_H
-
-#include <iostream>
-#include <memory>
-#include <string>
-#include <vector>
-
-#ifndef PUBLIC_SUFFIX_LIST_DAT
-#define PUBLIC_SUFFIX_LIST_DAT "public_suffix_list.dat"
-#endif
-
-namespace TLD {
-constexpr bool DEFAULT_IGNORE_WWW = false;
-
-using QueryParams = std::vector<std::string>;
-
-class Host;
-
-class Url {
-   public:
-    static bool isPslLoaded() noexcept;
-    static std::string extractHost(const std::string& url) noexcept;
-
-   public:
-    Url(const std::string& url, const bool ignore_www = DEFAULT_IGNORE_WWW);
-    Url() noexcept = default;
-
-    bool operator==(const Url&) const;
-
-    std::string str() const noexcept;
-    const std::string& protocol() const noexcept;
-    const std::string& subdomain() const noexcept;
-    const std::string& domain() const noexcept;
-    const std::string& suffix() const noexcept;
-    const std::string& query() const noexcept;
-    const std::string& fragment() const noexcept;
-    const std::string& userinfo() const noexcept;
-    std::string abspath() const noexcept;
-    std::string domainName() const noexcept;
-    const std::string& fulldomain() const noexcept;
-    const int port() const noexcept;
-    QueryParams params() const noexcept;
-    const Host& host() const;
-
-   private:
-    class Impl;
-    std::shared_ptr<Impl> impl; // since all methods are constants
-};
-
-class Host {
-   public:
-    static Host fromUrl(const std::string& url,
-                        const bool ignore_www = DEFAULT_IGNORE_WWW);
-    static void loadPslFromPath(const std::string& filepath);
-    static void loadPslFromString(const std::string& filestr);
-    static bool isPslLoaded() noexcept;
-    static std::string_view removeWWW(const std::string_view&) noexcept;
-
-   public:
-    Host(const std::string& host, const bool ignore_www = DEFAULT_IGNORE_WWW);
-    Host() = default;
-
-    bool operator==(const Host&) const;
-    bool operator==(const std::string&) const;
-
-    const std::string& suffix() const noexcept;
-    const std::string& domain() const noexcept;
-    std::string domainName() const noexcept;
-    const std::string& subdomain() const noexcept;
-    const std::string& fulldomain() const noexcept;
-    const std::string& str() const noexcept;
-
-   private:
-    class Impl;
-    std::shared_ptr<Impl> impl; // since all methods are constants
-};
-}  // namespace TLD
-
-std::ostream& operator<<(std::ostream& os, const TLD::QueryParams& dt);
-
-std::ostream& operator<<(std::ostream& os, const TLD::Url& dt);
-
-std::ostream& operator<<(std::ostream& os, const TLD::Host& dt);
-#endif  // DOMAINEXTRACTOR_URLPARSER_H

liburlparser-1.4.4/noxfile.py

@@ -1,24 +0,0 @@
-#!/bin/python3
-from __future__ import annotations
-
-import nox
-
-nox.options.sessions = ["lint", "tests"]
-
-
-@nox.session
-def lint(session: nox.Session) -> None:
-    """
-    Run the linter.
-    """
-    session.install("pre-commit")
-    session.run("pre-commit", "run", "--all-files", *session.posargs)
-
-
-@nox.session
-def tests(session: nox.Session) -> None:
-    """
-    Run the unit and regular tests.
-    """
-    session.install(".[test]")
-    session.run("pytest", *session.posargs)