ig_markets 0.13 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08c5bda8c3b5efc6a42dff92de064a76e42fa24
-  data.tar.gz: defcb9eaeb04b87f3772911e66b849a22ab091e2
+  metadata.gz: 4a9c0f861710bf880c830d2826c3e4ece9c2ef35
+  data.tar.gz: 4c2f4dbd5d336489e2a343ac0015ff34c0910e2b
 SHA512:
-  metadata.gz: 80efc7ada830d2c5758c0c58dd5f2e666c0c4f315bd196e1de8c25423b8a901be0ac4cac40ddc6f189ca8bedf3d48001caa925b149fa7afb62340f3e32e41a6b
-  data.tar.gz: 4eace6c040b07b374f878c9a621a8e090781758b345da829a841f0b8868c406b3f15b6e27f8166627fae33efebed7a4282e4b0367afce45492477c2e965fd861
+  metadata.gz: fa7dc0e4c01816d95e5b6dfec934c3a52e66b9b82ed27f5b777c19a89fa7bda5915b8f9bdba02ae6a3b8b42c251622ffa91c2c1a41e6c032ca4ae7300b611ca8
+  data.tar.gz: 9ca3b4fe730001d4ed3d8900ec5483e3a10e386e9b772f4057e0696b9c3f8019889318faf6abda047735046dade967bcaf537a1a157b95e90e5eb751928feb23

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # IG Markets Changelog
 
-### 0.13 — Unreleased
+### 0.14 — July 2, 2016
+
+- Added `delete-all` subcommand to `ig_markets orders`
+- Added a `#reload` method that reloads a model's attributes in-place to `IGMarkets::Account`,
+  `IGMarkets::ClientSentiment`, `IGMarkets::Market`, `IGMarkets::Position` and `IGMarkets::WorkingOrder`
+
+### 0.13 — June 22, 2016
 
 - Added `ig_markets performance` command that summarizes an account's dealing performance over a specified period
 - Added `ig_markets markets` command which prints the current state of all the passed EPICs

data/README.md

@@ -76,6 +76,7 @@ commands and their subcommands is:
 - `ig_markets orders create ...`
 - `ig_markets orders update DEAL-ID ...`
 - `ig_markets orders delete DEAL-ID`
+- `ig_markets orders delete-all`
 - `ig_markets performance --days N [...]`
 - `ig_markets positions [list] [...]`
 - `ig_markets positions create ...`
@@ -173,45 +174,48 @@ ig.deal_confirmation 'deal_reference'
 # Positions
 ig.positions.all
 ig.positions.create currency_code: 'USD', direction: :buy, epic: 'CS.D.EURUSD.CFD.IP', size: 2
-ig.positions['deal_id']
-ig.positions['deal_id'].profit_loss
-ig.positions['deal_id'].update limit_level: 1.2, stop_level: 1.1
-ig.positions['deal_id'].close
+position = ig.positions['deal_id']
+position.profit_loss
+position.update limit_level: 1.2, stop_level: 1.1
+position.reload
+position.close
 
 # Sprint market positions
 ig.sprint_market_positions.all
-ig.sprint_market_positions['deal_id']
 ig.sprint_market_positions.create direction: :buy, epic: 'FM.D.EURUSD24.EURUSD24.IP',
                                   expiry_period: :twenty_minutes, size: 100
+sprint_market_position = ig.sprint_market_positions['deal_id']
 
 # Working orders
 ig.working_orders.all
 ig.working_orders.create currency_code: 'USD', direction: :buy, epic: 'CS.D.EURUSD.CFD.IP',
                          level: 0.99, size: 1, type: :limit
-ig.working_orders['deal_id']
-ig.working_orders['deal_id'].update level: 1.25, limit_distance: 50, stop_distance: 50
-ig.working_orders['deal_id'].delete
+working_order = ig.working_orders['deal_id']
+working_order.update level: 1.25, limit_distance: 50, stop_distance: 50
+working_order.reload
+working_order.delete
 
 # Markets
 ig.markets.hierarchy
 ig.markets.search 'EURUSD'
 ig.markets.find 'CS.D.EURUSD.CFD.IP', 'IX.D.DOW.IFD.IP'
-ig.markets['CS.D.EURUSD.CFD.IP'].historical_prices resolution: :hour, number: 48
-ig.markets['CS.D.EURUSD.CFD.IP'].historical_prices resolution: :second, from: Time.now - 120,
-                                                   to: Time.now - 60
+market = ig.markets['CS.D.EURUSD.CFD.IP']
+market.historical_prices resolution: :hour, number: 48
+market.historical_prices resolution: :second, from: Time.now - 120, to: Time.now - 60
 
 # Watchlists
 ig.watchlists.all
 ig.watchlists.create 'New Watchlist', 'CS.D.EURUSD.CFD.IP', 'UA.D.AAPL.CASH.IP'
