oanda_api 0.9.5 → 0.9.6

data/spec/oanda_api/examples/spread_history_spec.rb

@@ -10,15 +10,15 @@ describe "OandaAPI::Resource::Labs::SpreadHistory" do
       expect(spread_history).to be_an OandaAPI::Resource::Labs::SpreadHistory
 
       expect(spread_history.averages.first.spread).to be_a Numeric
-      expect(spread_history.averages.first.timestamp).to be_a Fixnum
+      expect(spread_history.averages.first.timestamp).to be_a Integer
       expect(spread_history.averages.first.time).to be_a Time
 
       expect(spread_history.maximums.first.spread).to be_a Numeric
-      expect(spread_history.maximums.first.timestamp).to be_a Fixnum
+      expect(spread_history.maximums.first.timestamp).to be_a Integer
       expect(spread_history.maximums.first.time).to be_a Time
 
       expect(spread_history.minimums.first.spread).to be_a Numeric
-      expect(spread_history.minimums.first.timestamp).to be_a Fixnum
+      expect(spread_history.minimums.first.timestamp).to be_a Integer
       expect(spread_history.minimums.first.time).to be_a Time
     end
   end

data/spec/oanda_api/resource_collection_spec.rb

@@ -44,6 +44,15 @@ describe "OandaAPI::ResourceCollection" do
           expect(resource_collection.extra).to eq "I'm special"
         end
       end
+
+      describe "with location argument" do
+        let(:resource_collection) { OandaAPI::ResourceCollection.new({ candles: []}, resource_descriptor, location: "/some/resource/id" ) }
+
+        it "has a location accessor" do
+          expect(resource_collection.location).to eq "/some/resource/id"
+        end
+      end
+
     end
 
     context "without the collection attribute expected by the resource descriptor " do

data/spec/oanda_api/streaming/client_spec.rb

@@ -79,15 +79,15 @@ describe "OandaAPI::Streaming::Client" do
       events_json = <<-END
       {"heartbeat":{"time":"2014-05-26T13:58:40Z"}}\r\n
       {"transaction":{"id":10001}}\r\n
-      {"transaction":{"id":10002}}
+      {"transaction":{"id":10002}}\r\n
       END
 
       client = OandaAPI::Streaming::Client.new(:practice, "token")
       stub_request(:get, "https://stream-fxpractice.oanda.com/v1/events").to_return(body: events_json, status: 200)
-      
+
       [{emit_heartbeats: true,  heartbeats: 1, non_heartbeats: 2},
        {emit_heartbeats: false, heartbeats: 0, non_heartbeats: 2}].each do |test|
-        
+
         client.emit_heartbeats = test[:emit_heartbeats]
         heartbeats = non_heartbeats = 0
         client.events.stream do |resource|
@@ -115,7 +115,7 @@ describe "OandaAPI::Streaming::Client" do
       events_json = <<-END
       {"heartbeat":{"time":"2014-05-26T13:58:40Z"}}\r\n
       {"transaction":{"id":10001}}\r\n
-      {"transaction":{"id":10002}}
+      {"transaction":{"id":10002}}\r\n
       END
       stub_request(:get, "https://stream-fxpractice.oanda.com/v1/events").to_return(body: events_json, status: 200)
 
@@ -131,7 +131,7 @@ describe "OandaAPI::Streaming::Client" do
   describe "#stop!" do
     events_json = <<-END
       {"transaction":{"id": 1}}\r\n
-      {"transaction":{"id": 2}}
+      {"transaction":{"id": 2}}\r\n
     END
 
     context "without using #stop!" do

data/spec/oanda_api/streaming/request_spec.rb

@@ -57,7 +57,7 @@ describe "OandaAPI::Streaming::Request" do
     it "yields all resources returned in the response stream" do
       events_json = <<-END
         {"transaction":{"id": 1}}\r\n
-        {"transaction":{"id": 2}}
+        {"transaction":{"id": 2}}\r\n
       END
       ids = []
       stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
@@ -75,7 +75,7 @@ describe "OandaAPI::Streaming::Request" do
           {"transaction":{"id": 1}}\r\n
           {"heartbeat":{"id" : 0}}\r\n
           {"transaction":{"id": 2}}\r\n
-          {"heartbeat":{"id" : 0}}
+          {"heartbeat":{"id" : 0}}\r\n
         END
         ids =  []
         stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
