Merge branch 'master' into feature/directives

1 files changed, 109 insertions, 71 deletions

diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c
index 8d6c039..d94dc70 100644
--- a/tests/check_source_parser.c
+++ b/tests/check_source_parser.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include "../src/source-parser.h"
 #include "../src/error.h"
-#include "../src/utils/utils.h"
+#include "../src/utils.h"
 
 
 static void
@@ -31,23 +31,24 @@ test_source_parse(void **state)
         "\n"
         "bola\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(b_trie_size(source), 5);
-    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(sb_trie_size(source), 6);
+    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(b_trie_lookup(source, "CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n");
-    b_trie_free(source);
+    assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola");
+    sb_trie_free(source);
 }
 
 
@@ -62,23 +63,24 @@ test_source_parse_crlf(void **state)
         "\r\n"
         "bola\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(b_trie_size(source), 5);
-    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(sb_trie_size(source), 6);
+    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n"
         "<p>bola</p>\r\n");
-    assert_string_equal(b_trie_lookup(source, "CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n"
         "<p>bola</p>\r\n");
-    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\r\n"
         "\r\n"
         "bola\r\n");
-    b_trie_free(source);
+    assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola");
+    sb_trie_free(source);
 }
 
 
@@ -95,23 +97,24 @@ test_source_parse_with_spaces(void **state)
         "\n"
         "bola\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(b_trie_size(source), 5);
-    assert_string_equal(b_trie_lookup(source, "VAR1"), "chunda");
-    assert_string_equal(b_trie_lookup(source, "BOLA"), "guda");
-    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(sb_trie_size(source), 6);
+    assert_string_equal(sb_trie_lookup(source, "VAR1"), "chunda");
+    assert_string_equal(sb_trie_lookup(source, "BOLA"), "guda");
+    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(b_trie_lookup(source, "CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n");
-    b_trie_free(source);
+    assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola");
+    sb_trie_free(source);
 }
 
 
@@ -131,21 +134,21 @@ test_source_parse_with_excerpt(void **state)
         "guda\n"
         "yay";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(err);
     assert_non_null(source);
-    assert_int_equal(b_trie_size(source), 5);
-    assert_string_equal(b_trie_lookup(source, "VAR1"), "asd asd");
-    assert_string_equal(b_trie_lookup(source, "VAR2"), "123chunda");
-    assert_string_equal(b_trie_lookup(source, "EXCERPT"),
+    assert_int_equal(sb_trie_size(source), 6);
+    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n");
-    assert_string_equal(b_trie_lookup(source, "CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
         "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
         "<p>bola</p>\n"
         "<p>guda\n"
         "yay</p>\n");
-    assert_string_equal(b_trie_lookup(source, "RAW_CONTENT"),
+    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
         "# This is a test\n"
         "\n"
         "bola\n"
@@ -154,7 +157,41 @@ test_source_parse_with_excerpt(void **state)
         "\n"
         "guda\n"
         "yay");
-    b_trie_free(source);
+    assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola");
+    sb_trie_free(source);
+}
+
+
+static void
+test_source_parse_with_description(void **state)
+{
+    const char *a =
+        "VAR1: asd asd\n"
+        "VAR2: 123chunda\n"
+        "DESCRIPTION: huehuehuebrbr\n"
+        "----------\n"
+        "# This is a test\n"
+        "\n"
+        "bola\n";
+    blogc_error_t *err = NULL;
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    assert_null(err);
+    assert_non_null(source);
+    assert_int_equal(sb_trie_size(source), 6);
+    assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd");
+    assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda");
+    assert_string_equal(sb_trie_lookup(source, "EXCERPT"),
+        "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
+        "<p>bola</p>\n");
+    assert_string_equal(sb_trie_lookup(source, "CONTENT"),
+        "<h1 id=\"this-is-a-test\">This is a test</h1>\n"
+        "<p>bola</p>\n");
+    assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"),
+        "# This is a test\n"
+        "\n"
+        "bola\n");
+    assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "huehuehuebrbr");
+    sb_trie_free(source);
 }
 
 