-ig.watchlists['watchlist_id']
-ig.watchlists['watchlist_id'].markets
-ig.watchlists['watchlist_id'].add_market 'CS.D.EURUSD.CFD.IP'
-ig.watchlists['watchlist_id'].remove_market 'CS.D.EURUSD.CFD.IP'
-ig.watchlists['watchlist_id'].delete
+watchlist = ig.watchlists['watchlist_id']
+watchlist.markets
+watchlist.add_market 'CS.D.EURUSD.CFD.IP'
+watchlist.remove_market 'CS.D.EURUSD.CFD.IP'
+watchlist.delete
 
 # Client sentiment
-ig.client_sentiment['EURUSD']
-ig.client_sentiment['EURUSD'].related_sentiments
+client_sentiment = ig.client_sentiment['EURUSD']
+client_sentiment.related_sentiments
+client_sentiment.reload
 
 # Miscellaneous
 ig.applications

data/lib/ig_markets.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'colorize'
 require 'date'
+require 'json'
 require 'pry'
 require 'rest-client'
 require 'terminal-table'

data/lib/ig_markets/account.rb

@@ -19,5 +19,10 @@ module IGMarkets
     attribute :currency, String, regex: Regex::CURRENCY
     attribute :preferred, Boolean
     attribute :status, Symbol, allowed_values: [:disabled, :enabled, :suspended_from_dealing]
+
+    # Reloads this account's attributes by re-querying the IG Markets API.
+    def reload
+      self.attributes = @dealing_platform.account.all.detect { |a| a.account_id == account_id }.attributes
+    end
   end
 end

data/lib/ig_markets/activity.rb

@@ -8,7 +8,7 @@ module IGMarkets
       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_opended,
+                                                         :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,

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

@@ -74,6 +74,18 @@ module IGMarkets
         end
       end
 
