Skip to content

Commit 4d2f26e

Browse files
committed
Merge branch 'master' into v1.0
2 parents e7007b1 + 1e73642 commit 4d2f26e

File tree

12 files changed

+15
-161
lines changed

12 files changed

+15
-161
lines changed

Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = Crow
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 0.3
41+
PROJECT_NUMBER = 1.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BSD 3-Clause License
22

33
Copyright (c) 2014-2017, ipkn
4-
2020-2021, CrowCpp
4+
2020-2022, CrowCpp
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without
@@ -29,4 +29,4 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2929
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3030
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

32-
The Crow logo and other graphic material (excluding third party logos) used are under exclusive Copyright (c) 2021, Farook Al-Sammarraie (The-EDev), All rights reserved.
32+
The Crow logo and other graphic material (excluding third party logos) used are under exclusive Copyright (c) 2021-2022, Farook Al-Sammarraie (The-EDev), All rights reserved.

docs/getting_started/setup/legacy.md

-146
This file was deleted.

docs/guides/base64.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
Using `#!cpp crow::utility::base64encode(mystring, mystring.size())` will return a Base64 encoded string. For URL safe Base64 `#!cpp crow::utility::base64encode_urlsafe(mystring, mystring.size())` can be used. The key used in the encoding process can be changed, it is a string containing all 64 characters to be used.
44

55
## Decoding
6-
**Introduced in: `master`**<br><br>
6+
**Introduced in: `v1.0`**<br><br>
77

88
Using `#!cpp crow::utility::base64decode(mystring, mystring.size())` with `mystring` being a Base64 encoded string will return a plain-text string. The function works with both normal and URL safe Base64. However it cannot decode a Base64 string encoded with a custom key.

docs/guides/blueprints.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
!!! Warning
2-
3-
This feature is currently only available on the "master" branch.
1+
**Introduced in: `v1.0`**<br><br>
42

53
Crow supports flask style blueprints.<br>
64
A blueprint is a limited app. It cannot handle networking. But it can handle routes.<br>

docs/guides/json.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ A `wvalue` can be treated as an object or even a list (setting a value by using
3333

3434
!!! warning
3535

36-
JSON does not allow floating point values like `NaN` or `INF`, Crow will output `null` instead of `NaN` or `INF` when converting `wvalue` to a string. (`{"Key": NaN}` becomes `{"Key": null}`) (master and later)
36+
JSON does not allow floating point values like `NaN` or `INF`, Crow will output `null` instead of `NaN` or `INF` when converting `wvalue` to a string. (`{"Key": NaN}` becomes `{"Key": null}`)
3737

3838
<br><br>
3939

docs/guides/logging.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Writing a log is as simple as `#!cpp CROW_LOG_<LOG LEVEL> << "Hello";` (replace&
3131
Log times are reported in GMT timezone by default. This is because HTTP requires all reported times for requests and responses to be in GMT. This can be changed by using the macro `CROW_USE_LOCALTIMEZONE` which will set **only the log timezone** to the server's local timezone.
3232

3333
## Creating A custom logger
34-
**Introduced in: `master`**<br><br>
34+
**Introduced in: `v1.0`**<br><br>
3535

3636
Assuming you have an existing logger or Crow's default format just doesn't work for you. Crow allows you to use a custom logger for any log made using the `CROW_LOG_<LOG LEVEL>` macro.<br>
3737
All you need is a class extending `#!cpp crow::ILogHandler` containing the method `#!cpp void log(std::string, crow::LogLevel)`.<br>

docs/guides/multipart.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A message can be created either by defining the headers, boundary, and individua
2121

2222
Once a multipart message has been made, the individual parts can be accessed throughout `msg.parts`, `parts` is an `std::vector`.<br><br>
2323

24-
**Introduced in: `master`**<br><br>
24+
**Introduced in: `v1.0`**<br><br>
2525

2626
Part headers are organized in a similar way to request and response headers, and can be retrieved via `crow::multipart::get_header_object("header-key")`. This function returns a `crow::multipart::header` object.<br><br>
2727

docs/guides/routes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class a : public crow::returnable
7575
<br><br>
7676

7777
## Response codes
78-
**Introduced in: `master`**<br><br>
78+
**Introduced in: `v1.0`**<br><br>
7979

8080
Instead of assigning a response code, you can use the `crow::status` enum, for example you can replace `crow::response(200)` with `crow::response(crow::status::OK)`
8181

include/crow/json.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
#include <boost/algorithm/string/predicate.hpp>
1717
#include <boost/operators.hpp>
1818
#include <vector>
19-
#include <math.h>
19+
#include <cmath>
2020

2121
#include "crow/utility.h"
2222
#include "crow/settings.h"
2323
#include "crow/returnable.h"
2424
#include "crow/logging.h"
2525

26+
using std::isinf;
27+
using std::isnan;
28+
2629

2730
namespace crow
2831
{

include/crow/routing.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ namespace crow
775775
if (pos == req_url.size())
776776
{
777777
found_BP = std::move(*blueprints);
778-
return {node->rule_index, *blueprints, *params};
778+
return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{node->rule_index, *blueprints, *params};
779779
}
780780

781781
bool found_fragment = false;
@@ -902,7 +902,7 @@ namespace crow
902902
if (!found_fragment)
903903
found_BP = std::move(*blueprints);
904904

905-
return {found, found_BP, match_params}; //Called after all the recursions have been done
905+
return std::tuple<uint16_t, std::vector<uint16_t>, routing_params>{found, found_BP, match_params}; //Called after all the recursions have been done
906906
}
907907

908908
//This functions assumes any blueprint info passed is valid

mkdocs.yml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ nav:
3535
- Linux: getting_started/setup/linux.md
3636
- MacOS: getting_started/setup/macos.md
3737
- Windows: getting_started/setup/windows.md
38-
- Legacy: getting_started/setup/legacy.md
3938
- Your First Application: getting_started/your_first_application.md
4039
- Guides:
4140
- Different parts of Crow:

0 commit comments

Comments
 (0)