From 6c2d00026c57299b7bec3b2bee04edf04fffec0a Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 30 Nov 2015 16:29:45 -0500
Subject: [PATCH 01/12] use octokit to fetch gists when token present

---
 jekyll-gist.gemspec         |  1 +
 lib/jekyll-gist/gist_tag.rb | 42 +++++++++++++++++++++++++++----------
 spec/gist_tag_spec.rb       | 34 ++++++++++++++++++++++--------
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/jekyll-gist.gemspec b/jekyll-gist.gemspec
index b4f3ece..8b62a2a 100644
--- a/jekyll-gist.gemspec
+++ b/jekyll-gist.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "octokit", "~> 4.2"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 3e9b844..aad50a2 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -62,20 +62,40 @@ def gist_noscript_tag(gist_id, filename = nil)
       end
 
       def fetch_raw_code(gist_id, filename = nil)
+        content = code_from_api(gist_id, filename)
+        return content if content
+
         url = "https://gist.githubusercontent.com/#{gist_id}/raw"
         url = "#{url}/#{filename}" unless filename.empty?
-        begin
-          uri = URI(url)
-          Net::HTTP.start(uri.host, uri.port,
-            use_ssl: uri.scheme == 'https',
-            read_timeout: 3, open_timeout: 3) do |http|
-            request = Net::HTTP::Get.new uri.to_s
-            response = http.request(request)
-            response.body
-          end
-        rescue SocketError, Net::HTTPError, Net::OpenTimeout, Net::ReadTimeout, TimeoutError
-          nil
+        uri = URI(url)
+        Net::HTTP.start(uri.host, uri.port,
+          use_ssl: uri.scheme == 'https',
+          read_timeout: 3, open_timeout: 3) do |http|
+          request = Net::HTTP::Get.new uri.to_s
+          response = http.request(request)
+          response.body
         end
+      rescue SocketError, Net::HTTPError, Net::OpenTimeout, Net::ReadTimeout, TimeoutError
+        nil
+      end
+
+      private
+
+      def code_from_api(gist_id, filename = nil)
+        return unless ENV["JEKYLL_GITHUB_TOKEN"]
+
+        client = Octokit::Client.new :access_token => ENV["JEKYLL_GITHUB_TOKEN"]
+        gist = client.gist gist_id
+
+        file = if filename && gist.files[filename]
+          gist.files.filename
+        else
+          files.first
+        end
+
+        file.content unless file.truncated
+      rescue Octokit => e
+        nil
       end
     end
   end
diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index e10b177..7c15361 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -9,6 +9,7 @@
     doc.output  = Jekyll::Renderer.new(doc.site, doc).run
   end
 
+  before_each { ENV["JEKYLL_GITHUB_TOKEN"] = nil }
 
   context "valid gist" do
     context "with user prefix" do
@@ -18,7 +19,7 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
@@ -30,7 +31,7 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
@@ -42,7 +43,7 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
@@ -56,7 +57,7 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js\?file=#{filename}">\s<\/script>/)
       end
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
@@ -74,7 +75,7 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{doc.data['gist_id']}.js">\s<\/script>/)
       end
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
@@ -97,12 +98,12 @@
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{doc.data['gist_id']}.js\?file=#{doc.data['gist_filename']}">\s<\/script>/)
       end
 
-      it "produces the correct noscript tag" do 
+      it "produces the correct noscript tag" do
         expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
     end
 
-    context "with valid gist id and invalid filename" do 
+    context "with valid gist id and invalid filename" do
       before { stub_request(:get, "https://gist.githubusercontent.com/#{gist_id}/raw/#{gist_filename}").to_return(status: 404) }
       let(:gist_id)     { "mattr-/24081a1d93d2898ecf0f" }
       let(:gist_filename) { "myfile.ext" }
@@ -112,14 +113,29 @@
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist_id}.js\?file=#{gist_filename}">\s<\/script>/)
       end
 
-      it "does not produce the noscript tag" do 
+      it "does not produce the noscript tag" do
         expect(output).to_not match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
       end
 
     end
 
-  end
+    context "with token" do
+      before { ENV["JEKYLL_GITHUB_TOKEN"] = "1234" }
+      let(:gist_id)  { "1342013" }
+      let(:gist)     { "page.gist_id" }
+      let(:output) do
+        doc.data['gist_id'] = gist_id
+        doc.content = content
+        doc.output  = Jekyll::Renderer.new(doc.site, doc).run
+      end
+
+      it "produces the noscript tag" do
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
 
