compare_linker 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ff36e8002d51aa16c9c31b9d187f564eac1d53
-  data.tar.gz: 8adab281e5f6a8fcb53c41041a566b45a98235e7
+  metadata.gz: fe8706a6e774056382e01562c03e0d80a1b54e27
+  data.tar.gz: bbd74f1b4f4f97296235577d5d0c2440a0e592ce
 SHA512:
-  metadata.gz: bb90094ecc911eecad452ed5967cd700fd9c1646da356ba2d36d1dbb5832a55196e7af9e4935772ec0dcc98e763c919321b19f815b7606253937ebfaf26d339a
-  data.tar.gz: 75da3f152b86ce87b961df282d882c84c26c2c5da57f28c194cddd325025b79977c936c7283dfad148aea476adebd0a7869c84b5dbd8ff570f9acd9ffacb0cd6
+  metadata.gz: 207de118d2c3361db0e11b8863bc21164b6e0030d6a54a9a33c3630618cfc100a9cb49fbb5defa429f3455619122980f91ba33405e48b3f79f9945a5492b61ed
+  data.tar.gz: fdad1e8b92cd042b7f5cde2181e5ee08c49513a650ae5b7bdc7f218f623859434c41e81c1fcf04a86a421ed6151520cfa405a7aef0a009023937b3a1ed4e1c06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compare_linker (1.1.5)
+    compare_linker (1.1.6)
       httpclient
       octokit
 

data/lib/compare_linker/github_link_finder.rb

@@ -1,5 +1,6 @@
 require "json"
 require "httpclient"
+require "net/http"
 
 class CompareLinker
   class GithubLinkFinder
@@ -22,6 +23,7 @@ class CompareLinker
       if github_url.nil?
         @homepage_uri = gem_info["homepage_uri"]
       else
+        github_url = redirect_url(github_url)
         _, @repo_owner, @repo_name = github_url.match(%r!github\.com/([^/]+)/([^/]+)!).to_a
       end
 
@@ -32,5 +34,29 @@ class CompareLinker
     def repo_full_name
       "#{@repo_owner}/#{repo_name}"
     end
+
+    private
+
+    def redirect_url(url, limit = 5)
+      raise ArgumentError, 'HTTP redirect too deep' if limit <= 0
+
+      uri = URI.parse(url)
+      response = Net::HTTP.get_response(uri)
+
+      case response
+      when Net::HTTPSuccess
+        url
+      when Net::HTTPRedirection
+        redirect_url(to_absolute(response['location'], uri), limit - 1)
+      else
+        raise 'item not found'
+      end
+    end
+
+    def to_absolute(location, uri)
+      return location if location =~ /\Ahttp/
+      # RFC2394 violation?
+      "#{uri.scheme}://#{uri.host}#{location}"
+    end
   end
 end

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/spec/lib/compare_linker/github_link_finder_spec.rb

@@ -9,6 +9,7 @@ describe CompareLinker::GithubLinkFinder do
   describe "#find" do
     before do
       allow(HTTPClient).to receive(:get_content).and_return load_fixture("rails.json")
+      allow(subject).to receive(:redirect_url).and_return "http://github.com/rails/rails"
     end
 
     it "extracts repo_owner and repo_name" do
@@ -20,6 +21,7 @@ describe CompareLinker::GithubLinkFinder do
     context "if github url includes trailing slash" do
       before do
         allow(HTTPClient).to receive(:get_content).and_return load_fixture("web_translate_it.json")
+        allow(subject).to receive(:redirect_url).and_return "http://github.com/atelierconvivialite/webtranslateit/"
       end
 
       it "extracts repo_owner and repo_name without trailing slash" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kensuke Nagae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit