deribit-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9384ba752c4c01d89a64e693199e7a22e57cf03d0de5f3f69cf47d3cd420079
-  data.tar.gz: 8c7497902c3cfcf5d799379f721460b73bb75137d2a82ce5d99245be03252e1f
+  metadata.gz: a62314b7e75414635ba071509257b3351fc60ad480be229c244cc35dd546887e
+  data.tar.gz: f40fa635d14dbe3547f37cca66fcc8f5752ae73f4e1f0a4eb061c85e4e2a7f3c
 SHA512:
-  metadata.gz: cc000a2fc6d98a8db24e1742c5f61ada7e67e6b5634ebbf6d72eb9566f92146471feff17126d320608fb1aa37d584f63f8dad9c8ecfd2cd847bc9b905182b952
-  data.tar.gz: c2763b97462ee107278bb699e7f79ea16587e49d1fde62a1d7d13b2b5173731d4d55b6b475788375ba2e0522d0cb0ae0b0254ccde0c67f49db1ec9a36858bd60
+  metadata.gz: 41939581f1de76212b2a7b621fc004078edfada5cd732ff660e2d292ed915f9c376ce7a3eff9510a2daa30e9e1a8821a03cd02e7ece147635334b9867ef5a6f5
+  data.tar.gz: 3e3e2a78c651293ec0a0e6cddf8caefc68890cf37599242ac917708687a6cca2bf7d513616c3e2a70875c5f8982c3bab22f08a575c29a99f8bdd9512099cfd1f

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+/.env

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.3

data/.travis.yml

@@ -3,14 +3,14 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.3
+  - 2.6.3
 
 env:
   global:
     - CC_TEST_REPORTER_ID=d6a710d8173e78db96a25675960ddf02d27d9cd1fd4e237785cafd8878f8a5ba
 
 before_install:
-  - gem install bundler -v 1.17.1
+  - gem install bundler
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
 

data/CHANGELOG.md

@@ -5,6 +5,15 @@
 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).
 
+## [0.1.3] - 2019-07-02
+### Changed
+- extract HTTP class
+- upgrade Ruby to 2.6.3
+- update all gems
+### Fixed
+- trade history tests
+- new test prices
+
 ## [0.1.2] - 2019-04-17
 ### Added
 - private Websocket API

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deribit-api (0.1.2)
+    deribit-api (0.1.3)
       faraday
       faraday_middleware
       faye-websocket
@@ -23,15 +23,15 @@ GEM
       descendants_tracker (~> 0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.3.1)
-    dotenv (2.7.1)
+    docile (1.3.2)
+    dotenv (2.7.4)
     equalizer (0.0.11)
     eventmachine (1.2.7)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    faye-websocket (0.10.7)
+    faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashie (3.6.0)
@@ -40,8 +40,8 @@ GEM
     kwalify (0.7.2)
     method_source (0.9.2)
     minitest (5.11.3)
