bitstamp-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68718e31ee993310d025891b8900eb9eab314ac7
-  data.tar.gz: 3f0cc7a9f8ec7b939951f8de45bde8357a696ea9
+  metadata.gz: d3d492215e09b3c436dbc34f194cb53e3da584ad
+  data.tar.gz: c52480edde3169a738e47bf7616c3ce0005ba9ac
 SHA512:
-  metadata.gz: f0fae35f3bb75f5bbde75dd5e391df478446b6cdf7b5597fdbd3331ce9a51c732c868653818cfbbc015db5ba4e6d74e64125e87610e12296ac931ec609440138
-  data.tar.gz: 65b74db6cc22aa81c52dae6f24b8b027f92bece7d65e7136f2efaab609ae5549fddbdc652149bb9dab57d5499651d6d5fdd2f02afecef9b2726852022c8141fe
+  metadata.gz: 5b2f78be1babf0ce6f0dea0d2371690e20df25fcb0ada76139bb89a27717f9ea1d7d92966aa2950f1ce09c8019f5332e9480ccb474bc7921ddc6ee1499be7877
+  data.tar.gz: f40c6c6ae885dd7f7f51c58be9801e55fe598233e125091013e80a7209b6c4d8f532cdfb4974740f0051e6ca9588bf8b314a4e9601dead2d51fe8d9cb2c27137

data/lib/bitstamp/client.rb

@@ -3,18 +3,8 @@ require 'json'
 require 'openssl'
 require 'typhoeus'
 
-require_relative './account_balance'
-require_relative './deposit'
-require_relative './conversion_rates'
-require_relative './exception'
-require_relative './order_book'
-require_relative './orders'
-require_relative './subaccount_transfer'
-require_relative './ticker'
-require_relative './trading_pairs'
-require_relative './transactions'
-require_relative './user_transactions'
-require_relative './withdrawal'
+require_relative './handler'
+require_relative './http'
 
 module Bitstamp
   class Client
@@ -22,21 +12,23 @@ module Bitstamp
 
     BASE_URI = 'https://www.bitstamp.net/api'
 
+    CONNECTTIMEOUT = 1
+    TIMEOUT        = 10
+
+
     def initialize(customer_id:, api_key:, secret:)
       @customer_id    = customer_id
       @api_key        = api_key
       @secret         = secret
-
-      @connecttimeout = 1
-      @timeout        = 10
     end
 
     class << self
-      include ::Bitstamp::ConversionRates
-      include ::Bitstamp::OrderBook
-      include ::Bitstamp::Ticker
-      include ::Bitstamp::TradingPairs
-      include ::Bitstamp::Transactions
+      include ::Bitstamp::Handler
+      include ::Bitstamp::HTTP::ConversionRates
+      include ::Bitstamp::HTTP::OrderBook
+      include ::Bitstamp::HTTP::Ticker
+      include ::Bitstamp::HTTP::TradingPairs
+      include ::Bitstamp::HTTP::Transactions
 
       def request_uri(*parts)
         uri = BASE_URI
@@ -56,37 +48,25 @@ module Bitstamp
           headers: {
             'User-Agent' => "Bitstamp::Client Ruby v#{::Bitstamp::VERSION}"
           },
-          connecttimeout: @connecttimeout,
-          timeout:        @timeout,
+          connecttimeout: CONNECTTIMEOUT,
+          timeout:        TIMEOUT
         }
 
         request = ::Typhoeus::Request.new(request_uri, request_hash)
         response = request.run
 
-        return handle_response(response)
-      end
-
-      def handle_response(response)
-        body = JSON.parse(response.body)
-
-        if body.kind_of?(Hash) && body.has_key?('error')
-          raise ::Bitstamp::Exception::ServiceError(body)
-        end
-
-        return body
-      rescue JSON::ParserError
-        raise ::Bitstamp::Exception::InvalidContent.new(response.body)
+        return handle_body(response.body)
       end
     end
 
-    def_delegators "Bitstamp::Client", :request_uri, :handle_response
+    def_delegators "Bitstamp::Client", :request_uri
 
