octokit 1.15.0 → 1.15.1

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+* [1.15.1 - September 24,2012](https://github.com/pengwynn/octokit/compare/v1.15.0...v1.15.1)
 * [1.15.0 - September 24,2012](https://github.com/pengwynn/octokit/compare/v1.14.0...v1.15.0)
 * [1.14.0 - September 22,2012](https://github.com/pengwynn/octokit/compare/v1.13.0...v1.14.0)
 * [1.13.0 - September 5, 2012](https://github.com/pengwynn/octokit/compare/v1.12.0...v1.13.0)

data/lib/octokit/configuration.rb

@@ -15,6 +15,7 @@ module Octokit
       :client_id,
       :client_secret,
       :user_agent,
+      :request_host,
       :auto_traversal,
       :per_page].freeze
 
@@ -58,6 +59,7 @@ module Octokit
       self.oauth_token    = nil
       self.client_id      = nil
       self.client_secret  = nil
+      self.request_host   = nil
       self.user_agent     = DEFAULT_USER_AGENT
       self.auto_traversal = DEFAULT_AUTO_TRAVERSAL
     end

data/lib/octokit/request.rb

@@ -54,6 +54,8 @@ module Octokit
             request.body = options unless options.empty?
           end
         end
+
+        request.headers['Host'] = Octokit.request_host if Octokit.request_host
       end
 
       if raw

data/lib/octokit/version.rb

@@ -1,3 +1,3 @@
 module Octokit
-  VERSION = "1.15.0" unless defined?(Octokit::VERSION)
+  VERSION = "1.15.1" unless defined?(Octokit::VERSION)
 end

data/spec/octokit/client_spec.rb

@@ -106,5 +106,38 @@ describe Octokit::Client do
     end
   end
 
+  describe "request_host" do
+    after(:each) { Octokit.reset }
+
+    it "should default to nil" do
+      client = Octokit::Client.new
+      client.request_host.should be_nil
+    end
+
+    it "should be settable" do
+      Octokit.request_host = 'github.company.com'
+      client = Octokit::Client.new
+      client.request_host.should == 'github.company.com'
+    end
+
+    it "does not change the Host header when not set" do
+      Octokit.api_endpoint = 'http://github.internal'
+
+      stub_request(:any, /.*/)
+      req = stub_request(:get, 'http://github.internal/users/me').with(:headers => { 'Host' => /.*/})
+      Octokit.user "me"
+      req.should_not have_been_requested
+    end
+
+    it "changes the Host header when set" do
+      Octokit.api_endpoint = 'http://github.internal'
+      Octokit.request_host = 'github.company.com'
+
+      req = stub_request(:get, 'http://github.internal/users/me').with(:headers => { 'Host' => 'github.company.com' })
+      Octokit.user "me"
+      req.should have_been_requested
+    end
+  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
   prerelease: 
 platform: ruby
 authors: