okcoin-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b9ddcb048174c66dfe139614dad5cc16a579cd
-  data.tar.gz: d2f1dd779b0b1e8b8df576d922175e2a303a85ed
+  metadata.gz: 7fde5fbf15d7d1456c2e71b7c082d50027e61b2d
+  data.tar.gz: e3df5c33d806fe76fe3bb2342160e14f28d83dfb
 SHA512:
-  metadata.gz: ffc68b948ae4045634288d77331033b2d716a23962cff020e13f689ccb3a287738450b592f17ce65687719ac55cfaa1faf2615eca4ac314e2e147c318041c3c9
-  data.tar.gz: db614e11a9aade87684733d50e991152567d1b87fb63e788637f6fe31e12e434d0998c28376182c932543379852aeba6380bc1456bc1a04c0e68a633124af2af
+  metadata.gz: acf2b40dbf2faf83ebabd4aaf3a67735e19087dff98323373288b5fb0248b8dc2dd0c5dcb0443b256a87863c1f30fcf972f42f2ef4c9f3a6949de8225d724155
+  data.tar.gz: e1439a1322dbc48dbc6395a779186aa6f6f55c28525f76c5156a90a62de929d7894230f422ba7e0cf722ea837dd0ebb865c9174ca6329ab591e436182937f365

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'celluloid-websocket-client',  :github => 'ilyacherevkov/celluloid-websocket-client'
-
 # Specify your gem's dependencies in okcoin-rest-ruby.gemspec
 gemspec

data/README.md

@@ -19,7 +19,8 @@ And then execute:
 ### 1. REST Example
 ```
 okcoin = Okcoin::Rest.new api_key: ENV['OKCOIN_APIKEY'], secret_key: ENV['OKCOIN_SECRET']
-puts okcoin.user_info
+puts okcoin.userinfo
+puts okcoin.orderbook(pair: "btcusd", items_no: 50)
 ```
 
 ### 2. WebSocket Example
@@ -27,7 +28,9 @@ puts okcoin.user_info
 ```
   okcoin = Okcoin::WS.new api_key: ENV['OKCOIN_APIKEY'], secret_key: ENV['OKCOIN_SECRET']
   okcoin.userinfo
-  sleep 10
+  okcoin.pingpong
+  okcoin.price_api("{'event':'addChannel','channel':'ok_btcusd_ticker'}")
+  while true; sleep 1; end
   okcoin.close
 ``` 
 

data/lib/okcoin/rest.rb

@@ -1,118 +1,120 @@
-class Okcoin::Rest
-  BASE_URI = "https://www.okcoin.com/api"
-  TIMEOUT = 0.5
-
-  def initialize(api_key: nil, secret_key: nil)
-    @api_key = api_key
-    @secret_key = secret_key
-  end
+class Okcoin
+  class Rest
+    BASE_URI = "https://www.okcoin.com/api"
+    TIMEOUT = 0.5
+
+    def initialize(api_key: nil, secret_key: nil)
+      @api_key = api_key
+      @secret_key = secret_key
+    end
 
-  public
+    public
 
-    def orderbook(pair:, items_no: 50)
-      query = { "ok" => 1, "symbol" => pair, "size" => items_no }
-      get_request(url: "/depth.do", query: query)
-    end
+      def orderbook(pair:, items_no: 50)
+        query = { "ok" => 1, "symbol" => pair, "size" => items_no }
+        get_request(url: "/depth.do", query: query)
+      end
 
-    def futures_user_info
-      post_data = initial_post_data
-      post_request post_data: post_data, action: "/v1/future_userinfo.do"
-    end
+      def futures_userinfo
+        post_data = initial_post_data
+        post_request post_data: post_data, action: "/v1/future_userinfo.do"
+      end
 
-    def equity
-      post_data = initial_post_data
-      post_request(post_data: post_data, action: "/v1/future_userinfo.do")["info"]["btc"]["account_rights"]
-    end
+      def equity
+        post_data = initial_post_data
+        post_request(post_data: post_data, action: "/v1/future_userinfo.do")["info"]["btc"]["account_rights"]
+      end
 
-    def futures_orderbook(pair:, contract:, items_no: 50)
-      query = { "symbol" => pair, "contractType" => contract, "size" => items_no }
-      get_request(url: "/future_depth.do", query: query)
-    end
+      def futures_orderbook(pair:, contract:, items_no: 50)
+        query = { "symbol" => pair, "contractType" => contract, "size" => items_no }
+        get_request(url: "/future_depth.do", query: query)
+      end
 
-    def trade_futures(pair:, amount:, type:, contract_type:, match_price:, price: nil, lever_rate: 10)
-      post_data = initial_post_data
-      
-      post_data["symbol"] = pair
-      post_data["contract_type"] = contract_type
-      post_data["amount"] = amount
-      post_data["type"] = type
-      post_data["match_price"] = match_price
-      post_data["lever_rate"] = lever_rate
+      def trade_futures(pair:, amount:, type:, contract_type:, match_price:, price: nil, lever_rate: 10)
+        post_data = initial_post_data
+        
+        post_data["symbol"] = pair
+        post_data["contract_type"] = contract_type
+        post_data["amount"] = amount
+        post_data["type"] = type
+        post_data["match_price"] = match_price
+        post_data["lever_rate"] = lever_rate
 
