ig_markets 0.31 → 0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43d7d776df76a8ac237f866ea55d5006e1f87c5
-  data.tar.gz: d4ec2f9f14cb68aeb9b2942bc5e4c5a54f6d59f8
+  metadata.gz: 33c3ae06269ac129ea8042da743d2638e9d103a7
+  data.tar.gz: 5dc8bdd1bc5f32b58b845f6bec1040eeb2c21e92
 SHA512:
-  metadata.gz: 7ebcba64fce12c9f276811d0df4e6588d484de43c5673cfbf7afd8c448f9d6cd94bf396847890d188e5cd2d53326652783e5ef19f24f210e0e2ae08901377c8b
-  data.tar.gz: 5f3a03a7c45f0d973303fb37284b67ab5ba14e83a73917f540a4054b271b4812227a8afa826c11586fee6378d81c1be933bd8e450e8d74b5c874300e532d41bc
+  metadata.gz: 91d9892ccc49bdf29b5143c8ddb7f3e80d8aa7da64e89fb340da98b2fdbc8425c03178f87202a71efe8ec544319961d9c49acf7d6af73b1a86837bcd5caeaf5e
+  data.tar.gz: bbb4cdf0f2472244ad059372276520f043d521667218189b2d670f7de5ca6d54efe332224ee920737e1edc07ab5f71b6b3ef9bc7926921b0dbe028e9b6132be3

data/CHANGELOG.md

@@ -1,12 +1,25 @@
 # IG Markets Changelog
 
+### 0.32 — May 27, 2017
+
+- The `force_open` option now defaults to true for working orders, and is automatically set to true when creating a
+  position that specifies a limit distance, limit level, stop distance, or stop level
+- Added `--to` option to the `ig_markets activities`, `ig_markets transactions`, and `ig_markets performance`
+  commands
+- All timestamps provided to the `ig_markets activities`, `ig_markets transactions`, and `ig_markets performance`
+  commands must now specify an explicit time zone
+- Support the `unavailable` state on `IGMarkets::Streaming::MarketUpdate#market_state`
+- Fix exception in the `ig_markets performance` command when no performance data is found
+- Fixed `IGMarkets::AccountMethods#activities` and `IGMarkets::AccountMethods#transactions` sometimes returning
+  duplicate entries
+
 ### 0.31 — March 26, 2017
 
-- Added `IGMarkets::Streaming::PositionUpdate#currency` attribute.
-- Added proper detection of an invalid deal ID passed to `ig_markets orders update`.
+- Added `IGMarkets::Streaming::PositionUpdate#currency` attribute
+- Added proper detection of an invalid deal ID passed to `ig_markets orders update`
 - Limited the update rate of `ig_markets stream` to 2Hz to avoid flickering caused by large numbers of simultaneous
-  updates.
-- Fixed errors caused by a missing millisecond component on certain timestamps.
+  updates
+- Fixed errors caused by a missing millisecond component on certain timestamps
 
 ### 0.30 — March 10, 2017
 

data/lib/ig_markets/account.rb

@@ -12,13 +12,13 @@ module IGMarkets
     attribute :account_alias
     attribute :account_id
     attribute :account_name
-    attribute :account_type, Symbol, allowed_values: [:cfd, :physical, :spreadbet]
+    attribute :account_type, Symbol, allowed_values: %i[cfd physical spreadbet]
     attribute :balance, Balance
     attribute :can_transfer_from, Boolean
     attribute :can_transfer_to, Boolean
     attribute :currency, String, regex: Regex::CURRENCY
     attribute :preferred, Boolean
-    attribute :status, Symbol, allowed_values: [:disabled, :enabled, :suspended_from_dealing]
+    attribute :status, Symbol, allowed_values: %i[disabled enabled suspended_from_dealing]
 
     # Reloads this account's attributes by re-querying the IG Markets API.
     def reload

data/lib/ig_markets/activity.rb

@@ -6,20 +6,20 @@ module IGMarkets
     class Details < Model
       # Contains details on the actions that were performed by an activity. Returned by {#actions}.
       class Action < Model
-        attribute :action_type, Symbol, allowed_values: [:limit_order_amended, :limit_order_deleted,
-                                                         :limit_order_filled, :limit_order_opened, :limit_order_rolled,
-                                                         :position_closed, :position_deleted, :position_opened,
-                                                         :position_partially_closed, :position_rolled,
-                                                         :stop_limit_amended, :stop_order_amended, :stop_order_deleted,
-                                                         :stop_order_filled, :stop_order_opened, :stop_order_rolled,
-                                                         :unknown, :working_order_deleted]
+        attribute :action_type, Symbol, allowed_values: %i[limit_order_amended limit_order_deleted
+                                                           limit_order_filled limit_order_opened limit_order_rolled
+                                                           position_closed position_deleted position_opened
+                                                           position_partially_closed position_rolled
+                                                           stop_limit_amended stop_order_amended stop_order_deleted
+                                                           stop_order_filled stop_order_opened stop_order_rolled
+                                                           unknown working_order_deleted]
         attribute :affected_deal_id
       end
 
       attribute :actions, Action
       attribute :currency
       attribute :deal_reference
-      attribute :direction, Symbol, allowed_values: [:buy, :sell]
+      attribute :direction, Symbol, allowed_values: %i[buy sell]
       attribute :good_till_date
       attribute :guaranteed_stop, Boolean
       attribute :level, Float
@@ -33,14 +33,14 @@ module IGMarkets
       attribute :trailing_stop_distance, Integer
     end
 
-    attribute :channel, Symbol, allowed_values: [:dealer, :mobile, :public_fix_api, :public_web_api, :system, :web]
+    attribute :channel, Symbol, allowed_values: %i[dealer mobile public_fix_api public_web_api system web]
     attribute :date, Time, format: '%FT%T'
     attribute :deal_id
     attribute :description
     attribute :details, Details
     attribute :epic, String, regex: Regex::EPIC
-    attribute :period, Time, nil_if: %w(- DFB), format: ['%FT%T', '%d-%b-%y', '%b-%y']
-    attribute :status, Symbol, allowed_values: [:accepted, :rejected, :unknown]
-    attribute :type, Symbol, allowed_values: [:edit_stop_and_limit, :position, :system, :working_order]
+    attribute :period, Time, nil_if: %w[- DFB], format: ['%FT%T', '%d-%b-%y', '%b-%y']
+    attribute :status, Symbol, allowed_values: %i[accepted rejected unknown]
+    attribute :type, Symbol, allowed_values: %i[edit_stop_and_limit position system working_order]
   end
 end

data/lib/ig_markets/application.rb

@@ -15,7 +15,7 @@ module IGMarkets
     attribute :id
     attribute :name
     attribute :restricted_to_self, Boolean
-    attribute :status, Symbol, allowed_values: [:disabled, :enabled, :revoked]
+    attribute :status, Symbol, allowed_values: %i[disabled enabled revoked]
     attribute :terms_accepted_date, Time, format: '%Q'
     attribute :tier
   end

data/lib/ig_markets/cli/commands/activities_command.rb

@@ -4,10 +4,11 @@ module IGMarkets
     class Main
       desc 'activities', 'Prints account activities'
 
