oanda_api_v20 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb4df9b0234d22ffa2e3949f0f2753a268d7ddcc
-  data.tar.gz: 84480ffb98305fd91f832f453472c80f6a94d508
+  metadata.gz: 895ede3c8740f60d446789c78936ce3b57520b44
+  data.tar.gz: 1656c6021eb792b24ec0f8f004dec60f908d5dd2
 SHA512:
-  metadata.gz: b1850b8f4cda83248d8aec0f68bd44a0974c7784f9865ac776bc61c5e32495f51ca686d95fd71bc7ded214c17b2db69a982d1b38b1c8d6278e25a4ad93ebf358
-  data.tar.gz: aad4901a5dd0c6260a80c6b4e498db00e9ce98b2cc18e6043f493c363504b54a3dc80eb8037021e28ac73428cdd66a4be2a54cf5fbac6659d14af4a37854dd48
+  metadata.gz: 2577d9f7a3c9a4e44c22134a3642486f8d4a94d66df5aa57a68c4fffe7707f7369d8e6b6b1048176f29923e66d8513541203468488b6699ab16eb7ebcaa7d182
+  data.tar.gz: 8dabf1dd99dfa19fce1aedffdc943123259a2f61392866fc33ebf4eb9c0afc7e7430a35b9a546f8ef50d9a700a2b899b6927e673c04af214557bb94a758a8923

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.4
+#### 2016-08-16
+* Limit Oanda API requests to 30 per second.
+
 ## 0.0.3
 #### 2016-08-14
 * Persistent HTTP connections using the persistent_httparty Gem.

data/README.md

@@ -265,7 +265,4 @@ client.account('account_id').pricing(options).show
 There are still a lot to be added to this gem:
 
 - Unit tests using RSpec.
-- Persistent connections using persistent_httparty.
-- No more than 2 connections per second.
-- Limit to 30 requests per second.
 - ...

data/lib/oanda_api_v20/client.rb

@@ -2,6 +2,8 @@ module OandaApiV20
   class Client
     include HTTParty
 
+    MAX_REQUESTS_PER_SECOND_ALLOWED = 30
+
     BASE_URI = {
       live:     'https://api-fxtrade.oanda.com/v3',
       practice: 'https://api-fxpractice.oanda.com/v3'
@@ -15,6 +17,8 @@ module OandaApiV20
         self.send("#{key}=", value) if self.respond_to?("#{key}=")
       end
 
+      @debug = options[:debug] || false
+      @last_api_request_at = Array.new(MAX_REQUESTS_PER_SECOND_ALLOWED)
       @base_uri = options[:practice] == true ? BASE_URI[:practice] : BASE_URI[:live]
 
       @headers = {}
@@ -22,8 +26,6 @@ module OandaApiV20
       @headers['X-Accept-Datetime-Format'] = 'RFC3339'
       @headers['Content-Type']             = 'application/json'
 
-      @debug = options[:debug] || false
-
       persistent_connection_adapter_options = {
         name:         'oanda_api_v20',
         keep_alive:   30,
@@ -42,6 +44,8 @@ module OandaApiV20
         api = Api.new(api_attributes)
 
         if api.respond_to?(last_action)
+          set_last_api_request_at
+          govern_api_request_rate
           response = last_arguments.nil? || last_arguments.empty? ? api.send(last_action, &block) : api.send(last_action, *last_arguments, &block)
           api_result = JSON.parse(response.body)
           set_last_transaction_id(api_result)
@@ -57,12 +61,22 @@ module OandaApiV20
 
     private
 
-    attr_accessor :http_verb, :account_id, :last_transaction_id, :last_action, :last_arguments
+    attr_accessor :http_verb, :account_id, :last_transaction_id, :last_action, :last_arguments, :last_api_request_at
 
     def api_methods
       Accounts.instance_methods + Orders.instance_methods + Trades.instance_methods + Positions.instance_methods + Transactions.instance_methods + Pricing.instance_methods
     end
 
+    def govern_api_request_rate
+      return unless last_api_request_at[0]
+      halt = 60 - (last_api_request_at[MAX_REQUESTS_PER_SECOND_ALLOWED - 1] - last_api_request_at[0])
+      sleep halt if halt > 0
+    end
+
+    def set_last_api_request_at
+      last_api_request_at.push(Time.now.utc).shift
+    end
+
     def set_last_action_and_arguments(action, args)
       set_last_action(action)
       set_last_arguments(args)

data/lib/oanda_api_v20/version.rb

@@ -1,3 +1,3 @@
 module OandaApiV20
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oanda_api_v20
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kobus Joubert