Merge 4b27063 into 76cd473

lib/github_api/api.rb

@@ -41,7 +41,6 @@ class API
     #
     def initialize(options={}, &block)
       setup(options)
-      client(options) if client_id? && client_secret?
       yield_or_eval(&block) if block_given?
     end
 

lib/github_api/authorization.rb

@@ -6,10 +6,10 @@ module Authorization
     attr_accessor :scopes
 
     # Setup OAuth2 instance
-    def client(options={})
+    def client
       @client ||= ::OAuth2::Client.new(client_id, client_secret,
         {
-          :site          => options.fetch(:site) { Github.site },
+          :site          => current_options.fetch(:site) { Github.site },
           :authorize_url => 'login/oauth/authorize',
           :token_url     => 'login/oauth/access_token',
           :ssl           => { :verify => false }

spec/github/authorization_spec.rb

@@ -6,7 +6,8 @@
   let(:client_id) { '234jl23j4l23j4l' }
   let(:client_secret) { 'asasd79sdf9a7asfd7sfd97s' }
   let(:code) { 'c9798sdf97df98ds'}
-  let(:options) { {} }
+  let(:site) { 'http://github-ent.example.com/' }
+  let(:options) { {:site => site} }
 
   subject(:github) { Github.new options }
 
@@ -22,15 +23,15 @@
     end
 
     it "should assign site from the options hash" do
-      github.client.site.should == 'https://github.com'
+      github.client.site.should == site
     end
 
     it "should assign 'authorize_url" do
-      github.client.authorize_url.should == 'https://github.com/login/oauth/authorize'
+      github.client.authorize_url.should == "#{site}login/oauth/authorize"
     end
 
     it "should assign 'token_url" do
-      github.client.token_url.should == 'https://github.com/login/oauth/access_token'
+      github.client.token_url.should == "#{site}login/oauth/access_token"
     end
   end