json_merge_patch -> mergepatch

Author: danielaparker

CHANGELOG.md

@@ -1,8 +1,17 @@
 master
 -----
 
-- Use `std::from_chars` for chars to double conversion
-when supported in GCC and VC.
+Performance Enhancement:
+
+- Use `std::from_chars` for chars to double conversion when 
+supported in GCC and VC.
+
+Changes:
+
+- For consistency with library naming conventions, the directory 
+`include/jsoncons/json_merge_patch` has been renamed to
+`include/jsoncons/mergepatch`, and the namespace `json_merge_patch`
+has been renamed to `mergepatch`.
 
 0.168.7
 -------

README.md

@@ -36,7 +36,7 @@ or becoming a [:heart: sponsor](https://github.com/sponsors/danielaparker).
 - [csv](doc/ref/csv/csv.md) implements decode from and encode to CSV files.
 - [jmespath](doc/ref/jmespath/jmespath.md) implements [JMESPath](https://jmespath.org/), a query language for transforming JSON documents into other JSON documents.  
 - [jsonpatch](doc/ref/jsonpatch/jsonpatch.md) implements the IETF standard [JavaScript Object Notation (JSON) Patch](https://tools.ietf.org/html/rfc6902)
-- [json_merge_patch](doc/ref/json_merge_patch/json_merge_patch.md) implements the IETF standard [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386)
+- [mergepatch](doc/ref/mergepatch/json_merge_patch.md) implements the IETF standard [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386)
 - [jsonpath](doc/ref/jsonpath/jsonpath.md) implements [Stefan Goessner's JSONPath](http://goessner.net/articles/JsonPath/).  It also supports search and replace using JSONPath expressions.
 - [jsonpointer](doc/ref/jsonpointer/jsonpointer.md) implements the IETF standard [JavaScript Object Notation (JSON) Pointer](https://tools.ietf.org/html/rfc6901)
 - [jsonschema](doc/ref/jsonschema/jsonschema.md) implements the JSON Schema [Draft 7](https://json-schema.org/specification-links.html#draft-7) specification for validating input JSON. (since 0.160.0)

doc/ref/json_merge_patch/apply_merge_patch.md

@@ -1,7 +1,7 @@
-### jsoncons::json_merge_patch::apply_merge_patch
+### jsoncons::mergepatch::apply_merge_patch
 
 ```c++
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 
 template <class Json>
 void apply_merge_patch(Json& target, const Json& patch); 
@@ -25,10 +25,10 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 
 using jsoncons::json;
-namespace json_merge_patch = jsoncons::json_merge_patch;
+namespace mergepatch = jsoncons::mergepatch;
 
 int main()
 {
@@ -57,17 +57,17 @@ int main()
 }
     )");
 
-    json_merge_patch::apply_merge_patch(doc, patch);
+    mergepatch::apply_merge_patch(doc, patch);
 
     std::cout << "(1)\n" << pretty_print(doc) << std::endl;
 
     // Create a JSON Patch
 
-    auto patch2 = json_merge_patch::from_diff(doc2,doc);
+    auto patch2 = mergepatch::from_diff(doc2,doc);
 
     std::cout << "(2)\n" << pretty_print(patch2) << std::endl;
 
-    json_merge_patch::apply_merge_patch(doc2,patch2);
+    mergepatch::apply_merge_patch(doc2,patch2);
 
     std::cout << "(3)\n" << pretty_print(doc2) << std::endl;
 }

doc/ref/json_merge_patch/from_diff.md

@@ -1,7 +1,7 @@
-### jsoncons::json_merge_patch::from_diff
+### jsoncons::mergepatch::from_diff
 
 ```c++
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 
 template <class Json>
 Json from_diff(const Json& source, const Json& target)
@@ -21,10 +21,10 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 
 using jsoncons::json;
-namespace json_merge_patch = jsoncons::json_merge_patch;
+namespace mergepatch = jsoncons::mergepatch;
 
 int main()
 {
@@ -54,9 +54,9 @@ int main()
 }
     )");
 
-    auto patch = json_merge_patch::from_diff(source, target);
+    auto patch = mergepatch::from_diff(source, target);
 
-    json_merge_patch::apply_merge_patch(source, patch);
+    mergepatch::apply_merge_patch(source, patch);
 
     std::cout << "(1)\n" << pretty_print(patch) << std::endl;
     std::cout << "(2)\n" << pretty_print(source) << std::endl;

doc/ref/json_merge_patch/json_merge_patch.md

@@ -1,6 +1,6 @@
-### json_merge_patch extension
+### mergepatch extension
 
-The json_merge_patch extension implements the IETF standard [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386)
+The mergepatch extension implements the IETF standard [JSON Merge Patch](https://datatracker.ietf.org/doc/html/rfc7386)
 
 <table border="0">
   <tr>
@@ -19,10 +19,10 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 
 using jsoncons::json;
-namespace json_merge_patch = jsoncons::json_merge_patch;
+namespace mergepatch = jsoncons::mergepatch;
 
 int main()
 {
@@ -51,17 +51,17 @@ int main()
 }
     )");
 
-    json_merge_patch::apply_merge_patch(doc, patch);
+    mergepatch::apply_merge_patch(doc, patch);
 
     std::cout << "(1)\n" << pretty_print(doc) << std::endl;
 
     // Create a JSON Patch
 
-    auto patch2 = json_merge_patch::from_diff(doc2,doc);
+    auto patch2 = mergepatch::from_diff(doc2,doc);
 
     std::cout << "(2)\n" << pretty_print(patch2) << std::endl;
 
-    json_merge_patch::apply_merge_patch(doc2,patch2);
+    mergepatch::apply_merge_patch(doc2,patch2);
 
     std::cout << "(3)\n" << pretty_print(doc2) << std::endl;
 }

examples/src/json_merge_patch_examples.cpp

@@ -2,10 +2,10 @@
 // Distributed under Boost license
 
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 using jsoncons::json;
-namespace json_merge_patch = jsoncons::json_merge_patch;
+namespace mergepatch = jsoncons::mergepatch;
 
 void apply_json_merge_patch()
 {
@@ -36,17 +36,17 @@ void apply_json_merge_patch()
 }
     )");
 
-    json_merge_patch::apply_merge_patch(doc, patch);
+    mergepatch::apply_merge_patch(doc, patch);
 
     std::cout << "(1)\n" << pretty_print(doc) << std::endl;
 
     // Create a JSON Patch
 
-    auto patch2 = json_merge_patch::from_diff(doc2,doc);
+    auto patch2 = mergepatch::from_diff(doc2,doc);
 
     std::cout << "(2)\n" << pretty_print(patch2) << std::endl;
 
-    json_merge_patch::apply_merge_patch(doc2,patch2);
+    mergepatch::apply_merge_patch(doc2,patch2);
 
     std::cout << "(3)\n" << pretty_print(doc2) << std::endl;
 }
@@ -79,9 +79,9 @@ void create_json_merge_patch()
 }
     )");
 