+    end
+
+  end
 
   context "invalid gist" do
 

From 15b2ee9ce8a8095b8badca29586c0cadeac0860d Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 30 Nov 2015 17:28:59 -0500
Subject: [PATCH 02/12] before(:each)

---
 spec/gist_tag_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index 7c15361..6674588 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -9,7 +9,7 @@
     doc.output  = Jekyll::Renderer.new(doc.site, doc).run
   end
 
-  before_each { ENV["JEKYLL_GITHUB_TOKEN"] = nil }
+  before(:each) { ENV["JEKYLL_GITHUB_TOKEN"] = nil }
 
   context "valid gist" do
     context "with user prefix" do

From 64019365a47e491225b1b1030bd296d1da8dafeb Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 30 Nov 2015 18:00:02 -0500
Subject: [PATCH 03/12] working tests

---
 lib/jekyll-gist/gist_tag.rb       |  21 +++---
 spec/fixtures/multiple-files.json | 111 ++++++++++++++++++++++++++++++
 spec/fixtures/single-file.json    | 103 +++++++++++++++++++++++++++
 spec/gist_tag_spec.rb             |  17 ++++-
 spec/spec_helper.rb               |   6 +-
 5 files changed, 246 insertions(+), 12 deletions(-)
 create mode 100644 spec/fixtures/multiple-files.json
 create mode 100644 spec/fixtures/single-file.json

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index aad50a2..68f4899 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -1,5 +1,6 @@
 require 'cgi'
 require 'net/http'
+require 'octokit'
 
 Net::OpenTimeout = Class.new(RuntimeError) unless Net.const_defined?(:OpenTimeout)
 Net::ReadTimeout = Class.new(RuntimeError) unless Net.const_defined?(:ReadTimeout)
@@ -62,8 +63,7 @@ def gist_noscript_tag(gist_id, filename = nil)
       end
 
       def fetch_raw_code(gist_id, filename = nil)
-        content = code_from_api(gist_id, filename)
-        return content if content
+        return code_from_api(gist_id, filename) if ENV["JEKYLL_GITHUB_TOKEN"]
 
         url = "https://gist.githubusercontent.com/#{gist_id}/raw"
         url = "#{url}/#{filename}" unless filename.empty?
@@ -82,20 +82,21 @@ def fetch_raw_code(gist_id, filename = nil)
       private
 
       def code_from_api(gist_id, filename = nil)
-        return unless ENV["JEKYLL_GITHUB_TOKEN"]
-
         client = Octokit::Client.new :access_token => ENV["JEKYLL_GITHUB_TOKEN"]
         gist = client.gist gist_id
 
-        file = if filename && gist.files[filename]
-          gist.files.filename
+        file = if filename.to_s.empty?
+          # No file specified, return the value of the first key/value pair
+          gist.files.first[1]
         else
-          files.first
+          # .files is a hash of :"filename.extension" => data pairs
+          # Rather than using to_sym on arbitrary user input,
+          # Find our file by calling to_s on the keys
+          match = gist.files.find { |name, data| name.to_s == filename}
+          match[1] if match
         end
 
-        file.content unless file.truncated
-      rescue Octokit => e
-        nil
+        file[:content] if file && !file[:truncated]
       end
     end
   end
diff --git a/spec/fixtures/multiple-files.json b/spec/fixtures/multiple-files.json
new file mode 100644
index 0000000..338d3a7
--- /dev/null
+++ b/spec/fixtures/multiple-files.json
@@ -0,0 +1,111 @@
+{
+  "url": "https://api.github.com/gists/aa5a315d61ae9438b18d",
+  "forks_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/forks",
+  "commits_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/commits",
+  "id": "aa5a315d61ae9438b18d",
+  "description": "description of gist",
+  "public": true,
+  "owner": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/octocat",
+    "html_url": "https://github.com/octocat",
+    "followers_url": "https://api.github.com/users/octocat/followers",
+    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+    "organizations_url": "https://api.github.com/users/octocat/orgs",
+    "repos_url": "https://api.github.com/users/octocat/repos",
+    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/octocat/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "user": null,
+  "files": {
+    "ring.erl": {
+      "size": 932,
+      "raw_url": "https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl",
+      "type": "text/plain",
+      "language": "Erlang",
+      "truncated": false,
+      "content": "contents of gist"
+    },
+    "hello-world.rb": {
+      "size": 932,
+      "raw_url": "https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl",
+      "type": "text/plain",
+      "language": "Ruby",
+      "truncated": false,
+      "content": "puts 'hello world'"
+    }
+  },
+  "comments": 0,
+  "comments_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/comments/",
+  "html_url": "https://gist.github.com/aa5a315d61ae9438b18d",
+  "git_pull_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
+  "git_push_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
+  "created_at": "2010-04-14T02:15:15Z",
+  "updated_at": "2011-06-20T11:34:15Z",
+  "forks": [
+    {
+      "user": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/octocat",
+        "html_url": "https://github.com/octocat",
+        "followers_url": "https://api.github.com/users/octocat/followers",
+        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+        "organizations_url": "https://api.github.com/users/octocat/orgs",
+        "repos_url": "https://api.github.com/users/octocat/repos",
+        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/octocat/received_events",
+        "type": "User",
+        "site_admin": false
+      },
+      "url": "https://api.github.com/gists/dee9c42e4998ce2ea439",
+      "id": "dee9c42e4998ce2ea439",
+      "created_at": "2011-04-14T16:00:49Z",
+      "updated_at": "2011-04-14T16:00:49Z"
+    }
+  ],
+  "history": [
+    {
+      "url": "https://api.github.com/gists/aa5a315d61ae9438b18d/57a7f021a713b1c5a6a199b54cc514735d2d462f",
+      "version": "57a7f021a713b1c5a6a199b54cc514735d2d462f",
+      "user": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/octocat",
+        "html_url": "https://github.com/octocat",
+        "followers_url": "https://api.github.com/users/octocat/followers",
+        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+        "organizations_url": "https://api.github.com/users/octocat/orgs",
+        "repos_url": "https://api.github.com/users/octocat/repos",
+        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/octocat/received_events",
+        "type": "User",
+        "site_admin": false
+      },
+      "change_status": {
+        "deletions": 0,
+        "additions": 180,
+        "total": 180
+      },
+      "committed_at": "2010-04-14T02:15:15Z"
+    }
+  ]
+}
diff --git a/spec/fixtures/single-file.json b/spec/fixtures/single-file.json
new file mode 100644
index 0000000..9ac7921
--- /dev/null
+++ b/spec/fixtures/single-file.json
@@ -0,0 +1,103 @@
+{
+  "url": "https://api.github.com/gists/aa5a315d61ae9438b18d",
+  "forks_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/forks",
+  "commits_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/commits",
+  "id": "aa5a315d61ae9438b18d",
+  "description": "description of gist",
+  "public": true,
+  "owner": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/octocat",
+    "html_url": "https://github.com/octocat",
+    "followers_url": "https://api.github.com/users/octocat/followers",
+    "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+    "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+    "organizations_url": "https://api.github.com/users/octocat/orgs",
+    "repos_url": "https://api.github.com/users/octocat/repos",
+    "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/octocat/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "user": null,
+  "files": {
+    "ring.erl": {
+      "size": 932,
+      "raw_url": "https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl",
+      "type": "text/plain",
+      "language": "Erlang",
+      "truncated": false,
+      "content": "contents of gist"
+    }
+  },
+  "comments": 0,
+  "comments_url": "https://api.github.com/gists/aa5a315d61ae9438b18d/comments/",
+  "html_url": "https://gist.github.com/aa5a315d61ae9438b18d",
+  "git_pull_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
+  "git_push_url": "https://gist.github.com/aa5a315d61ae9438b18d.git",
+  "created_at": "2010-04-14T02:15:15Z",
+  "updated_at": "2011-06-20T11:34:15Z",
+  "forks": [
+    {
+      "user": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/octocat",
+        "html_url": "https://github.com/octocat",
+        "followers_url": "https://api.github.com/users/octocat/followers",
+        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+        "organizations_url": "https://api.github.com/users/octocat/orgs",
+        "repos_url": "https://api.github.com/users/octocat/repos",
+        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/octocat/received_events",
+        "type": "User",
+        "site_admin": false
+      },
+      "url": "https://api.github.com/gists/dee9c42e4998ce2ea439",
+      "id": "dee9c42e4998ce2ea439",
+      "created_at": "2011-04-14T16:00:49Z",
+      "updated_at": "2011-04-14T16:00:49Z"
+    }
+  ],
+  "history": [
+    {
+      "url": "https://api.github.com/gists/aa5a315d61ae9438b18d/57a7f021a713b1c5a6a199b54cc514735d2d462f",
+      "version": "57a7f021a713b1c5a6a199b54cc514735d2d462f",
+      "user": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/octocat",
+        "html_url": "https://github.com/octocat",
+        "followers_url": "https://api.github.com/users/octocat/followers",
+        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+        "organizations_url": "https://api.github.com/users/octocat/orgs",
+        "repos_url": "https://api.github.com/users/octocat/repos",
+        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/octocat/received_events",
+        "type": "User",
+        "site_admin": false
+      },
+      "change_status": {
+        "deletions": 0,
+        "additions": 180,
+        "total": 180
+      },
+      "committed_at": "2010-04-14T02:15:15Z"
+    }
+  ]
+}
diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index 6674588..b2cdd6d 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -121,6 +121,10 @@
 
     context "with token" do
       before { ENV["JEKYLL_GITHUB_TOKEN"] = "1234" }