@@ -92,7 +92,7 @@ describe "OandaAPI::Streaming::Request" do
           {"transaction":{"id": 1}}\r\n
           {"heartbeat":{"id" : 20}}\r\n
           {"transaction":{"id": 2}}\r\n
-          {"heartbeat":{"id" : 30}}
+          {"heartbeat":{"id" : 30}}\r\n
         END
         transactions = []
         heartbeats = 0
@@ -115,7 +115,7 @@ describe "OandaAPI::Streaming::Request" do
         events_json = <<-END
           {"transaction":{"id": 1}}\r\n
           {"disconnect":{"code":60,"message":"Access Token connection limit exceeded"}}\r\n
-          {"transaction":{"id": 2}}
+          {"transaction":{"id": 2}}\r\n
         END
 
         stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
@@ -130,7 +130,7 @@ describe "OandaAPI::Streaming::Request" do
         events_json = <<-END
           {"transaction":{"id": 1}}\r\n
           {"sponge-bob":{"is": "awesome"}}\r\n
-          {"transaction":{"id": 2}}
+          {"transaction":{"id": 2}}\r\n
         END
 
         stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
@@ -144,7 +144,7 @@ describe "OandaAPI::Streaming::Request" do
       events_json = <<-END
       {"transaction":{"id": 1}}\r\n
       {"transaction":{"id": 2}}\r\n
-      {"transaction":{"id": 3}}
+      {"transaction":{"id": 3}}\r\n
       END
       stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
       ids = []
@@ -160,7 +160,7 @@ describe "OandaAPI::Streaming::Request" do
         events_json = <<-END
         {"heartbeat":{"id": 1}}\r\n
         {"heartbeat":{"id": 2}}\r\n
-        {"heartbeat":{"id": 3}}
+        {"heartbeat":{"id": 3}}\r\n
         END
         stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
         heartbeats = 0
@@ -175,7 +175,7 @@ describe "OandaAPI::Streaming::Request" do
 
     context "when the stream contains multiple undelimited objects" do
       events_json = <<-END
-        {"tick":{"bid": 1}}{"tick":{"bid": 2}}\r\n{"tick":{"bid": 3}}
+        {"tick":{"bid": 1}}{"tick":{"bid": 2}}{"tick":{"bid": 3}}\r\n
       END
 
       it "yields all of the objects" do
@@ -196,5 +196,20 @@ describe "OandaAPI::Streaming::Request" do
         expect(ticks).to contain_exactly(1, 2, 3)
       end
     end
+
+    context "when the stream contains incomplete chunks" do
+      it "yields all of the objects grouping them", focus: true do
+        events_json = <<-END
+          {"tick":{"bid": 1}}\r\n{"ti\r\nck":{"bid": 2}}\r\n{"tick":{"b\r\nid": 3}}\r\n
+        END
+
+        stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
+        ticks = []
+        streaming_request.stream do |resource|
+          ticks << resource.bid
+        end
+        expect(ticks).to contain_exactly(1, 2, 3)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 lib = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
- 
 require 'simplecov'
 SimpleCov.start
 

data/spec/support/client_helper.rb

@@ -2,8 +2,12 @@ require 'support/vcr'
 
 module ClientHelper
   # Returns a practice API client
-  def self.client
-    @client ||= OandaAPI::Client::TokenClient.new :practice, test_account_token
+  def self.client(force_new: false)
+    if force_new
+      OandaAPI::Client::TokenClient.new(:practice, test_account_token)
+    else
+      @client ||= OandaAPI::Client::TokenClient.new :practice, test_account_token
+    end
   end
 
   def self.test_account_token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oanda_api
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Dean Missikowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -78,42 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: " A simple ruby client that supports all of the Oanda REST API methods.
   Uses Oanda recommended best practices including persistent connections, compression,
   request rate throttling, SSL certificate verification."
@@ -124,6 +124,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -161,6 +162,7 @@ files:
 - lib/oanda_api/streaming/client.rb
 - lib/oanda_api/streaming/json_parser.rb
 - lib/oanda_api/streaming/request.rb
+- lib/oanda_api/throttling/throttling.rb
 - lib/oanda_api/utils/utils.rb
 - lib/oanda_api/version.rb
 - oanda_api.gemspec