-      option :days, type: :numeric, required: true, desc: 'The number of days to print account activities for'
-      option :from, desc: 'The date and time to print account activities from, format: yyyy-mm-ddThh:mm:ss'
+      option :days, type: :numeric, desc: 'The number of days to print account activities for'
+      option :from, desc: 'The date and time to print account activities from, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
+      option :to, desc: 'The end date and time to print account transactions for, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
       option :epic, desc: 'Regex for filtering activities based on their EPIC'
-      option :sort_by, enum: %w(channel date epic type), default: 'date', desc: 'The attribute to sort activities by'
+      option :sort_by, enum: %w[channel date epic type], default: 'date', desc: 'The attribute to sort activities by'
 
       def activities
         self.class.begin_session(options) do |dealing_platform|

data/lib/ig_markets/cli/commands/orders_command.rb

@@ -20,10 +20,10 @@ module IGMarkets
 
       option :currency_code, required: true, desc: "The 3 character currency code, must be one of the instrument's " \
                                                    'currencies'
-      option :direction, enum: %w(buy sell), required: true, desc: 'The trade direction'
+      option :direction, enum: %w[buy sell], required: true, desc: 'The trade direction'
       option :epic, required: true, desc: 'The EPIC of the market to trade'
       option :expiry, desc: 'The expiry date of the instrument (if applicable), format: yyyy-mm-dd'
-      option :force_open, type: :boolean, default: false, desc: 'Whether a force open is required'
+      option :force_open, type: :boolean, default: true, desc: 'Whether a force open is required'
       option :good_till_date, desc: 'The date that the order will live till, format: yyyy-mm-ddThh:mm(+|-)zz:zz'
       option :guaranteed_stop, type: :boolean, default: false, desc: 'Whether a guaranteed stop is required'
       option :level, type: :numeric, required: true, desc: 'The level at which the order will be triggered'
@@ -32,7 +32,7 @@ module IGMarkets
       option :size, type: :numeric, required: true, desc: 'The size of the order'
       option :stop_distance, type: :numeric, desc: 'The distance away in pips to place the stop'
       option :stop_level, type: :numeric, desc: 'The level at which to place the stop'
-      option :type, enum: %w(limit stop), required: true, desc: 'The order type'
+      option :type, enum: %w[limit stop], required: true, desc: 'The order type'
 
       def create
         Main.begin_session(options) do |dealing_platform|
@@ -50,7 +50,7 @@ module IGMarkets
       option :limit_level, type: :numeric, desc: 'The level at which to place the limit'
       option :stop_distance, desc: 'The distance away in pips to place the stop'
       option :stop_level, type: :numeric, desc: 'The level at which to place the stop'
-      option :type, enum: %w(limit stop), desc: 'The order type'
+      option :type, enum: %w[limit stop], desc: 'The order type'
 
       def update(deal_id)
         Main.begin_session(options) do |dealing_platform|
@@ -92,8 +92,8 @@ module IGMarkets
 
       private
 
-      ATTRIBUTES = [:currency_code, :direction, :epic, :expiry, :force_open, :good_till_date, :guaranteed_stop, :level,
-                    :limit_distance, :limit_level, :size, :stop_distance, :stop_level, :type].freeze
+      ATTRIBUTES = %i[currency_code direction epic expiry force_open good_till_date guaranteed_stop level
+                      limit_distance limit_level size stop_distance stop_level type].freeze
 
       def working_order_attributes
         attributes = Main.filter_options options, ATTRIBUTES

data/lib/ig_markets/cli/commands/performance_command.rb

@@ -4,8 +4,9 @@ module IGMarkets
     class Main
       desc 'performance', 'Prints a summary of trading performance over a period'
 
-      option :days, type: :numeric, required: true, desc: 'The number of days to print performance for'
-      option :from, desc: 'The date and time to show performance from, format: yyyy-mm-ddThh:mm:ss'
+      option :days, type: :numeric, desc: 'The number of days to print performance for'
+      option :from, desc: 'The date and time to show performance from, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
+      option :to, desc: 'The end date and time to show transactions for, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
 
       def performance
         self.class.begin_session(options) do |dealing_platform|
@@ -16,7 +17,7 @@ module IGMarkets
 
           puts table
 
-          print_summary performances
+          print_summary performances if performances.any?
         end
       end
 

data/lib/ig_markets/cli/commands/positions_command.rb

@@ -26,22 +26,24 @@ module IGMarkets
 
       option :currency_code, required: true, desc: "The 3 character currency code, must be one of the instrument's " \
                                                    'currencies'
-      option :direction, required: true, enum: %w(buy sell), desc: 'The trade direction'
+      option :direction, required: true, enum: %w[buy sell], desc: 'The trade direction'
       option :epic, required: true, desc: 'The EPIC of the market to trade'
       option :expiry, desc: 'The expiry date of the instrument (if applicable), format: yyyy-mm-dd'
-      option :force_open, type: :boolean, default: false, desc: 'Whether a force open is required'
+      option :force_open, type: :boolean, desc: 'Whether a force open is required, defaults to true if ' \
+                                                '--limit-distance, --limit-level, --stop-distance or --stop-level ' \
+                                                'are specified'
       option :guaranteed_stop, type: :boolean, default: false, desc: 'Whether a guaranteed stop is required'
       option :level, type: :numeric, desc: "Required if and only if --order-type is 'limit' or 'quote'"
       option :limit_distance, type: :numeric, desc: 'The distance away in pips to place the limit, if set then ' \
                                                     '--limit-level must not be used'
       option :limit_level, type: :numeric, desc: 'The limit level, if set then --limit-distance must not be used'
-      option :order_type, enum: %w(limit market quote), default: 'market', desc: 'The order type'
+      option :order_type, enum: %w[limit market quote], default: 'market', desc: 'The order type'
       option :quote_id, desc: 'The Lightstreamer quote ID, required when using --order-type=quote'
       option :size, type: :numeric, required: true, desc: 'The size of the position'
       option :stop_distance, type: :numeric, desc: 'The distance away in pips to place the stop, if set then ' \
                                                    '--stop-level must not be used'
       option :stop_level, type: :numeric, desc: 'The stop level, if set then --stop-distance must not be used'
-      option :time_in_force, enum: %w(execute-and-eliminate fill-or-kill), desc: 'The order fill strategy'
+      option :time_in_force, enum: %w[execute-and-eliminate fill-or-kill], desc: 'The order fill strategy'
       option :trailing_stop, type: :boolean, desc: 'Whether to use a trailing stop, defaults to false'
       option :trailing_stop_increment, type: :numeric, desc: 'The increment step in pips for the trailing stop, ' \
                                                              'required when --trailing-stop is specified'
@@ -71,11 +73,11 @@ module IGMarkets
       desc 'close DEAL-ID', 'Closes or partially closes a position'
 
       option :level, type: :numeric, desc: "Required if and only if --order-type is 'limit' or 'quote'"
-      option :order_type, enum: %w(limit market quote), default: 'market', desc: 'The order type'
+      option :order_type, enum: %w[limit market quote], default: 'market', desc: 'The order type'
       option :quote_id, desc: 'The Lightstreamer quote ID, required when using --order-type=quote'
       option :size, type: :numeric, desc: 'The size of the position to close, if not specified then the entire ' \
                                           'position will be closed'
