bitfex 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a830e2f527b5de4456a1469cfc9bee9f36f8c8e1b8498dbbd8600dd485af5e35
-  data.tar.gz: 204ae8dc2394a689920f29b2fedd7c33662661de5f43d4bbb2eba8689677e6b1
+  metadata.gz: ac2f06a3a9254389e0bb5d7c8999270f7e8f36bc017876864483d2afe210e34b
+  data.tar.gz: 86bbdded35e3c2f878f92b202bd8d59a9578e3043c10b446e5314a8fe4ab4d41
 SHA512:
-  metadata.gz: b1a3ffa111c05e0a68832aaa77e858b90e653e83f3229ab9cccd07ad8407284bdb5fab264aba258273653e85dbcb26b3c2298444f32a40b0c60b3427c8644c64
-  data.tar.gz: 614f6d40384b812c38c2bca832243dd8d35d46826a057000315e3eb92fbc45708d3c593c3d492743dab99fbaf1b578d2062bc932f8db94b0de7d3e63652f9866
+  metadata.gz: ab8d0a9e9dfdebe36f07cea6e25b2b5f9571d3765a6acaa8af059b530e45f9ecf1fbef8f80ce30b0db8ac13c6e5cfcf6ac0f7194b9f20327be95ea5a19da5dd9
+  data.tar.gz: 41c9f32e4186011830bc88248cd8c41e9b1d5b5ebd9444a1a81620331a00975dfe67a62e00afa4698444471689d0991d819642a32cb2c3b8e0c251e59d0a46b2

data/lib/bitfex/api.rb

@@ -7,9 +7,9 @@ module Bitfex
 
     # @param server_url [String] URL of the main server
     # @param auth_server_url [String] URL of the auth server
-    def initialize(server_url: 'https://bitfex.trade', auth_server_url: 'https://auth.bitfex.trade')
+    def initialize(token: nil, server_url: 'https://bitfex.trade')
+      @token = token
       @_server_url = server_url
-      @_auth_server_url = auth_server_url
     end
 
     # @return [String] server url
@@ -17,35 +17,17 @@ module Bitfex
       @_server_url
     end
 
-    # @return [String] auth server url
-    def auth_server_url
-      @_auth_server_url
-    end
-
     # @param url [String] set URL of the server
     def server_url=(url)
       @_server_url = url
     end
 
-    # @param url [String] set URL of the auth server
-    def auth_server_url=(url)
-      @_auth_server_url = url
-    end
-
-    # Get token for API operations
-    # @param email [String] email
-    # @param password [String] password
-    def auth(email, password)
-      body = request_post('/auth', auth: { email: email, password: password })
-      return @token = body['jwt'] if body['jwt']
-      raise AuthError.new
-    end
-
     # Return account balances
     # @return [Hash<String, Fixnum>] balances
     def balances
       response = request_get('/api/v1/user')
       raise ApiError.new(response['errors'].to_json) unless response['success']
+
       response['balances']
     end
 
@@ -112,16 +94,17 @@ module Bitfex
     end
 
     def request(endpoint, klass, body = nil)
-      url = (body && body.has_key?(:auth) ? @_auth_server_url : @_server_url) + endpoint
+      url = @_server_url + endpoint
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.port == 443
 
       request = klass.new(uri.request_uri, 'Content-Type' => 'application/json')
 
-      request.add_field('Authorization', "Bearer #{token}") if token
+      request.add_field('X-API-Key', token) if token
       request.body = JSON.dump(body) if body
       response = http.request(request)
+
       JSON.parse(response.body || '{}')
     end
   end

data/lib/bitfex/version.rb

@@ -1,5 +1,5 @@
 module Bitfex
-  VERSION_INFO = [1, 2, 0].freeze
+  VERSION_INFO = [2, 0, 0].freeze
   VERSION = VERSION_INFO.map(&:to_s).join('.').freeze
 
   def self.version

data/test/test_bitfex.rb

@@ -19,110 +19,82 @@ class BitfexTest < Minitest::Test
     assert_equal 'https://google.com/', client.server_url
   end
 
-  def test_auth_success
-    stub_request(:post, 'https://auth.bitfex.trade/auth')
-      .with(body: '{"auth":{"email":"user@example.com","password":"123"}}')
-      .to_return(status: 200, body: '{"jwt":"token"}')
-
-    client = Bitfex::Api.new
-    assert_equal 'token', client.auth('user@example.com', '123')
-  end
-
-  def test_auth_failure
-    stub_request(:post, 'https://auth.bitfex.trade/auth')
-      .with(body: '{"auth":{"email":"user@example.com","password":"123"}}')
-      .to_return(status: 404, body: '{}')
-
-    assert_raises Bitfex::AuthError do
-      client = Bitfex::Api.new
-      client.auth('user@example.com', '123')
-    end
-  end
-
   def test_balances_success
     stub_request(:get, "https://bitfex.trade/api/v1/user")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 200, body: '{"success":true,"balances":{"BTC":10.5}}')
 
