bibox 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8986db1d579aa17da50d2dee9f419d81f9e3fb26f63de03fd830241c357be27c
-  data.tar.gz: b4e51c4e0990379d2906ca5970240e57e9c66439fadd7d4d9883cbab5746c0f7
+  metadata.gz: 5e8cf4b3e892dc5fc64f8807f486cb890b5c46d6b3abe2110f604ebb9b0ee796
+  data.tar.gz: 22c23c9ef4ae49f24ef93ef9918bd278aaedb85ad617590038f188782e71c08d
 SHA512:
-  metadata.gz: 011ab93a271422c1725c07427720fe177a7d5ed56c02133b63eec2c26664f081bc8aea9977cbffa839bcac6281083af9f64734384c50223db00fbd7b9f7979b9
-  data.tar.gz: 99cf68663a13a8090b204211c4dcce82bb08df89b7cc5ca597d8103606e1e566da346453f4625804653ca039ed257ad94c6c74dfdbe7e6ec034e097e6600dd75
+  metadata.gz: 9b38220351d35b3dde46f77daf13b8d030fe922e1f58b0a1353f525755c63413ca8f761201c7741216432913e7d94bdfefcdd2e6b58e73be35d20fd6a523ff03
+  data.tar.gz: 742ffce82b24e37ab872cbd9fd8fee74105efc8a039b619cdf5f1856fff0faa99d98928552df8430ccef07dd8541057c63aecd87d1c5fe3783eebc111a518329

data/.gitignore

@@ -10,6 +10,9 @@
 # rspec failure tracking
 .rspec_status
 
+# pry
+.pry_history
+
 credentials.yml
 .ruby-version
-.ruby-gemset
+.ruby-gemset

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bibox (0.1.2)
+    bibox (0.1.3)
       eventmachine (>= 1.2.7)
       faraday (>= 0.15.4)
       faraday_middleware (>= 0.13.1)
@@ -12,6 +12,7 @@ GEM
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
+    coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -24,7 +25,11 @@ GEM
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashdiff (0.3.8)
+    method_source (0.9.2)
     multipart-post (2.0.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (3.0.3)
     rake (10.5.0)
     rdoc (6.1.1)
@@ -57,6 +62,7 @@ PLATFORMS
 DEPENDENCIES
   bibox!
   bundler (~> 1.16)
+  pry (~> 0.12.2)
   rake (~> 10.0)
   rdoc (~> 6.0)
   rspec (~> 3.0)

data/README.md

@@ -56,7 +56,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/bibox. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/SebastianJ/bibox. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -64,4 +64,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Bibox project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/bibox/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Bibox project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/SebastianJ/bibox/blob/master/CODE_OF_CONDUCT.md).

data/bibox.gemspec

@@ -33,4 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rdoc",       "~> 6.0"
   spec.add_development_dependency "vcr",        "~> 4.0"
   spec.add_development_dependency "webmock",    "~> 3.1"
+  
+  spec.add_development_dependency "pry",        "~> 0.12.2"
 end

data/bin/console

@@ -23,9 +23,9 @@ end
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.config.history.file = File.join(__FILE__, "../.pry_history")
+Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+#require "irb"
+#IRB.start(__FILE__)

data/bin/websocket

@@ -23,18 +23,25 @@ class WebsocketWrapper
   
   def set_callbacks
     # Subscription callback
-    self.client.callbacks[:subscribe]     = -> { subscribe! }
+    self.client.callbacks[:subscribe]               =   -> { subscribe! }
     
     # Received messages callbacks
-    self.client.callbacks[:trading_pairs] = -> (data) { trading_pairs(data) }
-    self.client.callbacks[:order_book]    = -> (data) { order_book(data) }
-    self.client.callbacks[:trades]        = -> (data) { trades(data) }
-    self.client.callbacks[:ticker]        = -> (data) { ticker(data) }
-    self.client.callbacks[:klines]        = -> (data) { klines(data) }
+    self.client.callbacks[:trading_pairs]           =   -> (data) { trading_pairs(data) }
+    self.client.callbacks[:order_book]              =   -> (data) { order_book(data) }
+    self.client.callbacks[:trades]                  =   -> (data) { trades(data) }
+    self.client.callbacks[:ticker]                  =   -> (data) { ticker(data) }
+    self.client.callbacks[:klines]                  =   -> (data) { klines(data) }
+    
+    self.client.callbacks[:index_markets]           =   -> (data) { index_markets(data) }
+    self.client.callbacks[:contract_price_limits]   =   -> (data) { contract_price_limits(data) }
   end
   
   def subscribe!(pairs: ["4ETH_USDT"])
-    #self.client.subscribe_to_trading_pairs!
+    self.client.login!
+    self.client.subscribe_to_trading_pairs!
+    #self.client.subscribe_to_index_markets!
+    #self.client.subscribe_to_contract_price_limits!
+    
     self.client.subscribe_to_order_book!(pairs: pairs)
     self.client.subscribe_to_trades!(pairs: pairs)
     self.client.subscribe_to_ticker!(pairs: pairs)
