Use of the RAW markdown submission method :) And it works! =D

Author: stouf

headers/ghfmd.h

@@ -8,7 +8,7 @@
 
 
 
-#define API_REQUEST_URL "https://api.github.com/markdown"
+#define API_REQUEST_URL "https://api.github.com/markdown/raw"
 #define API_REQUEST_PORT 443
 #define JSON_SQUELETON_SIZE 32
 
@@ -17,18 +17,6 @@
 
 
 
-/**
- * Return the JSON expected by the REST API as a string, ready to be sent over
- * the network
- * 
- * @param   text    The markdown formated text submited
- * 
- * @return  The JSON expected by the REST API. It returns NULL if no memory
- *          could be allocated for the result.
- */
-char* get_json(char* text);
-
-
 
 /**
  * Convert a mardown formated content into its corresponding HTML content.

main.c

@@ -1,29 +1,61 @@
+/**
+ * This program reads the file given as first parameter which is supposed to be
+ * a markdown-formated text file. It reads this file and returns its html
+ * equivalent to the stdout
+ */
+
+
 #include "headers/ghfmd.h"
 
+#define MAX_SIZE 12288
+
 
 int main(int argc, char** argv) {
-    printf("This program transform markdown formated text into the ");
-        printf("corresponding HTML using the GitHub API v3.\n");
-    printf("Please, paste your code bellow:(8192 maximum for this test)\n\n");
+    if (argc <= 1) {
+        printf("Please, give your markdown file as first argument.\n");
+        return EXIT_FAILURE;
+    }
 
-    char markdown[8192];
-    if (fgets(markdown, 8192, stdin) == NULL) {
-        printf("Could not read the standard input\n");
+    // Open the file given as argument
+    FILE* file = fopen(argv[1], "r");
+    if (file == NULL) {
+        printf("Could not open the file\n");
         return EXIT_FAILURE;
     }
 
-    char* html = get_html_from_markdown(markdown);
+    // Allocate the memory for the coming file
+    char* file_content = (char*) malloc(MAX_SIZE * sizeof(char));
+    if (file_content == NULL) {
+        printf("Could not allocate enough memory for the purpose.\n");
+        fclose(file);
+        return EXIT_FAILURE;
+    }
 
+    // Read the file
+    char tmp = 0;
+    int i = -1;
+    while (i++ < MAX_SIZE) {
+        tmp = (char) fgetc(file);
+        if (tmp == EOF) {
+            // We've reached the end of the file, let's exit now
+            file_content[i] = '\0';
+            break;
+        } else {
+            file_content[i] = tmp;
+        }
+    }
+    fclose(file);
+    
+    // Now,  we just have to give our file's content to the library :)
+    char* html = get_html_from_markdown(file_content);
     if (html == NULL) {
-        printf("Something bad happened during the communication with the ");
-        printf("GitHub API server.\n");
-        free(markdown);
-        return EXIT_FAILURE;
+        printf("Something has happened during the parsing process.\n");
+        free(file_content);
     }
 
-    printf("%s\n", html);
+    printf("%s", html);
 
-    free(markdown);
+    free(file_content);
     free(html);
 
     return EXIT_SUCCESS;

sources/ghfmd.c

@@ -2,39 +2,6 @@
 
 
 
-/**
- * Return the JSON expected by the REST API as a string, ready to be sent over
- * the network
- * 
- * @param   text    The markdown formated text submited
- * 
- * @return  The JSON expected by the REST API. It returns NULL if no memory
- *          could be allocated for the result.
- */
-char* get_json(char* text) {
-    size_t text_len = strlen(text);
-    
-    // Allocate the memory for the result
-    // The final result will look like:
-    //  {"text": $text, "mode": "mardown"}
-    char* json =\
-        (char*) malloc((text_len + JSON_SQUELETON_SIZE + 1) * sizeof(char));
-    
-    if (json == NULL) {
-        return NULL;
-    }
-
-    int num_of_char_written = snprintf(json, (JSON_SQUELETON_SIZE + text_len +\
-        1), "{\"text\": \"%s\", \"mode\": \"markdown\"}", text);
-    
-    if (num_of_char_written != (text_len + JSON_SQUELETON_SIZE)) {
-        // Something bad has happened during the writting process to $json
-        free(json);
-        return NULL;
-    }
-    
-    return json;
-}
 
 
 
@@ -89,28 +56,16 @@ size_t receive_http_data(char* ptr, size_t size, size_t nmemb, void* userdata) {
  *          problem connected to the libcurl occured
  */
 char* get_html_from_markdown(char* markdown) {
-    // Let's transform our markdown formated text as the expected JSON
-    char* json = get_json(markdown);
-    
-    if (json == NULL) {
-        // A problem has occured during the JSON generation process
-        return NULL;
-    }
-    
-    
-    // Now, let's init curl's data
+    // Let's init curl's data
 
     // First, the global initialization
     if (curl_global_init(CURL_GLOBAL_ALL) != 0) {
-        free(json);
-
         return NULL;
     }
 
     // Easy interface initialization
     CURL* curl = curl_easy_init();
     if (curl == NULL) {
-        free(json);
         curl_global_cleanup();
 
         return NULL;
@@ -123,26 +78,33 @@ char* get_html_from_markdown(char* markdown) {
     curl_easy_setopt(curl, CURLOPT_URL, API_REQUEST_URL);
     curl_easy_setopt(curl, CURLOPT_PORT, API_REQUEST_PORT);
 
+    // Set the necessary HTTP headers
+    struct curl_slist* headers = NULL;
+    headers = curl_slist_append(headers, "Content-Type: text/plain");
+    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+    
     // Bind the callback for the data reception and which data will be called
     // with this callback as the 4th argument (see the function descript above)
     char* html_resulted = NULL;
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, receive_http_data);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &html_resulted);
 
     // Specify the data to send using the POST method
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, json);
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, markdown);
 
 
     // And finally send the request
     if (curl_easy_perform(curl) != 0) {
         // The request could not be sent...
         curl_easy_cleanup(curl);
         curl_global_cleanup();
-        free(json);
 
         return NULL;
     }
 
+    // Free the HTTP headers
+    curl_slist_free_all(headers);
+    
     // Cleanup the stuff done by curl
     curl_easy_cleanup(curl);
 

tests/ghfmd.c

@@ -13,29 +13,6 @@ int tests_run = 0;
 
 
 
-/**
- * Compare a "hard-written" result with the one received from the get_json()
- * function
- */
-char* test_get_json() {
-    char* text = (char*) malloc(11 * sizeof(char));
-    strcpy(text, "Hello world");
-    char* expected_json =\
-        (char*) malloc((11 + JSON_SQUELETON_SIZE) * sizeof(char));
-    strcpy(expected_json, "{\"text\": \"Hello world\", \"mode\": \"markdown\"}");
-    
-    char* json = get_json(text);
-    
-    mu_assert("The JSON generator didn't returned a correct string",
-        (strcmp(json, expected_json) == 0));
-        
-    free(json);
-    free(text);
-    free(expected_json);
-    
-    return 0;
-}
-
 
 
 
@@ -64,7 +41,6 @@ char* test_get_html_from_markdown() {
  * Run all defined tests
  */
 char* all_tests() {
-    mu_run_test(test_get_json);
     mu_run_test(test_get_html_from_markdown);
 
     return 0;