-      option :time_in_force, enum: %w(execute-and-eliminate fill-or-kill), desc: 'The order fill strategy'
+      option :time_in_force, enum: %w[execute-and-eliminate fill-or-kill], desc: 'The order fill strategy'
 
       def close(deal_id)
         with_position(deal_id) do |position|
@@ -85,8 +87,8 @@ module IGMarkets
 
       desc 'close-all', 'Closes all open positions'
 
-      option :order_type, enum: %w(limit market quote), default: 'market', desc: 'The order type'
-      option :time_in_force, enum: %w(execute-and-eliminate fill-or-kill), desc: 'The order fill strategy'
+      option :order_type, enum: %w[limit market quote], default: 'market', desc: 'The order type'
+      option :time_in_force, enum: %w[execute-and-eliminate fill-or-kill], desc: 'The order fill strategy'
 
       def close_all
         Main.begin_session(options) do |dealing_platform|
@@ -100,9 +102,9 @@ module IGMarkets
 
       private
 
-      ATTRIBUTES = [:currency_code, :direction, :epic, :expiry, :force_open, :guaranteed_stop, :level, :limit_distance,
-                    :limit_level, :order_type, :quote_id, :size, :stop_distance, :stop_level, :time_in_force,
-                    :trailing_stop, :trailing_stop_increment].freeze
+      ATTRIBUTES = %i[currency_code direction epic expiry force_open guaranteed_stop level limit_distance
+                      limit_level order_type quote_id size stop_distance stop_level time_in_force
+                      trailing_stop trailing_stop_increment].freeze
 
       def position_attributes
         attributes = Main.filter_options options, ATTRIBUTES

data/lib/ig_markets/cli/commands/prices_command.rb

@@ -5,8 +5,8 @@ module IGMarkets
       desc 'prices', 'Prints historical prices for a market'
 
       option :epic, required: true, desc: 'The EPIC of the market to print historical prices for'
-      option :resolution, enum: %w(second minute minute-2 minute-3 minute-5 minute-10 minute-15 minute-30 hour hour-2
-                                   hour-3 hour-4 day week month), required: true, desc: 'The price resolution'
+      option :resolution, enum: %w[second minute minute-2 minute-3 minute-5 minute-10 minute-15 minute-30 hour hour-2
+                                   hour-3 hour-4 day week month], required: true, desc: 'The price resolution'
       option :number, type: :numeric, desc: 'The number of historical prices to return, if this is specified then ' \
                                             '--from and --to are ignored, otherwise they are required'
       option :from, desc: 'The start of the period to return prices for, required unless --number is specified, ' \
@@ -55,9 +55,9 @@ END
       end
 
       def historical_price_result_from_date_range(market)
-        filtered_options = self.class.filter_options options, [:from, :to]
+        filtered_options = self.class.filter_options options, %i[from to]
 
-        [:from, :to].each do |attribute|
+        %i[from to].each do |attribute|
           self.class.parse_date_time filtered_options, attribute, Time, '%FT%T%z', 'yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
         end
 

data/lib/ig_markets/cli/commands/sprints_command.rb

@@ -20,9 +20,9 @@ module IGMarkets
 
       desc 'create', 'Creates a new sprint market position'
 
-      option :direction, enum: %w(buy sell), required: true, desc: 'The trade direction'
+      option :direction, enum: %w[buy sell], required: true, desc: 'The trade direction'
       option :epic, required: true, desc: 'The EPIC of the market to trade'
-      option :expiry_period, enum: %w(1 2 5 20 60), required: true, desc: 'The expiry period in seconds'
+      option :expiry_period, enum: %w[1 2 5 20 60], required: true, desc: 'The expiry period in seconds'
       option :size, required: true, desc: 'The position size'
 
       def create

data/lib/ig_markets/cli/commands/transactions_command.rb

@@ -4,11 +4,12 @@ module IGMarkets
     class Main
       desc 'transactions', 'Prints account transactions'
 
-      option :days, type: :numeric, required: true, desc: 'The number of days to print account transactions for'
-      option :from, desc: 'The date and time to print account transactions from, format: yyyy-mm-ddThh:mm:ss'
+      option :days, type: :numeric, desc: 'The number of days to print account transactions for'
+      option :from, desc: 'The date and time to print account transactions from, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
+      option :to, desc: 'The end date and time to print account transactions for, format: yyyy-mm-ddThh:mm:ss(+|-)zz:zz'
       option :instrument, desc: 'Regex for filtering transactions based on their instrument'
       option :interest, type: :boolean, default: true, desc: 'Whether to show interest deposits and withdrawals'
-      option :sort_by, enum: %w(date instrument profit-loss type), default: 'date', desc: 'The attribute to sort ' \
+      option :sort_by, enum: %w[date instrument profit-loss type], default: 'date', desc: 'The attribute to sort ' \
                                                                                           'transactions by'
 
       def transactions

data/lib/ig_markets/cli/main.rb

@@ -27,21 +27,23 @@ module IGMarkets
 
       private
 
-      # Turns the `:days` and `:from` options into a hash with `:from` and `:to` keys that can be passed to
-      # {AccountMethods#activities} and {AccountMethods#transactions}.
+      # Turns the `:days` or `:from` options into a hash that can be passed to {AccountMethods#activities} and
+      # {AccountMethods#transactions}.
       def history_options
-        days_in_seconds = options[:days] * 24 * 60 * 60
-
         if options[:from]
-          from = Time.strptime options[:from], '%FT%T'
-          to = from + days_in_seconds
-
-          { from: from, to: to }
+          {
+            from: history_options_parse_time(options[:from]),
+            to: history_options_parse_time(options[:to])
+          }
         else
-          { from: Time.now - days_in_seconds }
+          { from: Time.now.utc - options[:days] * 86_400 }
         end
       end
 
+      def history_options_parse_time(input)
+        input && Time.strptime(input, '%FT%T%z')
+      end
+
       class << self
         # This is the initial entry point for the execution of the command-line client. It is responsible for reading
         # any config files, implementing the --version/-v options, and then invoking the main application.
@@ -97,7 +99,7 @@ module IGMarkets
         end
 
         # Parses and validates a `Date` or `Time` option received as a command-line argument. Raises `ArgumentError` if
-        # it is been specified in an invalid format.
+        # it has been specified in an invalid format.
         #
         # @param [Hash] attributes The attributes hash.
         # @param [Symbol] attribute The name of the date or time attribute to parse and validate.

data/lib/ig_markets/cli/tables/accounts_table.rb

@@ -22,10 +22,12 @@ module IGMarkets
           status = { disabled: 'Disabled', enabled: 'Enabled',
                      suspended_from_dealing: 'Suspended' }.fetch account.status
 
-          [account.account_name, account.account_id, type, account.currency, status, account.preferred] +
-            [:available, :balance, :deposit, :profit_loss].map do |attribute|
-              Format.currency account.balance.send(attribute), account.currency
-            end
+          currency_values = %i[available balance deposit profit_loss].map do |attribute|
+            Format.currency account.balance.send(attribute), account.currency
+          end
+
+          [account.account_name, account.account_id, type, account.currency, status,
+           account.preferred] + currency_values
         end
 
         def cell_color(value, _model, _row_index, column_index)