@@ -66,6 +73,16 @@ class WebsocketWrapper
     pp data
   end
   
+  def index_markets(data)
+    puts "\nReceived index markets message!"
+    pp data
+  end
+  
+  def contract_price_limits(data)
+    puts "\nReceived contract price limits message!"
+    pp data
+  end
+  
 end
 
 WebsocketWrapper.new.run!

data/lib/bibox.rb

@@ -36,6 +36,7 @@ require "bibox/models/asset"
 require "bibox/models/user_assets"
 require "bibox/models/transfer"
 require "bibox/models/bill"
+require "bibox/models/contract"
 
 require "bibox/rest/public/ticker"
 require "bibox/rest/public/pairs"
@@ -49,6 +50,10 @@ require "bibox/rest/private/assets"
 require "bibox/rest/private/transfers"
 require "bibox/rest/private/bills"
 
+require "bibox/rest/private/contracts/general"
+require "bibox/rest/private/contracts/assets"
+require "bibox/rest/private/contracts/orders"
+
 require "bibox/rest/errors"
 require "bibox/rest/client"
 

data/lib/bibox/models/contract.rb

@@ -0,0 +1,20 @@
+module Bibox
+  module Models
+    class Contract < Base
+      MAPPING   =   {
+        id:             :integer,
+        pair:           :string,
+        value:          :float,
+        coin_symbol:    :string,
+        
+        offset_normal:  :float,
+        offset_short:   :float,
+        offset_long:    :float,
+        normal_dx:      :float,
+        
+        created_at:     :datetime,
+        updated_at:     :datetime
+      }
+    end
+  end
+end

data/lib/bibox/models/transfer.rb

@@ -8,8 +8,8 @@ module Bibox
         coin_symbol:    :string,
         confirm_count:  :string,
         amount:         :float,
-        updated_at:     :datetime,
-        created_at:     :datetime,
+        updated_at:     :time,
+        created_at:     :time,
         url:            :string,
         icon_url:       :string,
         status:         {enum: {1 => :pending, 2 => :success, 3 => :failed}},

data/lib/bibox/rest/client.rb

@@ -21,6 +21,10 @@ module Bibox
       include ::Bibox::Rest::Private::Assets
       include ::Bibox::Rest::Private::Transfers
       include ::Bibox::Rest::Private::Bills
+      
+      include ::Bibox::Rest::Private::Contracts::General
+      include ::Bibox::Rest::Private::Contracts::Assets
+      include ::Bibox::Rest::Private::Contracts::Orders
             
       def configured?
         !self.configuration.key.to_s.empty? && !self.configuration.secret.to_s.empty?

data/lib/bibox/rest/private/contracts/assets.rb

@@ -0,0 +1,24 @@
+module Bibox
+  module Rest
+    module Private
+      module Contracts
+        module Assets
+          
+          def contract_assets(coin_symbol: "USDT", options: {})
+            payload     =   [
+              {
+                cmd:  "query/assets",
+                body: {
+                  coin_symbol: coin_symbol
+                }
+              }
+            ]
+          
+            response    =   parse(post("/cquery", data: payload, options: options))&.fetch("result", [])&.first&.fetch("result", [])
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/bibox/rest/private/contracts/general.rb

@@ -0,0 +1,22 @@
+module Bibox
+  module Rest
+    module Private
+      module Contracts
+        module General
+          def contract_values(options: {})
+            payload     =   [
+              {
+                cmd:  "query/contractValue",
+                body: {}
+              }
+            ]
+          
+            response    =   post("/cquery", data: payload, options: options)#&.fetch("result", [])&.first&.fetch("result", [])
+          
+            raise response.inspect
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bibox/rest/private/contracts/orders.rb

@@ -0,0 +1,24 @@
+module Bibox
+  module Rest
+    module Private
+      module Contracts
+        module Orders
+          
+          def contract_orders(pair:, options: {})
+            payload     =   [
+              {
+                cmd:  "query/order",
+                body: {
+                  pair: pair
+                }
+              }
+            ]
+          
+            response    =   parse(post("/cquery", data: payload, options: options))&.fetch("result", [])&.first&.fetch("result", [])
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/bibox/utilities.rb

@@ -1,7 +1,12 @@
 module Bibox
   class Utilities
     
-    class << self      
+    class << self
+      
+      def decode_and_inflate(data)
+        Zlib::GzipReader.new(StringIO.new(Base64.decode64(data))).read
+      end
+      
       def convert_value(value, type, use_ms_for_time: true)
         if type.is_a?(Symbol)
           return case type

data/lib/bibox/version.rb

@@ -1,3 +1,3 @@
 module Bibox
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/bibox/websocket/client.rb

@@ -10,21 +10,27 @@ module Bibox
         self.keepalive    =   options.fetch(:keepalive, false)
         
         self.matchers     =   {
-          trading_pairs:  /\d?[A-Z]+_[A-Z]+_market/,
-          order_book:     /\d?[A-Z]+_[A-Z]+_depth$/,
-          trades:         /\d?[A-Z]+_[A-Z]+_deals$/,
-          ticker:         /\d?[A-Z]+_[A-Z]+_ticker$/,
-          klines:         /\d?[A-Z]+_[A-Z]+_kline_(?<period>.*)$/
+          trading_pairs:          /\d?[A-Z]+_[A-Z]+_market/,
+          order_book:             /\d?[A-Z]+_[A-Z]+_depth$/,
+          trades:                 /\d?[A-Z]+_[A-Z]+_deals$/,
+          ticker:                 /\d?[A-Z]+_[A-Z]+_ticker$/,
+          klines:                 /\d?[A-Z]+_[A-Z]+_kline_(?<period>.*)$/,
+          
+          index_markets:          /\d?[A-Z]+_[A-Z]+_indexMarket/,
+          contract_price_limits:  /\d?[A-Z]+_[A-Z]+_contractPriceLimit$/,
         }
         
         self.callbacks    =   {
-          subscribe:      ->  { subscribe! },
-          message:        ->  (data) { message(data) },
-          trading_pairs:  ->  (data) { nil },
-          order_book:     ->  (data) { nil },
-          trades:         ->  (data) { nil },
-          ticker:         ->  (data) { nil },
-          klines:         ->  (data) { nil },
+          subscribe:              ->  { subscribe! },
+          message:                ->  (data) { message(data) },
+          trading_pairs:          ->  (data) { nil },
+          order_book:             ->  (data) { nil },
+          trades:                 ->  (data) { nil },
+          ticker:                 ->  (data) { nil },
+          klines:                 ->  (data) { nil },
+          
+          index_markets:          ->  (data) { nil },
+          contract_price_limits:  ->  (data) { nil },
         }
       end
 
@@ -56,10 +62,22 @@ module Bibox
         self.socket.onerror     =   method(:on_error)
       end
       
+      def login!
+        subscribe_to! channel_name("ALL_ALL_login")
+      end
+      
       def subscribe_to_trading_pairs!
         subscribe_to! channel_name("ALL_ALL_market")
       end
       
+      def subscribe_to_index_markets!
+        subscribe_to! channel_name("ALL_ALL_indexMarket")
+      end
+      
+      def subscribe_to_contract_price_limits!
+        subscribe_to! channel_name("ALL_ALL_contractPriceLimit")
+      end
+      
       def subscribe_to_order_book!(pairs: [])
         pairs&.each { |pair| subscribe_to! channel_name("#{pair}_depth") }
       end
@@ -105,6 +123,10 @@ module Bibox
             period = channel.match(self.matchers[:klines])&.[](:period)
             data.merge!("period" => period) if !period.to_s.empty?
             self.callbacks[:klines].call(data)
+          when self.matchers[:index_markets]
+            self.callbacks[:index_markets].call(data)
+          when self.matchers[:contract_price_limits]
+            self.callbacks[:contract_price_limits].call(data)
         end
       end
 
@@ -116,10 +138,6 @@ module Bibox
           return data
         end
         
-        def decode_and_inflate(data)
-          Zlib::GzipReader.new(StringIO.new(Base64.decode64(data))).read
-        end
-        
         def send_pong(timestamp)
           self.socket.send({pong: timestamp}.to_json)
         end
@@ -130,7 +148,7 @@ module Bibox
 
         def on_message(event)
           parsed                =   parse(event.data)
-
+          
           if parsed
             if parsed.is_a?(Hash)
               send_pong(parsed["ping"]) unless parsed.fetch("ping", nil).to_s.empty?
@@ -141,7 +159,7 @@ module Bibox
             is_binary           =   parsed.fetch("binary", nil)&.eql?("1")
 
             if is_binary && !parsed.fetch("data", nil).to_s.empty?
-              parsed["data"]    =   parse(decode_and_inflate(parsed["data"]))
+              parsed["data"]    =   parse(Bibox::Utilities.decode_and_inflate(parsed["data"]))
             end
           
             self.callbacks[:message].call(parsed)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibox
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sebastian Johnsson
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 description: Ruby REST + Websocket clients for crypto currency exchange Bibox's API
 email:
 - sebastian.johnsson@gmail.com
@@ -182,6 +196,7 @@ files:
 - lib/bibox/models/asset.rb
 - lib/bibox/models/base.rb
 - lib/bibox/models/bill.rb
+- lib/bibox/models/contract.rb
 - lib/bibox/models/ohlcv.rb
 - lib/bibox/models/order.rb
 - lib/bibox/models/order_book.rb
@@ -194,6 +209,9 @@ files:
 - lib/bibox/rest/errors.rb
 - lib/bibox/rest/private/assets.rb
 - lib/bibox/rest/private/bills.rb
+- lib/bibox/rest/private/contracts/assets.rb
+- lib/bibox/rest/private/contracts/general.rb
+- lib/bibox/rest/private/contracts/orders.rb
 - lib/bibox/rest/private/order_book.rb
 - lib/bibox/rest/private/orders.rb
 - lib/bibox/rest/private/transfers.rb