Change to simplify api setup.

piotrmurach · piotrmurach · commit bc4035011037 · 2016-06-19T21:24:22.000+01:00
diff --git a/lib/github_api/api.rb b/lib/github_api/api.rb
@@ -17,6 +17,7 @@ module Github
   # Core class responsible for api interface operations
   class API
     extend Github::ClassMethods
+
     include Constants
     include Authorization
     include MimeType
@@ -43,36 +44,39 @@ class API
     #
     # @api public
     def initialize(options={}, &block)
-      setup(options)
+      opts = Github.configuration.fetch.merge(options)
+      @current_options = opts
+
+      Github.configuration.property_names.each do |key|
+        send("#{key}=", opts[key])
+      end
+
+      if opts.key?(:login)
+        @login, @password = opts[:login], opts[:password]
+      elsif opts.key?(:basic_auth)
+        @login, @password = extract_basic_auth(opts[:basic_auth])
+      end
+
       yield_or_eval(&block) if block_given?
     end
 
+    # Call block with argument
+    #
+    # @api private
     def yield_or_eval(&block)
       return unless block
       block.arity > 0 ? yield(self) : self.instance_eval(&block)
     end
 
-    # Configure options and process basic authorization
-    #
-    # @api private
-    def setup(options={})
-      options = Github.configuration.fetch.merge(options)
-      self.current_options = options
-      Github.configuration.property_names.each do |key|
-        send("#{key}=", options[key])
-      end
-      process_basic_auth(options[:basic_auth])
-    end
-
     # Extract login and password from basic_auth parameter
     #
-    def process_basic_auth(auth)
+    # @api private
+    def extract_basic_auth(auth)
       case auth
       when String
-        self.login, self.password = auth.split(':', 2)
+        auth.split(':', 2)
       when Hash
-        self.login    = auth[:login]
-        self.password = auth[:password]
+        [auth[:login], auth[:password]]
       end
     end
 
diff --git a/lib/github_api/authorization.rb b/lib/github_api/authorization.rb
@@ -71,6 +71,5 @@ def authentication
     def _verify_client # :nodoc:
       raise ArgumentError, 'Need to provide client_id and client_secret' unless client_id? && client_secret?
     end
-
   end # Authorization
 end # Github
diff --git a/spec/github/authorization_spec.rb b/spec/github/authorization_spec.rb
@@ -9,10 +9,10 @@
   let(:site) { 'http://github-ent.example.com/' }
   let(:options) { {:site => site} }
 
-  subject(:github) { Github.new options }
+  subject(:github) { Github.new(options) }
 
   after do
-    reset_authentication_for github
+    reset_authentication_for(github)
   end
 
   context '.client' do
@@ -151,13 +151,16 @@
     end
 
     context 'login & password' do
-      let(:options) { { :login => 'github', :password => 'pass' } }
-
       it "should return hash with login & password params" do
-        expect(github.authentication).to be_a Hash
-        expect(github.authentication).to have_key(:login)
+        options = {login: 'github', password: 'pass'}
+        github = Github.new(options)
+
+        expect(github.authentication).to be_a(Hash)
+        expect(github.authentication).to include({login: 'github'})
+        expect(github.authentication).to include({password: 'pass'})
+
+        reset_authentication_for(github)
       end
     end
   end # authentication
-
 end # Github::Authorization