data/lib/ig_markets/cli/tables/activities_table.rb

@@ -10,7 +10,7 @@ module IGMarkets
         end
 
         def headings
-          %w(Date Channel Type Status EPIC Market Size Level Limit Stop Result)
+          %w[Date Channel Type Status EPIC Market Size Level Limit Stop Result]
         end
 
         def right_aligned_columns

data/lib/ig_markets/cli/tables/historical_price_result_snapshots_table.rb

@@ -6,7 +6,7 @@ module IGMarkets
         private
 
         def headings
-          %w(Date Open Close Low High)
+          %w[Date Open Close Low High]
         end
 
         def right_aligned_columns

data/lib/ig_markets/cli/tables/market_overviews_table.rb

@@ -34,7 +34,7 @@ module IGMarkets
         end
 
         def levels(market_overview)
-          [:bid, :offer, :high, :low, :net_change, :percentage_change].map do |attribute|
+          %i[bid offer high low net_change percentage_change].map do |attribute|
             Format.level market_overview.send(attribute)
           end
         end

data/lib/ig_markets/client_account_summary.rb

@@ -5,7 +5,7 @@ module IGMarkets
     class FormDetails < Model
       attribute :form_dismissable, Boolean
       attribute :form_title
-      attribute :form_type, Symbol, allowed_values: [:bca, :kyc]
+      attribute :form_type, Symbol, allowed_values: %i[bca kyc]
       attribute :form_url
     end
 
@@ -13,17 +13,17 @@ module IGMarkets
     class AccountDetails < Model
       attribute :account_id
       attribute :account_name
-      attribute :account_type, Symbol, allowed_values: [:cfd, :physical, :spreadbet]
+      attribute :account_type, Symbol, allowed_values: %i[cfd physical spreadbet]
       attribute :preferred, Boolean
     end
 
     attribute :account_info, Account::Balance
-    attribute :account_type, Symbol, allowed_values: [:cfd, :physical, :spreadbet]
+    attribute :account_type, Symbol, allowed_values: %i[cfd physical spreadbet]
     attribute :accounts, AccountDetails
-    attribute :authentication_status, Symbol, allowed_values: [:authenticated, :authenticated_missing_credentials,
-                                                               :change_environment, :disabled_preferred_account,
-                                                               :missing_preferred_account,
-                                                               :rejected_invalid_client_version]
+    attribute :authentication_status, Symbol, allowed_values: %i[authenticated authenticated_missing_credentials
+                                                                 change_environment disabled_preferred_account
+                                                                 missing_preferred_account
+                                                                 rejected_invalid_client_version]
     attribute :client_id
     attribute :currency_iso_code, String, regex: Regex::CURRENCY
     attribute :currency_symbol
@@ -35,7 +35,7 @@ module IGMarkets
     attribute :has_active_live_accounts, Boolean
     attribute :ig_company
     attribute :lightstreamer_endpoint
-    attribute :rerouting_environment, Symbol, allowed_values: [:demo, :live, :test, :uat]
+    attribute :rerouting_environment, Symbol, allowed_values: %i[demo live test uat]
     attribute :timezone_offset, Float
     attribute :trailing_stops_enabled, Boolean
   end

data/lib/ig_markets/deal_confirmation.rb

@@ -4,7 +4,7 @@ module IGMarkets
     # Contains details on a specific deal that was affected by a dealing event. Returned by {#affected_deals}.
     class AffectedDeal < Model
       attribute :deal_id
-      attribute :status, Symbol, allowed_values: [:amended, :deleted, :fully_closed, :opened, :partially_closed]
+      attribute :status, Symbol, allowed_values: %i[amended deleted fully_closed opened partially_closed]
     end
 
     attribute :account_id
@@ -13,38 +13,38 @@ module IGMarkets
     attribute :date, Time, format: ['%FT%T.%L', '%FT%T']
     attribute :deal_id
     attribute :deal_reference
-    attribute :deal_status, Symbol, allowed_values: [:accepted, :fund_account, :rejected]
-    attribute :direction, Symbol, allowed_values: [:buy, :sell]
+    attribute :deal_status, Symbol, allowed_values: %i[accepted fund_account rejected]
+    attribute :direction, Symbol, allowed_values: %i[buy sell]
     attribute :epic, String, regex: Regex::EPIC
-    attribute :expiry, Date, nil_if: %w(- DFB), format: ['%d-%b-%y', '%b-%y']
+    attribute :expiry, Date, nil_if: %w[- DFB], format: ['%d-%b-%y', '%b-%y']
     attribute :guaranteed_stop, Boolean
     attribute :level, Float
     attribute :limit_distance, Integer
     attribute :limit_level, Float
     attribute :profit, Float
     attribute :profit_currency, String, regex: Regex::CURRENCY
-    attribute :reason, Symbol, allowed_values: [:account_not_enabled_to_trading, :attached_order_level_error,
-                                                :attached_order_trailing_stop_error, :cannot_change_stop_type,
-                                                :cannot_remove_stop, :closing_only_trades_accepted_on_this_market,
-                                                :conflicting_order, :contact_support_instrument_error, :cr_spacing,
-                                                :duplicate_order_error, :exchange_manual_override,
-                                                :finance_repeat_dealing, :force_open_on_same_market_different_currency,
-                                                :general_error, :good_till_date_in_the_past, :instrument_not_found,
-                                                :insufficient_funds, :level_tolerance_error, :manual_order_timeout,
-                                                :market_closed, :market_closed_with_edits, :market_closing,
-                                                :market_not_borrowable, :market_offline, :market_phone_only,
-                                                :market_rolled, :market_unavailable_to_client, :max_auto_size_exceeded,
-                                                :minimum_order_size_error, :move_away_only_limit, :move_away_only_stop,
-                                                :move_away_only_trigger_level, :opposing_direction_orders_not_allowed,
-                                                :opposing_positions_not_allowed, :order_locked, :order_not_found,
-                                                :over_normal_market_size, :partially_closed_position_not_deleted,
-                                                :position_not_available_to_close, :position_not_found,
-                                                :reject_spreadbet_order_on_cfd_account, :size_increment,
-                                                :sprint_market_expiry_after_market_close, :stop_or_limit_not_allowed,
-                                                :stop_required_error, :strike_level_tolerance, :success,
-                                                :trailing_stop_not_allowed, :unknown, :wrong_side_of_market]
+    attribute :reason, Symbol, allowed_values: %i[account_not_enabled_to_trading attached_order_level_error
+                                                  attached_order_trailing_stop_error cannot_change_stop_type
+                                                  cannot_remove_stop closing_only_trades_accepted_on_this_market
+                                                  conflicting_order contact_support_instrument_error cr_spacing
+                                                  duplicate_order_error exchange_manual_override
+                                                  finance_repeat_dealing force_open_on_same_market_different_currency
+                                                  general_error good_till_date_in_the_past instrument_not_found
+                                                  insufficient_funds level_tolerance_error manual_order_timeout
+                                                  market_closed market_closed_with_edits market_closing
+                                                  market_not_borrowable market_offline market_phone_only
+                                                  market_rolled market_unavailable_to_client max_auto_size_exceeded
+                                                  minimum_order_size_error move_away_only_limit move_away_only_stop
+                                                  move_away_only_trigger_level opposing_direction_orders_not_allowed
+                                                  opposing_positions_not_allowed order_locked order_not_found
+                                                  over_normal_market_size partially_closed_position_not_deleted
+                                                  position_not_available_to_close position_not_found
+                                                  reject_spreadbet_order_on_cfd_account size_increment
+                                                  sprint_market_expiry_after_market_close stop_or_limit_not_allowed
+                                                  stop_required_error strike_level_tolerance success
+                                                  trailing_stop_not_allowed unknown wrong_side_of_market]
     attribute :size, Float
