compare_linker 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77a7f1b91fab3b694011b66ae937c8321a0fa287
-  data.tar.gz: 776bfcc6f09254ead72883cb229c9c43f116f8fc
+  metadata.gz: 6f0e3bda9179cf4d4c524678a35ab90e6bfc4f59
+  data.tar.gz: 1f50cd40c055491ab0a93443bbe213cfe0483f07
 SHA512:
-  metadata.gz: 35f9148e6da4b569bf0253eef283e93d0fb7afb726b3369c64d4974d14bac5544d81e9a39a4ddf221bf41f346b75b577f5158bd828952387c77e37a111a41a34
-  data.tar.gz: 385ec662dc463457213b163568f6ce557a1ffbf24bef4bdb8ce07570052622e9fbbb204d3d132fa1cdc9922f3e43f3967e389e0eb94d1a38aeb370c1433a95fb
+  metadata.gz: 135c0afd55875f951969b2e2fe815c9d4dfc7b5ec8fbc992a90ce6fccaa8d07f06c4381c6078a1d02e2f703fb2c53611a8a6f1cd6fcf70aa2a82ea837ca42cfc
+  data.tar.gz: 11e4d41e901270e29d2f13673b1f1891b944ac7c75901b9bbce3bacee92fd510e7a1d0b142511a9b94686907e3503d546bc58b23db92a61fcd18541614d9d51c

data/Gemfile.lock

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

data/lib/compare_linker/github_link_finder.rb

@@ -20,14 +20,13 @@ class CompareLinker
         gem_info["source_code_uri"]
       ].find { |uri| uri.to_s.match(/github\.com\//) }
 
-      if github_url.nil?
-        @homepage_uri = gem_info["homepage_uri"]
-      else
-        github_url = redirect_url(github_url)
+      if github_url = redirect_url(github_url)
         _, @repo_owner, @repo_name = github_url.match(%r!github\.com/([^/]+)/([^/]+)!).to_a
+      else
+        @homepage_uri = gem_info["homepage_uri"]
       end
 
-    rescue JSON::ParserError
+    rescue HTTPClient::BadResponseError
       @homepage_uri = "https://rubygems.org/gems/#{gem_name}"
     end
 
@@ -38,7 +37,8 @@ class CompareLinker
     private
 
     def redirect_url(url, limit = 5)
-      raise ArgumentError, 'HTTP redirect too deep' if limit <= 0
+      return nil if url.nil?
+      return nil if limit <= 0
 
       uri = URI.parse(url)
       response = Net::HTTP.get_response(uri)
@@ -49,7 +49,7 @@ class CompareLinker
       when Net::HTTPRedirection
         redirect_url(to_absolute(response['location'], uri), limit - 1)
       else
-        raise 'item not found'
+        nil
       end
     end
 

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/spec/fixtures/coffee-script-source.json

@@ -0,0 +1 @@
+{"name":"coffee-script-source","downloads":23413938,"version":"1.9.1.1","version_downloads":10964,"platform":"ruby","authors":"Jeremy Ashkenas","info":"    CoffeeScript is a little language that compiles into JavaScript.\n    Underneath all of those embarrassing braces and semicolons,\n    JavaScript has always had a gorgeous object model at its heart.\n    CoffeeScript is an attempt to expose the good parts of JavaScript\n    in a simple way.\n","licenses":["MIT"],"metadata":{},"sha":"05bbce02078abdb6969abfee5b18b9b914b475895222acac3d5613fe3dcf2eab","project_uri":"http://rubygems.org/gems/coffee-script-source","gem_uri":"http://rubygems.org/gems/coffee-script-source-1.9.1.1.gem","homepage_uri":"http://jashkenas.github.com/coffee-script/","wiki_uri":null,"documentation_uri":null,"mailing_list_uri":null,"source_code_uri":null,"bug_tracker_uri":null,"dependencies":{"development":[],"runtime":[]}}

data/spec/lib/compare_linker/github_link_finder_spec.rb

@@ -33,7 +33,8 @@ describe CompareLinker::GithubLinkFinder do
 
     context "if gem not found on rubygems.org" do
       before do
-        allow(HTTPClient).to receive(:get_content).and_return load_fixture("not_found.json")
+        exception = HTTPClient::BadResponseError.new "unexpected response:..."
+        allow(HTTPClient).to receive(:get_content).and_raise exception
       end
 
       it "extracts homepage_uri" do
@@ -41,5 +42,17 @@ describe CompareLinker::GithubLinkFinder do
         expect(subject.homepage_uri).to eq "https://rubygems.org/gems/not_found"
       end
     end
+
+    context "if homepage_uri is '404 not found'" do
+      before do
+        allow(HTTPClient).to receive(:get_content).and_return load_fixture("coffee-script-source.json")
+        allow(subject).to receive(:redirect_url).and_return nil
+      end
+
+      it "extracts homepage_uri" do
+        subject.find("coffee-script-source")
+        expect(subject.homepage_uri).to eq "http://jashkenas.github.com/coffee-script/"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Kensuke Nagae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -110,7 +110,7 @@ files:
 - lib/compare_linker/webhook_payload.rb
 - payload.rb
 - runner.rb
-- spec/fixtures/not_found.json
+- spec/fixtures/coffee-script-source.json
 - spec/fixtures/rails.json
 - spec/fixtures/web_translate_it.json
 - spec/lib/compare_linker/github_link_finder_spec.rb
@@ -141,7 +141,7 @@ signing_key:
 specification_version: 4
 summary: Create GitHub's compare view URLs for pull request
 test_files:
-- spec/fixtures/not_found.json
+- spec/fixtures/coffee-script-source.json
 - spec/fixtures/rails.json
 - spec/fixtures/web_translate_it.json
 - spec/lib/compare_linker/github_link_finder_spec.rb

data/spec/fixtures/not_found.json

@@ -1 +0,0 @@
-This rubygem could not be found.