use octokit to fetch gists when token present

Author: benbalter

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"

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

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