-    attribute :status, Symbol, allowed_values: [:amended, :closed, :deleted, :open, :partially_closed]
+    attribute :status, Symbol, allowed_values: %i[amended closed deleted open partially_closed]
     attribute :stop_distance, Integer
     attribute :stop_level, Float
     attribute :trailing_stop, Boolean

data/lib/ig_markets/dealing_platform/account_methods.rb

@@ -45,7 +45,7 @@ module IGMarkets
       def transactions(options)
         options[:type] ||= :all
 
-        unless [:all, :all_deal, :deposit, :withdrawal].include? options[:type]
+        unless %i[all all_deal deposit withdrawal].include? options[:type]
           raise ArgumentError, "invalid transaction type: #{options[:type]}"
         end
 
@@ -85,7 +85,7 @@ module IGMarkets
           options[:url_parameters][:to] = request_result.last.send(options[:date_attribute]).utc.strftime('%FT%T')
         end
 
-        models.uniq
+        models.uniq(&:to_h)
       end
 
       # Parses and formats options shared by {#activities} and {#transactions} into a set of URL parameters.

data/lib/ig_markets/dealing_platform/position_methods.rb

@@ -80,7 +80,7 @@ module IGMarkets
       # Internal model used by {#create}
       class PositionCreateAttributes < Model
         attribute :currency_code, String, regex: Regex::CURRENCY
-        attribute :direction, Symbol, allowed_values: [:buy, :sell]
+        attribute :direction, Symbol, allowed_values: %i[buy sell]
         attribute :epic, String, regex: Regex::EPIC
         attribute :expiry, Date, format: '%d-%b-%y'
         attribute :force_open, Boolean
@@ -88,12 +88,12 @@ module IGMarkets
         attribute :level, Float
         attribute :limit_distance, Integer
         attribute :limit_level, Float
-        attribute :order_type, Symbol, allowed_values: [:limit, :market, :quote]
+        attribute :order_type, Symbol, allowed_values: %i[limit market quote]
         attribute :quote_id
         attribute :size, Float
         attribute :stop_distance, Integer
         attribute :stop_level, Float
-        attribute :time_in_force, Symbol, allowed_values: [:execute_and_eliminate, :fill_or_kill]
+        attribute :time_in_force, Symbol, allowed_values: %i[execute_and_eliminate fill_or_kill]
         attribute :trailing_stop, Boolean
         attribute :trailing_stop_increment, Integer
 
@@ -106,12 +106,19 @@ module IGMarkets
         private
 
         def set_defaults
-          self.force_open = false if force_open.nil?
+          set_default_force_open
+
           self.guaranteed_stop = false if guaranteed_stop.nil?
           self.order_type ||= :market
           self.time_in_force = :execute_and_eliminate if order_type == :market
         end
 
+        def set_default_force_open
+          self.force_open = false if force_open.nil?
+          self.force_open = true if attributes[:limit_distance] || attributes[:limit_level] ||
+                                    attributes[:stop_distance] || attributes[:stop_level]
+        end
+
         # Runs a series of validations on this model's attributes to check whether it is ready to be sent to the IG
         # Markets API.
         def validate
@@ -124,8 +131,8 @@ module IGMarkets
 
         # Checks that all required attributes for position creation are present.
         def validate_required_attributes
-          required = [:currency_code, :direction, :epic, :force_open, :guaranteed_stop, :order_type, :size,
-                      :time_in_force]
+          required = %i[currency_code direction epic force_open guaranteed_stop order_type size
+                        time_in_force]
 
           required.each do |attribute|
             raise ArgumentError, "#{attribute} attribute must be set" if attributes[attribute].nil?

data/lib/ig_markets/dealing_platform/sprint_market_position_methods.rb

@@ -49,10 +49,10 @@ module IGMarkets
 
       # Internal model used by {#create}
       class SprintMarketPositionCreateAttributes < Model
-        attribute :direction, Symbol, allowed_values: [:buy, :sell]
+        attribute :direction, Symbol, allowed_values: %i[buy sell]
         attribute :epic, String, regex: Regex::EPIC
-        attribute :expiry_period, Symbol, allowed_values: [:one_minute, :two_minutes, :five_minutes, :twenty_minutes,
-                                                           :sixty_minutes]
+        attribute :expiry_period, Symbol, allowed_values: %i[one_minute two_minutes five_minutes twenty_minutes
+                                                             sixty_minutes]
         attribute :size, Float
       end
 

data/lib/ig_markets/dealing_platform/streaming_methods.rb

@@ -49,8 +49,8 @@ module IGMarkets
         accounts ||= @dealing_platform.client_account_summary.accounts
 
         items = Array(accounts).map { |account| "ACCOUNT:#{account.account_id}" }
-        fields = [:available_cash, :available_to_deal, :deposit, :equity, :equity_used, :funds, :margin, :margin_lr,
-                  :margin_nlr, :pnl, :pnl_lr, :pnl_nlr]
+        fields = %i[available_cash available_to_deal deposit equity equity_used funds margin margin_lr
+                    margin_nlr pnl pnl_lr pnl_nlr]
 
         build_subscription items: items, fields: fields, mode: :merge
       end
@@ -64,8 +64,8 @@ module IGMarkets
       # @return [Streaming::Subscription]
       def build_markets_subscription(epics)
         items = Array(epics).map { |epic| "MARKET:#{epic}" }
-        fields = [:bid, :change, :change_pct, :high, :low, :market_delay, :market_state, :mid_open, :odds, :offer,
-                  :strike_price, :update_time]
+        fields = %i[bid change change_pct high low market_delay market_state mid_open odds offer
+                    strike_price update_time]
 
         build_subscription items: items, fields: fields, mode: :merge
       end
@@ -82,7 +82,7 @@ module IGMarkets
         accounts ||= @dealing_platform.client_account_summary.accounts
 
         items = Array(accounts).map { |account| "TRADE:#{account.account_id}" }
-        fields = [:confirms, :opu, :wou]
+        fields = %i[confirms opu wou]
 
         build_subscription items: items, fields: fields, mode: :distinct
       end
@@ -96,8 +96,8 @@ module IGMarkets
       # @return [Streaming::Subscription]
       def build_chart_ticks_subscription(epics)
         items = Array(epics).map { |epic| "CHART:#{epic}:TICK" }
-        fields = [:bid, :day_high, :day_low, :day_net_chg_mid, :day_open_mid, :day_perc_chg_mid, :ltp, :ltv, :ofr, :ttv,
-                  :utm]
+        fields = %i[bid day_high day_low day_net_chg_mid day_open_mid day_perc_chg_mid ltp ltv ofr ttv
+                    utm]
 
         build_subscription items: items, fields: fields, mode: :distinct
       end
