oanda_api 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7f97bda3c0ece6ba2dfbabf7b59cab04991de0
-  data.tar.gz: efcdee86eeca8013b772aac230a5a33476051b12
+  metadata.gz: a80562ee64a74c0c4ea6b5ef112ca9c94de2693a
+  data.tar.gz: d1f343f2f83e5a157b982bf7f99eaba8b8bfd070
 SHA512:
-  metadata.gz: 27f14d9b88d7a01908c566ed116bea03c60079a7807ae5449224baabb511ab1ffea8924c6da67aaa47e94253eea5f400cbbac48582897a2f34e2c43392c6e797
-  data.tar.gz: 4dea06ea3ca3763503b44370b14b9adcd2b618a6fc6f6b28cd2ac6d85ed779cb9b8314f198b896eb80434028f81bc912d1dab8f57d74df53f86420f3e467c922
+  metadata.gz: 60a73b0a93284b5a2d7444e01c95e486ed4cecd16657c85a3840dce2557f850a7e1d9137999996c8dd899a94f36938148bbbf0456b8c2e0ff75d0bc3a53195c2
+  data.tar.gz: a761bd94438f861a3da1b2546d361df47cef008d93cb025e2bffc947aa448e391985aac6b094e45769ba577830086ce4f555d3b8760adcd34062a2edc1d208fa

data/CHANGELOG.md

@@ -1,14 +1,14 @@
 # Change Log
 
-## 0.9.0
+## 0.9.3
 
