poloniex_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f6cc08ad5faec147135e5469ba13690c9e1a4d
-  data.tar.gz: 40139a798ac2ac7a4cc247ebf7fd7ce5f69fc102
+  metadata.gz: b9dc6f92ad54feb3b6fd28fc8c68514010a1f20a
+  data.tar.gz: 2d0c918530cbac989d065417f35d2c563c840c60
 SHA512:
-  metadata.gz: 1fc969743b1352410943254c242ce36c712ba2b436aeb2591795c91685506647a1edeb725a8cfb178d57c7038534ac20a23e89a1acf81c23baa9a08c92b0e57e
-  data.tar.gz: db528b1d2fcfd611ddb682beb4e6a081f52d4f8e154226c67220798b1d67ff638dbe651ebf185c7a0a4e383087ad00a77efbd91b1ec866eabe615e0ab94c9cb0
+  metadata.gz: 4eb532356fc687cfa06ec7dd5261b7f5940d6daf6b8e1a2c35f7ee01f7ab006e6897f4f33c14b105e4d175e49a1d6c29c64ef3ef328721ff9e129bfc6f168a68
+  data.tar.gz: fd8c5aa587ff4a7a67b0327ddba0eb125692c9b36cf12b09a23e34c5e0bb8944a107920cba8d0eb4be0d760dff722d822bb44ceb10b8e5fcb63600ceb3c2c446

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+
+## [0.0.2] - 2017-08-29
+
+### Added
+- Wrap get and post calls in retry loops
+- Add timeout values to requests
+
+### Changed
+- Updated `market_trade_hist` to follow the call pattern
+
+## 0.0.1 - 2017-08-27
+### Added
+- Public and private API commands return JSON response 
+
+[Unreleased]: https://github.com/brianmcmichael/poloniex_api/compare/v0.0.2...HEAD
+[0.0.2]: https://github.com/brianmcmichael/poloniex_api/compare/v0.0.1...v0.0.2

data/lib/poloniex/version.rb

@@ -1,3 +1,3 @@
 module Poloniex
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/poloniex.rb

@@ -24,10 +24,8 @@
 
 
 # TODO
-# [ ] Add retries functionality
 # [ ] Test withdraw method
 # [ ] Test margin_buy method
-# [ ] Better mapping of _get method
 # [ ] Clean up the post request
 # [ ] Refactor market_trade_hist
 # [ ] Add examples
@@ -41,10 +39,11 @@ require 'logger'
 require 'uri'
 require 'base64'
 require 'digest'
+require 'timeout'
 
 module Poloniex
 
-  RETRY_DELAYS = [0, 2, 5, 30]
+  RETRY_DELAYS = [0, 2, 5, 30, nil]
 
   # Possible Commands
   PUBLIC_COMMANDS = %w(returnTicker return24hVolume returnOrderBook marketTradeHist returnChartData returnCurrencies returnLoanOrders)
@@ -75,9 +74,8 @@ module Poloniex
     # @param [String] key api key supplied by Poloniex
     # @param [String] secret hash supplied by Poloniex
     # @param [int] timeout time in sec to wait for an api response
-    #   (otherwise 'requests.exceptions.Timeout' is raised)
     # @param [datatype] json_nums to use when parsing json ints and floats
-    def initialize(key = false, secret = false, timeout = nil, json_nums = false)
+    def initialize(key = false, secret = false, timeout = 3, json_nums = false)
       self.logger = Logger.new(STDOUT)
 
       # create nonce
@@ -88,28 +86,6 @@ module Poloniex
       self.timeout = timeout
     end
 
-    # FIXME make this a decorator
-    def retry(func)
-    end
-
-    def retrying(*args, **kwargs)
-      problems = []
-      RETRY_DELAYS.each do |delay|
-        begin
-          # attempt call
-          return func(*args, **kwargs)
-        rescue Poloniex::RequestException.new => problem
-          problems.push problem
-          if delay == RETRY_DELAYS.last
-            raise Poloniex::RetryException.new "Retry delays exhausted #{problem}"
-          end
-        end
-        if problems.any?
-          LOGGER.debug problems.join("\n")
-        end
-      end
-    end
-
     # """ Main Api Function
     #   - encodes and sends <command> with optional [args] to Poloniex api
     #   - raises 'poloniex.PoloniexError' if an api key or secret is missing
