Don't eagerly initialize oauth client w/ incomplete options

5long · Mar 31, 2013 · 4b27063 · 4b27063
1 parent e201c7e
commit 4b27063
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/github_api/api.rb b/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
 

diff --git a/lib/github_api/authorization.rb b/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 }