- * Add support for live [Streaming](http://developer.oanda.com/rest-live/streaming/).
- * Add #to_json serialization to resource classes.
- * Fixed Yardoc formatting.
+* Fixed support for retrieving [full account history](http://developer.oanda.com/rest-live/transaction-history/#getFullAccountHistory). Thanks [bewon](https://github.com/bewon).
+* Fixed issue [#6](https://github.com/nukeproof/oanda_api/issues/6) to make streaming JSON parsers available correctly under *nix. Thanks [Eric](https://github.com/lifeBCE).
 
-###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.2
 
+ * Specify version of HTTParty as 0.13.3 until HTTParty issue [#398](https://github.com/jnunemaker/httparty/issues/398) is resolved.
+ * Now support any whitespace as delimiting multiple JSON objects in streaming API with `OandaAPI::Streaming::Adapters::Generic`.
 
 
 ## 0.9.1
@@ -22,8 +22,11 @@ OandaAPI now supports Oanda's streaming API for consuming realtime ticks and acc
 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.0
 
-## 0.9.2
+ * Add support for live [Streaming](http://developer.oanda.com/rest-live/streaming/).
+ * Add #to_json serialization to resource classes.
+ * Fixed Yardoc formatting.
 
- * 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`.
+###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`. 

data/README.md

@@ -1,5 +1,7 @@
 # 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)
+[![Gem Version](https://badge.fury.io/rb/oanda_api.svg)](https://rubygems.org/gems/oanda_api)
+[![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 

data/lib/oanda_api.rb

@@ -3,7 +3,6 @@ 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'
@@ -26,5 +25,6 @@ require_relative 'oanda_api/resource/position'
 require_relative 'oanda_api/resource/price'
 require_relative 'oanda_api/resource/trade'
 require_relative 'oanda_api/resource/transaction'
+require_relative 'oanda_api/resource/transaction_history'
 require_relative 'oanda_api/utils/utils'
 require_relative 'oanda_api/version'

data/lib/oanda_api/client/resource_descriptor.rb

@@ -15,6 +15,15 @@ module OandaAPI
     class ResourceDescriptor
       attr_reader :collection_name, :path, :resource_klass
 
+      # Mapper for not "typical" resources.
+      #   Key is a resource from the API path.
+      #   Value is a hash that can contain "resource_name" from the code and/or
+      #   "is_collection" (if true: will force treating response as a collection of resources,
+      #   if false: will force treating response as a single resource).
+      RESOURCES_MAPPER = {
+          alltransactions: { resource_name: "transaction_history", is_collection: false }
+      }
+
       # Analyzes the resource request and determines the type of resource
       # expected from the API.
       #
@@ -24,10 +33,7 @@ module OandaAPI
       def initialize(path, method)
         @path = path
         path.match(/\/(?<resource_name>[a-z]*)\/?(?<resource_id>\w*?)$/) do |names|
-          resource_name, resource_id = [Utils.singularize(names[:resource_name]), names[:resource_id]]
-          self.resource_klass = resource_name
-          @is_collection      = method == :get && resource_id.empty?
-          @collection_name    = Utils.pluralize(resource_name).to_sym if is_collection?
+          initialize_from_resource_name(names[:resource_name], method, names[:resource_id])
         end
       end
 
@@ -43,10 +49,24 @@ module OandaAPI
       # @param [String] resource_name
       # @return [void]
       def resource_klass=(resource_name)
-        klass_symbol = resource_name.capitalize.to_sym
+        klass_symbol = OandaAPI::Utils.classify(resource_name).to_sym
         fail ArgumentError, "Invalid resource" unless OandaAPI::Resource.constants.include?(klass_symbol)
         @resource_klass = OandaAPI::Resource.const_get klass_symbol
       end
+
+      # Will set instance attributes based on resource_name, method and resource_id.
+      #
+      # @param [String] resource_name name of the resource (from the path).
+      # @param [Symbol] method an http verb (see {OandaAPI::Client.map_method_to_http_verb}).
+      # @param [Symbol] resource_id id of the resource.
+      # @return [void]
+      def initialize_from_resource_name(resource_name, method, resource_id)
+        mapped_resource = RESOURCES_MAPPER.fetch(resource_name.to_sym,
+                                                 { resource_name: Utils.singularize(resource_name) })
+        self.resource_klass = mapped_resource.fetch :resource_name
+        @is_collection      = mapped_resource.fetch :is_collection, method == :get && resource_id.empty?
+        @collection_name    = Utils.pluralize(mapped_resource.fetch(:resource_name)).to_sym if is_collection?
+      end
     end
   end
 end

data/lib/oanda_api/resource/transaction_history.rb

@@ -0,0 +1,9 @@
+module OandaAPI
+  module Resource
+    # Transactions History value object. Resource name in API: alltransactions.
+    # See the Oanda Developer Guide for information about {http://developer.oanda.com/rest-live/transaction-history/ Transactions history}.
+    class TransactionHistory < ResourceBase
+
+    end
+  end
+end

data/lib/oanda_api/streaming/json_parser.rb

@@ -5,13 +5,15 @@ module OandaAPI
     #
     # 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.
+    #
+    # Much of this module's code was borrowed from [multi_json](https://github.com/intridea/multi_json).
     module JsonParser
       extend self
 
       # Map parser adapters to the gem library they require.
       REQUIREMENT_MAP = {
-        gson: "Gson",
-        yajl: "Yajl"
+        gson: "gson",
+        yajl: "yajl"
       }
 
       # Loads (if not already loaded) and returns the current adapter class.
@@ -86,6 +88,7 @@ module OandaAPI
         begin
           return sym if Kernel.const_get sym.to_s.capitalize
         rescue ::NameError
+          nil
         end
 
         begin

data/lib/oanda_api/utils/utils.rb

@@ -10,6 +10,13 @@ module OandaAPI
       s.to_s.gsub(/(?:_)([a-z\d]*)/i) { "#{$1.capitalize}" }.sub(/^(.)/) { $1.downcase }
     end
 
+    # Converts a string from snake_case to upper camel case (class name like "MyClass").
+    # @param [String] s
+    # @return [String]
+    def self.classify(s)
+      s.split('_').collect(&:capitalize).join
+    end
+
     # Naively plops an "s" at the end of a string.
     # If the string is "" or nil, returns "".
     # @param [String] s

data/lib/oanda_api/version.rb

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

data/oanda_api.gemspec

@@ -21,7 +21,7 @@ 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.3"
+  s.add_dependency "httparty",                  "~> 0.13", ">= 0.13.5"
   s.add_dependency "persistent_httparty",       "~> 0.1"
   s.add_dependency "http-exceptions",           "~> 0.0"
 

data/spec/oanda_api/client/resource_descriptor_spec.rb

@@ -6,6 +6,18 @@ describe "OandaAPI::Client::ResourceDescriptor" do
     it "sets path" do
       expect(resource_descriptor.path).to eq("/accounts")
     end
+
+    context 'when path resource is equal alltransactions' do
+      let(:resource_descriptor) { OandaAPI::Client::ResourceDescriptor.new "/account/123/alltransactions", :get }
+
+      it 'is sets TransactionHistory as resource_klass' do
+        expect(resource_descriptor.resource_klass).to eq(OandaAPI::Resource::TransactionHistory)
+      end
+
+      it 'is sets @is_collection to false' do
+        expect(resource_descriptor.is_collection?).to be false
+      end
+    end
   end
 
   context "when the path ends with a known resource" do

data/spec/oanda_api/utils/utils_spec.rb

@@ -27,6 +27,18 @@ describe "OandaAPI::Utils" do
     end
   end
 
+  describe '.classify' do
+    it 'return capitalized one word text' do
+      expect(OandaAPI::Utils.classify('ruby')).to eq("Ruby")
+    end
+    it 'capitalizes first word and each word after _ sign' do
+      expect(OandaAPI::Utils.classify('this_is_ruby')).to eq("ThisIsRuby")
+    end
+    it 'downcase letters inside the word (except first letter)' do
+      expect(OandaAPI::Utils.classify('RUBY')).to eq("Ruby")
+    end
+  end
+
   describe ".pluralize" do
     it "naively adds an s to the end of strings" do
       expect(OandaAPI::Utils.pluralize("thing")).to eq("things")

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: oanda_api
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Dean Missikowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-07-08 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'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: persistent_httparty
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +149,7 @@ files:
 - lib/oanda_api/resource/price.rb
 - lib/oanda_api/resource/trade.rb
 - lib/oanda_api/resource/transaction.rb
+- lib/oanda_api/resource/transaction_history.rb
 - lib/oanda_api/resource_base.rb
 - lib/oanda_api/resource_collection.rb
 - lib/oanda_api/streaming/adapter_error.rb