@@ -114,9 +114,9 @@ module IGMarkets
         scale = { one_second: 'SECOND', one_minute: '1MINUTE', five_minutes: '5MINUTE', one_hour: 'HOUR' }.fetch scale
         items = ["CHART:#{epic}:#{scale}"]
 
-        fields = [:bid_close, :bid_high, :bid_low, :bid_open, :cons_end, :cons_tick_count, :day_high, :day_low,
-                  :day_net_chg_mid, :day_open_mid, :day_perc_chg_mid, :ltp_close, :ltp_high, :ltp_low, :ltp_open, :ltv,
-                  :ofr_close, :ofr_high, :ofr_low, :ofr_open, :ttv, :utm]
+        fields = %i[bid_close bid_high bid_low bid_open cons_end cons_tick_count day_high day_low
+                    day_net_chg_mid day_open_mid day_perc_chg_mid ltp_close ltp_high ltp_low ltp_open ltv
+                    ofr_close ofr_high ofr_low ofr_open ttv utm]
 
         build_subscription items: items, fields: fields, mode: :merge
       end

data/lib/ig_markets/dealing_platform/working_order_methods.rb

@@ -39,7 +39,7 @@ module IGMarkets
       # @option attributes [:buy, :sell] :direction Order direction. Required.
       # @option attributes [String] :epic The EPIC of the instrument for the order. Required.
       # @option attributes [Date] :expiry The expiry date of the instrument (if applicable). Optional.
-      # @option attributes [Boolean] :force_open Whether a force open is required. Defaults to `false`.
+      # @option attributes [Boolean] :force_open Whether a force open is required. Defaults to `true`.
       # @option attributes [Time] :good_till_date The date that the working order will live till. If not specified then
       #                    the working order will remain until it is cancelled.
       # @option attributes [Boolean] :guaranteed_stop Whether a guaranteed stop is required. Defaults to `false`.
@@ -72,7 +72,7 @@ module IGMarkets
       # Internal model used by {#create}.
       class WorkingOrderCreateAttributes < Model
         attribute :currency_code, String, regex: Regex::CURRENCY
-        attribute :direction, Symbol, allowed_values: [:buy, :sell]
+        attribute :direction, Symbol, allowed_values: %i[buy sell]
         attribute :epic, String, regex: Regex::EPIC
         attribute :expiry, Date, format: '%d-%b-%y'
         attribute :force_open, Boolean
@@ -84,8 +84,8 @@ module IGMarkets
         attribute :size, Float
         attribute :stop_distance, Integer
         attribute :stop_level, Float
-        attribute :time_in_force, Symbol, allowed_values: [:good_till_cancelled, :good_till_date]
-        attribute :type, Symbol, allowed_values: [:limit, :stop]
+        attribute :time_in_force, Symbol, allowed_values: %i[good_till_cancelled good_till_date]
+        attribute :type, Symbol, allowed_values: %i[limit stop]
 
         def initialize(attributes)
           super
@@ -96,7 +96,7 @@ module IGMarkets
         private
 
         def set_defaults
-          self.force_open = false if force_open.nil?
+          self.force_open = true if force_open.nil?
           self.guaranteed_stop = false if guaranteed_stop.nil?
           self.time_in_force = good_till_date ? :good_till_date : :good_till_cancelled
         end
@@ -104,7 +104,7 @@ module IGMarkets
         # Runs a series of validations on this model's attributes to check whether it is ready to be sent to the IG
         # Markets API.
         def validate
-          required = [:currency_code, :direction, :epic, :guaranteed_stop, :level, :size, :time_in_force, :type]
+          required = %i[currency_code direction epic guaranteed_stop level size time_in_force type]
           required.each do |attribute|
             raise ArgumentError, "#{attribute} attribute must be set" if send(attribute).nil?
           end

data/lib/ig_markets/instrument.rb

@@ -62,14 +62,14 @@ module IGMarkets
     attribute :country
     attribute :currencies, Currency
     attribute :epic, String, regex: Regex::EPIC
-    attribute :expiry, Date, nil_if: %w(- DFB), format: ['%d-%b-%y', '%b-%y']
+    attribute :expiry, Date, nil_if: %w[- DFB], format: ['%d-%b-%y', '%b-%y']
     attribute :expiry_details, ExpiryDetails
     attribute :force_open_allowed, Boolean
     attribute :limited_risk_premium, LimitedRiskPremium
     attribute :lot_size, Float
     attribute :margin_deposit_bands, MarginDepositBand
     attribute :margin_factor, Float
-    attribute :margin_factor_unit, Symbol, allowed_values: [:percentage, :points]
+    attribute :margin_factor_unit, Symbol, allowed_values: %i[percentage points]
     attribute :market_id
     attribute :name
     attribute :news_code
@@ -82,11 +82,11 @@ module IGMarkets
     attribute :sprint_markets_minimum_expiry_time, Float
     attribute :stops_limits_allowed, Boolean
     attribute :streaming_prices_available, Boolean
-    attribute :type, Symbol, allowed_values: [:binary, :bungee_capped, :bungee_commodities, :bungee_currencies,
-                                              :bungee_indices, :commodities, :currencies, :indices, :opt_commodities,
-                                              :opt_currencies, :opt_indices, :opt_rates, :opt_shares, :rates, :sectors,
-                                              :shares, :sprint_market, :test_market, :unknown]
-    attribute :unit, Symbol, allowed_values: [:amount, :contracts, :shares]
+    attribute :type, Symbol, allowed_values: %i[binary bungee_capped bungee_commodities bungee_currencies
+                                                bungee_indices commodities currencies indices opt_commodities
+                                                opt_currencies opt_indices opt_rates opt_shares rates sectors
+                                                shares sprint_market test_market unknown]
+    attribute :unit, Symbol, allowed_values: %i[amount contracts shares]
     attribute :value_of_one_pip
   end
 end

data/lib/ig_markets/limited_risk_premium.rb

@@ -2,7 +2,7 @@ module IGMarkets
   # Contains details on a limited risk premium. Returned by {Instrument#limited_risk_premium},
   # {Position#limited_risk_premium} and {WorkingOrder#limited_risk_premium}.
   class LimitedRiskPremium < Model
-    attribute :unit, Symbol, allowed_values: [:percentage, :points]
+    attribute :unit, Symbol, allowed_values: %i[percentage points]
     attribute :value, Float
   end
 end

data/lib/ig_markets/market.rb

@@ -7,18 +7,18 @@ module IGMarkets
     class DealingRules < Model
       # Contains specfics for a single dealing rule.
       class RuleDetails < Model
-        attribute :unit, Symbol, allowed_values: [:percentage, :points]
+        attribute :unit, Symbol, allowed_values: %i[percentage points]
         attribute :value, Float
       end
 
-      attribute :market_order_preference, Symbol, allowed_values: [:available_default_off, :available_default_on,
-                                                                   :not_available]
+      attribute :market_order_preference, Symbol, allowed_values: %i[available_default_off available_default_on
+                                                                     not_available]
       attribute :max_stop_or_limit_distance, RuleDetails
       attribute :min_controlled_risk_stop_distance, RuleDetails
       attribute :min_deal_size, RuleDetails
       attribute :min_normal_stop_or_limit_distance, RuleDetails
       attribute :min_step_distance, RuleDetails
