ig_markets 0.3 → 0.4

data/lib/ig_markets/position.rb

@@ -4,8 +4,8 @@ module IGMarkets
   class Position < Model
     attribute :contract_size, Float
     attribute :controlled_risk, Boolean
-    attribute :created_date, Time, format: '%Y/%m/%d %T:%L', time_zone: '+0000'
-    attribute :created_date_utc, Time, format: '%FT%T', time_zone: '+0000'
+    attribute :created_date, Time, format: '%Y/%m/%d %T:%L'
+    attribute :created_date_utc, Time, format: '%FT%T'
     attribute :currency, String, regex: Regex::CURRENCY
     attribute :deal_id
     attribute :direction, Symbol, allowed_values: [:buy, :sell]

data/lib/ig_markets/session.rb

@@ -104,10 +104,7 @@ module IGMarkets
 
     private
 
-    HOST_URLS = {
-      demo: 'https://demo-api.ig.com/gateway/deal/',
-      production: 'https://api.ig.com/gateway/deal/'
-    }.freeze
+    HOST_URLS = { demo: 'https://demo-api.ig.com/gateway/deal/', production: 'https://api.ig.com/gateway/deal/' }.freeze
 
     def validate_authentication
       %i(username password api_key).each do |attribute|
@@ -120,10 +117,7 @@ module IGMarkets
     def password_encryptor
       result = get 'session/encryptionKey', API_V1
 
-      PasswordEncryptor.new.tap do |encryptor|
-        encryptor.encoded_public_key = result.fetch :encryption_key
-        encryptor.time_stamp = result.fetch :time_stamp
-      end
+      PasswordEncryptor.new result.fetch(:encryption_key), result.fetch(:time_stamp)
     end
 
     def request(options)
@@ -162,16 +156,25 @@ module IGMarkets
 
       RestClient::Request.execute options
     rescue RestClient::Exception => exception
-      return exception.response if exception.response
+      raise RequestFailedError, exception.message unless exception.response
+
+      return exception.response unless !options[:retry] && client_token_invalid?(exception.response)
 
-      raise RequestFailedError, exception.message
+      sign_in
+      execute_request options.merge(retry: true)
     rescue SocketError => socket_error
       raise RequestFailedError, socket_error
     end
 
+    def client_token_invalid?(response)
+      ResponseParser.parse(JSON.parse(response.body))[:error_code] == 'error.security.client-token-invalid'
+    rescue JSON::ParserError
+      false
+    end
+
     def process_response(response)
       result = begin
-        ResponseParser.parse JSON.parse(response.body, symbolize_names: true)
+        ResponseParser.parse JSON.parse(response.body)
       rescue JSON::ParserError
         {}
       end

data/lib/ig_markets/version.rb

@@ -1,4 +1,4 @@
 module IGMarkets
   # The version of this gem.
-  VERSION = '0.3'.freeze
+  VERSION = '0.4'.freeze
 end

data/lib/ig_markets/working_order.rb

@@ -3,14 +3,14 @@ module IGMarkets
   # {DealingPlatform::WorkingOrderMethods#[]}.
   class WorkingOrder < Model
     attribute :created_date, Time, format: '%Y/%m/%d %T:%L'
-    attribute :created_date_utc, Time, format: '%FT%T', time_zone: '+0000'
+    attribute :created_date_utc, Time, format: '%FT%T'
     attribute :currency_code, String, regex: Regex::CURRENCY
     attribute :deal_id
     attribute :direction, Symbol, allowed_values: [:buy, :sell]
     attribute :dma, Boolean
     attribute :epic, String, regex: Regex::EPIC
-    attribute :good_till_date, Time, format: '%Y/%m/%d %R', time_zone: '+0000'
-    attribute :good_till_date_iso, Time, format: '%FT%R', time_zone: '+0000'
+    attribute :good_till_date, Time, format: '%Y/%m/%d %R'
+    attribute :good_till_date_iso, Time, format: '%FT%R'
     attribute :guaranteed_stop, Boolean
     attribute :limit_distance, Fixnum
     attribute :order_level, Float
@@ -38,7 +38,6 @@ module IGMarkets
     # @option new_attributes [Float] :level
     # @option new_attributes [Fixnum] :limit_distance
     # @option new_attributes [Fixnum] :stop_distance
-    # @option new_attributes [:good_till_cancelled, :good_till_date] :time_in_force
     # @option new_attributes [:limit, :stop] :type
     #
     # @return [String] The deal reference of the update operation. Use {DealingPlatform#deal_confirmation} to check
@@ -48,6 +47,8 @@ module IGMarkets
                          stop_distance: stop_distance, time_in_force: time_in_force, type: order_type
                        }.merge new_attributes
 
+      new_attributes[:time_in_force] = new_attributes[:good_till_date] ? :good_till_date : :good_till_cancelled
+
       payload = PayloadFormatter.format WorkingOrderUpdateAttributes.new new_attributes
 
       @dealing_platform.session.put("workingorders/otc/#{deal_id}", payload, API_V1).fetch(:deal_reference)
@@ -55,7 +56,7 @@ module IGMarkets
 
     # Internal model used by {#update}.
     class WorkingOrderUpdateAttributes < Model
-      attribute :good_till_date, Time, format: '%Y/%m/%d %R'
+      attribute :good_till_date, Time, format: '%Y/%m/%d %R:%S'
       attribute :level, Float
       attribute :limit_distance, Fixnum
       attribute :stop_distance, Fixnum

data/lib/ig_markets.rb

@@ -13,17 +13,19 @@ require 'ig_markets/account_activity'
 require 'ig_markets/account_transaction'
 require 'ig_markets/api_versions'
 require 'ig_markets/application'
+require 'ig_markets/cli/orders_command'
+require 'ig_markets/cli/positions_command'
+require 'ig_markets/cli/sprints_command'
+require 'ig_markets/cli/watchlists_command'
 require 'ig_markets/cli/main'
 require 'ig_markets/cli/account_command'
 require 'ig_markets/cli/activities_command'
+require 'ig_markets/cli/config_file'
 require 'ig_markets/cli/confirmation_command'
-require 'ig_markets/cli/orders_command'
-require 'ig_markets/cli/positions_command'
+require 'ig_markets/cli/output'
 require 'ig_markets/cli/search_command'
 require 'ig_markets/cli/sentiment_command'
-require 'ig_markets/cli/sprints_command'
 require 'ig_markets/cli/transactions_command'
-require 'ig_markets/cli/watchlists_command'
 require 'ig_markets/client_sentiment'
 require 'ig_markets/deal_confirmation'
 require 'ig_markets/dealing_platform'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ig_markets
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Richard Viney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -157,7 +157,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE.md
+- README.md
 - bin/ig_markets
+- lib/ig_markets.rb
 - lib/ig_markets/account.rb
 - lib/ig_markets/account_activity.rb
 - lib/ig_markets/account_transaction.rb
@@ -166,9 +170,11 @@ files:
 - lib/ig_markets/boolean.rb
 - lib/ig_markets/cli/account_command.rb
 - lib/ig_markets/cli/activities_command.rb
+- lib/ig_markets/cli/config_file.rb
 - lib/ig_markets/cli/confirmation_command.rb
 - lib/ig_markets/cli/main.rb
 - lib/ig_markets/cli/orders_command.rb
+- lib/ig_markets/cli/output.rb
 - lib/ig_markets/cli/positions_command.rb
 - lib/ig_markets/cli/search_command.rb
 - lib/ig_markets/cli/sentiment_command.rb
@@ -177,6 +183,7 @@ files:
 - lib/ig_markets/cli/watchlists_command.rb
 - lib/ig_markets/client_sentiment.rb
 - lib/ig_markets/deal_confirmation.rb
+- lib/ig_markets/dealing_platform.rb
 - lib/ig_markets/dealing_platform/account_methods.rb
 - lib/ig_markets/dealing_platform/client_sentiment_methods.rb
 - lib/ig_markets/dealing_platform/market_methods.rb
@@ -184,15 +191,14 @@ files:
 - lib/ig_markets/dealing_platform/sprint_market_position_methods.rb
 - lib/ig_markets/dealing_platform/watchlist_methods.rb
 - lib/ig_markets/dealing_platform/working_order_methods.rb
-- lib/ig_markets/dealing_platform.rb
 - lib/ig_markets/format.rb
 - lib/ig_markets/historical_price_result.rb
 - lib/ig_markets/instrument.rb
 - lib/ig_markets/market.rb
 - lib/ig_markets/market_hierarchy_result.rb
 - lib/ig_markets/market_overview.rb
-- lib/ig_markets/model/typecasters.rb
 - lib/ig_markets/model.rb
+- lib/ig_markets/model/typecasters.rb
 - lib/ig_markets/password_encryptor.rb
 - lib/ig_markets/payload_formatter.rb
 - lib/ig_markets/position.rb
@@ -204,10 +210,6 @@ files:
 - lib/ig_markets/version.rb
 - lib/ig_markets/watchlist.rb
 - lib/ig_markets/working_order.rb
-- lib/ig_markets.rb
-- CHANGELOG.md
-- LICENSE.md
-- README.md
 homepage: https://github.com/rviney/ig_markets
 licenses:
 - MIT
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for the IG Markets dealing platform.