deribit 1.3.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01033c2b53f215d35bbfe632dfa2c36b1892ebe305943d2d126aafe3a026c231
-  data.tar.gz: 82540961814471f3c11dcdd0be67b7bfd7d4a5c8fc57a17d43ed22be3d281509
+  metadata.gz: c7d582e9a80f6deedcc4047f1e299903c0ea18883b329b41240e93780982a213
+  data.tar.gz: 0d3f86ea956bcf6b706fb63da469ac4da52ae92da99e1af68edab7c73ee53374
 SHA512:
-  metadata.gz: 5f8fd1d0aa6c42a4c9f0e0fa4ac89fff4387774e29f4e5e451542a284e9ec8a1c217177cf203f3cab9e0504bbc1ce80f01fad7488a082fa0716d401dff6c448a
-  data.tar.gz: '097fb448d4addd3c5ca370f788dca646d7a2a8ff57509fefb84023b60e7a4547cd90daf973aad73e18b46cf089d6aa56353df5ad6119799459a087758b2705dc'
+  metadata.gz: d2e24585970cf7d86320b593a75ecca28adc80e446d26027ec9762bb4a18f5bde2f221a979075436b7a1897cfda71bd0d64dea5c5a9763a95fdbae06924d246c
+  data.tar.gz: c9ebe1dc7045238917fe7280da6aa89f11d5ed04ea76701126b5b5142790ec907c31e51b9b6f8bb36a97f6d85e883891cdde3ea147f1c7c1a1cfd9b35f756127

data/README.md

@@ -54,7 +54,7 @@ Constructor creates new API client.
 
 ### Methods
 