-    include ::Bitstamp::AccountBalance
-    include ::Bitstamp::Deposit
-    include ::Bitstamp::Orders
-    include ::Bitstamp::SubaccountTransfer
-    include ::Bitstamp::UserTransactions
-    include ::Bitstamp::Withdrawal
+    include ::Bitstamp::HTTP::AccountBalance
+    include ::Bitstamp::HTTP::Deposit
+    include ::Bitstamp::HTTP::Orders
+    include ::Bitstamp::HTTP::SubaccountTransfer
+    include ::Bitstamp::HTTP::UserTransactions
+    include ::Bitstamp::HTTP::Withdrawal
 
     def call(request_uri, method, body)
       body = params_with_signature(body)
@@ -110,33 +90,5 @@ module Bitstamp
 
       return OpenSSL::HMAC.hexdigest("SHA256", @secret, message).upcase
     end
-
-    private
-
-    def run_request(path:, nonce:, request_params: {})
-      body = request_params.merge(
-        {
-          key:       key,
-          signature: signature(nonce),
-          nonce:     nonce
-        }
-      )
-
-      request_uri = BASE_URI + path
-
-      request_hash = {
-        method: 'POST',
-        body:   body
-      }
-
-      request  = ::Typhoeus::Request.new(request_uri, request_hash)
-      response = request.run
-    end
-
-    def signature(nonce)
-      message = nonce + @customer_id + @api_key
-
-      return OpenSSL::HMAC.hexdigest("SHA256", @secret, message)
-    end
   end
 end

data/lib/bitstamp/exception.rb

@@ -1,14 +1,10 @@
 module Bitstamp
   module Exception
     class ServiceError < StandardError
-      attr_reader :body
-
-      def initialize(body)
-        @body = body
-      end
+      attr_reader :message
 
-      def message
-        @body.fetch('error')
+      def initialize(message)
+        @message = message
       end
 
       alias_method :to_s, :message
@@ -17,12 +13,12 @@ module Bitstamp
     class InvalidContent < StandardError
       attr_reader :body
 
-      def initialize(body)
-        @body = body
+      def initialize(raw_body)
+        @raw_body = raw_body
       end
 
       def message
-        "Failed to parse body as 'json': '#{@body}'"
+        "Failed to parse body as 'json': '#{@raw_body}'"
       end
 
       def inspect

data/lib/bitstamp/handler.rb

@@ -0,0 +1,21 @@
+require_relative './exception'
+
+module Bitstamp
+  module Handler
+    def handle_body(raw_body)
+      body = JSON.parse(raw_body)
+
+      if body.kind_of?(Hash)
+        if body.has_key?('error')
+          raise ::Bitstamp::Exception::ServiceError.new(body.fetch('error'))
+        elsif body.has_key?('status') && body.fetch('status') == 'error'
+          raise ::Bitstamp::Exception::ServiceError.new(body.fetch('reason'))
+        end
+      end
+
+      return body
+    rescue JSON::ParserError
+      raise ::Bitstamp::Exception::InvalidContent.new(raw_body)
+    end
+  end
+end

data/lib/bitstamp/http.rb

@@ -0,0 +1,16 @@
+module Bitstamp
+  module HTTP
+  end
+end
+
+require_relative './http/account_balance'
+require_relative './http/deposit'
+require_relative './http/conversion_rates'
+require_relative './http/order_book'
+require_relative './http/orders'
+require_relative './http/subaccount_transfer'
+require_relative './http/ticker'
+require_relative './http/trading_pairs'
+require_relative './http/transactions'
+require_relative './http/user_transactions'
+require_relative './http/withdrawal'