+      before {
+        stub_request(:get, "https://api.github.com/gists/1342013").
+          to_return(:status => 200, :body => fixture("single-file"), :headers => {"Content-Type" => "application/json"})
+      }
       let(:gist_id)  { "1342013" }
       let(:gist)     { "page.gist_id" }
       let(:output) do
@@ -130,9 +134,20 @@
       end
 
       it "produces the noscript tag" do
-        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+        expect(output).to match(/<noscript><pre>contents of gist<\/pre><\/noscript>/)
       end
 
+      context "with a filename" do
+        before {
+          stub_request(:get, "https://api.github.com/gists/1342013").
+            to_return(:status => 200, :body => fixture("multiple-files"), :headers => {"Content-Type" => "application/json"})
+        }
+        let(:content)  { "{% gist 1342013 hello-world.rb %}" }
+
+        it "produces the noscript tag" do
+          expect(output).to match(/<noscript><pre>puts &#39;hello world&#39;<\/pre><\/noscript>/)
+        end
+      end
     end
 
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6967f66..e766014 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,6 @@
 require File.expand_path("../lib/jekyll-gist.rb", TEST_DIR)
 
 Jekyll.logger.log_level = :error
-STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:')
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
@@ -42,4 +41,9 @@ def site(opts = {})
     }))
     Jekyll::Site.new(conf)
   end
+
+  def fixture(name)
+    path = File.expand_path "./fixtures/#{name}.json", File.dirname(__FILE__)
+    File.open(path).read
+  end
 end

From 2d1b64e9011f37c9f77c45a13783b06e7da1d65c Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 30 Nov 2015 18:02:00 -0500
Subject: [PATCH 04/12] dont look for truncation

---
 lib/jekyll-gist/gist_tag.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 68f4899..66b5652 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -96,7 +96,7 @@ def code_from_api(gist_id, filename = nil)
           match[1] if match
         end
 
-        file[:content] if file && !file[:truncated]
+        file[:content] if file
       end
     end
   end

From 63a6ef7c00ef1146fffa38725b1aba4e355fe843 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Mon, 30 Nov 2015 18:04:01 -0500
Subject: [PATCH 05/12] document

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4302e41..770a2f8 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ You may optionally specify a `filename` after the `gist_id`:
 
 This will produce the correct URL to show just the specified file in your post rather than the entire Gist.
 
