Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ source 'https://rubygems.org'

gemspec

gem 'faraday_adapter_socks'
gem 'dotenv'
gem 'emittr'
gem 'zlib'
Expand Down
16 changes: 8 additions & 8 deletions bitfinex-rb.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://www.bitfinex.com/'
spec.license = 'MIT'

spec.files = Dir['lib/**/*']
spec.files = Dir['lib/**/*']
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']
spec.add_runtime_dependency 'faraday', '~> 0.15.3', '>= 0.15.3'
spec.add_runtime_dependency 'faraday', '~> 1'
spec.add_runtime_dependency 'socksify', "~> 1.7"
spec.add_runtime_dependency 'eventmachine', '~> 1.2.7', '>= 1.2.7'
spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1.2', '>= 2.1.2'
spec.add_runtime_dependency 'faye-websocket', '~> 0.10.7'
spec.add_runtime_dependency 'json', '~> 2.2.0','>= 2.2.0'
spec.add_runtime_dependency 'faraday_middleware', '~> 0.12.2', '>= 0.12.2'
spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.5'
spec.add_runtime_dependency 'faye-websocket', '~> 0.11'
spec.add_runtime_dependency 'json', '~> 2.2','>= 2.2'
spec.add_runtime_dependency 'faraday_middleware', '~> 1'
spec.add_runtime_dependency 'emittr', '~> 0.1.0', '>= 0.1.0'
spec.add_runtime_dependency 'dotenv', '~> 2.5.0', '>= 2.5.0'
spec.add_runtime_dependency 'faraday_adapter_socks', '~> 0.1.1', '>= 0.1.1'
spec.add_runtime_dependency 'dotenv', '~> 2.5', '>= 2.5'
spec.add_runtime_dependency 'zlib', '~> 1.0.0', '>= 1.0.0'
end
3 changes: 3 additions & 0 deletions lib/bitfinex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
require 'base64'
require 'openssl'
require 'faraday'
require 'socksify'
require 'socksify/http'
require 'json'
require 'faraday_middleware'
require 'dotenv/load'
Expand All @@ -11,6 +13,7 @@
require_relative './rest/v2'
require_relative './ws/ws2'

require_relative './faraday/adapter/net_http_socks'
require_relative './models/alert'
require_relative './models/balance_info'
require_relative './models/candle'
Expand Down
21 changes: 21 additions & 0 deletions lib/faraday/adapter/net_http_socks.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
class NetHttpSocks < Faraday::Adapter::NetHttp
SOCKS_SCHEMES = ['socks', 'socks4', 'socks5']

def net_http_connection(env)
proxy = env[:request][:proxy]

net_http_class = if proxy
if SOCKS_SCHEMES.include?(proxy[:uri].scheme)
Net::HTTP::SOCKSProxy(proxy[:uri].host, proxy[:uri].port)
else
Net::HTTP::Proxy(proxy[:uri].host, proxy[:uri].port, proxy[:user], proxy[:password])
end
else
Net::HTTP
end

net_http_class.new(env[:url].host, env[:url].port)
end
end

Faraday::Adapter.register_middleware(net_http_socks: NetHttpSocks)
2 changes: 0 additions & 2 deletions lib/rest/rest_client.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'faraday_adapter_socks'

module Bitfinex
module RESTClient
def check_params(params, allowed_params)
Expand Down