oanda_api 0.9.4 → 0.9.5

data/spec/fixtures/vcr_cassettes/without_throttling.yml

@@ -2,13 +2,15 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -21,7 +23,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:49 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -29,23 +31,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"7307c40c38b58f85d7f3145c3c71bd20c5445765"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:48.718496Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:48 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -58,7 +62,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:50 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -66,23 +70,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:50 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -95,7 +101,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:51 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -103,23 +109,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:51 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -132,7 +140,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:52 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -140,23 +148,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:52 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -169,7 +179,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:53 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -177,23 +187,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:53 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -206,7 +218,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:54 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -214,23 +226,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:54 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -243,7 +257,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:55 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -251,23 +265,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:55 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -280,7 +296,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:56 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -288,23 +304,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:56 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -317,7 +335,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:58 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -325,23 +343,25 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
+  recorded_at: Mon, 14 Mar 2016 16:28:57 GMT
 - request:
     method: get
-    uri: http://api-sandbox.oanda.com/v1/prices?instruments=EUR_USD&username=dwaymotim
+    uri: https://api-fxpractice.oanda.com/v1/prices?instruments=EUR_USD
     body:
       encoding: US-ASCII
       string: ''
     headers:
       X-Accept-Datetime-Format:
       - RFC3339
+      Authorization:
+      - Bearer <OANDA_TESTING_API_TOKEN>
       Connection:
       - keep-alive
       Keep-Alive:
@@ -354,7 +374,7 @@ http_interactions:
       Server:
       - openresty/1.7.0.1
       Date:
-      - Fri, 11 Sep 2015 20:41:30 GMT
+      - Mon, 14 Mar 2016 16:28:59 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -362,12 +382,12 @@ http_interactions:
       Connection:
       - keep-alive
       Etag:
-      - '"f481d760a871b4f679207cd0715bd4be8271f399"'
+      - '"50c652cb079cb183ec34718d3760fd9f07cd9948"'
     body:
       encoding: UTF-8
       string: "{\n\t\"prices\" : [\n\t\t{\n\t\t\t\"instrument\" : \"EUR_USD\",\n\t\t\t\"time\"
-        : \"2015-09-11T20:41:29.948985Z\",\n\t\t\t\"bid\" : 1.24115,\n\t\t\t\"ask\"
-        : 1.24128\n\t\t}\n\t]\n}"
+        : \"2016-03-14T16:28:49.214000Z\",\n\t\t\t\"bid\" : 1.11104,\n\t\t\t\"ask\"
+        : 1.11118\n\t\t}\n\t]\n}"
     http_version: 
-  recorded_at: Fri, 11 Sep 2015 20:41:30 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Mon, 14 Mar 2016 16:28:58 GMT
+recorded_with: VCR 3.0.1

data/spec/oanda_api/client/client_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'uri'
 require 'webmock/rspec'
+require 'support/client_helper'
 
 describe "OandaAPI::Client" do
   describe ".query_string_normalizer" do
@@ -66,16 +67,28 @@ describe "OandaAPI::Client" do
         end
         expect(OandaAPI::Client.last_throttled_at).to be > before_throttled_at
       end
+      it "tracks the time the last request was issued" do
+        OandaAPI.configuration.use_request_throttling = true
+        before_throttled_at = Time.now
+        (OandaAPI.configuration.max_requests_per_second + 2).times do
+          OandaAPI::Client.throttle_request_rate
+        end
+        expect(OandaAPI::Client.last_request_at).to be > before_throttled_at
+        
+      end
+      
     end
   end
 
   describe "#api_uri" do
     let(:client) { Struct.new(:domain) { include OandaAPI::Client }.new }
+    let(:resource_descriptor) {OandaAPI::Client::ResourceDescriptor.new "/accounts", :get}
+    
     it "is domain specific" do
       uris = {}
       OandaAPI::DOMAINS.each do |domain|
         client.domain = domain
-        uris[client.api_uri("/path")] = domain
+        uris[client.api_uri(resource_descriptor)] = domain
       end
       expect(uris.size).to eq(3)
     end
@@ -83,7 +96,7 @@ describe "OandaAPI::Client" do
     it "is an absolute URI" do
       OandaAPI::DOMAINS.each do |domain|
         client.domain = domain
-        uri = URI.parse client.api_uri("/path")
+        uri = URI.parse client.api_uri(resource_descriptor)
         expect(uri.absolute?).to be true
       end
     end
@@ -93,7 +106,7 @@ describe "OandaAPI::Client" do
     let(:client) { (Class.new { include OandaAPI::Client }).new }
 
     it "is called by the constructor of an including class" do
-      OandaAPI::Client.default_options[:connection_adapter] = nil          
+      OandaAPI::Client.default_options[:connection_adapter] = nil
       expect(OandaAPI::Client.default_options[:connection_adapter]).to be_nil
       
       klass = Class.new { include OandaAPI::Client }
@@ -104,30 +117,30 @@ describe "OandaAPI::Client" do
       expect(OandaAPI::Client.default_options[:connection_adapter_options][:keep_alive]).to eq 20
     end
 
-    it "loads a persistent connection adapter" do      
-      OandaAPI::Client.default_options[:connection_adapter] = nil          
+    it "loads a persistent connection adapter" do
+      OandaAPI::Client.default_options[:connection_adapter] = nil
       expect(OandaAPI::Client.default_options[:connection_adapter]).to be_nil
       client.load_persistent_connection_adapter keep_alive: 30
       expect(OandaAPI::Client.default_options[:connection_adapter]).to be_a HTTParty::Persistent::ConnectionAdapter
    end
 
-   it "overrides a persistent connection adapter settings" do      
+   it "overrides a persistent connection adapter settings" do
      client.load_persistent_connection_adapter pool_size: OandaAPI.configuration.connection_pool_size + 1
      expect(OandaAPI::Client.default_options[:connection_adapter_options][:pool_size]).to eq OandaAPI.configuration.connection_pool_size + 1      
    end
   end
-  
+
   describe "#execute_request" do
-    let(:client) { OandaAPI::Client::UsernameClient.new "spongebob" }
+    let(:client) { ClientHelper.client }
 
     it "returns a response for a successful request" do
-      stub_request(:get, "http://api-sandbox.oanda.com/v1/accounts?username=spongebob")
+      stub_request(:get, "https://api-fxpractice.oanda.com/v1/accounts")
         .to_return(status: 200, body: "{\"accounts\" : []}", headers: { "content-type" => "application/json" })
       expect(client.execute_request(:get, "/accounts")).to be_an OandaAPI::ResourceCollection
     end
 
     it "raises OandaAPI::RequestError for an invalid request" do
-      stub_request(:get, "http://api-sandbox.oanda.com/v1/accounts/a_bad_request?username=spongebob")
+      stub_request(:get, "https://api-fxpractice.oanda.com/v1/accounts/a_bad_request")
         .to_return(status:  [404, "Something bad happened (but we still love you)."])
       expect { client.execute_request :get, "/accounts/a_bad_request" }.to raise_error(OandaAPI::RequestError)
     end