oanda_api 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7acc3d30cf5e19c55528d74251a43ad5e6387c
-  data.tar.gz: 6bb298acd99fb97dd08d82d86455e910694e56cc
+  metadata.gz: 9f7f97bda3c0ece6ba2dfbabf7b59cab04991de0
+  data.tar.gz: efcdee86eeca8013b772aac230a5a33476051b12
 SHA512:
-  metadata.gz: f44a232f8c05ee18ec10b8a0e98cba28d865e8533ba2b0efdf7eca8e87936a5e9fadbc2ee49c56a5916f81b7d7063d8dbf9b9371c87d920a7d7f36992bac8f8b
-  data.tar.gz: 63c786402973185453b85fee525936234ac690a49b5119922dfbebb6fc4613512f36cdbe5cfc0bc5d883e2fafec20cf29bd8ea3f19d20fffe6b11e0305d25b7b
+  metadata.gz: 27f14d9b88d7a01908c566ed116bea03c60079a7807ae5449224baabb511ab1ffea8924c6da67aaa47e94253eea5f400cbbac48582897a2f34e2c43392c6e797
+  data.tar.gz: 4dea06ea3ca3763503b44370b14b9adcd2b618a6fc6f6b28cd2ac6d85ed779cb9b8314f198b896eb80434028f81bc912d1dab8f57d74df53f86420f3e467c922

data/CHANGELOG.md

@@ -1,11 +1,29 @@
 # Change Log
 