@@ -170,7 +172,6 @@ files:
 - spec/fixtures/vcr_cassettes/calendar_instrument_and_period_get.yml
 - spec/fixtures/vcr_cassettes/calendar_period_get.yml
 - spec/fixtures/vcr_cassettes/candles_options_get.yml
-- spec/fixtures/vcr_cassettes/client_helper_account.yml
 - spec/fixtures/vcr_cassettes/client_helper_accounts.yml
 - spec/fixtures/vcr_cassettes/instrument_EUR_USD.yml
 - spec/fixtures/vcr_cassettes/instrument_USD_JPY.yml
@@ -196,6 +197,7 @@ files:
 - spec/fixtures/vcr_cassettes/transaction_id_get.yml
 - spec/fixtures/vcr_cassettes/transactions_options_get.yml
 - spec/fixtures/vcr_cassettes/with_throttling_and_max_requests_per_second.yml
+- spec/fixtures/vcr_cassettes/with_throttling_new_connections.yml
 - spec/fixtures/vcr_cassettes/with_throttling_with_multiple_threads.yml
 - spec/fixtures/vcr_cassettes/without_throttling.yml
 - spec/oanda_api/client/client_spec.rb
@@ -246,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A ruby client for the Oanda REST API.
@@ -257,7 +259,6 @@ test_files:
 - spec/fixtures/vcr_cassettes/calendar_instrument_and_period_get.yml
 - spec/fixtures/vcr_cassettes/calendar_period_get.yml
 - spec/fixtures/vcr_cassettes/candles_options_get.yml
-- spec/fixtures/vcr_cassettes/client_helper_account.yml
 - spec/fixtures/vcr_cassettes/client_helper_accounts.yml
 - spec/fixtures/vcr_cassettes/instrument_EUR_USD.yml
 - spec/fixtures/vcr_cassettes/instrument_USD_JPY.yml
@@ -283,6 +284,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/transaction_id_get.yml
 - spec/fixtures/vcr_cassettes/transactions_options_get.yml
 - spec/fixtures/vcr_cassettes/with_throttling_and_max_requests_per_second.yml
+- spec/fixtures/vcr_cassettes/with_throttling_new_connections.yml
 - spec/fixtures/vcr_cassettes/with_throttling_with_multiple_threads.yml
 - spec/fixtures/vcr_cassettes/without_throttling.yml
 - spec/oanda_api/client/client_spec.rb
@@ -313,4 +315,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
 - spec/support/vcr.rb
-has_rdoc: 

data/spec/fixtures/vcr_cassettes/client_helper_account.yml

@@ -1,45 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api-fxpractice.oanda.com/v1/accounts
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      X-Accept-Datetime-Format:
-      - RFC3339
-      Authorization:
-      - Bearer <OANDA_TESTING_API_TOKEN>
-      Connection:
-      - keep-alive
-      Keep-Alive:
-      - 30
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - openresty/1.7.0.1
-      Date:
-      - Mon, 14 Mar 2016 18:52:24 GMT
-      Content-Type:
-      - application/json
-      Content-Length:
-      - '366'
-      Connection:
-      - keep-alive
-      Etag:
-      - '"efb224b14d5e6c03ab1a19a9983274e09d124b20"'
-    body:
-      encoding: UTF-8
-      string: "{\n\t\"accounts\" : [\n\t\t{\n\t\t\t\"accountId\" : 1871900,\n\t\t\t\"accountName\"
-        : \"Primary\",\n\t\t\t\"accountCurrency\" : \"USD\",\n\t\t\t\"marginRate\"
-        : 0.05\n\t\t},\n\t\t{\n\t\t\t\"accountId\" : 1401515,\n\t\t\t\"accountName\"
-        : \"USD\",\n\t\t\t\"accountCurrency\" : \"USD\",\n\t\t\t\"marginRate\" : 0.1\n\t\t},\n\t\t{\n\t\t\t\"accountId\"
-        : 5094848,\n\t\t\t\"accountName\" : \"WTI\",\n\t\t\t\"accountCurrency\" :
-        \"CAD\",\n\t\t\t\"marginRate\" : 0.05\n\t\t}\n\t]\n}"
-    http_version: 
-  recorded_at: Mon, 14 Mar 2016 18:52:25 GMT
-recorded_with: VCR 2.9.3