+      desc 'delete-all', 'Deletes all working orders'
+
+      def delete_all
+        Main.begin_session(options) do |dealing_platform|
+          dealing_platform.working_orders.all.each do |working_order|
+            deal_reference = working_order.delete
+
+            Main.report_deal_confirmation deal_reference
+          end
+        end
+      end
+
       private
 
       ATTRIBUTES = [:currency_code, :direction, :epic, :expiry, :force_open, :good_till_date, :guaranteed_stop, :level,

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

@@ -66,11 +66,13 @@ module IGMarkets
       end
 
       def table_title(watchlist)
-        title = "#{watchlist.name} (id: #{watchlist.id}"
-        title << ', editable' if watchlist.editable
-        title << ', deleteable' if watchlist.deleteable
-        title << ', default' if watchlist.default_system_watchlist
-        title << ')'
+        details = ["id: #{watchlist.id}"]
+
+        details << :default if watchlist.default_system_watchlist
+        details << :editable if watchlist.editable
+        details << :deleteable if watchlist.deleteable
+
+        "#{watchlist.name} (#{details.join ', '})"
       end
     end
   end

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

@@ -27,9 +27,6 @@ module IGMarkets
         types = details.actions.map(&:action_type).uniq
         types.delete :unknown
 
-        # Fix a typo in one of the values
-        types.map! { |v| v == :position_opended ? :position_opened : v }
-
         types.map { |v| format_cell_value v }.join ', '
       end
     end

data/lib/ig_markets/client_sentiment.rb

@@ -6,6 +6,11 @@ module IGMarkets
     attribute :market_id
     attribute :short_position_percentage, Float
 
+    # Reloads this client sentiment's attributes by re-querying the IG Markets API.
+    def reload
+      self.attributes = @dealing_platform.client_sentiment[market_id].attributes
+    end
+
     # Returns client sentiments for markets that are related to this one.
     #
     # @return [Array<ClientSentiment>]

data/lib/ig_markets/dealing_platform/position_methods.rb

@@ -69,10 +69,8 @@ module IGMarkets
       #         the position creation.
       def create(attributes)
         model = PositionCreateAttributes.new attributes
-        model.validate
 
-        payload = PayloadFormatter.format model
-        payload[:expiry] ||= '-'
+        payload = PayloadFormatter.format model, expiry: '-'
 
         @dealing_platform.session.post('positions/otc', payload, API_V2).fetch(:deal_reference)
       end
@@ -101,8 +99,17 @@ module IGMarkets
 
         def initialize(attributes = {})
           super
-
           set_defaults
+          validate
+        end
+
+        private
+
+        def set_defaults
+          self.force_open = false if force_open.nil?
+          self.guaranteed_stop = false if guaranteed_stop.nil?
+          self.order_type ||= :market
+          self.time_in_force = :execute_and_eliminate if order_type == :market
         end
 
         # Runs a series of validations on this model's attributes to check whether it is ready to be sent to the IG
@@ -115,15 +122,6 @@ module IGMarkets
           validate_guaranteed_stop_constraints
         end
 
-        private
-
-        def set_defaults
-          self.force_open = false if force_open.nil?
-          self.guaranteed_stop = false if guaranteed_stop.nil?
-          self.order_type ||= :market
-          self.time_in_force = :execute_and_eliminate if order_type == :market
-        end
-
         # 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,

data/lib/ig_markets/dealing_platform/working_order_methods.rb

@@ -63,11 +63,8 @@ module IGMarkets
       #         the working order creation.
       def create(attributes)
         model = WorkingOrderCreateAttributes.new attributes
-        model.validate
 
-        payload = PayloadFormatter.format model
-
-        payload[:expiry] ||= '-'
+        payload = PayloadFormatter.format model, expiry: '-'
 
         @dealing_platform.session.post('workingorders/otc', payload, API_V2).fetch :deal_reference
       end
@@ -92,8 +89,16 @@ module IGMarkets
 
         def initialize(attributes)
           super
-
           set_defaults
+          validate
+        end
+
+        private
+
+        def set_defaults
+          self.force_open = false 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
 
         # Runs a series of validations on this model's attributes to check whether it is ready to be sent to the IG
@@ -110,14 +115,6 @@ module IGMarkets
 
           raise ArgumentError, 'Do not specify both stop_distance and stop_level options' if stop_distance && stop_level
         end
-
-        private
-
-        def set_defaults
-          self.force_open = false 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
       end
 
       private_constant :WorkingOrderCreateAttributes

data/lib/ig_markets/market.rb

@@ -43,6 +43,11 @@ module IGMarkets
     attribute :instrument, Instrument
     attribute :snapshot, Snapshot
 
+    # Reloads this market's attributes by re-querying the IG Markets API.
+    def reload
+      self.attributes = @dealing_platform.markets[instrument.epic].attributes
+    end
+
     # Returns historical prices for this market at a given resolution, either the most recent prices by specifying the
     # `:number` option, or those from a date range by specifying the `:from` and `:to` options.
     #

data/lib/ig_markets/model.rb

@@ -51,6 +51,15 @@ module IGMarkets
       "#<#{self.class.name} #{formatted_attributes.join ', '}>"
     end
 
+    # Mass assigns the passed attributes to this model.
+    #
+    # @param [Hash] new_attributes The attributes to assign on this model.
+    def attributes=(new_attributes)
+      new_attributes.each do |name, value|
+        send "#{name}=", value
+      end
+    end
+
     private
 
     # Returns the {#inspect} string for the given value.

data/lib/ig_markets/payload_formatter.rb

@@ -9,10 +9,11 @@ module IGMarkets
     # available `:format` option.
     #
     # @param [Model] model The model instance to convert attributes for.
+    # @param [Hash] defaults The default attribute values to return, can be overridden by values set on `model`.
     #
     # @return [Hash] The resulting attributes hash.
-    def format(model)
-      model.class.defined_attributes.each_with_object({}) do |(name, options), formatted|
+    def format(model, defaults = {})
+      model.class.defined_attributes.each_with_object(defaults.dup) do |(name, options), formatted|
         value = model.send name
 
         next if value.nil?

data/lib/ig_markets/position.rb

@@ -59,6 +59,11 @@ module IGMarkets
       price_delta * size * contract_size
     end
 
+    # Reloads this position's attributes by re-querying the IG Markets API.
+    def reload
+      self.attributes = @dealing_platform.positions[deal_id].attributes
+    end
+
     # Closes this position. If called with no options then this position will be fully closed at current market prices,
     # partial closes and greater control over the close conditions can be achieved by using the relevant options.
     #

data/lib/ig_markets/version.rb

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

data/lib/ig_markets/working_order.rb

@@ -21,6 +21,11 @@ module IGMarkets
 
     deprecated_attribute :created_date, :good_till_date_iso
 
+    # Reloads this working order's attributes by re-querying the IG Markets API.
+    def reload
+      self.attributes = @dealing_platform.working_orders[deal_id].attributes
+    end
+
     # Deletes this working order.
     #
     # @return [String] The deal reference of the deletion operation. Use {DealingPlatform#deal_confirmation} to check

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ig_markets
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
 platform: ruby
 authors:
 - Richard Viney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +156,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement