Add tests for handling redirects

Author: CalebFenton

Gemfile

@@ -80,4 +80,6 @@ group :development, :test do
 
   # Create hashes that look like classes with methods
   gem 'hash_dot'
+
+  gem 'webmock'
 end

Gemfile.lock

@@ -38,6 +38,7 @@ GEM
       tzinfo (~> 1.1)
     activesupport-json_encoder (1.1.0)
       activesupport (>= 4.1.0, < 5.0)
+    addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
     byebug (8.2.2)
@@ -51,6 +52,8 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.1)
     connection_pool (2.2.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -69,6 +72,7 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hash_dot (2.0.2)
+    hashdiff (0.3.0)
     i18n (0.7.0)
     jbuilder (2.4.1)
       activesupport (>= 3.0.0, < 5.1)
@@ -146,6 +150,7 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     rufus-scheduler (3.2.0)
+    safe_yaml (1.0.4)
     sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -198,6 +203,10 @@ GEM
       activemodel (>= 4.2)
       debug_inspector
       railties (>= 4.2)
+    webmock (2.0.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -230,6 +239,7 @@ DEPENDENCIES
   turbolinks
   uglifier (>= 2.7.2)
   web-console (~> 3.1.1)
+  webmock
 
 BUNDLED WITH
    1.11.2

lib/github_api.rb

@@ -77,7 +77,10 @@ def self.request_raw(uri, github_token, params = nil, headers = {})
       break
     end
 
-    return request_raw(uri, github_token, params, headers) if response == Net::HTTPRedirection
+    if response.kind_of?(Net::HTTPRedirection)
+      new_url = response['location']
+      return request_raw(new_url, github_token, params, headers)
+    end
 
     unless response.code.to_i == 200
       raise "Request failed with #{response.code}: #{response.read_body}"

spec/lib/github_api_spec.rb

@@ -0,0 +1,30 @@
+=begin
+Copyright 2016 SourceClear Inc
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+
+require 'rails_helper'
+#require 'spec_helper'
+
+describe 'GitHubAPI' do
+  describe '.request_raw' do
+    #https://api.github.com/repositories/5625/commits?since=2016-05-01T12%3A45%3A06%2B00%3A00
+    let(:url) { 'https://api.github.com/repositories/5625/commits_redirect?since=2016-05-01T12%3A45%3A06%2B00%3A00' }
+    let(:github_token) { 'token' }
+    subject { GitHubAPI.request_raw(url, github_token) }
+
+#self.request_raw(uri, github_token, params = nil, headers = {})
+    it { should_not be nil }
+  end
+end

spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'webmock/rspec'
+require_relative 'support/fake_github.rb'
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -23,6 +26,6 @@
   end
 
   config.before(:each) do
-    stub_request(:any, /api.github.com/).to_rack(FakeGitHub)
+    stub_request(:any, /api\.github\.com/).to_rack(FakeGitHub)
   end
 end

spec/support/fake_github.rb

@@ -0,0 +1,24 @@
+require 'sinatra/base'
+
+class FakeGitHub < Sinatra::Base
+  get '/repositories/:organization/:project/contributors' do
+    json_response 200, 'contributors.json'
+  end
+
+  #https://api.github.com/repositories/5625/commits?since=2016-05-01T12%3A45%3A06%2B00%3A00
+  get '/repositories/:project_id/commits_redirect' do
+    redirect to("/repositories/#{params['project_id']}/commits")
+  end
+
+  get '/repositories/:project_id/commits' do
+    json_response 200, 'commits.json'
+  end
+
+  private
+
+  def json_response(response_code, file_name)
+    content_type :json
+    status response_code
+    File.open("#{File.dirname(__FILE__)}/fixtures/#{file_name}", 'rb').read
+  end
+end

spec/support/fixtures/commits.json

@@ -0,0 +1,72 @@
+[
+  {
+    "sha": "d6dcaa7203e859037bfaa1222f85111feb3dbe93",
+    "commit": {
+      "author": {
+        "name": "Caleb Fenton",
+        "email": "[email protected]",
+        "date": "2016-02-23T04:03:40Z"
+      },
+      "committer": {
+        "name": "Caleb Fenton",
+        "email": "[email protected]",
+        "date": "2016-02-23T04:03:40Z"
+      },
+      "message": "Prepare 1.0 release, update gradlew",
+      "tree": {
+        "sha": "31af61b96fd652305d4a8874cc1ddb27fafc59a2",
+        "url": "https://api.github.com/repos/CalebFenton/simplify/git/trees/31af61b96fd652305d4a8874cc1ddb27fafc59a2"
+      },
+      "url": "https://api.github.com/repos/CalebFenton/simplify/git/commits/d6dcaa7203e859037bfaa1222f85111feb3dbe93",
+      "comment_count": 4
+    },
+    "url": "https://api.github.com/repos/CalebFenton/simplify/commits/d6dcaa7203e859037bfaa1222f85111feb3dbe93",
+    "html_url": "https://github.com/CalebFenton/simplify/commit/d6dcaa7203e859037bfaa1222f85111feb3dbe93",
+    "comments_url": "https://api.github.com/repos/CalebFenton/simplify/commits/d6dcaa7203e859037bfaa1222f85111feb3dbe93/comments",
+    "author": {
+      "login": "CalebFenton",
+      "id": 1356658,
+      "avatar_url": "https://avatars.githubusercontent.com/u/1356658?v=3",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/CalebFenton",
+      "html_url": "https://github.com/CalebFenton",
+      "followers_url": "https://api.github.com/users/CalebFenton/followers",
+      "following_url": "https://api.github.com/users/CalebFenton/following{/other_user}",
+      "gists_url": "https://api.github.com/users/CalebFenton/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/CalebFenton/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/CalebFenton/subscriptions",
+      "organizations_url": "https://api.github.com/users/CalebFenton/orgs",
+      "repos_url": "https://api.github.com/users/CalebFenton/repos",
+      "events_url": "https://api.github.com/users/CalebFenton/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/CalebFenton/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "CalebFenton",
+      "id": 1356658,
+      "avatar_url": "https://avatars.githubusercontent.com/u/1356658?v=3",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/CalebFenton",
+      "html_url": "https://github.com/CalebFenton",
+      "followers_url": "https://api.github.com/users/CalebFenton/followers",
+      "following_url": "https://api.github.com/users/CalebFenton/following{/other_user}",
+      "gists_url": "https://api.github.com/users/CalebFenton/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/CalebFenton/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/CalebFenton/subscriptions",
+      "organizations_url": "https://api.github.com/users/CalebFenton/orgs",
+      "repos_url": "https://api.github.com/users/CalebFenton/repos",
+      "events_url": "https://api.github.com/users/CalebFenton/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/CalebFenton/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "5d8997a715edefdd4d5404f5ac53fc44b1fe2f64",
+        "url": "https://api.github.com/repos/CalebFenton/simplify/commits/5d8997a715edefdd4d5404f5ac53fc44b1fe2f64",
+        "html_url": "https://github.com/CalebFenton/simplify/commit/5d8997a715edefdd4d5404f5ac53fc44b1fe2f64"
+      }
+    ]
+  }
+]