deribit-api 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f76e8a99154e3e620008c524704c74cf01c0cf3303352ed22981f403cd0912
-  data.tar.gz: 149ef6954294ee435ce56097b4e79fbdcd162df1f05b3efa3a698e87c5094c47
+  metadata.gz: 9190274b8e9a8685d94a7795e36e5d02824acdfe97417923dcf12e0c2685caf2
+  data.tar.gz: a7dcd9a94ce0f80627f100b27f79e6f03cd0e4d07655c16837f3c444c6d516dc
 SHA512:
-  metadata.gz: c373baa7adac07baeb5b820cadbebb83b72d7c15d962e17b4b83d736df9cfcb03235379400858a6f3aeae118c40648010f2d5a03396b793614c0aa1e8a9c6e23
-  data.tar.gz: c981a53a4f1a28196f5a8fbd1bbee2448509c6d9e6fb74f9ffc7eda47371c76c9da8fdf8d40d16ba9546949ef688fb2bd9befe9025f3973c911f8c0bd7190cd3
+  metadata.gz: cbb94007ede87a6c332ff98e0628084598a0c9ae06aa23482ab8a49ac309e2c87fce4f82b664bf390765d6bb0fc62be90f1fec0ae51ff59111be3674c6dcb089
+  data.tar.gz: 375beeb4e635832e442074b6f97a79d1abb7af72cfb81be16b5fb699039ae9df5c2d0a4768772f3975bbb298d7de7bf042772428949899daa127930116e56502

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/CHANGELOG.md

@@ -5,6 +5,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.2] - 2020-06-10
+### Changed
+- update all gems
+- update Ruby to 2.7.1
+- refactor Naming module
+
 ## [2.0.1] - 2020-05-13
 ### Added
 - client#orders supports filtering by both currency and instrument name

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deribit-api (2.0.1)
+    deribit-api (2.0.2)
       faraday
       faraday-detailed_logger
       faraday_middleware