data/lib/bitstamp/{account_balance.rb → http/account_balance.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module AccountBalance
     def account_balance(nonce: nil, currency_pair: nil)
       params = { nonce: nonce }

data/lib/bitstamp/{conversion_rates.rb → http/conversion_rates.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module ConversionRates
     def eur_usd_conversion_rate
       return call(request_uri('eur_usd'), 'GET', nil)

data/lib/bitstamp/{deposit.rb → http/deposit.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module Deposit
     def bitcoin_deposit_address(nonce: nil)
       params = { nonce: nonce }

data/lib/bitstamp/{order_book.rb → http/order_book.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module OrderBook
     def order_book(currency_pair: nil)
       if currency_pair == nil

data/lib/bitstamp/{orders.rb → http/orders.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module Orders
     def open_orders(nonce: nil, currency_pair: nil)
       params = { nonce: nonce }
@@ -28,18 +28,21 @@ module Bitstamp
       call(request_uri('cancel_all_orders'), 'POST', params)
     end
 
-    def buy_limit_order(nonce: nil, amount:, price:, limit_price:, currency_pair:)
+    def buy_limit_order(nonce: nil, amount:, price:, limit_price: nil, currency_pair:)
       params = {
-        nonce:       nonce,
-        amount:      amount,
-        price:       price,
-        limit_price: limit_price
+        nonce:  nonce,
+        amount: amount,
+        price:  price
       }
 
+      if limit_price != nil
+        params[:limit_price] = limit_price
+      end
+
       call(request_uri('v2', 'buy', currency_pair), 'POST', params)
     end
 
-    def buy_market_order(nonce: nil, amount:)
+    def buy_market_order(nonce: nil, amount:, currency_pair:)
       params = {
         nonce:       nonce,
         amount:      amount,
@@ -48,18 +51,21 @@ module Bitstamp
       call(request_uri('v2', 'buy', 'market', currency_pair), 'POST', params)
     end
 
-    def sell_limit_order(nonce: nil, amount:, price:, limit_price:, currency_pair:)
+    def sell_limit_order(nonce: nil, amount:, price:, limit_price: nil, currency_pair:)
       params = {
         nonce:       nonce,
         amount:      amount,
-        price:       price,
-        limit_price: limit_price
+        price:       price
       }
 
+      if limit_price != nil
+        params[:limit_price] = limit_price
+      end
+
       call(request_uri('v2', 'sell', currency_pair), 'POST', params)
     end
 
-    def sell_market_order(nonce: nil, amount:)
+    def sell_market_order(nonce: nil, amount:, currency_pair:)
       params = {
         nonce:       nonce,
         amount:      amount,

data/lib/bitstamp/{subaccount_transfer.rb → http/subaccount_transfer.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module SubaccountTransfer
     def transfer_to_main(nonce: nil, amount:, currency:, sub_account:)
       params = {

data/lib/bitstamp/http/ticker.rb

@@ -0,0 +1,11 @@
+module Bitstamp::HTTP
+  module Ticker
+    def ticker(currency_pair:)
+      return call(request_uri('v2', 'ticker', currency_pair), 'GET', nil)
+    end
+
+    def hourly_ticker(currency_pair:)
+      return call(request_uri('v2', 'ticker_hour', currency_pair), 'GET', nil)
+    end
+  end
+end

data/lib/bitstamp/{trading_pairs.rb → http/trading_pairs.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module TradingPairs
     def trading_pair_info
       return call(request_uri('v2', 'trading-pair-info'), 'GET', nil)

data/lib/bitstamp/http/transactions.rb

@@ -0,0 +1,7 @@
+module Bitstamp::HTTP
+  module Transactions
+    def transactions(currency_pair:)
+      return call(request_uri('v2', 'transactions', currency_pair), 'GET', nil)
+    end
+  end
+end

data/lib/bitstamp/{user_transactions.rb → http/user_transactions.rb}

@@ -1,7 +1,12 @@
-module Bitstamp
+module Bitstamp::HTTP
   module UserTransactions
     def user_transactions(nonce: nil, offset: 0, limit: 100, sort: 'desc', currency_pair: nil)
-      params = { nonce: nonce }
+      params = {
+        nonce:  nonce,
+        offset: offset,
+        limit:  limit,
+        sort:   sort
+      }
 
       if currency_pair == nil
         call(request_uri('v2', 'user_transactions'), 'POST', params)

data/lib/bitstamp/{withdrawal.rb → http/withdrawal.rb}

@@ -1,4 +1,4 @@
-module Bitstamp
+module Bitstamp::HTTP
   module Withdrawal
     def withdrawal_requests(nonce: nil, timedelta: 86400)
       params = { nonce: nonce, timedelta: timedelta }
@@ -10,7 +10,7 @@ module Bitstamp
       params = {
         nonce:   nonce,
         amount:  amount,
-        address: address,
+        address: address
       }
 
       call(request_uri('bitcoin_withdrawal'), 'POST', params)

data/lib/bitstamp/socket.rb

@@ -0,0 +1,7 @@
+module Bitstamp
+  module Socket
+  end
+end
+
+require_relative './socket/orders.rb'
+require_relative './socket/trades.rb'

data/lib/bitstamp/socket/orders.rb

@@ -0,0 +1,38 @@
+module Bitstamp::Socket
+  module Orders
+    def live_order_book(currency_pair:, &block)
+      channel = "order_book_#{currency_pair}"
+      event   = 'data'
+
+      listen(channel, event, block)
+    end
+
+    def live_orders_created(currency_pair:, &block)
+      channel = "live_orders_#{currency_pair}"
+      event   = 'order_created'
+
+      listen(channel, event, block)
+    end
+
+    def live_orders_changed(currency_pair:, &block)
+      channel = "live_orders_#{currency_pair}"
+      event   = 'order_changed'
+
+      listen(channel, event, block)
+    end
+
+    def live_orders_deleted(currency_pair:, &block)
+      channel = "live_orders_#{currency_pair}"
+      event   = 'order_deleted'
+
+      listen(channel, event, block)
+    end
+
+    def live_full_order_book(currency_pair:, &block)
+      channel = "diff_order_book_#{currency_pair}"
+      event   = 'data'
+
+      listen(channel, event, block)
+    end
+  end
+end

data/lib/bitstamp/socket/trades.rb

@@ -0,0 +1,10 @@
+module Bitstamp::Socket
+  module Trades
+    def live_trades(currency_pair:, &block)
+      channel = "live_trades_#{currency_pair}"
+      event   = 'trade'
+
+      listen(channel, event, block)
+    end
+  end
+end

data/lib/bitstamp/version.rb

@@ -1,3 +1,3 @@
 module Bitstamp
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/bitstamp/websocket.rb

@@ -2,62 +2,64 @@ require 'faye/websocket'
 require 'eventmachine'
 require 'json'
 
+require_relative './handler'
+require_relative './socket'
+
 module Bitstamp
   class Websocket
+    include ::Bitstamp::Handler
+    include ::Bitstamp::Socket::Orders
+    include ::Bitstamp::Socket::Trades
+
     BASE_URI  = 'wss://ws.pusherapp.com/app/de504dc5763aeef9ff52'
     CLIENT_ID = 'bitstamp-client'
     PROTOCOL  = 7
-    PARAMS    = "?#{CLIENT_ID}&version=#{Bitstamp::VERSION}&protocol=#{PROTOCOL}"
+    PARAMS    = "?client=#{CLIENT_ID}&version=#{Bitstamp::VERSION}&protocol=#{PROTOCOL}"
 
     def initialize(logger)
       @logger = logger
     end
 
-    def live_trades(currency_pair:, &block)
-      channel = "live_trades_#{currency_pair}"
-      event   = 'trade'
-
-      listen(channel, event, block)
-    end
-
-    private
-
     def listen(channel, event, block)
       EM.run do
-        websocket = Faye::WebSocket::Client.new(BASE_URI + PARAMS)
+        setup_socket(channel, event, block)
+      end
+    end
 
-        websocket.on(:open) do |message|
-          subscribe(websocket, channel)
-          @logger.debug("Opened connection and subscribed to #{channel}")
-        end
+    def setup_socket(channel, event, block)
+      websocket = Faye::WebSocket::Client.new(BASE_URI + PARAMS)
+
+      websocket.on(:open) do |message|
+        subscribe(websocket, channel)
+        @logger.debug("Opened connection and subscribed to '#{channel}'")
+      end
 
-        websocket.on(:message) do |message|
-          parsed_message = JSON.parse(message.data)
+      websocket.on(:message) do |message|
+        parsed_message = handle_body(message.data)
 
-          case parsed_message.fetch('event')
-          when event
-            data = JSON.parse(parsed_message.fetch('data'))
-            block.call(data)
-          when 'pusher:connection_established'
-            @logger.debug('Connection established')
-          when 'pusher_internal:subscription_succeeded'
-            @logger.debug("Subscription to channel '#{channel}' succeeded")
-          else
-            @logger.debug("Received unhandled message: #{message.data.to_s}")
-          end
+        case parsed_message.fetch('event')
+        when event
+          data = handle_body(parsed_message.fetch('data'))
+          block.call(data)
+        when 'pusher:connection_established'
+          @logger.debug('Connection established')
+        when 'pusher_internal:subscription_succeeded'
+          @logger.debug("Subscription to channel '#{channel}' succeeded")
+        else
+          @logger.debug("Received unhandled message: #{message.data.to_s}")
         end
+      end
 
-        websocket.on(:close) do |message|
-          @logger.debug("Closed websocket connection: #{message.data.to_s}")
+      websocket.on(:close) do |message|
+        @logger.debug("Closed websocket connection: #{message.data.to_s}")
 
-          return
-        end
+        return
       end
     end
 
     def subscribe(websocket, channel)
       subscribe_message = {
-        event: "pusher:subscribe",
+        event: 'pusher:subscribe',
         data:  { channel: channel }
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitstamp-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -172,21 +172,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bitstamp.rb
-- lib/bitstamp/account_balance.rb
 - lib/bitstamp/client.rb
-- lib/bitstamp/conversion_rates.rb
-- lib/bitstamp/deposit.rb
 - lib/bitstamp/exception.rb
-- lib/bitstamp/order_book.rb
-- lib/bitstamp/orders.rb
-- lib/bitstamp/subaccount_transfer.rb
-- lib/bitstamp/ticker.rb
-- lib/bitstamp/trading_pairs.rb
-- lib/bitstamp/transactions.rb
-- lib/bitstamp/user_transactions.rb
+- lib/bitstamp/handler.rb
+- lib/bitstamp/http.rb
+- lib/bitstamp/http/account_balance.rb
+- lib/bitstamp/http/conversion_rates.rb
+- lib/bitstamp/http/deposit.rb
+- lib/bitstamp/http/order_book.rb
+- lib/bitstamp/http/orders.rb
+- lib/bitstamp/http/subaccount_transfer.rb
+- lib/bitstamp/http/ticker.rb
+- lib/bitstamp/http/trading_pairs.rb
+- lib/bitstamp/http/transactions.rb
+- lib/bitstamp/http/user_transactions.rb
+- lib/bitstamp/http/withdrawal.rb
+- lib/bitstamp/socket.rb
+- lib/bitstamp/socket/orders.rb
+- lib/bitstamp/socket/trades.rb
 - lib/bitstamp/version.rb
 - lib/bitstamp/websocket.rb
-- lib/bitstamp/withdrawal.rb
 homepage: https://github.com/tobischo/bitstamp
 licenses:
 - MIT

data/lib/bitstamp/ticker.rb

@@ -1,19 +0,0 @@
-module Bitstamp
-  module Ticker
-    def ticker(currency_pair: nil)
-      if currency_pair == nil
-        return call(request_uri('ticker'), 'GET', nil)
-      else
-        return call(request_uri('v2', 'ticker', currency_pair), 'GET', nil)
-      end
-    end
-
-    def hourly_ticker(currency_pair: nil)
-      if currency_pair == nil
-        return call(request_uri('ticker_hour'), 'GET', nil)
-      else
-        return call(request_uri('v2', 'ticker_hour', currency_pair), 'GET', nil)
-      end
-    end
-  end
-end

data/lib/bitstamp/transactions.rb

@@ -1,11 +0,0 @@
-module Bitstamp
-  module Transactions
-    def transactions(currency_pair: nil)
-      if currency_pair == nil
-        return call(request_uri('transactions'), 'GET', nil)
-      else
-        return call(request_uri('v2', 'transactions', currency_pair, ''), 'GET', nil)
-      end
-    end
-  end
-end