okex 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e79f7f281cc49fecf294441cfc91c8a0f7e065204a69fae02c968f48b5fc83a
-  data.tar.gz: 802b3412745cc52ed7989bf6e16d9e6e61a9d5c962446bb81b29182abcaeeab0
+  metadata.gz: 012c9b50e5c4dd3fb5522d0eef07764feb177c23a2aee07e1a847399fb7b7d68
+  data.tar.gz: 43f87e76c36c65bf9b81122392b36af8bee0f5125617b28ff2a6e2ae6a36196a
 SHA512:
-  metadata.gz: 1f00ee33cb15494a908dba476c5fb1b3eaeea37b3b313bfb5d47a95237ac6117b83b6adae1790bbf62ece997b4f972eb98d77a6326dbb3899da4bb116d96cc06
-  data.tar.gz: 6a2ddad58a09dfdb945babd65cc78022c427bb6147df57f5c38b5e74438ebf16e75f2746287da0931abfb4e0f643077aeee984f7920ea5954ca47aa75a548783
+  metadata.gz: 84533cb2cc12b733a01c29a3f76274e1b179573fa0ad21e2588c87b04e76e9afdca18979c22056b4fa4c75fbec578e7fbb319e198721bedb9150e39e4f819f2a
+  data.tar.gz: 839673d67fed38b99dce0b5d5f31df562e56d9617c5e7c87cad1772136b616c60d457d6d9397427372bb0b6fd4168c9b035a8d74fb50b972c9bfc68e48defbce

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    okex (0.2.3)
+    okex (0.2.5)
       faraday (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     diff-lcs (1.4.4)
     faraday (1.5.0)
       faraday-em_http (~> 1.0)
@@ -47,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.17)
+  byebug (~> 11.1)
   okex!
   rake (~> 10.0)
   rspec (~> 3.0)

data/lib/okex.rb

@@ -4,8 +4,11 @@ require "okex/api_v5"
 require "okex/client"
 require "okex/coin"
 require "okex/order"
+require "okex/account_order"
+require "okex/trade_order"
 require "okex/host"
 
+
 module OKEX
   class Error < StandardError; end
 end

data/lib/okex/account_order.rb

@@ -0,0 +1,4 @@
+module OKEX
+  class AccountOrder < Order
+  end
+end

data/lib/okex/api_v5.rb

@@ -8,11 +8,21 @@ class OKEX::ApiV5
     client.get(host, "/api/v5/public/instruments?instType=SWAP")
   end
 
-  def orders
+  def account_orders
     resp = client.get(host, "/api/v5/account/positions")
     
+    if resp['success']
+      return resp['data'].map {|params| OKEX::AccountOrder.new(params)}
+    end
+
+    []
+  end
+
+  def trade_orders(instrument_id)
+    resp = client.get(host, "/api/v5/trade/order?instId=#{instrument_id}")
+    
     if resp['code'].to_i == 0 && resp['data'].size > 0
-      return resp['data'].map {|params| OKEX::Order.new(params)}
+      return resp['data'].map {|params| OKEX::TradeOrder.new(params)}
     end
 
     []
@@ -31,21 +41,21 @@ class OKEX::ApiV5
     client.post(host, "/api/v5/trade/order", params)
   end
 
-  def close_long(instid)
-    close_position(instid, "long")
+  def close_long(instrument_id)
+    close_position(instrument_id, "long")
   end
 
-  def close_short(instid)
-    close_position(instid, "short")
+  def close_short(instrument_id)
+    close_position(instrument_id, "short")
   end
 
   private
 
   attr_reader :client, :host
 
-  def close_position(instid, direction)
+  def close_position(instrument_id, direction)
     params = {
-      "instId": instid,
+      "instId": instrument_id,
       "mgnMode": "cross",
       "posSide": direction
     }

data/lib/okex/client.rb

@@ -60,7 +60,14 @@ module OKEX
     end
 
     def _resp(result)
-      JSON.parse(result.body)
+      result = JSON.parse(result.body)
+      
+      code = result['code'].to_i
+      if code == 0 && result['msg'].empty?
+        return {'success' => true, 'data' => result['data']}
+      else
+        return {'success' => false, 'code' => code, 'msg' => result['msg']}
+      end
     end
   end
 end

data/lib/okex/order.rb

@@ -30,6 +30,11 @@ module OKEX
       dig("liqPx").to_f
     end
 
+    # 最新成交价
+    def last_price
+      dig("last").to_f
+    end
+
     # 持仓方向
     def position_side
       side = dig("posSide")
@@ -38,11 +43,34 @@ module OKEX
       end
     end
 
+    def long?
+      position_side == POS_LONG
+    end
+
+    def short?
+      position_side == POS_SHORT
+    end
+
+    # 开仓方向名称
+    def position_name
+      case position_side
+      when POS_SHORT
+        '空'
+      when POS_LONG
+        '多'
+      end
+    end
+
     # 未实现收益
     def upl
       dig("upl").to_f
     end
 
+    # 持仓张数
+    def pos
+      dig("pos").to_i
+    end
+
     private
 
     def dig(key)

data/lib/okex/trade_order.rb

@@ -0,0 +1,24 @@
+module OKEX
+  class TradeOrder < Order
+
+    # 预估强平价
+    def est_liq_price
+      dig("liqPx").to_f
+    end
+
+    # 最新成交价
+    def last_price
+      dig("fillPx").to_f
+    end
+
+    # 未实现收益
+    def upl
+      dig("pnl").to_f
+    end
+
+    # 持仓张数
+    def pos
+      dig("sz").to_i
+    end
+  end
+end

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/okex.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug", "~> 11.1"
 
   spec.add_runtime_dependency "faraday", "~> 1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - David Zhang
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +99,7 @@ files:
 - bin/console
 - bin/setup
 - lib/okex.rb
+- lib/okex/account_order.rb
 - lib/okex/api_v3.rb
 - lib/okex/api_v5.rb
 - lib/okex/client.rb
@@ -92,6 +107,7 @@ files:
 - lib/okex/coin/bitcoin.rb
 - lib/okex/host.rb
 - lib/okex/order.rb
+- lib/okex/trade_order.rb
 - lib/okex/version.rb
 - okex.gemspec
 homepage: https://github.com/daqing/okex