-* `getinstruments(expired: false, only_active: true)` - [Doc](https://www.deribit.com/docs/api/#getinstruments), public
+* `instruments(expired: false, only_active: true)` - [Doc](https://www.deribit.com/docs/api/#getinstruments), public
 
   Returns active instruments
   **Parameters**
@@ -64,7 +64,7 @@ Constructor creates new API client.
   | `expired`    | `boolean`  | Optional, for returning all expired instruments.           |
   | `only_active`| `boolean`  | Optional, returns only isActive true instruments           |
 
-* `getorderbook(instrument)` - [Doc](https://www.deribit.com/docs/api/#getinstruments), public
+* `orderbook(instrument)` - [Doc](https://www.deribit.com/docs/api/#getinstruments), public
 
   Retrieve the orderbook for a given instrument.
 
@@ -75,11 +75,11 @@ Constructor creates new API client.
   | `instrument` | `string`   | Required, instrument name                                  |
 
 
-* `index()` - [Doc](https://www.deribit.com/docs/api/#index), public
+* `index` - [Doc](https://www.deribit.com/docs/api/#index), public
 
   Get price index, BTC-USD rates.
 
-* `getcurrencies()` - [Doc](https://www.deribit.com/docs/api/#getcurrencies), public
+* `getcurrencies` - [Doc](https://www.deribit.com/docs/api/#getcurrencies), public
 
   Get all supported currencies.
 
@@ -171,7 +171,7 @@ Constructor creates new API client.
   |--------------|------------|-----------------------------------------------------------------------------------|
   | `order_id`    | `integer`  | Required, ID of the order returned by "sell" or "buy" request
 
-* `getopenorders(instrument)` - [Doc](https://www.deribit.com/docs/api/#getopenorders), private
+* `open_orders(instrument)` - [Doc](https://www.deribit.com/docs/api/#getopenorders), private
 
   Retrieve open orders.
 
@@ -181,19 +181,10 @@ Constructor creates new API client.
   |--------------|------------|-----------------------------------------------------------------------|
   | `instrument` | `string`   | Optional, instrument name, use if want orders for specific instrument |
 
-* `positions()` - [Doc](https://www.deribit.com/docs/api/#positions), private
+* `positions` - [Doc](https://www.deribit.com/docs/api/#positions), private
 
   Retreive positions.
 
-* `orderhistory(count)` - [Doc](https://www.deribit.com/docs/api/#orderhistory), private
-
-  Get history.
-
-  **Parameters**
-
-  | Name       | Type       | Description                                                |
-  |------------|------------|------------------------------------------------------------|
-  | `count`    | `integer`  | Optional, number of requested records                      |
 
 * `tradehistory(count: count, instrument: instrument, start_trade_id: start_trade_id)` - [Doc](https://www.deribit.com/docs/api/#tradehistory), private
 
@@ -236,7 +227,7 @@ class MyHandler < Deribit::WS::Handler
   end
 
   #action handler
-  def getinstruments(json)
+  def instruments(json)
     #you actions here
   end
 end

data/lib/deribit/api.rb

@@ -2,7 +2,7 @@ module Deribit
   class API
     attr_reader :request
 
-    def initialize(key, secret, test_server: nil)
+    def initialize(key = nil, secret = nil, test_server: nil)
       @request = Request.new(key, secret, test_server: test_server)
     end
 

data/lib/deribit/request.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'net/http'
+require 'json'
 
 module Deribit
   class Request

data/lib/deribit/version.rb

@@ -1,3 +1,3 @@
 module Deribit
-  VERSION = "1.3.2"
+  VERSION = "1.4.3"
 end

data/lib/deribit/ws.rb

@@ -3,13 +3,12 @@ require 'websocket-client-simple'
 module Deribit
   class WS
     AVAILABLE_EVENTS = [:order_book, :trade, :my_trade, :user_order, :index, :portfolio, :announcement]
-
-    attr_reader :socket, :response, :ids_stack, :handler, :subscribed_instruments
+    attr_reader :socket, :response, :ids_stack, :handler, :subscribed_instruments, :test_server
 
     def initialize(key, secret, handler: Handler, test_server: nil)
-      test_server  = ENV["DERIBIT_TEST_SERVER"]  if test_server == nil
+      @test_server = test_server || ENV["DERIBIT_TEST_SERVER"]
       @request     = Request.new(key, secret, test_server: test_server)
-      @socket      = connect(test_server ? WS_TEST_URL : WS_SERVER_URL)
+      @socket      = connect
       @handler     = handler.instance_of?(Class) ? handler.new : handler
       @ids_stack  = []
 
@@ -32,7 +31,8 @@ module Deribit
       end
     end
 
-    def connect(url)
+    def connect
+      url = test_server ? WS_TEST_URL : WS_SERVER_URL
       puts "Connecting to #{url}"
       WebSocket::Client::Simple.connect(url)
     end
@@ -197,7 +197,7 @@ module Deribit
 
     def set_heartbeat(interval = "60")
       params = {
-        "interval": interval
+        "interval": interval.to_s
       }
 
       send(path: '/api/v1/public/setheartbeat', arguments: params)
@@ -221,6 +221,7 @@ module Deribit
           if msg.type == :text
             json = JSON.parse(msg.data, symbolize_names: true)
             puts "Subscribed!" if json[:message] == "subscribed"
+            # puts "Got json: #{json}"
 
             if json[:message] == "test_request"
               # puts "Got test request: #{json.inspect}" # DEBUG
@@ -243,7 +244,8 @@ module Deribit
               instance.handler.send(:notice, json)
             end
 
-            instance.handler.timestamp = Time.now.to_i
+            # puts "Want to update timestamp for handler for event: #{json.inspect}"
+            instance.handler.update_timestamp!
           elsif msg.type == :close
             puts "trying to reconnect = got close event, msg: #{msg.inspect}"
             instance.reconnect!

data/lib/deribit/ws/handler.rb

@@ -1,8 +1,7 @@
 module Deribit
   class WS
-    
     class Handler
-      attr_accessor :timestamp
+      attr_reader :timestamp
       
       AVAILABLE_METHODS = [
         :account, 
@@ -25,10 +24,6 @@ module Deribit
       ]
       SILENT = [:setheartbeat, :subscribed, :heartbeat, :"public API test"]
 
-      def initialize
-        @timestamp = Time.now.to_i
-      end
-
       def method_missing(m, *json, &block)
         return false  if SILENT.include?(m.to_sym)
         
@@ -50,6 +45,10 @@ module Deribit
       def handle_error(json, error)
         puts "Alert! #{error.class} on message: '#{json.try(:fetch, :message)}', #{json.inspect}. Message: #{error.full_message}"
       end
+
+      def update_timestamp!
+        @timestamp = Time.now.to_i
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deribit
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Alexander Dmitriev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler