Merge pull request #82 from robin-cruk/use-authorization-header

use Authorization header rather than query parameter

Author: ekalinin

gh-md-toc

@@ -23,7 +23,7 @@
 #       substr($0, match($0, "href=\"[^\"]+?\" ")+6, RLENGTH-8)
 #
 
-gh_toc_version="0.6.1"
+gh_toc_version="0.6.2"
 
 gh_user_agent="gh-md-toc v$gh_toc_version"
 
@@ -52,17 +52,23 @@ gh_toc_load() {
 gh_toc_md2html() {
     local gh_file_md=$1
     URL=https://api.github.com/markdown/raw
+
     if [ ! -z "$GH_TOC_TOKEN" ]; then
         TOKEN=$GH_TOC_TOKEN
     else
-        TOKEN="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt"
+        TOKEN_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt"
+        if [ -f "$TOKEN_FILE" ]; then
+            TOKEN="$(cat $TOKEN_FILE)"
+        fi
     fi
-    if [ -f "$TOKEN" ]; then
-        AUTH_HEADER=("-H" "Authorization: token $(cat $TOKEN)")
+    if [ ! -z "${TOKEN}" ]; then
+        AUTHORIZATION="--header \"Authorization: token ${TOKEN}\""
     fi
+
     # echo $URL 1>&2
     OUTPUT="$(curl -s --user-agent "$gh_user_agent" \
-        --data-binary @"$gh_file_md" -H "Content-Type:text/plain" "${AUTH_HEADER[@]}" \
+        --data-binary @"$gh_file_md" -H "Content-Type:text/plain" \
+        ${AUTHORIZATION} \
         $URL)"
 
     if [ "$?" != "0" ]; then
@@ -136,8 +142,8 @@ gh_toc(){
         if [ "$rawhtml" == "XXRateLimitXX" ]; then
              echo "Parsing local markdown file requires access to github API"
              echo "Error: You exceeded the hourly limit. See: https://developer.github.com/v3/#rate-limiting"
-             TOKEN="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt"
-             echo "or place github auth token here: $TOKEN"
+             TOKEN_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt"
+             echo "or place GitHub auth token here: ${TOKEN_FILE}"
              exit 1
         fi
         local toc=`echo "$rawhtml" | gh_toc_grab "$gh_src_copy"`

tests/tests.bats

@@ -110,7 +110,7 @@ load test_helper
 @test "--version" {
     run $BATS_TEST_DIRNAME/../gh-md-toc --version
     assert_success
-    assert_equal "${lines[0]}" "0.6.1"
+    assert_equal "${lines[0]}" "0.6.2"
 }
 
 @test "TOC for non-english chars, #6, #10" {