-      post_data["price"] = price if price
+        post_data["price"] = price if price
 
-      post_request post_data: post_data, action: "/v1/future_trade.do"
-    end
+        post_request post_data: post_data, action: "/v1/future_trade.do"
+      end
 
-    def future_cancel(pair:, contract_type:, order_id:)
-      post_data = initial_post_data
+      def future_cancel(pair:, contract_type:, order_id:)
+        post_data = initial_post_data
 
-      post_data["symbol"] = pair
-      post_data["contract_type"] = contract_type
-      post_data["order_id"] = order_id
+        post_data["symbol"] = pair
+        post_data["contract_type"] = contract_type
+        post_data["order_id"] = order_id
 
-      post_request post_data: post_data, action: "/v1/future_cancel.do"
-    end
+        post_request post_data: post_data, action: "/v1/future_cancel.do"
+      end
 
-    def futures_orders_info(order_id:, symbol:, contract_type:)
-      post_data = initial_post_data
-      post_data["symbol"] = symbol
-      post_data["contract_type"] = contract_type
-      post_data["order_id"] = order_id
+      def futures_orders_info(order_id:, symbol:, contract_type:)
+        post_data = initial_post_data
+        post_data["symbol"] = symbol
+        post_data["contract_type"] = contract_type
+        post_data["order_id"] = order_id
 
-      post_request post_data: post_data, action: "/v1/future_orders_info.do"
-    end
+        post_request post_data: post_data, action: "/v1/future_orders_info.do"
+      end
 
-    def futures_position(pair:, contract_type:)
-      post_data = initial_post_data
-      post_data["symbol"] = pair
-      post_data["contract_type"] = contract_type
-      post_request post_data: post_data, action: "/v1/future_position.do"
-    end
+      def futures_position(pair:, contract_type:)
+        post_data = initial_post_data
+        post_data["symbol"] = pair
+        post_data["contract_type"] = contract_type
+        post_request post_data: post_data, action: "/v1/future_position.do"
+      end
 
 
-    def user_info
-      post_data = initial_post_data
-      post_request post_data: post_data, action: "/v1/userinfo.do"
-    end
+      def userinfo
+        post_data = initial_post_data
+        post_request post_data: post_data, action: "/v1/userinfo.do"
+      end
 
-  private 
+    private 
 
-    def handle_timeouts
-      begin
-        yield
-      rescue => ex
-        Rails.logger.info "Okcoin: An error of type #{ex.class} happened, message is #{ex.message}. Retrying..."
-        sleep TIMEOUT
-        retry
+      def handle_timeouts
+        begin
+          yield
+        rescue => ex
+          Rails.logger.info "Okcoin: An error of type #{ex.class} happened, message is #{ex.message}. Retrying..."
+          sleep TIMEOUT
+          retry
+        end
       end
-    end
 
-    def initial_post_data
-      post_data = {}
-      post_data["api_key"] = @api_key
-      post_data
-    end
+      def initial_post_data
+        post_data = {}
+        post_data["api_key"] = @api_key
+        post_data
+      end
 
-    def post_request(post_data:, action:)
-      params_string = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
-      hashed_string = params_string + "&secret_key=#{@secret_key}"
-      signature = OpenSSL::Digest.new("md5", hashed_string).to_s.upcase
-      post_data["sign"] = signature
-
-      payload = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
-      
-      handle_timeouts do
-        request = Curl.post(BASE_URI + action, payload) do |request|
-          request.headers['Content-type'] = 'application/x-www-form-urlencoded'
+      def post_request(post_data:, action:)
+        params_string = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
+        hashed_string = params_string + "&secret_key=#{@secret_key}"
+        signature = OpenSSL::Digest.new("md5", hashed_string).to_s.upcase
+        post_data["sign"] = signature
+
+        payload = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
+        
+        handle_timeouts do
+          request = Curl.post(BASE_URI + action, payload) do |request|
+            request.headers['Content-type'] = 'application/x-www-form-urlencoded'
+          end
+          JSON.parse(request.body_str)
         end
-        JSON.parse(request.body_str)
       end
-    end
 
-    def get_request(url:, query: nil)
-      handle_timeouts do
-        query ? JSON.parse(Curl.get(BASE_URI + url, query).body_str) : JSON.parse(Curl.get(BASE_URI + url).body_str)
+      def get_request(url:, query: nil)
+        handle_timeouts do
+          query ? JSON.parse(Curl.get(BASE_URI + url, query).body_str) : JSON.parse(Curl.get(BASE_URI + url).body_str)
+        end
       end
-    end
+  end
 end

data/lib/okcoin/version.rb

@@ -1,3 +1,3 @@
 class Okcoin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/okcoin/ws.rb