@@ -163,13 +200,13 @@ test_source_parse_config_empty(void **state)
 {
     const char *a = "";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg, "Your source file is empty.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -178,14 +215,14 @@ test_source_parse_config_invalid_key(void **state)
 {
     const char *a = "bola: guda";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Can't find a configuration key or the content separator.\n"
         "Error occurred near line 1, position 1: bola: guda");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -194,14 +231,14 @@ test_source_parse_config_no_key(void **state)
 {
     const char *a = "BOLa";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Invalid configuration key.\n"
         "Error occurred near line 1, position 4: BOLa");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -210,14 +247,14 @@ test_source_parse_config_no_key2(void **state)
 {
     const char *a = "BOLA";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
     assert_string_equal(err->msg,
         "Your last configuration key is missing ':' and the value\n"
         "Error occurred near line 1, position 5: BOLA");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -226,7 +263,7 @@ test_source_parse_config_no_value(void **state)
 {
     const char *a = "BOLA:\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -234,7 +271,7 @@ test_source_parse_config_no_value(void **state)
         "Configuration value not provided for 'BOLA'.\n"
         "Error occurred near line 1, position 6: BOLA:");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -243,7 +280,7 @@ test_source_parse_config_no_value2(void **state)
 {
     const char *a = "BOLA:";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -251,7 +288,7 @@ test_source_parse_config_no_value2(void **state)
         "Configuration value not provided for 'BOLA'.\n"
         "Error occurred near line 1, position 6: BOLA:");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -260,7 +297,7 @@ test_source_parse_config_reserved_name(void **state)
 {
     const char *a = "FILENAME: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -268,7 +305,7 @@ test_source_parse_config_reserved_name(void **state)
         "'FILENAME' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -277,7 +314,7 @@ test_source_parse_config_reserved_name2(void **state)
 {
     const char *a = "CONTENT: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -285,7 +322,7 @@ test_source_parse_config_reserved_name2(void **state)
         "'CONTENT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -294,7 +331,7 @@ test_source_parse_config_reserved_name3(void **state)
 {
     const char *a = "DATE_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -302,7 +339,7 @@ test_source_parse_config_reserved_name3(void **state)
         "'DATE_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -311,7 +348,7 @@ test_source_parse_config_reserved_name4(void **state)
 {
     const char *a = "DATE_FIRST_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -319,7 +356,7 @@ test_source_parse_config_reserved_name4(void **state)
         "'DATE_FIRST_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -328,7 +365,7 @@ test_source_parse_config_reserved_name5(void **state)
 {
     const char *a = "DATE_LAST_FORMATTED: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -336,7 +373,7 @@ test_source_parse_config_reserved_name5(void **state)
         "'DATE_LAST_FORMATTED' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -345,7 +382,7 @@ test_source_parse_config_reserved_name6(void **state)
 {
     const char *a = "PAGE_FIRST: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -353,7 +390,7 @@ test_source_parse_config_reserved_name6(void **state)
         "'PAGE_FIRST' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -362,7 +399,7 @@ test_source_parse_config_reserved_name7(void **state)
 {
     const char *a = "PAGE_PREVIOUS: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -370,7 +407,7 @@ test_source_parse_config_reserved_name7(void **state)
         "'PAGE_PREVIOUS' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -379,7 +416,7 @@ test_source_parse_config_reserved_name8(void **state)
 {
     const char *a = "PAGE_CURRENT: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -387,7 +424,7 @@ test_source_parse_config_reserved_name8(void **state)
         "'PAGE_CURRENT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -396,7 +433,7 @@ test_source_parse_config_reserved_name9(void **state)
 {
     const char *a = "PAGE_NEXT: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -404,7 +441,7 @@ test_source_parse_config_reserved_name9(void **state)
         "'PAGE_NEXT' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -413,7 +450,7 @@ test_source_parse_config_reserved_name10(void **state)
 {
     const char *a = "PAGE_LAST: asd\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -421,7 +458,7 @@ test_source_parse_config_reserved_name10(void **state)
         "'PAGE_LAST' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -430,7 +467,7 @@ test_source_parse_config_reserved_name11(void **state)
 {
     const char *a = "BLOGC_VERSION: 1.0\r\n";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -438,7 +475,7 @@ test_source_parse_config_reserved_name11(void **state)
         "'BLOGC_VERSION' variable is forbidden in source files. It will be set "
         "for you by the compiler.");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -447,7 +484,7 @@ test_source_parse_config_value_no_line_ending(void **state)
 {
     const char *a = "BOLA: asd";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -455,7 +492,7 @@ test_source_parse_config_value_no_line_ending(void **state)
         "No line ending after the configuration value for 'BOLA'.\n"
         "Error occurred near line 1, position 10: BOLA: asd");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -464,7 +501,7 @@ test_source_parse_invalid_separator(void **state)
 {
     const char *a = "BOLA: asd\n---#";
     blogc_error_t *err = NULL;
-    b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+    sb_trie_t *source = blogc_source_parse(a, strlen(a), &err);
     assert_null(source);
     assert_non_null(err);
     assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
@@ -472,7 +509,7 @@ test_source_parse_invalid_separator(void **state)
         "Invalid content separator. Must be more than one '-' characters.\n"
         "Error occurred near line 2, position 4: ---#");
     blogc_error_free(err);
-    b_trie_free(source);
+    sb_trie_free(source);
 }
 
 
@@ -484,6 +521,7 @@ main(void)
         unit_test(test_source_parse_crlf),
         unit_test(test_source_parse_with_spaces),
         unit_test(test_source_parse_with_excerpt),
+        unit_test(test_source_parse_with_description),
         unit_test(test_source_parse_config_empty),
         unit_test(test_source_parse_config_invalid_key),
         unit_test(test_source_parse_config_no_key),