@@ -120,6 +96,8 @@ module Poloniex
       # Get command type
       cmd_type = self.check_command(command)
 
+      problems = []
+
       # Pass the command
       args['command'] = command
       payload = {}
@@ -150,22 +128,52 @@ module Poloniex
             'Key' => key
         }
 
-        # Send the call
-        # FIXME
-        ret = _post(PRIVATE_API_BASE, args, payload['headers'])
+        RETRY_DELAYS.each do |delay|
+          begin
+            # attempt call
+            # Send the call
+            ret = _post(PRIVATE_API_BASE, args, payload['headers'])
+
+            # Return the data
+            return self.handle_returned(ret.body)
+          rescue Poloniex::RequestException => problem
+            problems.push problem
+            if delay == RETRY_DELAYS.last
+              raise Poloniex::RetryException.new "Retry delays exhausted #{problem}"
+            else
+              LOGGER.debug(problem)
+              LOGGER.info("-- delaying for #{delay} seconds")
+              sleep(delay)
+            end
+          rescue => e
+            puts e
+          end
+
 
-        # Return the data
-        return self.handle_returned(ret.body)
+        end
       end
       if cmd_type == 'Public'
 
         # Encode URL
         payload['url'] = PUBLIC_API_BASE + URI.encode_www_form(args)
 
-        # Send the call
-        ret = _get(payload['url'])
-
-        return self.handle_returned(ret)
+        RETRY_DELAYS.each do |delay|
+          begin
+            # Send the call
+            ret = _get(payload['url'])
+
+            return self.handle_returned(ret)
+          rescue Poloniex::RequestException => problem
+            problems.push problem
+            if delay == RETRY_DELAYS.last
+              raise Poloniex::RetryException.new "Retry delays exhausted #{problem}"
+            else
+              LOGGER.debug(problem)
+              LOGGER.info("-- delaying for #{delay} seconds")
+              sleep(delay)
+            end
+          end
+        end
       end
     end
 
@@ -243,11 +251,8 @@ module Poloniex
     # Returns the past 200 trades for a given market, or up to 50,000
     # trades between a range specified in UNIX timestamps by the "start" and
     # "end" parameters.
-    #
-    # FIXME: Why is this performing it's own GET? Can this use self.call()?
     def market_trade_hist(currency_pair, _start: false, _end: false)
-      args =  {
-          "command" => 'returnTradeHistory',
+      args = {
           "currencyPair" => currency_pair.to_s.upcase
       }
       if _start
@@ -256,11 +261,8 @@ module Poloniex
       if _end
         args['end'] = _end
       end
-      url = URI.parse(PUBLIC_API_BASE)
-      url.query = URI.encode_www_form(args)
-      ret = _get(url.to_s, timeout: self.timeout)
 
-      self.handle_returned(ret)
+      self.call('returnTradeHistory', args)
     end
 
     # Returns candlestick chart data. Parameters are "currencyPair",
@@ -683,14 +685,22 @@ module Poloniex
       "#{'%.6f' % Time.now.to_f}".gsub('.', '').to_i
     end
 
-    # TODO utilize path and port
-    def _get(uri, path = nil, port = nil)
-      address = URI.parse(uri)
-      Net::HTTP.get(address)
+    # Perform the HTTP GET
+    def _get(path)
+      address = URI.parse(path)
+      begin
+        Timeout::timeout(self.timeout) {
+          Net::HTTP.get(address)
+        }
+      rescue Timeout::Error
+        raise Poloniex::RequestException.new "Request took longer than #{self.timeout} seconds!"
+      end
+
     end
 
-    def _post(url, data = {}, initheader = nil, dest = nil)
-      address = URI.parse(url)
+    # Perform the HTTP POST
+    def _post(path, data = {}, initheader = nil, dest = nil)
+      address = URI.parse(path)
       form_data = data
       headers = initheader
 
@@ -698,10 +708,17 @@ module Poloniex
       http.use_ssl = true
 
       request = Net::HTTP::Post.new(address.request_uri, headers)
+
       request.body = URI.encode_www_form(form_data).encode(UTF_8)
 
-      response = http.request(request)
-      response
+      begin
+        Timeout::timeout(self.timeout) {
+          http.request(request)
+        }
+      rescue Timeout::Error
+        raise Poloniex::RequestException.new "Request took longer than #{self.timeout} seconds!"
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poloniex_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brian McMichael
@@ -17,6 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE
 - README.md