onebox 1.8.12 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e49b29d9f523548133ecd1ab5e06b38d0095de7
-  data.tar.gz: 8a019562dfac53eaabb811217cbbe1d9b71118e3
+  metadata.gz: 881354a49c26f3ff8f7f96286bfda2f1fe313cf5
+  data.tar.gz: ff63ab334806ad83ba234af67d29eff74a40c0b2
 SHA512:
-  metadata.gz: 739d913e0759b3a3c3f4280f215125bce634303af0f2e6154e192e2deca6b4b4f2a9f02069653f5f2c2e1c06225cb271862e289d4c4fe6f8eddc48c49ad81f73
-  data.tar.gz: aeef0ad8e417d3eb127f7d1f62b8dfc0792700f17c9a023ce1ee0235798a0b96ab348340cb534ec6a1a9de1ec6331318c5ee22b3f312e02654fc10d8aae163ba
+  metadata.gz: c7ce9b381f54dfa5c1ae033ee67c7c824a026b2eedb91e7569668e105745dc0e1158a683baeb5582850c79016c0d0f3178c17d155fa3eea3d2b9334f8fc70e5e
+  data.tar.gz: 4099701a95bc9eb0c7a5d39df03f062f794f81c63aeb69ec96b489f193d3034e4d270dabeedbcc00972cbfd919b05f703fdb1f5b3303707a49cc80da7e24e7a4

data/lib/onebox/engine/github_commit_onebox.rb

@@ -5,7 +5,7 @@ module Onebox
       include LayoutSupport
       include JSON
 
-      matches_regexp Regexp.new("^https?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/commit/")
+      matches_regexp Regexp.new("^https?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/commits?/")
       always_https
 
       def url
@@ -15,7 +15,13 @@ module Onebox
       private
 
       def match
-        @match ||= @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/commit/(?<sha>[^/]+)})
+        return @match if @match
+
+        @match = @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/commits?/(?<sha>[^/]+)})
+
+        @match = @url.match(%{github\.com/(?<owner>[^/]+)/(?<repository>[^/]+)/pull/(?<pr>[^/]+)/commits?/(?<sha>[^/]+)}) if @match.nil?
+
+        @match
       end
 
       def data

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.12"
+  VERSION = "1.8.13"
 end

data/spec/lib/onebox/engine/github_commit_onebox_spec.rb

@@ -1,53 +1,108 @@
 require "spec_helper"
 
 describe Onebox::Engine::GithubCommitOnebox do
-  before(:all) do
-    @link = "https://github.com/discourse/discourse/commit/803d023e2307309f8b776ab3b8b7e38ba91c0919"
-    @uri = "https://api.github.com/repos/discourse/discourse/commits/803d023e2307309f8b776ab3b8b7e38ba91c0919"
-  end
-
-  include_context "engines"
-  it_behaves_like "an engine"
 
-  describe "#to_html" do
-    it "includes owner" do
-      expect(html).to include("discourse")
+  describe "regular commit url" do
+    before(:all) do
+      @link = "https://github.com/discourse/discourse/commit/803d023e2307309f8b776ab3b8b7e38ba91c0919"
+      @uri = "https://api.github.com/repos/discourse/discourse/commits/803d023e2307309f8b776ab3b8b7e38ba91c0919"
     end
 
-    it "includes repository name" do
-      expect(html).to include("discourse")
-    end
+    include_context "engines"
+    it_behaves_like "an engine"
 
-    it "includes commit sha" do
-      expect(html).to include("803d023e2307309f8b776ab3b8b7e38ba91c0919")
-    end
+    describe "#to_html" do
+      it "includes owner" do
+        expect(html).to include("discourse")
+      end
 
-    it "includes commit author gravatar" do
-      expect(html).to include("2F7d3010c11d08cf990b7614d2c2ca9098.png")
-    end
+      it "includes repository name" do
+        expect(html).to include("discourse")
+      end
 
-    it "includes commit message" do
-      expect(html).to include("Fixed GitHub auth")
-    end
+      it "includes commit sha" do
+        expect(html).to include("803d023e2307309f8b776ab3b8b7e38ba91c0919")
+      end
 
-    it "includes commit author" do
-      expect(html).to include("SamSaffron")
-    end
+      it "includes commit author gravatar" do
+        expect(html).to include("2F7d3010c11d08cf990b7614d2c2ca9098.png")
+      end
 
-    it "includes commit time and date" do
-      expect(html).to include("02:03AM - 02 Aug 13")
-    end
+      it "includes commit message" do
+        expect(html).to include("Fixed GitHub auth")
+      end
+
+      it "includes commit author" do
+        expect(html).to include("SamSaffron")
+      end
+
+      it "includes commit time and date" do
+        expect(html).to include("02:03AM - 02 Aug 13")
+      end
+
+      it "includes number of files changed" do
+        expect(html).to include("1 file")
+      end
+
+      it "includes number of additions" do
+        expect(html).to include("18 additions")
+      end
 
-    it "includes number of files changed" do
-      expect(html).to include("1 file")
+      it "includes number of deletions" do
+        expect(html).to include("2 deletions")
+      end
     end
+  end
 
-    it "includes number of additions" do
-      expect(html).to include("18 additions")
+  describe "PR with commit URL" do
+    before(:all) do
+      @link = "https://github.com/discourse/discourse/pull/4662/commits/803d023e2307309f8b776ab3b8b7e38ba91c0919"
+      @uri = "https://api.github.com/repos/discourse/discourse/commits/803d023e2307309f8b776ab3b8b7e38ba91c0919"
     end
 
-    it "includes number of deletions" do
-      expect(html).to include("2 deletions")
+    include_context "engines"
+    it_behaves_like "an engine"
+
+    describe "#to_html" do
+      it "includes owner" do
+        expect(html).to include("discourse")
+      end
+
+      it "includes repository name" do
+        expect(html).to include("discourse")
+      end
+
+      it "includes commit sha" do
+        expect(html).to include("803d023e2307309f8b776ab3b8b7e38ba91c0919")
+      end
+
+      it "includes commit author gravatar" do
+        expect(html).to include("2F7d3010c11d08cf990b7614d2c2ca9098.png")
+      end
+
+      it "includes commit message" do
+        expect(html).to include("Fixed GitHub auth")
+      end
+
+      it "includes commit author" do
+        expect(html).to include("SamSaffron")
+      end
+
+      it "includes commit time and date" do
+        expect(html).to include("02:03AM - 02 Aug 13")
+      end
+
+      it "includes number of files changed" do
+        expect(html).to include("1 file")
+      end
+
+      it "includes number of additions" do
+        expect(html).to include("18 additions")
+      end
+
+      it "includes number of deletions" do
+        expect(html).to include("2 deletions")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.12
+  version: 1.8.13
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json