jekyll-gist 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9a1f020a20730b4d05b3264615d466c95eaa38
-  data.tar.gz: 68298be1c9f87daf66fb9a45179e500056e849fa
+  metadata.gz: 956dde53efdc7ba004b745ad63965672a082de7b
+  data.tar.gz: 1bb48861f6d8676f0450b3508390f28da05b0040
 SHA512:
-  metadata.gz: b7d2155feaf88a4a587379de08206e83708a8df4784cc8020a385b2c5f1c8514054c0d5811ffa8c0313d9d7ecfd91c8d7f83dcbd311221951c2586327de59d25
-  data.tar.gz: 44461408e409690988f71fa94485cb5d8751edcf5dc68e3949c3816ee7d2148bc9f90a7fcc0941fd5b3351fc16950958637775a00e3cebeaa4235658d642f24c
+  metadata.gz: 579e357cb1bc2996bb2d4c2a6fb4daf5f1c9a33e794ab7eef245a7c20197cd88cac90dc81cfae6fdc33b1d15de1101801e6341ceb3c97e4f0d9a2105f27d3c6a
+  data.tar.gz: 3e286821b3a9820c1049908d1cae54e9b7df2d6892499f8fadc475a36b401f7acc7269e3510b22f5dad4c77ac2544f901bf48d6b46951395c4660b4960cc2a6d

data/History.markdown

@@ -0,0 +1,11 @@
+## HEAD
+
+## 1.1.0 / 2014-06-18
+
+### Minor Enhancements
+
+  * Update regex to allow for new sha-ish ids in Gist. (#1)
+
+## 1.0.0 / 2014-06-01
+
+  * Birthday!

data/README.md

@@ -2,6 +2,8 @@
 
 Liquid tag for displaying GitHub Gists in Jekyll sites: `{% gist %}`.
 
+[![Build Status](https://travis-ci.org/jekyll/jekyll-gist.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-gist)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/jekyll-gist/gist_tag.rb

@@ -13,7 +13,10 @@ module Jekyll
     #{@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
@@ -21,11 +24,7 @@ module Jekyll
       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 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_tag('gist', Jekyll::Gist::GistTag)
+Liquid::Template.register_tag('gist', Jekyll::Gist::GistTag)

data/lib/jekyll-gist/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Gist
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/gist_tag_spec.rb

@@ -8,18 +8,26 @@ describe(Jekyll::Gist::GistTag) do
     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>/)
+  context "valid gist" do
+    context "with user prefix" do
+      let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
+
+      it "produces the correct script tag" do
+        expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
+      end
     end
-  end
 
-  context "private gist" do
+    context "without user prefix" do
+      let(:gist) { "28949e1d5ee2273f9fd3" }
 
-    context "when valid" do
-      let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
+      it "produces the correct script tag" do
+        expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
+      end
+    end
+
+    context "classic Gist id style" do
+      let(:gist) { "1234321" }
 
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
@@ -35,9 +43,13 @@ describe(Jekyll::Gist::GistTag) do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js\?file=#{filename}">\s<\/script>/)
       end
     end
+  end
+
+
+  context "invalid gist" do
 
-    context "when invalid" do
-      let(:gist) { "mattr-24081a1d93d2898ecf0f" }
+    context "no gist id present" do
+      let(:gist) { "" }
 
       it "raises an error" do
         expect(->{ output }).to raise_error
@@ -46,12 +58,4 @@ describe(Jekyll::Gist::GistTag) do
 
   end
 
-  context "no gist id present" do
-    let(:gist) { "" }
-
-    it "raises an error" do
-      expect(->{ output }).to raise_error
-    end
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- History.markdown
 - LICENSE.txt
 - README.md
 - Rakefile