+**Pro-tip**: If you provide a personal access token with Gist scope, as the environmental variable `JEKYLL_GITHUB_TOKEN`, Jekyll Gist will use the Gist API to speed up site generation.
+
 ## Contributing
 
 1. Fork it ( https://github.com/jekyll/jekyll-gist/fork )

From 87b93ed9bdc49d4b80bb4ac43eec7b6e0d75dc3d Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:36:36 -0500
Subject: [PATCH 06/12] allways be backwards compatibling

---
 lib/jekyll-gist/gist_tag.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 66b5652..151c523 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -54,7 +54,13 @@ def gist_noscript_tag(gist_id, filename = nil)
         code = fetch_raw_code(gist_id, filename)
         if !code.nil?
           code = code.force_encoding(@encoding)
-          "<noscript><pre>#{CGI.escapeHTML(code)}</pre></noscript>"
+          code = CGI.escapeHTML(code)
+
+          # CGI.escapeHTML behavior differs in Ruby < 2.0
+          # See https://github.com/jekyll/jekyll-gist/pull/28
+          code = code.gsub("'", "&#39;") if RUBY_VERSION < "2.0"
+
+          "<noscript><pre>#{code}</pre></noscript>"
         else
           Jekyll.logger.warn "Warning:", "The <noscript> tag for your gist #{gist_id} could not"
           Jekyll.logger.warn "", "be generated. This will affect users who do not have"

From 60bca91894f9842363b81ac8f7d59930df35b779 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:41:34 -0500
Subject: [PATCH 07/12] missing end

---
 spec/gist_tag_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index e65b055..777f2a7 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -147,6 +147,8 @@
         it "produces the noscript tag" do
           expect(output).to match(/<noscript><pre>puts &#39;hello world&#39;<\/pre><\/noscript>/)
         end
+      end
+    end
 
     context "with noscript disabled" do
       let(:doc) { doc_with_content(content, { "gist" => { "noscript" => false } }) }
@@ -160,7 +162,6 @@
         expect(output).to_not match(/<noscript>/)
       end
     end
-
   end
 
   context "invalid gist" do

From 91b83639f10cb59748c3ab232637101752b83c03 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:42:09 -0500
Subject: [PATCH 08/12] whitespace

---
 spec/gist_tag_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index 777f2a7..c651b4f 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -162,6 +162,7 @@
         expect(output).to_not match(/<noscript>/)
       end
     end
+    
   end
 
   context "invalid gist" do

From 32857aa3e73f4ee9f236a932a8c77fe71f13a37e Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:42:38 -0500
Subject: [PATCH 09/12] whitespace

---
 spec/gist_tag_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index c651b4f..15d8602 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -162,7 +162,7 @@
         expect(output).to_not match(/<noscript>/)
       end
     end
-    
+
   end
 
   context "invalid gist" do

From d9c695f6b7fd4e5a03a19338c9d0e3a477e70f13 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:46:51 -0500
Subject: [PATCH 10/12] cache client

---
 lib/jekyll-gist/gist_tag.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 17e03b8..9d2d958 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -90,7 +90,6 @@ def fetch_raw_code(gist_id, filename = nil)
       private
 
       def code_from_api(gist_id, filename = nil)
-        client = Octokit::Client.new :access_token => ENV["JEKYLL_GITHUB_TOKEN"]
         gist = client.gist gist_id
 
         file = if filename.to_s.empty?
@@ -106,6 +105,10 @@ def code_from_api(gist_id, filename = nil)
 
         file[:content] if file
       end
+
+      def client
+        @client ||= Octokit::Client.new :access_token => ENV["JEKYLL_GITHUB_TOKEN"]
+      end
     end
   end
 end

From 9153e437fd9446c0687c16111727495508c21fd5 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 12:48:31 -0500
Subject: [PATCH 11/12] balance whitespace

---
 lib/jekyll-gist/gist_tag.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 9d2d958..86dc3d9 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -99,7 +99,7 @@ def code_from_api(gist_id, filename = nil)
           # .files is a hash of :"filename.extension" => data pairs
           # Rather than using to_sym on arbitrary user input,
           # Find our file by calling to_s on the keys
-          match = gist.files.find { |name, data| name.to_s == filename}
+          match = gist.files.find { |name, data| name.to_s == filename }
           match[1] if match
         end
 

From af85461e399ea51a875199b78a222c575d6fb739 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 1 Dec 2015 13:06:33 -0500
Subject: [PATCH 12/12] cache on the class, not the instance

---
 lib/jekyll-gist/gist_tag.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 86dc3d9..83a1595 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -90,7 +90,7 @@ def fetch_raw_code(gist_id, filename = nil)
       private
 
       def code_from_api(gist_id, filename = nil)
-        gist = client.gist gist_id
+        gist = GistTag.client.gist gist_id
 
         file = if filename.to_s.empty?
           # No file specified, return the value of the first key/value pair
@@ -106,7 +106,7 @@ def code_from_api(gist_id, filename = nil)
         file[:content] if file
       end
 
-      def client
+      def self.client
         @client ||= Octokit::Client.new :access_token => ENV["JEKYLL_GITHUB_TOKEN"]
       end
     end