-    auto patch = json_merge_patch::from_diff(source, target);
+    auto patch = mergepatch::from_diff(source, target);
 
-    json_merge_patch::apply_merge_patch(source, patch);
+    mergepatch::apply_merge_patch(source, patch);
 
     std::cout << "(1)\n" << pretty_print(patch) << std::endl;
     std::cout << "(2)\n" << pretty_print(source) << std::endl;

include/jsoncons_ext/json_merge_patch/json_merge_patch.hpp renamed to include/jsoncons_ext/mergepatch/json_merge_patch.hpp

@@ -15,7 +15,7 @@
 #include <jsoncons/json.hpp>
 
 namespace jsoncons { 
-namespace json_merge_patch {
+namespace mergepatch {
 
     template <class Json>
     Json from_diff(const Json& source, const Json& target)
@@ -97,7 +97,7 @@ namespace json_merge_patch {
         target = detail::apply_merge_patch_(target, patch);
     }
 
-} // namespace json_merge_patch
+} // namespace mergepatch
 } // namespace jsoncons
 
 #endif

test/json_merge_patch/input/compliance/rfc7396-test-cases.json renamed to test/mergepatch/input/compliance/rfc7396-test-cases.json

@@ -6,7 +6,7 @@
 #endif
 #include <iostream>
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/json_merge_patch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
 #include <catch/catch.hpp>
 #include <iostream>
 #include <sstream>
@@ -38,13 +38,13 @@ void json_merge_patch_tests(const std::string& fpath)
             if (test_case.contains("result"))
             {
                 json target = test_group.at("given");
-                json_merge_patch::apply_merge_patch(target, patch);
+                mergepatch::apply_merge_patch(target, patch);
                 const json& expected = test_case["result"];
                 if (target == expected)
                 {
                     json target2 = test_group.at("given");
-                    json patch2 = json_merge_patch::from_diff(target2, target);
-                    json_merge_patch::apply_merge_patch(target2, patch2);
+                    json patch2 = mergepatch::from_diff(target2, target);
+                    mergepatch::apply_merge_patch(target2, patch2);
                     if (target2 != target)
                     {
                         if (test_case.contains("comment"))
@@ -75,12 +75,12 @@ void json_merge_patch_tests(const std::string& fpath)
     }
 }
 
-TEST_CASE("json_merge_patch tests")
+TEST_CASE("mergepatch tests")
 {
     SECTION("compliance")
     {
-        json_merge_patch_tests("./json_merge_patch/input/compliance/rfc7396-test-cases.json");
-        //json_merge_patch_tests("./json_merge_patch/input/compliance/test.json");
+        json_merge_patch_tests("./mergepatch/input/compliance/rfc7396-test-cases.json");
+        //json_merge_patch_tests("./mergepatch/input/compliance/test.json");
     }
 }