Skip to content

Commit 1422833

Browse files
committed
Merge pull request #95 from dgmyrek/master
Updated to faraday 0.9.0
2 parents 5142e29 + 6cd862f commit 1422833

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lib/spark_api/authentication/oauth2_impl/faraday_middleware.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def on_complete(env)
3434
end
3535

3636
end
37-
Faraday.register_middleware :response, :oauth2_impl => FaradayMiddleware
37+
Faraday::Response.register_middleware :oauth2_impl => FaradayMiddleware
3838

3939
#==OAuth2 Faraday response middleware
4040
# HTTP Response after filter to package oauth2 responses and bubble up basic api errors.
@@ -62,7 +62,7 @@ def on_complete(env)
6262
end
6363

6464
end
65-
Faraday.register_middleware :response, :sparkbar_impl => SparkbarFaradayMiddleware
65+
Faraday::Response.register_middleware :sparkbar_impl => SparkbarFaradayMiddleware
6666

6767
end
6868
end

lib/spark_api/faraday_middleware.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ def decompress_body(env)
8080
end
8181

8282
end
83-
Faraday.register_middleware :response, :spark_api => FaradayMiddleware
83+
Faraday::Response.register_middleware :spark_api => FaradayMiddleware
8484

8585
end

spark_api.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
3131
s.default_executable = %q{spark_api}
3232
s.require_paths = ["lib"]
3333

34-
s.add_dependency 'faraday', '~> 0.8.1'
34+
s.add_dependency 'faraday', '~> 0.9.0'
3535
s.add_dependency 'multi_json', '~> 1.0'
3636
s.add_dependency 'json', '~> 1.7'
3737
s.add_dependency 'builder', '>= 2.1.2', '< 4.0.0'

spec/unit/spark_api/configuration_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
:endpoint => "https://api.wade.dev.fbsdata.com",
4040
:ssl_verify => false)
4141
client.ssl_verify.should be_false
42-
client.connection.ssl.should eq({:verify=>false})
42+
client.connection.ssl.verify.should be_false
4343
end
4444

4545
it "should allow restrict ssl certificates when verification is on" do
4646
client = SparkApi::Client.new(:auth_endpoint => "https://login.wade.dev.fbsdata.com",
4747
:endpoint => "https://api.wade.dev.fbsdata.com",
4848
:ssl_verify => true)
4949
client.ssl_verify.should be_true
50-
client.connection.ssl.should eq({})
50+
client.connection.ssl.should be_empty
5151
end
5252
end
5353

0 commit comments

Comments
 (0)