-    multipart-post (2.0.0)
-    parser (2.6.0.0)
+    multipart-post (2.1.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -52,13 +52,13 @@ GEM
     psych (3.1.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    reek (5.3.1)
+    reek (5.4.0)
       codeclimate-engine-rb (~> 0.4.0)
       kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.7, != 2.5.1.1)
       psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -69,10 +69,10 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    yard (0.9.18)
+    websocket-extensions (0.1.4)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
@@ -90,4 +90,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/TODOs.org

@@ -8,7 +8,11 @@
 ** FIX API
 ** DONE use minitest
    CLOSED: [2019-02-26 Tue] SCHEDULED: <2019-02-26 Tue>
-** extract HTTP client
+** DONE extract HTTP client
+   CLOSED: [2019-04-23 Tue 15:24]
+   :LOGBOOK:
+   CLOCK: [2019-04-23 Tue 14:31]--[2019-04-23 Tue 15:18] =>  0:47
+   :END:
 ** DONE public Websocket API
    CLOSED: [2019-04-02 Tue 13:12] SCHEDULED: <2019-03-29 Fri>
    :LOGBOOK:
@@ -22,13 +26,17 @@
    :END:
 ** response middleware
 ** check key/secret present for private endpoints
-** fix trade history
+** DONE fix trade history
+   CLOSED: [2019-04-23 Tue 15:17]
 ** research async websocket implementation
-** cleaup 'params' for both http and websocket
+** cleanup 'params' for both http and websocket
+** update buy/sell endpoints with new params
 ** TODO Deribit implementation
-   SCHEDULED: <2019-04-23 Tue +1w>
+   SCHEDULED: <2019-08-02 Tue +1m>
    :PROPERTIES:
-   :LAST_REPEAT: [2019-04-17 Wed 18:26]
+   :LAST_REPEAT: [2019-07-02 Tue 13:01]
    :END:
+   - State "DONE"       from "TODO"       [2019-07-02 Tue 13:01]
+   - State "DONE"       from "TODO"       [2019-04-23 Tue 15:24]
    - State "DONE"       from "TODO"       [2019-04-17 Wed 18:26]
    - State "DONE"       from "TODO"       [2019-04-02 Tue 13:02]

data/lib/deribit.rb

@@ -7,6 +7,7 @@ require 'deribit/version'
 require 'deribit/client'
 require 'deribit/authentication'
 require 'deribit/websocket'
+require 'deribit/http'
 
 # Root module
 module Deribit

data/lib/deribit/client.rb

@@ -6,7 +6,7 @@ module Deribit
     # URL for mainnet
     MAINNET_URL = 'www.deribit.com'
 
-    attr_reader :websocket
+    attr_reader :http, :websocket
 
     # Create new instance
     # @param key [String] Deribit Access Key
@@ -16,14 +16,7 @@ module Deribit
     # @return [Deribit::Client] the instance of client
     def initialize(key: nil, secret: nil, testnet: false, debug: false)
       host = testnet ? TESTNET_URL : MAINNET_URL
-      @connection = Faraday::Connection.new(url: 'https://' + host) do |f|
-        f.request :json
-        f.response :mashify
-        f.response :json
-        f.use Deribit::Authentication, key, secret
-        f.response :logger if debug
-        f.adapter Faraday.default_adapter
-      end
+      @http = Deribit::Http.new host, key: key, secret: secret
       @websocket = Deribit::Websocket.new host, key: key, secret: secret
     end
 
@@ -35,7 +28,7 @@ module Deribit
       if block_given?
         websocket.subscribe :time, &blk
       else
-        get :time
+        http.get :time
       end
     end
 
@@ -68,7 +61,7 @@ module Deribit
       if block_given?
         websocket.subscribe :test, params: params, &blk
       else
-        get :test, params: params, raw_body: true
+        http.get :test, params: params, raw_body: true
       end
     end
 
@@ -80,7 +73,7 @@ module Deribit
       if block_given?
         websocket.subscribe :ping, &blk
       else
-        get :ping
+        http.get :ping
       end
     end
 
@@ -94,7 +87,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getinstruments, params: params, &blk
       else
-        get :getinstruments, params: params
+        http.get :getinstruments, params: params
       end
     end
 
@@ -106,7 +99,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getcurrencies, &blk
       else
-        get :getcurrencies
+        http.get :getcurrencies
       end
     end
 
@@ -120,7 +113,7 @@ module Deribit
       if block_given?
         websocket.subscribe :index, params: params, &blk
       else
-        get :index, params: params
+        http.get :index, params: params
       end
     end
 
@@ -137,7 +130,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getorderbook, params: params, &blk
       else
-        get :getorderbook, params: params
+        http.get :getorderbook, params: params
       end
     end
 
@@ -163,7 +156,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getlasttrades, params: params, &blk
       else
-        get :getlasttrades, params: params
+        http.get :getlasttrades, params: params
       end
     end
 
@@ -179,7 +172,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getsummary, params: params, &blk
       else
-        get :getsummary, params: params
+        http.get :getsummary, params: params
       end
     end
 
@@ -191,7 +184,7 @@ module Deribit
       if block_given?
         websocket.subscribe :stats, &blk
       else
-        get :stats
+        http.get :stats
       end
     end
 
@@ -203,7 +196,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getannouncements, &blk
       else
-        get :getannouncements
+        http.get :getannouncements
       end
     end
 
@@ -221,7 +214,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getlastsettlements, params: filters, &blk
       else
-        get :getlastsettlements, params: filters
+        http.get :getlastsettlements, params: filters
       end
     end
 
@@ -234,7 +227,7 @@ module Deribit
       if block_given?
         websocket.subscribe :account, params: { auth: true }, &blk
       else
-        get :account, auth: true
+        http.get :account, auth: true
       end
     end
 
@@ -260,7 +253,7 @@ module Deribit
       if block_given?
         websocket.subscribe :buy, params: params.merge(auth: true), &blk
       else
-        post :buy, params
+        http.post :buy, params
       end
     end
 
@@ -276,7 +269,7 @@ module Deribit
       if block_given?
         websocket.subscribe :sell, params: params, &blk
       else
-        post :sell, params
+        http.post :sell, params
       end
     end
 
@@ -296,7 +289,7 @@ module Deribit
       if block_given?
         websocket.subscribe :edit, params: params, &blk
       else
-        post :edit, params
+        http.post :edit, params
       end
     end
 
@@ -310,7 +303,7 @@ module Deribit
       if block_given?
         websocket.subscribe :cancel, params: params, &blk
       else
-        post :cancel, params
+        http.post :cancel, params
       end
     end
 
@@ -326,7 +319,7 @@ module Deribit
       if block_given?
         websocket.subscribe :cancelall, params: params, &blk
       else
-        post :cancelall, params
+        http.post :cancelall, params
       end
     end
 
@@ -342,7 +335,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getopenorders, params: options.merge(auth: true), &blk
       else
-        get :getopenorders, auth: true, params: options
+        http.get :getopenorders, auth: true, params: options
       end
     end
 
@@ -355,7 +348,7 @@ module Deribit
       if block_given?
         websocket.subscribe :positions, params: params, &blk
       else
-        get :positions, params
+        http.get :positions, params
       end
     end
 
@@ -371,7 +364,7 @@ module Deribit
       if block_given?
         websocket.subscribe :orderhistory, params: options.merge(auth: true), &blk
       else
-        get :orderhistory, auth: true, params: options
+        http.get :orderhistory, auth: true, params: options
       end
     end
 
@@ -385,7 +378,7 @@ module Deribit
       if block_given?
         websocket.subscribe :orderstate, params: params, &blk
       else
-        get :orderstate, auth: true, params: params
+        http.get :orderstate, auth: true, params: params
       end
     end
 
@@ -400,7 +393,7 @@ module Deribit
       if block_given?
         websocket.subscribe :tradehistory, params: params, &blk
       else
-        get :tradehistory, auth: true, params: params
+        http.get :tradehistory, auth: true, params: params
       end
     end
 
@@ -411,7 +404,7 @@ module Deribit
       if block_given?
         websocket.subscribe :newannouncements, params: { auth: true }, &blk
       else
-        get :newannouncements, auth: true
+        http.get :newannouncements, auth: true
       end
     end
 
@@ -441,7 +434,7 @@ module Deribit
       if block_given?
         websocket.subscribe :getemaillang, params: { auth: true }, &blk
       else
-        get :getemaillang, auth: true
+        http.get :getemaillang, auth: true
       end
     end
 
@@ -453,7 +446,7 @@ module Deribit
       if block_given?
         websocket.subscribe :setemaillang, params: { lang: lang, auth: true }, &blk
       else
-        post :setemaillang, lang: lang
+        http.post :setemaillang, lang: lang
       end
     end
 
@@ -465,7 +458,7 @@ module Deribit
       if block_given?
         websocket.subscribe :setannouncementasread, params: { announcementid: announcement_id, auth: true }, &blk
       else
-        post :setannouncementasread, announcementid: announcement_id
+        http.post :setannouncementasread, announcementid: announcement_id
       end
     end
 
@@ -483,32 +476,8 @@ module Deribit
       if block_given?
         websocket.subscribe :settlementhistory, params: filters.merge(auth: true), &blk
       else
-        get :settlementhistory, auth: true, params: filters
+        http.get :settlementhistory, auth: true, params: filters
       end
     end
-
-    private
-
-    def get(action, params: {}, raw_body: false, auth: false)
-      response = @connection.get path(action, auth), params
-      # TODO: move to middleware
-      raise response.message unless response.success?
-      raise response.body.message unless response.body.success
-      body = response.body
-      raw_body ? body : body.result
-    end
-
-    def post(action, params)
-      response = @connection.post path(action, true), params
-      raise response.message unless response.success?
-      raise response.body.message unless response.body.success
-
-      response.body.result || response.body.success?
-    end
-
-    def path(action, auth = false)
-      access = auth ? 'private' : 'public'
-      "/api/v1/#{access}/#{action}"
-    end
   end
 end

data/lib/deribit/http.rb

@@ -0,0 +1,45 @@
+module Deribit
+  # HTTP API
+  # @see https://docs.deribit.com/api-http.html
+  class Http
+    def initialize(host, key: nil, secret: nil, debug: false)
+      url = 'https://' + host
+      @connection = Faraday::Connection.new(url: url) do |f|
+        f.request :json
+        f.response :mashify
+        f.response :json
+        f.use Deribit::Authentication, key, secret
+        f.response :logger if debug
+        f.adapter Faraday.default_adapter
+      end
+    end
+
+    def get(action, params: {}, raw_body: false, auth: false)
+      response = @connection.get path(action, auth), params
+
+      # TODO: move to middleware
+      raise response.message unless response.success?
+      raise response.body.message unless response.body.success
+
+      body = response.body
+      raw_body ? body : body.result
+    end
+
+    def post(action, params)
+      response = @connection.post path(action, true), params
+
+      # TODO: move to middleware
+      raise response.message unless response.success?
+      raise response.body.message unless response.body.success
+
+      response.body.result || response.body.success?
+    end
+
+    private
+
+    def path(action, auth = false)
+      access = auth ? 'private' : 'public'
+      "/api/v1/#{access}/#{action}"
+    end
+  end
+end

data/lib/deribit/version.rb

@@ -1,3 +1,3 @@
 module Deribit
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/deribit/websocket.rb

@@ -1,4 +1,6 @@
 module Deribit
+  # Websocket API
+  # @see https://docs.deribit.com/api-websocket.html
   class Websocket
     attr_reader :host, :key, :secret
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deribit-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Iulian Costan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -217,6 +217,7 @@ files:
 - lib/deribit.rb
 - lib/deribit/authentication.rb
 - lib/deribit/client.rb
+- lib/deribit/http.rb
 - lib/deribit/version.rb
 - lib/deribit/websocket.rb
 homepage: https://github.com/icostan/deribit-api-ruby
@@ -241,8 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby library for Deribit API