-## 0.90
+## 0.9.0
 
  * Add support for live [Streaming](http://developer.oanda.com/rest-live/streaming/).
  * Add #to_json serialization to resource classes.
- * fixed Yardoc formatting.
+ * Fixed Yardoc formatting.
 
 ###What's New?
 OandaAPI now supports Oanda's streaming API for consuming realtime ticks and account transactions. See the example in the README and have a look at the specs for `OandaAPI::Streaming::Client`. 
- 
+
+
+
+## 0.9.1
+
+ * Fixed JSON serialization for nested ResourceBase instances.
+ * Fixed some edge cases that could generate ParseError when parsing streaming JSON.
+ * Added support for streaming JSON parsers [yajl-ruby](https://github.com/brianmario/yajl-ruby) and [gson](https://github.com/avsej/gson.rb).
+ * Serialized JSON is now deserialized using symbolized names to avoid garbage collection overhead that occurs when strings are used.
+
+###What's New?
+As with version 0.9.0, `OandaAPI::Streaming::Client` will use the JSON gem parser if it is the only JSON parser installed. However, the JSON gem does not support parsing streams of objects very robustly (i.e. it expects complete documents, or the stream to delimit multiple objects consistently). If you are using the streaming API, and install either the [yajl-ruby](https://github.com/brianmario/yajl-ruby) gem (for MRI and Rubinius ruby) or the [gson](https://github.com/avsej/gson.rb) gem (for jruby), then `OandaAPI::Streaming::Client` will use either of those streaming JSON gems for a gain in reliability.
+
+
+
+## 0.9.2
+
+ * Specify version of HTTParty as 0.13.3 until HTTParty issue #398 is resolved.
+ * Now support any whitespace as delimiting multiple JSON objects in streaming API with `OandaAPI::Streaming::Adapters::Generic`.

data/Gemfile

@@ -4,15 +4,19 @@ gemspec
 
 group :development do
   gem "pry"
-  gem 'pry-stack_explorer'
-  gem 'pry-byebug'
-
+  gem "pry-stack_explorer"
+  gem "pry-byebug"
   gem "guard"
   gem "guard-rspec"
   gem "fuubar"
   gem "redcarpet"
   gem "github-markup"
-  gem "rubocop", require: false
+  gem "rubocop", :require => false
 end
 
-gem 'simplecov', :require => false, :group => :test
+group :test do
+  gem "simplecov", :require => false
+  gem "codeclimate-test-reporter", :group => :test, :require => nil
+  # gem "yajl-ruby"      # install this if you're running under mri or rubinius
+  # gem "gson"           # install this if you're running under jruby
+end

data/README.md

@@ -1,4 +1,6 @@
 # OandaAPI
+[![Code Climate](https://codeclimate.com/github/nukeproof/oanda_api/badges/gpa.svg)](https://codeclimate.com/github/nukeproof/oanda_api) [![Test Coverage](https://codeclimate.com/github/nukeproof/oanda_api/badges/coverage.svg)](https://codeclimate.com/github/nukeproof/oanda_api)
+
 Access Oanda FX accounts, get market data, trade, build trading strategies using Ruby.
 ## Synopsis 
 OandaAPI is a simple Ruby wrapper for the [Oanda REST API](http://developer.oanda.com/rest-live/introduction/).
@@ -128,7 +130,7 @@ client = OandaAPI::Streaming::Client.new(:practice, ENV.fetch("OANDA_PRACTICE_TO
 prices = client.prices(account_id: 1234, instruments: %w[AUD_CAD AUD_CHF])
 prices.stream do |price|
   # Note: The code in this block should handle the price
-  #       as efficently as possible, otherwise the connection could timeout.
+  #       as efficiently as possible, otherwise the connection could timeout.
   #       For example, you could publish the tick on a queue to be handled
   #       by some other thread or process.
   price  # => OandaAPI::Resource::Price

data/lib/oanda_api.rb

@@ -3,6 +3,7 @@ require 'httparty'
 require 'persistent_httparty'
 require 'http/exceptions'
 require 'time'
+require 'erb'  # Hack to fix issue with httparty 0.13.4 [issue 398](https://github.com/jnunemaker/httparty/issues/398)
 
 require_relative 'oanda_api/configuration'
 require_relative 'oanda_api/client/client'
@@ -11,6 +12,7 @@ require_relative 'oanda_api/client/resource_descriptor'
 require_relative 'oanda_api/client/token_client'
 require_relative 'oanda_api/client/username_client'
 require_relative 'oanda_api/streaming/client'
+require_relative 'oanda_api/streaming/json_parser'
 require_relative 'oanda_api/streaming/request'
 require_relative 'oanda_api/errors'
 require_relative 'oanda_api/resource_base'

data/lib/oanda_api/client/client.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'http/exceptions'
+require_relative 'json_parser'
 
 module OandaAPI
   # List of valid subdomains clients can access.
@@ -17,6 +18,9 @@ module OandaAPI
                                   keep_alive: 30,
                                   pool_size: 2
 
+    # Use a custom JSON parser
+    parser OandaAPI::Client::JsonParser
+
     # Resource URI templates
     BASE_URI = {
       live:     "https://api-fxtrade.oanda.com/[API_VERSION]",

data/lib/oanda_api/client/json_parser.rb

@@ -0,0 +1,16 @@
+module OandaAPI
+  module Client
+    #
+    # Overrides the default JSON parser to symbolize names.
+    class JsonParser < HTTParty::Parser
+      SupportedFormats = {"application/json" => :json}
+
+      protected
+
+      # perform json parsing on body
+      def json
+        JSON.parse body, symbolize_names: true
+      end
+    end
+  end
+end

data/lib/oanda_api/resource/candle.rb

@@ -3,6 +3,51 @@ module OandaAPI
     # Candle value object.
     # See the Oanda Developer Guide for information about {http://developer.oanda.com/rest-live/rates/#retrieveInstrumentHistory Candles}.
     class Candle < ResourceBase
+
+      # Granularity Constants
+      # See http://developer.oanda.com/rest-live/rates/#aboutCandlestickRepresentation
+      module Granularity
+        # Top of minute alignments
+        S5  = "S5"
+        S10 = "S10"
+        S15 = "S15"
+        S30 = "S30"
+        M1  = "M1"
+
+        # Top of hour alignments
+        M2  = "M2"
+        M3  = "M3" 
+        M4  = "M4"
+        M5  = "M5"
+        M10 = "M10"
+        M15 = "M15"
+        M30 = "M30"
+        H1  = "H1"
+
+        # Start of day alignments (default 17:00, Timezone/New York)
+        H2  = "H2"
+        H3  = "H3"
+        H4  = "H4"
+        H6  = "H6"
+        H8  = "H8"
+        H12 = "H12"
+        D   = "D1"
+
+        # Start of week alignment (default Friday)
+        W = "W"
+
+        # Start of month alignment (first day of month)
+        M = "M"
+
+        VALID_GRANULARITIES = [S5,S10,S15,S30,M1,M2,M3,M4,M5,M10,M15,M30,H1,H2,H3,H4,H6,H8,H12,D,W,M]
+      end
+
+      # Candle Formats
+      module Format
+        BIDASK   = "bidask"
+        MIDPOINT = "midpoint"
+      end
+
       attr_accessor :close_ask,
                     :close_bid,
                     :close_mid,

data/lib/oanda_api/resource_base.rb

@@ -22,8 +22,8 @@ module OandaAPI
 
     # Serializes an instance as JSON
     # @return [String] a stringified JSON representation of an instance
-    def to_json
-      JSON.generate @_attributes.merge(custom_attributes)
+    def to_json(*args)
+      JSON.generate @_attributes.merge(custom_attributes), *args
     end
 
     private

data/lib/oanda_api/streaming/adapter_error.rb

@@ -0,0 +1,19 @@
+module OandaAPI
+  module Streaming
+    #
+    # Raised if an invalid adapter is used with {OandaAPI::Streaming::JsonParser}
+    class AdapterError < ArgumentError
+      attr_reader :cause
+
+      def self.build(original_exception)
+        message = "Did not recognize your adapter specification (#{original_exception.message})."
+        new(message).tap do |exception|
+          exception.instance_eval do
+            @cause = original_exception
+            set_backtrace original_exception.backtrace
+          end
+        end
+      end
+    end
+  end
+end

data/lib/oanda_api/streaming/adapters/generic.rb

@@ -0,0 +1,29 @@
+module OandaAPI
+  module Streaming
+    #
+    # Everything related to `Streaming::Adapters`
+    module Adapters
+      #
+      # Uses the JSON library. This parser does not handle multiple json objects in a json stream
+      #  unless the objects are separated with whitespace.
+      module Generic
+        extend self
+
+        # A delimiter for separating multiple json objects in a stream.
+        DELIMITER = "<oanda_api::delimiter>"
+        MULTI_OBJECT_DELIMITER = "}#{DELIMITER}{"
+
+        # Deserializes a stream of JSON objects.
+        # @param [String] string serialized json.
+        # @return [Array<Hash>] an array of hashes.
+        def parse(string)
+          string.strip!
+          return [] if string.empty?
+          string.gsub(/}\s*{/, MULTI_OBJECT_DELIMITER).split(DELIMITER).map do |json|
+            JSON.parse json, symbolize_names: true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/oanda_api/streaming/adapters/gson.rb

@@ -0,0 +1,31 @@
+require 'gson'
+
+module OandaAPI
+  module Streaming
+    module Adapters
+      #
+      # Can be used if the ruby engine (`RUBY_ENGINE`) is jruby. Uses the {https://github.com/avsej/gson.rb gson} gem.
+      # Handles streams of multiple JSON objects that may or may not be delimited with whitespace.
+      module Gson
+        extend self
+
+        # Deserializes a stream of JSON objects.
+        # @param [String] string serialized json.
+        # @return [Array<Hash>] an array of hashes.
+        def parse(string)
+          string.strip!
+          return [] if string.empty?
+          [parser.decode(string)].flatten
+        end
+
+        private
+
+        # @private
+        # Memoized parser instance.
+        def parser
+          @parser ||= ::Gson::Decoder.new(symbolize_keys: true)
+        end
+      end
+    end
+  end
+end

data/lib/oanda_api/streaming/adapters/yajl.rb

@@ -0,0 +1,31 @@
+require 'yajl'
+
+module OandaAPI
+  module Streaming
+    module Adapters
+      #
+      # Can be used if the ruby engine (`RUBY_ENGINE`) is NOT jruby. Uses the {https://github.com/brianmario/yajl-ruby yajl-ruby} gem.
+      # Handles streams of multiple JSON objects that may or may not be delimited with whitespace.
+      module Yajl
+        extend self
+
+        # Deserializes a stream of JSON objects.
+        # @param [String] string serialized json.
+        # @return [Array<Hash>] an array of hashes.
+        def parse(string)
+          results = []
+          parser.parse(string) { |hash| results << hash }
+          results
+        end
+
+        private
+
+        # @private
+        # Memoized parser instance.
+        def parser
+          @parser ||= ::Yajl::Parser.new(symbolize_keys: true)
+        end
+      end
+    end
+  end
+end

data/lib/oanda_api/streaming/client.rb

@@ -27,7 +27,7 @@ module OandaAPI
     #
     #   # -- Stopping the stream --
     #   # You may add a second argument to the block to yield the client itself.
-    #   # You can use the client's `#stop!` method to terminate streaming.
+    #   # You can use it to issue a client.stop! to terminate streaming.
     #   @prices = []
     #   prices = client.prices(account_id: 1234, instruments: %w[AUD_CAD AUD_CHF])
     #   prices.stream do |price, client|

data/lib/oanda_api/streaming/json_parser.rb

@@ -0,0 +1,125 @@
+require_relative 'adapter_error'
+
+module OandaAPI
+  module Streaming
+    #
+    # Used to deserialize a stream of JSON objects. Will load and use a streaming JSON parser
+    # if one is installed, otherwise defaults to use the JSON gem.
+    module JsonParser
+      extend self
+
+      # Map parser adapters to the gem library they require.
+      REQUIREMENT_MAP = {
+        gson: "Gson",
+        yajl: "Yajl"
+      }
+
+      # Loads (if not already loaded) and returns the current adapter class.
+      # @return [.parse] a class implementing a `.parse` method
+      def adapter
+        return @adapter if defined?(@adapter) && @adapter
+
+        # Load default adapter
+        self.use nil
+        @adapter
+      end
+
+      # Returns a symbol identifying either the currently loaded adapter or
+      #  one that can be loaded. Preference is given to an adapter optimized
+      #  for parsing streaming json if it is installed.
+      #
+      # @return [Symbol] a symbol identifying an adapter either currently loaded or that
+      #  one that can be loaded.
+      def default_adapter
+        jruby? ? try_adapter(:gson) : try_adapter(:yajl)
+      end
+
+      # Loads the requested adapter.
+      # @param [nil, String, Symbol, Module, Class] new_adapter identifies an adapter to load.
+      # @return[.parse] a Module or Class that implements a `.parse` method for deserializing a stream of JSON objects.
+      def use(new_adapter)
+        @adapter = load_adapter(new_adapter)
+      end
+      alias adapter= use
+
+      # Loads the requested adapter.
+      # @param [String, Symbol, nil, false, Class, Module] new_adapter identifies an adapter to load.
+      # @return [.parse] a Module or Class that implements a `.parse` method for deserializing a stream of JSON objects.
+      # @raise [AdapterError] if the adapter cannot be loaded.
+      def load_adapter(new_adapter)
+        case new_adapter
+        when String, Symbol
+          load_adapter_from_string_name new_adapter.to_s
+        when NilClass, FalseClass
+          load_adapter default_adapter
+        when Class, Module
+          new_adapter
+        else
+          fail ::LoadError, new_adapter
+        end
+      rescue ::LoadError => exception
+        raise AdapterError.build(exception)
+      end
+
+      private
+
+      # @return [true] if jRuby is the ruby execution engine
+      def jruby?
+        defined?(RUBY_ENGINE) && (RUBY_ENGINE =~ /jruby/i)
+      end
+
+      # Loads the requested adapter.
+      # @param [String] name the adapter to load.
+      # @return [Class, Module] the loaded adapter
+      def load_adapter_from_string_name(name)
+        require_relative "adapters/#{name.downcase}"
+        klass_name = name.to_s.split('_').map(&:capitalize) * ''
+        OandaAPI::Streaming::Adapters.const_get(klass_name)
+      end
+
+      # Checks if the requested adapter is loadable.
+      #  Returns a symbol identifiying either the requested adapter or
+      #  a generic loadable adapter.
+      # @param [Symbol] sym identifies an adapter.
+      # @return [Symbol] a symbol identifying a loadable adapter.
+      def try_adapter(sym)
+        begin
+          return sym if Kernel.const_get sym.to_s.capitalize
+        rescue ::NameError
+        end
+
+        begin
+          require REQUIREMENT_MAP.fetch sym
+          return sym
+        rescue ::LoadError
+          warning
+          return :generic
+        end
+      end
+
+      # Writes a warning to stdout about the generic json parser.
+      # @return[void]
+      def warning
+        Kernel.warn <<-END
+        +------------------------------------------------------------------+
+        + Warning: You're currently using a JSON parser that doesn't       +
+        +          handle streams of JSON objects very well. For faster    +
+        + and more reliable parsing, it's recommended to install one of    +
+        + following gems dependent on the Ruby engine you're using. Once   +
+        + installed, OandaAPI::Streaming will detect the upgraded parser   +
+        + and use it.                                                      +
+        +                                                                  +
+        + RUBY_ENGINE  Recommended JSON Parsing Gem                        +
+        + ===========  ==================================================  +
+        + ruby or rbx  yajl-ruby (http://github.com/brianmario/yajl-ruby)  +
+        +              install with: gem install yajl-ruby                 +
+        +                                                                  +
+        +                                                                  +
+        + jruby        gson (https://github.com/avsej/gson.rb)             +
+        +              install with: gem install gson                      +
+        +------------------------------------------------------------------+
+        END
+      end
+    end
+  end
+end

data/lib/oanda_api/streaming/request.rb

@@ -9,7 +9,7 @@ module OandaAPI
     #   @return [OandaAPI::Streaming::Client] a streaming client instance.
     #
     # @!attribute [rw] emit_heartbeats
-    #   @return [boolean]
+    #   @return [boolean] true if heartbeats are emitted.
     #
     # @!attribute [r] uri
     #   @return [URI::HTTPS] a URI instance.
@@ -20,14 +20,14 @@ module OandaAPI
       attr_accessor :client, :emit_heartbeats
       attr_reader :uri, :request
 
-      # Creates an OandaAPI::Streaming::Request instance.
-      # @param [Streaming::Client] client a streaming client instance that can be used to
-      #   send signals to an instance of this Streaming::Request.
+      # Creates a `Streaming::Request` instance.
+      # @param [Streaming::Client] client a streaming client instance which can be used to
+      #   send signals to an instance of this `Streaming::Request` class.
       # @param [String] uri an absolute URI to the service endpoint.
       # @param [Hash] query a list of query parameters, unencoded. The list
-      #   is converted into a query string. See {OandaAPI::Client#query_string_normalizer}.
+      #   is converted into a query string. See `OandaAPI::Client#query_string_normalizer`.
       # @param [Hash] headers a list of header values that will be sent with the request.
-      def initialize(client: nil, uri:, query: {}, headers: {})
+      def initialize(client: nil, uri: nil, query: {}, headers: {})
         self.client = client.nil? ? self : client
         @uri = URI uri
         @uri.query = OandaAPI::Client.default_options[:query_string_normalizer].call(query)
@@ -41,9 +41,9 @@ module OandaAPI
       # Sets the client attribute
       # @param [OandaAPI::Streaming::Client] value
       # @return [void]
-      # @raise [ArgumentError] if value is not an OandaAPI::Streaming::Client instance.
+      # @raise [ArgumentError] if value is not an {OandaAPI::Streaming::Client} instance.
       def client=(value)
-        fail ArgumentError, "Expecting an OandaAPI::Streaming::Client" unless (value.is_a?(OandaAPI::Streaming::Client) || value.is_a?(OandaAPI::Streaming::Request))
+        fail ArgumentError, "Expecting an OandaAPI::Streaming::Client" unless value.is_a?(OandaAPI::Streaming::Client) || value.is_a?(OandaAPI::Streaming::Request)
         @client = value
       end
 
@@ -64,7 +64,7 @@ module OandaAPI
         !!@stop_requested
       end
 
-      # @return [true] if the instance is connected and streaming a response.
+      # @return [boolean] true if the instance is connected and is streaming a response.
       def running?
         !!@running
       end
@@ -72,15 +72,15 @@ module OandaAPI
       # Emits a stream of {OandaAPI::ResourceBase} instances, depending
       #  on the endpoint that the request is servicing, either
       #  {OandaAPI::Resource::Price} or {OandaAPI::Resource::Transaction}
-      #  instances are emitted. When #emit_heartbeats? is `true`, then
-      #  resources could also be {OandaAPI::Resource::Heartbeat}.
+      #  instances are emitted. When {#emit_heartbeats?} is `true`, then
+      #  {OandaAPI::Resource::Heartbeat} could also be emitted.
       #
       #  Note this method runs as an infinite loop and will block indefinitely
       #  until either the connection is halted or a {#stop!} signal is recieved.
       #
       # @yield [OandaAPI::ResourceBase, OandaAPI::Streaming::Client] Each resource found in the response
       #   stream is yielded as they are received. The client instance controlling the
-      #   streaming request is also yielded. It can be used to issue a signaller.#stop! to terminate the resquest.
+      #   streaming request is also yielded. It can be used to issue a `client.stop!` to terminate the resquest.
       # @raise [OandaAPI::StreamingDisconnect] if the endpoint was disconnected by server.
       # @raise [OandaAPI::RequestError] if an unexpected resource is returned.
       # @return [void]
@@ -113,23 +113,28 @@ module OandaAPI
       #   When #emit_heartbeats? is `true`, then the instance could be an {OandaAPI::Resource::Heartbeat}.
       # @raise [OandaAPI::StreamingDisconnect] if the endpoint was disconnected by server.
       # @raise [OandaAPI::RequestError] if an unexpected resource is returned.
-      def handle_response(response)
-        response.split("\r\n").map do |json|
-          parsed_response = JSON.parse json
+      def handle_response(string)
+        parse(string).map do |parsed_response|
           case
-          when parsed_response["heartbeat"]
-            OandaAPI::Resource::Heartbeat.new parsed_response["heartbeat"] if emit_heartbeats?
-          when parsed_response["tick"]
-            OandaAPI::Resource::Price.new parsed_response["tick"]
-          when parsed_response["transaction"]
-            OandaAPI::Resource::Transaction.new parsed_response["transaction"]
-          when parsed_response["disconnect"]
-            raise OandaAPI::StreamingDisconnect, parsed_response["disconnect"]["message"]
+          when parsed_response[:heartbeat]
+            OandaAPI::Resource::Heartbeat.new parsed_response[:heartbeat] if emit_heartbeats?
+          when parsed_response[:tick]
+            OandaAPI::Resource::Price.new parsed_response[:tick]
+          when parsed_response[:transaction]
+            OandaAPI::Resource::Transaction.new parsed_response[:transaction]
+          when parsed_response[:disconnect]
+            fail OandaAPI::StreamingDisconnect, parsed_response[:disconnect][:message]
           else
-            raise OandaAPI::RequestError, "unknown resource: #{json}"
+            fail OandaAPI::RequestError, "unknown resource: #{parsed_response}"
           end
         end.compact
       end
+
+      # @private
+      # Uses the best json parser available for optimal performance and stream parsing ability.
+      def parse(string)
+        OandaAPI::Streaming::JsonParser.adapter.parse string
+      end
     end
   end
 end

data/lib/oanda_api/version.rb

@@ -1,3 +1,3 @@
 module OandaAPI
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

data/oanda_api.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "httparty",                  "~> 0.13"
+  s.add_dependency "httparty",                  "0.13.3"
   s.add_dependency "persistent_httparty",       "~> 0.1"
   s.add_dependency "http-exceptions",           "~> 0.0"
 
-  s.add_development_dependency "rspec",         "~> 3.1"
+  s.add_development_dependency "rspec",         "~> 3.2"
   s.add_development_dependency "vcr",           "~> 2.9"
-  s.add_development_dependency "webmock",       "~> 1.20"
+  s.add_development_dependency "webmock",       "~> 1.21"
   s.add_development_dependency "yard",          "~> 0.8"
 end

data/spec/oanda_api/client/json_parser_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "OandaAPI::Client::JsonParser" do
+
+  it "deserializes json using symbolized keys" do
+    [
+      ["{\"a\":[{\"b\":{\"3\":3}}]}", { :a => [:b => { :"3" => 3 }] }],
+       [ "\r\n \r\n     {\"a\":\"a\"} \r\n ", { :a => "a"}]
+    ].each do |serialized, deserialized|
+      expect(OandaAPI::Client::JsonParser.call serialized, :json).to eq(deserialized)
+    end
+  end
+end

data/spec/oanda_api/resource_base_spec.rb

@@ -43,5 +43,11 @@ describe "OandaAPI::ResourceBase" do
       h = JSON.parse obj.to_json
       expect(h).to include("webbed_feet" => "customized webbed feet")
     end
+
+    it "serializes when nested" do
+      obj = MyCustomizedClass.new webbedFeet: "webbed feet"
+      a = JSON.parse [obj].to_json
+      expect(a.first).to include("webbed_feet" => "customized webbed feet")
+    end
   end
 end

data/spec/oanda_api/streaming/adapters/generic_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'shared/adapter'
+require 'oanda_api/streaming/adapters/generic'
+
+describe "OandaAPI::Streaming::Adapters::Generic" do
+  it_behaves_like 'an adapter', described_class
+end

data/spec/oanda_api/streaming/adapters/gson_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'shared/adapter'
+require 'oanda_api/streaming/adapters/gson' if gem_installed? :Gson
+
+describe "OandaAPI::Streaming::Adapters::Gson", :if => gem_installed?(:Gson) do
+  it_behaves_like 'an adapter', described_class
+end

data/spec/oanda_api/streaming/adapters/yajl_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'shared/adapter'
+require 'oanda_api/streaming/adapters/yajl' if gem_installed? :Yajl
+
+describe "OandaAPI::Streaming::Adapters::Yajl", :if => gem_installed?(:Yajl) do
+  it_behaves_like 'an adapter', described_class
+end

data/spec/oanda_api/streaming/json_parser_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe "OandaAPI::Streaming::JsonParser" do
+
+  context "when no streaming json parsers are available" do
+    around do |example|
+      simulate_no_adapters{ example.call }
+    end
+
+    it "defaults to :generic adapter" do
+      silence_warnings do
+        expect(OandaAPI::Streaming::JsonParser.default_adapter).to eq(:generic)
+      end
+    end
+
+    it "prints a warning about using a non-optimal JSON parser" do
+      expect(Kernel).to receive(:warn).with(/warning/i)
+      OandaAPI::Streaming::JsonParser.default_adapter
+    end
+  end
+
+  it "defaults to the best available JSON parser for jruby", :if => gem_installed?(:Gson) do
+    # Clear memoized variable that may have been set by previous tests
+    OandaAPI::Streaming::JsonParser.send(:remove_instance_variable, :@adapter) if OandaAPI::Streaming::JsonParser.instance_variable_defined?(:@adapter)
+    expect(OandaAPI::Streaming::JsonParser.adapter.to_s).to eq("OandaAPI::Streaming::Adapters::Gson")
+  end
+
+  it "defaults to the best available JSON parser for non-jruby", :if => gem_installed?(:Yajl) do
+    # Clear memoized variable that may have been set by previous tests
+    OandaAPI::Streaming::JsonParser.send(:remove_instance_variable, :@adapter) if OandaAPI::Streaming::JsonParser.instance_variable_defined?(:@adapter)
+    expect(OandaAPI::Streaming::JsonParser.adapter.to_s).to eq("OandaAPI::Streaming::Adapters::Yajl")
+  end
+
+  describe "explicitly overriding the adapter" do
+    after(:each) do
+      OandaAPI::Streaming::JsonParser.adapter = nil
+    end
+
+    it 'is settable via a symbol' do
+      OandaAPI::Streaming::JsonParser.use :generic
+      expect(OandaAPI::Streaming::JsonParser.adapter).to eq(OandaAPI::Streaming::Adapters::Generic)
+    end
+
+    it 'is settable via a case-insensitive string' do
+      OandaAPI::Streaming::JsonParser.use 'generic'
+      expect(OandaAPI::Streaming::JsonParser.adapter).to eq(OandaAPI::Streaming::Adapters::Generic)
+    end
+
+    it 'is settable via a class' do
+      adapter = Class.new
+      OandaAPI::Streaming::JsonParser.use adapter
+      expect(OandaAPI::Streaming::JsonParser.adapter).to eq(adapter)
+    end
+
+    it 'is settable via a module' do
+      adapter = Module.new
+      OandaAPI::Streaming::JsonParser.use adapter
+      expect(OandaAPI::Streaming::JsonParser.adapter).to eq(adapter)
+    end
+  end
+
+  it 'throws AdapterError on bad input' do
+    expect{ OandaAPI::Streaming::JsonParser.use 'bad adapter' }.to raise_error(OandaAPI::Streaming::AdapterError, /bad adapter/)
+  end
+end

data/spec/oanda_api/streaming/request_spec.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'webmock/rspec'
 
 describe "OandaAPI::Streaming::Request" do
+
   let(:streaming_request) {
     OandaAPI::Streaming::Request.new(uri: "https://a.url.com",
                                      query: { account: 1234, instruments: %w[AUD_CAD AUD_CHF] },
@@ -60,7 +61,10 @@ describe "OandaAPI::Streaming::Request" do
       END
       ids = []
       stub_request(:any, /\.com/).to_return(body: events_json, status: 200)
-      streaming_request.stream { |resource| ids << resource.id }
+
+      streaming_request.stream do |resource|
+        ids << resource.id
+      end
       expect(ids).to contain_exactly(1, 2)
     end
 
@@ -168,5 +172,29 @@ describe "OandaAPI::Streaming::Request" do
         expect(heartbeats).to eq 1
       end
     end
+
+    context "when the stream contains multiple undelimited objects" do
+      events_json = <<-END
+        {"tick":{"bid": 1}}{"tick":{"bid": 2}}\r\n{"tick":{"bid": 3}}
+      END
+
+      it "yields all of the objects" do
+        case
+        when gem_installed?(:Yajl)
+          OandaAPI::Streaming::JsonParser.use(:yajl)
+        when gem_installed?(:Gson)
+          OandaAPI::Streaming::JsonParser.use(:gson)
+        else
+          OandaAPI::Streaming::JsonParser.use(:generic)
+        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/shared/adapter.rb

@@ -0,0 +1,19 @@
+shared_examples_for 'an adapter' do |adapter|
+
+  before{ OandaAPI::Streaming::JsonParser.use adapter }
+
+  describe ".parse" do
+    it "deserializes json using symbolized keys" do
+      [
+        ["{\"a\":[{\"b\":{\"3\":3}}]}", [{ :a => [:b => { :"3" => 3 }] }]],
+        ["{\"a\":\"a\"} \r\n ", [{ :a => "a"}]],
+        ["", []],
+        ["   ", []],
+        ["\r\n", []]
+        
+      ].each do |serialized, deserialized|
+        expect(OandaAPI::Streaming::JsonParser.adapter.parse(serialized)).to eq(deserialized)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 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
 
@@ -12,3 +15,64 @@ RSpec.configure do |c|
     OandaAPI.configure { |config| config.use_request_throttling = false }
   end
 end
+
+def jruby?
+  defined?(RUBY_ENGINE) && (RUBY_ENGINE =~ /jruby/i)
+end
+
+def gem_installed?(const)
+  begin
+    require const.to_s.downcase unless Object.const_defined? const
+    true
+  rescue ::LoadError => e
+    false
+  end
+end
+
+# Makes the adapter requirements break (i.e. simulates that a gem required
+#  for an adapter is not installed).
+def break_requirements
+  requirements = OandaAPI::Streaming::JsonParser::REQUIREMENT_MAP
+  OandaAPI::Streaming::JsonParser::REQUIREMENT_MAP.each do | adapter, library|
+    OandaAPI::Streaming::JsonParser::REQUIREMENT_MAP[adapter] = "foo/#{library}"
+  end
+
+  yield
+ensure
+  requirements.keys do |adapter|
+    OandaAPI::Streaming::JsonParser::REQUIREMENT_MAP[adapter] = requirements[adapter]
+  end
+end
+
+# Silences warnings issued by Kerel.warn
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+def simulate_no_adapters
+  break_requirements do
+    undefine_constants :Yajl, :Gson do
+      yield
+    end
+  end
+end
+
+def undefine_constants(*consts)
+  values = {}
+  consts.each do |const|
+    if Object.const_defined?(const)
+      values[const] = Object.const_get(const)
+      Object.send :remove_const, const
+    end
+  end
+
+  yield
+
+  ensure
+    values.each do |const, value|
+      Object.const_set const, value
+    end
+end

data/spec/support/vcr.rb

@@ -4,4 +4,5 @@ VCR.configure do |c|
   c.hook_into :webmock
   c.configure_rspec_metadata!
   c.default_cassette_options = { record: :new_episodes }
+  c.ignore_hosts 'codeclimate.com'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oanda_api
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Dean Missikowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: persistent_httparty
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - Rakefile
 - lib/oanda_api.rb
 - lib/oanda_api/client/client.rb
+- lib/oanda_api/client/json_parser.rb
 - lib/oanda_api/client/namespace_proxy.rb
 - lib/oanda_api/client/resource_descriptor.rb
 - lib/oanda_api/client/token_client.rb
@@ -144,7 +145,12 @@ files:
 - lib/oanda_api/resource/transaction.rb
 - lib/oanda_api/resource_base.rb
 - lib/oanda_api/resource_collection.rb
+- lib/oanda_api/streaming/adapter_error.rb
+- lib/oanda_api/streaming/adapters/generic.rb
+- lib/oanda_api/streaming/adapters/gson.rb
+- lib/oanda_api/streaming/adapters/yajl.rb
 - lib/oanda_api/streaming/client.rb
+- lib/oanda_api/streaming/json_parser.rb
 - lib/oanda_api/streaming/request.rb
 - lib/oanda_api/utils/utils.rb
 - lib/oanda_api/version.rb
@@ -176,6 +182,7 @@ files:
 - spec/fixtures/vcr_cassettes/sandbox_client_account.yml
 - spec/fixtures/vcr_cassettes/sandbox_instrument_EUR_USD.yml
 - spec/oanda_api/client/client_spec.rb
+- spec/oanda_api/client/json_parser_spec.rb
 - spec/oanda_api/client/namespace_proxy_spec.rb
 - spec/oanda_api/client/resource_descriptor_spec.rb
 - spec/oanda_api/client/token_client_spec.rb
@@ -189,9 +196,14 @@ files:
 - spec/oanda_api/examples/transactions_spec.rb
 - spec/oanda_api/resource_base_spec.rb
 - spec/oanda_api/resource_collection_spec.rb
+- spec/oanda_api/streaming/adapters/generic_spec.rb
+- spec/oanda_api/streaming/adapters/gson_spec.rb
+- spec/oanda_api/streaming/adapters/yajl_spec.rb
 - spec/oanda_api/streaming/client_spec.rb
+- spec/oanda_api/streaming/json_parser_spec.rb
 - spec/oanda_api/streaming/request_spec.rb
 - spec/oanda_api/utils/utils_spec.rb
+- spec/shared/adapter.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
 - spec/support/vcr.rb
@@ -247,6 +259,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/sandbox_client_account.yml
 - spec/fixtures/vcr_cassettes/sandbox_instrument_EUR_USD.yml
 - spec/oanda_api/client/client_spec.rb
+- spec/oanda_api/client/json_parser_spec.rb
 - spec/oanda_api/client/namespace_proxy_spec.rb
 - spec/oanda_api/client/resource_descriptor_spec.rb
 - spec/oanda_api/client/token_client_spec.rb
@@ -260,9 +273,14 @@ test_files:
 - spec/oanda_api/examples/transactions_spec.rb
 - spec/oanda_api/resource_base_spec.rb
 - spec/oanda_api/resource_collection_spec.rb
+- spec/oanda_api/streaming/adapters/generic_spec.rb
+- spec/oanda_api/streaming/adapters/gson_spec.rb
+- spec/oanda_api/streaming/adapters/yajl_spec.rb
 - spec/oanda_api/streaming/client_spec.rb
+- spec/oanda_api/streaming/json_parser_spec.rb
 - spec/oanda_api/streaming/request_spec.rb
 - spec/oanda_api/utils/utils_spec.rb
+- spec/shared/adapter.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
 - spec/support/vcr.rb