-      attribute :trailing_stops_preference, Symbol, allowed_values: [:available, :not_available]
+      attribute :trailing_stops_preference, Symbol, allowed_values: %i[available not_available]
     end
 
     # Contains details on a snapshot of a market. Returned by {#snapshot}.
@@ -30,8 +30,8 @@ module IGMarkets
       attribute :delay_time, Float
       attribute :high, Float
       attribute :low, Float
-      attribute :market_status, Symbol, allowed_values: [:closed, :edits_only, :offline, :on_auction,
-                                                         :on_auction_no_edits, :suspended, :tradeable]
+      attribute :market_status, Symbol, allowed_values: %i[closed edits_only offline on_auction
+                                                           on_auction_no_edits suspended tradeable]
       attribute :net_change, Float
       attribute :offer, Float
       attribute :percentage_change, Float
@@ -75,12 +75,12 @@ module IGMarkets
 
     # Validates the options passed to {#historical_prices}.
     def validate_historical_prices_options(options)
-      resolutions = [:second, :minute, :minute_2, :minute_3, :minute_5, :minute_10, :minute_15, :minute_30, :hour,
-                     :hour_2, :hour_3, :hour_4, :day, :week, :month]
+      resolutions = %i[second minute minute_2 minute_3 minute_5 minute_10 minute_15 minute_30 hour
+                       hour_2 hour_3 hour_4 day week month]
 
       raise ArgumentError, 'resolution is invalid' unless resolutions.include? options[:resolution]
 
-      return if options.keys == [:resolution, :from, :to] || options.keys == [:resolution, :number]
+      return if options.keys == %i[resolution from to] || options.keys == %i[resolution number]
 
       raise ArgumentError, 'options must specify either :number or :from and :to'
     end

data/lib/ig_markets/market_overview.rb

@@ -5,7 +5,7 @@ module IGMarkets
     attribute :delay_time, Float
     attribute :epic, String, regex: Regex::EPIC
     attribute :exchange_id
-    attribute :expiry, String, nil_if: %w(- DFB)
+    attribute :expiry, String, nil_if: %w[- DFB]
     attribute :high, Float
     attribute :instrument_name
     attribute :instrument_type, Symbol, allowed_values: Instrument.allowed_values(:type)

data/lib/ig_markets/model.rb

@@ -35,11 +35,25 @@ module IGMarkets
 
     # Compares this model to another, the attributes and class must match for them to be considered equal.
     #
-    # @param [#class, #attributes] other The other model to compare to.
+    # @param [Model] other The other model to compare to.
     #
     # @return [Boolean]
     def ==(other)
-      self.class == other.class && attributes == other.attributes
+      self.class == other.class && to_h == other.to_h
+    end
+
+    # Converts this model into a nested hash of attributes. This is simlar to just calling {#attributes}, but in this
+    # case any attributes that are instances of {Model} will also be transformed into a hash in the return value.
+    #
+    # @return [Hash]
+    def to_h
+      attributes.each_with_object({}) do |(key, value), hash|
+        hash[key] = if value.is_a? Model
+                      value.to_h
+                    else
+                      value
+                    end
+      end
     end
 
     # Returns a human-readable string containing this model's type and all its current attribute values.

data/lib/ig_markets/model/typecasters.rb

@@ -20,7 +20,7 @@ module IGMarkets
 
       def typecaster_boolean(value, _options, name)
         return value if [nil, true, false].include? value
-        return value == '1' if %w(0 1).include? value
+        return value == '1' if %w[0 1].include? value
 
         raise ArgumentError, "#{self}##{name}: invalid boolean value: #{value}"
       end

data/lib/ig_markets/position.rb

@@ -8,7 +8,7 @@ module IGMarkets
     attribute :currency, String, regex: Regex::CURRENCY
     attribute :deal_id
     attribute :deal_reference
-    attribute :direction, Symbol, allowed_values: [:buy, :sell]
+    attribute :direction, Symbol, allowed_values: %i[buy sell]
     attribute :level, Float
     attribute :limit_level, Float
     attribute :limited_risk_premium, LimitedRiskPremium
@@ -134,7 +134,7 @@ module IGMarkets
         raise ArgumentError, 'set quote_id if and only if order_type is :quote'
       end
 
-      return unless [:limit, :quote].include?(attributes[:order_type]) == attributes[:level].nil?
+      return unless %i[limit quote].include?(attributes[:order_type]) == attributes[:level].nil?
 
       raise ArgumentError, 'set level if and only if order_type is :limit or :quote'
     end
@@ -142,17 +142,17 @@ module IGMarkets
     # Internal model used by {#close}.
     class PositionCloseAttributes < Model
       attribute :deal_id
-      attribute :direction, Symbol, allowed_values: [:buy, :sell]
+      attribute :direction, Symbol, allowed_values: %i[buy sell]
       attribute :level, Float
-      attribute :order_type, Symbol, allowed_values: [:limit, :market, :quote]
+      attribute :order_type, Symbol, allowed_values: %i[limit market quote]
       attribute :quote_id
       attribute :size, Float
-      attribute :time_in_force, Symbol, allowed_values: [:execute_and_eliminate, :fill_or_kill]
+      attribute :time_in_force, Symbol, allowed_values: %i[execute_and_eliminate fill_or_kill]
 
       # Runs a series of validations on this model's attributes to check whether it is ready to be sent to the IG
       # Markets API.
       def validate
-        [:deal_id, :direction, :order_type, :size, :time_in_force].each do |attribute|
+        %i[deal_id direction order_type size time_in_force].each do |attribute|
           raise ArgumentError, "#{attribute} attribute must be set" if attributes[attribute].nil?
         end
 

data/lib/ig_markets/sprint_market_position.rb

@@ -5,7 +5,7 @@ module IGMarkets
     attribute :currency, String, regex: Regex::CURRENCY
     attribute :deal_id
     attribute :description
-    attribute :direction, Symbol, allowed_values: [:buy, :sell]
+    attribute :direction, Symbol, allowed_values: %i[buy sell]
     attribute :epic, String, regex: Regex::EPIC
     attribute :expiry_time, Time, format: '%FT%T'
     attribute :instrument_name

data/lib/ig_markets/streaming/account_state.rb

@@ -174,7 +174,7 @@ module IGMarkets
           working_order.currency_code = working_order_update.currency
           working_order.order_level = working_order_update.level
 
-          %i(good_till_date limit_distance order_type stop_distance time_in_force).each do |attribute|
+          %i[good_till_date limit_distance order_type stop_distance time_in_force].each do |attribute|
             working_order.send "#{attribute}=", working_order_update.send(attribute)
           end
         end

data/lib/ig_markets/streaming/consolidated_chart_data_update.rb

@@ -24,7 +24,7 @@ module IGMarkets
       attribute :ofr_high, Float
       attribute :ofr_low, Float
       attribute :ofr_open, Float
-      attribute :scale, Symbol, allowed_values: [:one_second, :one_minute, :five_minutes, :one_hour]
+      attribute :scale, Symbol, allowed_values: %i[one_second one_minute five_minutes one_hour]
       attribute :ttv, Float
       attribute :utm, Time, format: '%Q'
     end

data/lib/ig_markets/streaming/market_update.rb

@@ -9,8 +9,8 @@ module IGMarkets
       attribute :high, Float
       attribute :low, Float
       attribute :market_delay, Boolean
-      attribute :market_state, Symbol, allowed_values: [:closed, :offline, :tradeable, :edit, :auction,
-                                                        :auction_no_edit, :suspended]
+      attribute :market_state, Symbol, allowed_values: %i[closed offline tradeable edit auction
+                                                          auction_no_edit suspended unavailable]
       attribute :mid_open, Float
       attribute :odds, Float
       attribute :offer, Float

data/lib/ig_markets/streaming/position_update.rb

@@ -8,15 +8,15 @@ module IGMarkets
       attribute :deal_id
       attribute :deal_id_origin
       attribute :deal_reference
-      attribute :deal_status, Symbol, allowed_values: [:accepted, :rejected]
-      attribute :direction, Symbol, allowed_values: [:buy, :sell]
+      attribute :deal_status, Symbol, allowed_values: %i[accepted rejected]
+      attribute :direction, Symbol, allowed_values: %i[buy sell]
       attribute :epic, String, regex: Regex::EPIC
-      attribute :expiry, Date, nil_if: %w(- DFB), format: ['%d-%b-%y', '%b-%y']
+      attribute :expiry, Date, nil_if: %w[- DFB], format: ['%d-%b-%y', '%b-%y']
       attribute :guaranteed_stop, Boolean
       attribute :level, Float
       attribute :limit_level, Float
       attribute :size, Float
-      attribute :status, Symbol, allowed_values: [:deleted, :open, :updated]
+      attribute :status, Symbol, allowed_values: %i[deleted open updated]
       attribute :stop_level, Float
       attribute :timestamp, Time, format: ['%FT%T.%L', '%FT%T']
     end

data/lib/ig_markets/streaming/working_order_update.rb

@@ -8,19 +8,19 @@ module IGMarkets
       attribute :currency, String, regex: Regex::CURRENCY
       attribute :deal_id
       attribute :deal_reference
-      attribute :deal_status, Symbol, allowed_values: [:accepted, :rejected]
-      attribute :direction, Symbol, allowed_values: [:buy, :sell]
+      attribute :deal_status, Symbol, allowed_values: %i[accepted rejected]
+      attribute :direction, Symbol, allowed_values: %i[buy sell]
       attribute :epic, String, regex: Regex::EPIC
-      attribute :expiry, Date, nil_if: %w(- DFB), format: ['%d-%b-%y', '%b-%y']
+      attribute :expiry, Date, nil_if: %w[- DFB], format: ['%d-%b-%y', '%b-%y']
       attribute :good_till_date, Time, format: '%FT%T'
       attribute :guaranteed_stop, Boolean
       attribute :level, Float
       attribute :limit_distance, Integer
-      attribute :order_type, Symbol, allowed_values: [:limit, :stop]
+      attribute :order_type, Symbol, allowed_values: %i[limit stop]
       attribute :size, Float
-      attribute :status, Symbol, allowed_values: [:deleted, :open, :updated]
+      attribute :status, Symbol, allowed_values: %i[deleted open updated]
       attribute :stop_distance, Integer
-      attribute :time_in_force, Symbol, allowed_values: [:good_till_cancelled, :good_till_date]
+      attribute :time_in_force, Symbol, allowed_values: %i[good_till_cancelled good_till_date]
       attribute :timestamp, Time, format: ['%FT%T.%L', '%FT%T']
     end
   end

data/lib/ig_markets/transaction.rb

@@ -3,17 +3,17 @@ module IGMarkets
   # {DealingPlatform::AccountMethods#transactions}.
   class Transaction < Model
     attribute :cash_transaction, Boolean
-    attribute :close_level, String, nil_if: %w(- 0)
+    attribute :close_level, String, nil_if: %w[- 0]
     attribute :currency
     attribute :date_utc, Time, format: '%FT%T'
     attribute :instrument_name
     attribute :open_date_utc, Time, format: '%FT%T'
-    attribute :open_level, String, nil_if: %w(- 0)
-    attribute :period, Time, nil_if: %w(- DFB), format: ['%FT%T', '%d-%b-%y', '%b-%y']
+    attribute :open_level, String, nil_if: %w[- 0]
+    attribute :period, Time, nil_if: %w[- DFB], format: ['%FT%T', '%d-%b-%y', '%b-%y']
     attribute :profit_and_loss
     attribute :reference
     attribute :size, String, nil_if: '-'
-    attribute :transaction_type, Symbol, allowed_values: [:chart, :deal, :depo, :dividend, :exchange, :trade, :with]
+    attribute :transaction_type, Symbol, allowed_values: %i[chart deal depo dividend exchange trade with]
 
     deprecated_attribute :date
 
@@ -23,7 +23,7 @@ module IGMarkets
     #
     # @return [Boolean]
     def interest?
-      [:depo, :with].include?(transaction_type) && !(instrument_name.downcase =~ /(^|[^a-z])interest([^a-z]|$)/).nil?
+      %i[depo with].include?(transaction_type) && !(instrument_name.downcase =~ /(^|[^a-z])interest([^a-z]|$)/).nil?
     end
 
     # Returns this transaction's {#profit_and_loss} as a `Float`, denominated in this transaction's {#currency}.

data/lib/ig_markets/version.rb

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

data/lib/ig_markets/working_order.rb

@@ -5,7 +5,7 @@ module IGMarkets
     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 :direction, Symbol, allowed_values: %i[buy sell]
     attribute :dma, Boolean
     attribute :epic, String, regex: Regex::EPIC
     attribute :good_till_date, Time, format: '%Y/%m/%d %R'
@@ -14,9 +14,9 @@ module IGMarkets
     attribute :limited_risk_premium, LimitedRiskPremium
     attribute :order_level, Float
     attribute :order_size, Float
-    attribute :order_type, Symbol, allowed_values: [:limit, :stop]
+    attribute :order_type, Symbol, allowed_values: %i[limit stop]
     attribute :stop_distance, Integer
-    attribute :time_in_force, Symbol, allowed_values: [:good_till_cancelled, :good_till_date]
+    attribute :time_in_force, Symbol, allowed_values: %i[good_till_cancelled good_till_date]
 
     attribute :market, MarketOverview
 
@@ -70,8 +70,8 @@ module IGMarkets
       attribute :limit_level, Float
       attribute :stop_distance, Integer
       attribute :stop_level, Float
-      attribute :time_in_force, Symbol, allowed_values: [:good_till_cancelled, :good_till_date]
-      attribute :type, Symbol, allowed_values: [:limit, :stop]
+      attribute :time_in_force, Symbol, allowed_values: %i[good_till_cancelled good_till_date]
+      attribute :type, Symbol, allowed_values: %i[limit stop]
 
       def initialize(existing_attributes, new_attributes)
         existing_attributes.delete :limit_distance if new_attributes.key? :limit_level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ig_markets
 version: !ruby/object:Gem::Version
-  version: '0.31'
+  version: '0.32'
 platform: ruby
 authors:
 - Richard Viney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.4
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -361,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library and command-line client for accessing the IG Markets dealing platform.