@@ -15,7 +15,7 @@ GEM
     backport (1.1.2)
     benchmark (0.1.0)
     bump (0.9.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     docile (1.3.2)
     dotenv (2.7.5)
     e2mmap (0.1.0)
@@ -35,12 +35,12 @@ GEM
     maruku (0.7.3)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -51,29 +51,34 @@ GEM
     psych (3.1.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    reek (6.0.0)
+    reek (6.0.1)
       kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
       psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
+    regexp_parser (1.7.1)
     reline (0.1.4)
       io-console (~> 0.5)
-    reverse_markdown (1.4.0)
+    reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.4)
-    rubocop (0.83.0)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    solargraph (0.39.7)
+    solargraph (0.39.8)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -82,7 +87,7 @@ GEM
       maruku (~> 0.7, >= 0.7.3)
       nokogiri (~> 1.9, >= 1.9.1)
       parser (~> 2.3)
-      reverse_markdown (~> 1.0, >= 1.0.5)
+      reverse_markdown (>= 1.0.5, < 3)
       rubocop (~> 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)

data/TODOs.org

@@ -37,12 +37,13 @@
 ** cleanup 'params' for both http and websocket
 ** DONE update buy/sell endpoints with new params
 ** DONE initial 2.0 API implementaion
-** refactor Naming module
+** DONE refactor Naming module
 ** TODO deribit-api-ruby maintenance
-   SCHEDULED: <2020-06-09 Tue +3m>
+   SCHEDULED: <2020-12-09 Wed +6m>
    :PROPERTIES:
-   :LAST_REPEAT: [2020-05-13 Wed 14:14]
+   :LAST_REPEAT: [2020-06-10 Wed 07:36]
    :END:
+   - State "DONE"       from "TODO"       [2020-06-10 Wed 07:36]
    - State "DONE"       from "TODO"       [2020-05-13 Wed 14:14]
    - State "DONE"       from "TODO"       [2020-04-23 Thu 13:25]
    - State "DONE"       from "TODO"       [2020-01-09 Thu 18:00]

data/lib/deribit/client.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
+require 'deribit/naming'
 
 module Deribit
-  TESTNET_HOST = 'test.deribit.com'.freeze
-  MAINNET_HOST = 'www.deribit.com'.freeze
+  TESTNET_HOST = 'test.deribit.com'
+  MAINNET_HOST = 'www.deribit.com'
 
   # Deribit API 2.0 client implementation
   # @author Iulian Costan (deribit-api@iuliancostan.com)
   class Client
+    include Naming
     attr_reader :http, :websocket
 
     # Create new instance
@@ -71,7 +73,7 @@ module Deribit
       end
 
       if block_given?
-        channel = Naming.book_channel options
+        channel = book_channel options
         websocket.subscribe channel, params: {}, &blk
       else
         http.get '/public/get_order_book', options
@@ -116,10 +118,10 @@ module Deribit
       end
 
       if block_given?
-        channel = Naming.trades_channel filters
+        channel = trades_channel filters
         websocket.subscribe channel, params: {}, &blk
       else
-        uri = Naming.trades_uri filters
+        uri = trades_uri filters
         response = http.get uri, filters
         response.trades
       end
@@ -261,7 +263,7 @@ module Deribit
     # @see https://docs.deribit.com/#private-cancel_all_by_currency
     # @see https://docs.deribit.com/#private-cancel_all_by_instrument
     def cancel_all(options = {})
-      uri = Naming.cancel_uri options
+      uri = cancel_uri options
       http.get uri, options
     end
 
@@ -274,7 +276,7 @@ module Deribit
         raise 'block is missing, HTTP-RPC not supported for this endpoint'
       end
 
-      channel = Naming.channel_for_instrument 'quote', options
+      channel = channel_for_instrument 'quote', options
       websocket.subscribe channel, params: options, &blk
     end
 
@@ -285,7 +287,7 @@ module Deribit
     # @see https://docs.deribit.com/#ticker-instrument_name-interval
     def ticker(options = { instrument_name: 'BTC-PERPETUAL' }, &blk)
       if block_given?
-        channel = Naming.channel 'ticker', options
+        channel = channel 'ticker', options
         websocket.subscribe channel, params: options, &blk
       else
         http.get '/public/ticker', options
@@ -307,10 +309,10 @@ module Deribit
       raise ArgumentError, 'either :instrument_name or :currency is required' unless options[:instrument_name] || options[:currency]
 
       if block_given?
-        channel = Naming.channel 'user.orders', options
+        channel = channel 'user.orders', options
         websocket.subscribe channel, params: options, &blk
       else
-        uri = Naming.orders_uri options
+        uri = orders_uri options
         http.get uri, options
       end
     end

data/lib/deribit/naming.rb

@@ -2,15 +2,14 @@
 
 module Deribit
   # @author Iulian Costan (deribit-api@iuliancostan.com)
-  # TODO: refactor and clean this up
   module Naming
-    def self.trades_channel(options)
+    def trades_channel(options)
       private = options.delete :private
       trades = private ? 'user.trades' : 'trades'
       channel trades, options
     end
 
-    def self.trades_uri(options)
+    def trades_uri(options)
       private = options.delete :private
       uri = private ? 'private/get_user_trades' : 'public/get_last_trades'
       uri += by_instrument(options) + by_currency(options)
@@ -18,50 +17,61 @@ module Deribit
       uri
     end
 
-    def self.book_channel(options)
+    def book_channel(options)
       'book' + for_instrument(options) + with_group_and_depth(options) + with_interval(options)
     end
 
-    def self.channel(prefix, options)
-      prefix + channel_suffix(options)
+    def channel(prefix, options)
+      channel = prefix
+      channel += for_instrument(options) if options[:instrument_name]
+      channel += for_currency(options) if options[:currency]
+      channel += with_interval(options)
+      channel
     end
 
-    def self.channel_for_instrument(prefix, options)
+    def channel_for_instrument(prefix, options)
       prefix + for_instrument(options)
     end
 
-    def self.instrument_with_interval(prefix, options)
+    def instrument_with_interval(prefix, options)
       prefix + for_instrument(options) + with_interval(options)
     end
 
-    def self.cancel_uri(options)
+    def cancel_uri(options)
       '/private/cancel_all' + by_instrument(options) + by_currency(options)
     end
 
-    def self.orders_uri(options)
+    def orders_uri(options)
       '/private/get_open_orders' + by_instrument(options) + by_currency(options)
     end
 
-    def self.by_instrument(options)
+    def by_instrument(options)
       options[:instrument_name] ? '_by_instrument' : ''
     end
 
-    def self.by_currency(options)
+    def by_currency(options)
       options[:currency] ? '_by_currency' : ''
     end
 
-    def self.for_instrument(options)
+    def for_instrument(options)
       raise 'instrument_name param is required' unless options[:instrument_name]
 
       ".#{options[:instrument_name]}"
     end
 
-    def self.with_interval(options)
+    def for_currency(options)
+      raise 'currency param is required' unless options[:currency]
+
+      kind = options[:kind] || 'any'
+      ".#{kind}.#{options[:currency]}"
+    end
+
+    def with_interval(options)
       interval = options[:interval] || '100ms'
       ".#{interval}"
     end
 
-    def self.with_group_and_depth(options)
+    def with_group_and_depth(options)
       if options[:group] || options[:depth]
         group = options[:group] || '5'
         depth = options[:depth] || '10'
@@ -70,19 +80,5 @@ module Deribit
         ''
       end
     end
-
-    def self.channel_suffix(options)
-      currency = options[:currency]
-      instrument_name = options[:instrument_name]
-      kind = options[:kind] || 'any'
-      interval = options[:interval] || 'raw'
-      if instrument_name
-        ".#{instrument_name}.#{interval}"
-      elsif currency
-        ".#{kind}.#{currency}.#{interval}"
-      else
-        raise 'invalid args'
-      end
-    end
   end
 end

data/lib/deribit/version.rb

@@ -1,3 +1,3 @@
 module Deribit
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deribit-api
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Iulian Costan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -256,6 +256,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -287,7 +288,7 @@ metadata:
   homepage_uri: https://github.com/icostan/deribit-api-ruby
   source_code_uri: https://github.com/icostan/deribit-api-ruby.git
   changelog_uri: https://github.com/icostan/deribit-api-ruby/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Idiomatic Ruby library for Deribit API 2.0
 test_files: []