Add options integration.

piotrmurach · piotrmurach · commit a7bedd42735f · 2013-02-17T19:36:08.000Z
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -87,7 +87,7 @@ def stack(options={}, &block)
 
     # Returns a Fraday::Connection object
     #
-    def connection(options = {})
+    def connection(options={})
       conn_options = default_options(options)
       clear_cache unless options.empty?
       puts "OPTIONS:#{conn_options.inspect}" if ENV['DEBUG']
diff --git a/lib/github_api/request.rb b/lib/github_api/request.rb
@@ -36,7 +36,7 @@ def request(method, path, params, options) # :nodoc:
 
       puts "EXECUTED: #{method} - #{path} with #{params} and #{options}" if ENV['DEBUG']
 
-      conn = connection(options)
+      conn = connection(options.merge(current_options))
       if conn.path_prefix != '/' && path.index(conn.path_prefix) != 0
         path = (conn.path_prefix + path).gsub(/\/(\/)*/, '/')
       end
diff --git a/spec/integration/options_spec.rb b/spec/integration/options_spec.rb
@@ -0,0 +1,115 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Github, 'options' do
+  let(:default_adapter) { :net_http }
+  let(:adapter) { :patron }
+  let(:token) { '123' }
+  let(:options) { { :adapter => adapter  } }
+
+  context 'when different instances of the same class' do
+    it 'instantiates the same api classes with different options' do
+      repos  = Github::Repos.new
+      repos2 = Github::Repos.new options
+
+      expect(repos.object_id).to_not eql(repos2.object_id)
+
+      expect(repos.adapter).to eql default_adapter
+      expect(repos2.adapter).to eql adapter
+
+      repos.adapter = adapter
+      repos2.adapter = default_adapter
+
+      expect(repos.adapter).to eql adapter
+      expect(repos2.adapter).to eql default_adapter
+    end
+
+    it 'instantiates the same clients with different options' do
+      client  = Github.new :oauth_token => 'client'
+      client2 = Github.new :oauth_token => 'client2'
+
+      expect(client.object_id).to_not eql(client2.object_id)
+
+      expect(client.oauth_token).to eql 'client'
+      expect(client2.oauth_token).to eql 'client2'
+    end
+  end
+
+  context 'when different instances of the same chain' do
+    it "inherits properties from client and doesn't pass them up the tree" do
+      client = Github.new options
+      repos  = client.repos
+
+      expect(client.adapter).to eql(adapter)
+      expect(repos.adapter).to eql(adapter)
+
+      repos.adapter = default_adapter
+      expect(client.adapter).to eql(adapter)
+      expect(repos.adapter).to eql(default_adapter)
+
+      client.oauth_token = token
+      expect(client.oauth_token).to eql(token)
+      expect(repos.oauth_token).to be_nil
+    end
+
+    it "inherits properties from api and doesn't pass them up the tree" do
+      repos    = Github::Repos.new options
+      comments = repos.comments
+
+      expect(repos.adapter).to eql(adapter)
+      expect(comments.adapter).to eql(adapter)
+
+      comments.adapter = default_adapter
+      expect(repos.adapter).to eql(adapter)
+      expect(comments.adapter).to eql(default_adapter)
+
+      repos.oauth_token = token
+      expect(repos.oauth_token).to eql(token)
+      expect(comments.oauth_token).to be_nil
+    end
+  end
+
+  context 'when setting attributes through accessors' do
+    let(:default_endpoint) { 'https://api.github.com'}
+    let(:endpoint) { 'https://my-company/api/v3' }
+    let(:login) { 'Piotr' }
+
+    it 'sets login on correct instance' do
+      client = Github.new :login => login
+      expect(Github.login).to be_nil
+      expect(client.login).to eql login
+    end
+
+    it 'sets attribute' do
+      client = Github.new options
+      client.endpoint = endpoint
+      expect(Github.endpoint).to eql default_endpoint
+      expect(client.endpoint).to eql endpoint
+    end
+
+    it 'sets attribute through dsl' do
+      client = Github.new do |config|
+        config.endpoint = endpoint
+      end
+      expect(client.endpoint).to eql endpoint
+      repos = client.repos do |config|
+        config.adapter = adapter
+      end
+      expect(repos.endpoint).to eql endpoint
+      expect(repos.adapter).to eql adapter
+    end
+
+    it 'updates current_options through api setters' do
+      client = Github.new :endpoint => endpoint
+      expect(client.repos.current_options[:endpoint]).to eql endpoint
+      expect(client.repos.endpoint).to eql endpoint
+
+      client.repos.endpoint = default_endpoint
+
+      expect(client.repos.endpoint).to eql default_endpoint
+      expect(client.repos.current_options[:endpoint]).to eql default_endpoint
+    end
+  end
+
+end # options

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ def stack(options={}, &block)`
`87`	`87`
`88`	`88`	`# Returns a Fraday::Connection object`
`89`	`89`	`#`
`90`		`- def connection(options = {})`
	`90`	`+ def connection(options={})`
`91`	`91`	`conn_options = default_options(options)`
`92`	`92`	`clear_cache unless options.empty?`
`93`	`93`	`puts "OPTIONS:#{conn_options.inspect}" if ENV['DEBUG']`