Update regex to allow for new sha-ish ids in Gist.

Recently Gist unified all the URLs (which in public gists were numeric
and in private gists, alphanumeric). This made certain flows break but
Gist now should redirect to the proper url if given either the new
SHA-ish id or the classic numeric ID.

Author: Leon Gersing

lib/jekyll-gist/gist_tag.rb

@@ -13,19 +13,18 @@ def render(context)
     #{@markup}
 
   Valid syntax:
-    for all gists: {% gist user/1234567 %}
+    {% gist user/1234567 %}
+    {% gist user/1234567 foo.js %}
+    {% gist 28949e1d5ee2273f9fd3 %}
+    {% gist 28949e1d5ee2273f9fd3 best.md %}
   eos
         end
       end
 
       private
 
       def determine_arguments(input)
-        matched = if input.include?("/")
-          input.match(/\A([a-zA-Z0-9\/\-_]+) ?(\S*)\Z/)
-        else
-          input.match(/\A(\d+) ?(\S*)\Z/)
-        end
+        matched = input.match(/\A([\S]+|.*(?=\/).+)\s?(\S*)\Z/)
         [matched[1].strip, matched[2].strip] if matched && matched.length >= 3
       end
 
@@ -41,4 +40,4 @@ def gist_script_tag(gist_id, filename = nil)
   end
 end
 
-Liquid::Template.register_tag('gist', Jekyll::Gist::GistTag)
+Liquid::Template.register_tag('gist', Jekyll::Gist::GistTag)

spec/gist_tag_spec.rb

@@ -8,18 +8,18 @@
     doc.output  = Jekyll::Renderer.new(doc.site, doc).run
   end
 
-  context "simple gist" do
-    let(:gist) { 358471 }
 
-    it "produces the correct script tag" do
-      expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
-    end
-  end
+  context "valid gist" do
+    context "with user prefix" do
+      let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
 
-  context "private gist" do
+      it "produces the correct script tag" do
+        expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
+      end
+    end
 
-    context "when valid" do
-      let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
+    context "without user prefix" do
+      let(:gist) { "28949e1d5ee2273f9fd3" }
 
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
@@ -35,9 +35,13 @@
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js\?file=#{filename}">\s<\/script>/)
       end
     end
+  end
+
 
-    context "when invalid" do
-      let(:gist) { "mattr-24081a1d93d2898ecf0f" }
+  context "invalid gist" do
+
+    context "no gist id present" do
+      let(:gist) { "" }
 
       it "raises an error" do
         expect(->{ output }).to raise_error
@@ -46,12 +50,4 @@
 
   end
 
-  context "no gist id present" do
-    let(:gist) { "" }
-
-    it "raises an error" do
-      expect(->{ output }).to raise_error
-    end
-  end
-
 end