-    client = Bitfex::Api.new
-    client.token = '123'
-    assert_equal({'BTC' => 10.5}, client.balances)
+    client = Bitfex::Api.new(token: '123')
+    assert_equal({ 'BTC' => 10.5 }, client.balances)
   end
 
   def test_balances_failure
     stub_request(:get, "https://bitfex.trade/api/v1/user")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 403, body: '{"success":false,"errors":["TEST"]}')
 
     assert_raises Bitfex::ApiError do
-      client = Bitfex::Api.new
-      client.token = '123'
+      client = Bitfex::Api.new(token: '123')
       client.balances
     end
   end
 
   def test_orders_list_success
     stub_request(:get, "https://bitfex.trade/api/v1/orders?pair=BTC_RUR")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 200, body: '{"success":true,"orders":[{"id":1}]}')
 
-    client = Bitfex::Api.new
-    client.token = '123'
+    client = Bitfex::Api.new(token: '123')
     assert_equal([{'id' => 1}], client.orders_list('BTC_RUR'))
   end
 
   def test_orders_list_faulure
     stub_request(:get, "https://bitfex.trade/api/v1/orders?pair=BTC_RUR")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 403, body: '{"success":false,"errors":["TEST"]}')
 
     assert_raises Bitfex::ApiError do
-      client = Bitfex::Api.new
-      client.token = '123'
+      client = Bitfex::Api.new(token: '123')
       client.orders_list('BTC_RUR')
     end
   end
 
   def test_my_orders_success
     stub_request(:get, "https://bitfex.trade/api/v1/orders/my")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 200, body: '{"success":true,"orders":[{"id":1}]}')
 
-    client = Bitfex::Api.new
-    client.token = '123'
+    client = Bitfex::Api.new(token: '123')
     assert_equal([{'id' => 1}], client.my_orders)
   end
 
   def test_my_orders_faulure
     stub_request(:get, "https://bitfex.trade/api/v1/orders/my")
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 403, body: '{"success":false,"errors":["TEST"]}')
 
     assert_raises Bitfex::ApiError do
-      client = Bitfex::Api.new
-      client.token = '123'
+      client = Bitfex::Api.new(token: '123')
       client.my_orders
     end
   end
 
   def test_delete_order_success
     stub_request(:delete, 'https://bitfex.trade/api/v1/orders/1')
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 200, body: '{"success":true}')
 
-    client = Bitfex::Api.new
-    client.token = '123'
+    client = Bitfex::Api.new(token: '123')
     assert_equal true, client.delete_order(1)
   end
 
   def test_delete_order_failure
     stub_request(:delete, 'https://bitfex.trade/api/v1/orders/1')
-      .with(headers: { 'Authorization' => 'Bearer 123' })
+      .with(headers: { 'X-API-Key' => '123' })
       .to_return(status: 400, body: '{"success":false,"errors":["TEST"]}')
 
     assert_raises Bitfex::ApiError do
-      client = Bitfex::Api.new
-      client.token = '123'
+      client = Bitfex::Api.new(token: '123')
       client.delete_order(1)
     end
   end
@@ -130,23 +102,23 @@ class BitfexTest < Minitest::Test
   def test_create_order_success
     stub_request(:post, 'https://bitfex.trade/api/v1/orders')
       .with(body: "{\"order\":{\"pair\":\"BTC_RUR\",\"operation\":\"buy\",\"amount\":1.0,\"price\":60000.0}}",
-            headers: { 'Authorization' => 'Bearer 123' })
+            headers: { 'X-API-Key' => '123' })
       .to_return(status: 200, body: '{"success":true}')
 
-    client = Bitfex::Api.new
-    client.token = '123'
+    client = Bitfex::Api.new(token: '123')
     assert_equal true, client.create_order(:buy, 'BTC_RUR', 1.0, 600_00.0)
   end
 
   def test_create_order_failure
     stub_request(:post, 'https://bitfex.trade/api/v1/orders')
-      .with(body: "{\"order\":{\"pair\":\"BTC_RUR\",\"operation\":\"buy\",\"amount\":1.0,\"price\":60000.0}}",
-            headers: { 'Authorization' => 'Bearer 123' })
+      .with(
+        body: '{"order":{"pair":"BTC_RUR","operation":"buy","amount":1.0,"price":60000.0}}',
+        headers: { 'X-API-Key' => '123' }
+      )
       .to_return(status: 403, body: '{"success":false,"errors":["TEST"]}')
 
     assert_raises Bitfex::ApiError do
-      client = Bitfex::Api.new
-      client.token = '123'
+      client = Bitfex::Api.new(token: '123')
       client.create_order(:buy, 'BTC_RUR', 1.0, 600_00.0)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfex
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - BitFex.Trade