@@ -1,74 +1,76 @@
-class Okcoin::WS
-  include Celluloid
-  BASE_URI = 'wss://real.okcoin.com:10440/websocket/okcoinapi'
+class Okcoin
+  class WS
+    include Celluloid
+    BASE_URI = 'wss://real.okcoin.com:10440/websocket/okcoinapi'
 
-  def initialize(api_key: nil, secret_key: nil)
-    @driver = Celluloid::WebSocket::Client.new(BASE_URI, Celluloid::Actor.current)
-    @api_key = api_key
-    @secret_key = secret_key
-  end
-
-  public 
-    # When WebSocket is opened, register callbacks
-    def on_open
-     puts "Websocket connection to #{BASE_URI} established succesfully"
+    def initialize(api_key: nil, secret_key: nil)
+      @driver = Celluloid::WebSocket::Client.new(BASE_URI, Celluloid::Actor.current)
+      @api_key = api_key
+      @secret_key = secret_key
     end
 
-    # When raw WebSocket message is received
-    def on_message(msg)
-      puts "Message received: #{msg}"
-    end
+    public 
+      # When WebSocket is opened, register callbacks
+      def on_open
+       puts "Websocket connection to #{BASE_URI} established succesfully"
+      end
 
-    # When WebSocket is closed
-    def on_close(code, reason)
-      puts "WebSocket connection closed: #{code.inspect}, #{reason.inspect}"
-      @driver.terminate
-      terminate
-    end
+      # When raw WebSocket message is received
+      def on_message(msg)
+        puts "Message received: #{msg}"
+      end
 
-    # close WebSocket connection
-    def close
-      @driver.close
-    end
+      # When WebSocket is closed
+      def on_close(code, reason)
+        puts "WebSocket connection closed: #{code.inspect}, #{reason.inspect}"
+        @driver.terminate
+        terminate
+      end
 
-    def pingpong
-      every(5){ @driver.text "{'event':'ping'}" }
-    end
+      # close WebSocket connection
+      def close
+        @driver.close
+      end
 
-    def userinfo
-      post_data = initial_post_data
-      emit(event: 'addChannel', channel: 'ok_spotusd_userinfo', post_data: post_data)
-    end
+      def pingpong
+        every(5){ @driver.text "{'event':'ping'}" }
+      end
 
-    def futures_userinfo
-      post_data = initial_post_data
-      emit(event: 'addChannel', channel: 'ok_futureusd_userinfo', post_data: post_data)
-    end
+      def userinfo
+        post_data = initial_post_data
+        emit(event: 'addChannel', channel: 'ok_spotusd_userinfo', post_data: post_data)
+      end
 
-    def price_api(data)
-      @driver.text data
-    end
+      def futures_userinfo
+        post_data = initial_post_data
+        emit(event: 'addChannel', channel: 'ok_futureusd_userinfo', post_data: post_data)
+      end
 
-  private
+      def price_api(data)
+        @driver.text data
+      end
 
-    def initial_post_data
-      post_data = {}
-      post_data['api_key'] = @api_key
-      post_data
-    end
+    private
 
-    def sign(post_data:)
-      params_string = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
-      hashed_string = params_string + "&secret_key=#{@secret_key}"
-      signature = OpenSSL::Digest.new('md5', hashed_string).to_s.upcase
-      post_data['sign'] = signature
-      post_data = post_data.sort
-      post_data.collect! { |item| "'#{item[0]}':'#{item[1]}'" }
-      post_data = post_data.join(",")
-    end
+      def initial_post_data
+        post_data = {}
+        post_data['api_key'] = @api_key
+        post_data
+      end
 
-    def emit(event:, channel:, post_data: nil)
-      post_data = sign(post_data: post_data)
-      @driver.text  "{'event':'#{event}', 'channel':'#{channel}', 'parameters': {#{post_data}}}"
-    end
+      def sign(post_data:)
+        params_string = post_data.sort.collect{|k, v| "#{k}=#{v}"} * '&'
+        hashed_string = params_string + "&secret_key=#{@secret_key}"
+        signature = OpenSSL::Digest.new('md5', hashed_string).to_s.upcase
+        post_data['sign'] = signature
+        post_data = post_data.sort
+        post_data.collect! { |item| "'#{item[0]}':'#{item[1]}'" }
+        post_data = post_data.join(",")
+      end
+
+      def emit(event:, channel:, post_data: nil)
+        post_data = sign(post_data: post_data)
+        @driver.text  "{'event':'#{event}', 'channel':'#{channel}', 'parameters': {#{post_data}}}"
+      end
+  end
 end

data/okcoin-ruby.gemspec

@@ -5,6 +5,7 @@ require 'okcoin/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "okcoin-ruby"
+  spec.required_ruby_version = '~> 2.0'
   spec.version       = Okcoin::VERSION
   spec.authors       = ["Ilya Cherevkov"]
   spec.email         = ["icherevkov@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okcoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ilya Cherevkov
@@ -93,9 +93,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="