ig_markets 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c696f25e6b960d65896474cf519c7492f8ad195
-  data.tar.gz: 54dcc2e3caa92373344c3faf7c3a1ea8f916dcf2
+  metadata.gz: 2b3fab7b62a9c929a8262f9ef104c200278e03b2
+  data.tar.gz: 1fe0c83b896f00e493a2e7a4257fb2f43a80188f
 SHA512:
-  metadata.gz: 3b0052a80212495c796d6ab5c75188690f259d640fa96982b7c0cb7f7b636014bc43cea9e5102a4bb17e8c07cb0f671d634db469165ab83b002d66d7bdde53b6
-  data.tar.gz: 588dd121edd94b04546afa353802f39ccdde3c972684f17d297d6d2d649baa2cce25968dfc82a6876e06ce7e0e86093236ba4a13720d9db98531a437c057cb17
+  metadata.gz: e3325e6ea4704dc3bc75f333d82718115a82febc8aa4f814bd10f3495bdf27a3fc43bafa59b39fe0a7c01a454c8417478ef4aa9588551cfbe5875ab4927e2ae6
+  data.tar.gz: e4578ffa1bb86eab2cfb2b32a0223e9792db69ce50f433e6da2936415fac0cc248d51a605b37a1a777434da01697e6e5def084e5911faad5c1ad565b9fade536

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # IG Markets Changelog
 
+### 0.18 — August 2, 2016
+
+- Added support for the recently added `#date` attribute on `IGMarkets::DealConfirmation`
+- Fixed the second call to `IGMarkets::Session#sign_in` looping indefinitely if the previously logged in session was not
+  explicitly signed out
+- Fixed automatic re-sign-in when the client security token is invalid not working correctly
+- Fixed exception when executing a `DELETE` request and verbose output is enabled
+
 ### 0.17 — July 27, 2016
 
 - Switched to the `excon` HTTP library

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

@@ -0,0 +1,54 @@
+module IGMarkets
+  module CLI
+    # Implements the `ig_markets stream` command.
+    class Main < Thor
+      desc 'stream', 'Displays a live stream of prices for a set of markets'
+
+      option :epics, type: :array, desc: 'The EPICs of the markets to stream live prices for'
+
+      def stream
+        self.class.begin_session(options) do |dealing_platform|
+          @data_queue = Queue.new
+
+          lightstreamer = create_lightstreamer_session dealing_platform
+          create_lightstreamer_subscription lightstreamer
+
+          loop do
+            puts @data_queue.pop
+
+            raise lightstreamer.error if lightstreamer.error
+          end
+        end
+      end
+
+      private
+
+      def create_lightstreamer_session(dealing_platform)
+        session = dealing_platform.session
+
+        server_url = dealing_platform.client_account_summary.lightstreamer_endpoint
+        username = dealing_platform.client_account_summary.client_id
+        password = "CST-#{session.client_security_token}|XST-#{session.x_security_token}"
+
+        lightstreamer = Lightstreamer::Session.new server_url: server_url, username: username, password: password
+
+        lightstreamer.connect
+        puts "Session ID: #{lightstreamer.session_id}"
+
+        lightstreamer
+      end
+
+      def create_lightstreamer_subscription(lightstreamer)
+        items = Array(options[:epics]).map { |market| "MARKET:#{market}" }
+
+        subscription = lightstreamer.build_subscription items: items, fields: [:bid, :offer], mode: :merge
+
+        subscription.on_data do |_subscription, item_name, item_data, _new_values|
+          @data_queue.push "#{item_name[7..-1]} - #{item_data.map { |key, value| "#{key}: #{value}" }.join ', '}"
+        end
+
+        subscription.start snapshot: true
+      end
+    end
+  end
+end

data/lib/ig_markets/cli/main.rb

@@ -135,11 +135,12 @@ module IGMarkets
         # Prints the passed error to `stderr` and then exits the application.
         def warn_and_exit(error)
           class_name = error.class.name.split('::').last
+          class_name = nil if class_name == 'IGMarketsError'
 
           message = error.message.to_s
-          message = nil if message.empty? || message == error.class.to_s
+          message = nil if ['', error.class.to_s].include? message
 
-          warn ["IG Markets: #{class_name}", message].compact.join(', ')
+          warn "ig_markets: #{[class_name, message].compact.join ', '}"
 
           exit 1
         end

data/lib/ig_markets/deal_confirmation.rb

@@ -8,6 +8,7 @@ module IGMarkets
     end
 
     attribute :affected_deals, AffectedDeal
+    attribute :date, Time, format: '%FT%T.%L'
     attribute :deal_id
     attribute :deal_reference
     attribute :deal_status, Symbol, allowed_values: [:accepted, :fund_account, :rejected]
@@ -23,14 +24,14 @@ module IGMarkets
     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, :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,
+                                                :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,

data/lib/ig_markets/dealing_platform/position_methods.rb

@@ -70,9 +70,9 @@ module IGMarkets
       def create(attributes)
         model = PositionCreateAttributes.new attributes
 
-        payload = PayloadFormatter.format model, expiry: '-'
+        body = RequestBodyFormatter.format model, expiry: '-'
 
-        @dealing_platform.session.post('positions/otc', payload, API_V2).fetch(:deal_reference)
+        @dealing_platform.session.post('positions/otc', body, API_V2).fetch(:deal_reference)
       end
 
       private

data/lib/ig_markets/dealing_platform/sprint_market_position_methods.rb

@@ -42,9 +42,9 @@ module IGMarkets
       # @return [String] The resulting deal reference, use {DealingPlatform#deal_confirmation} to check the result of
       #         the sprint market position creation.
       def create(attributes)
-        payload = PayloadFormatter.format SprintMarketPositionCreateAttributes.new attributes
+        body = RequestBodyFormatter.format SprintMarketPositionCreateAttributes.new(attributes)
 
-        @dealing_platform.session.post('positions/sprintmarkets', payload).fetch :deal_reference
+        @dealing_platform.session.post('positions/sprintmarkets', body).fetch :deal_reference
       end
 
       # Internal model used by {#create}

data/lib/ig_markets/dealing_platform/working_order_methods.rb

@@ -64,9 +64,9 @@ module IGMarkets
       def create(attributes)
         model = WorkingOrderCreateAttributes.new attributes
 
-        payload = PayloadFormatter.format model, expiry: '-'
+        body = RequestBodyFormatter.format model, expiry: '-'
 
-        @dealing_platform.session.post('workingorders/otc', payload, API_V2).fetch :deal_reference
+        @dealing_platform.session.post('workingorders/otc', body, API_V2).fetch :deal_reference
       end
 
       # Internal model used by {#create}.

data/lib/ig_markets/position.rb

@@ -93,9 +93,9 @@ module IGMarkets
       model = PositionCloseAttributes.build options
       model.validate
 
-      payload = PayloadFormatter.format model
+      body = RequestBodyFormatter.format model
 
-      @dealing_platform.session.delete('positions/otc', payload).fetch :deal_reference
+      @dealing_platform.session.delete('positions/otc', body).fetch :deal_reference
     end
 
     # Updates this position. No attributes are mandatory, and any attributes not specified will be kept at their
@@ -119,9 +119,9 @@ module IGMarkets
         new_attributes[:trailing_stop_distance] = new_attributes[:trailing_stop_increment] = nil
       end
 
-      payload = PayloadFormatter.format PositionUpdateAttributes.new new_attributes
+      body = RequestBodyFormatter.format PositionUpdateAttributes.new(new_attributes)
 
-      @dealing_platform.session.put("positions/otc/#{deal_id}", payload, API_V2).fetch(:deal_reference)
+      @dealing_platform.session.put("positions/otc/#{deal_id}", body, API_V2).fetch(:deal_reference)
     end
 
     # Validates the internal consistency of the `:order_type`, `:quote_id` and `:level` attributes.

data/lib/ig_markets/{payload_formatter.rb → request_body_formatter.rb}

@@ -1,11 +1,11 @@
 module IGMarkets
-  # Contains methods for formatting payloads that can be passed to the IG Markets API.
+  # Contains methods for formatting request bodies that can be passed to the IG Markets API.
   #
   # @private
-  module PayloadFormatter
+  module RequestBodyFormatter
     module_function
 
-    # Takes a {Model} and returns its attributes in a hash ready to be passed as a payload to the IG Markets API.
+    # Takes a {Model} and returns its attributes in a hash ready to be passed as a request body to the IG Markets API.
     # Attribute names will be converted from snake case to camel case, `Symbol` attributes will be converted to strings
     # and will be uppercased, and both `Date` and `Time` attributes will be converted to strings using their first
     # available `:format` option.

data/lib/ig_markets/request_printer.rb

@@ -20,10 +20,10 @@ module IGMarkets
 
         puts '  Headers:'
         options[:headers].each do |name, value|
-          print_request_header name, value
+          puts "    #{name}: #{value}"
         end
 
-        print_request_body options[:payload]
+        print_request_body options[:body]
       end
 
       # Formats and prints a JSON response body.
@@ -41,10 +41,6 @@ module IGMarkets
 
       private
 
-      def print_request_header(name, value)
-        puts "    #{name.to_s.split('_').map { |h| h[0].upcase + h[1..-1] }.join('-')}: #{value}"
-      end
-
       def print_request_body(body)
         return unless body
 

data/lib/ig_markets/session.rb

@@ -40,6 +40,8 @@ module IGMarkets
     #
     # @return [Hash] The data returned in the body of the sign in request.
     def sign_in
+      @client_security_token = @x_security_token = nil
+
       body = { identifier: username, password: password_encryptor.encrypt(password), encryptedPassword: true }
 
       sign_in_result = request method: :post, url: 'session', body: body, api_version: API_V2
@@ -139,7 +141,7 @@ module IGMarkets
 
       headers['Content-Type'] = headers['Accept'] = 'application/json; charset=UTF-8'
       headers['X-IG-API-KEY'] = api_key
-      headers['Version'] = options.delete :api_version
+      headers['Version'] = options.fetch :api_version
 
       headers['CST'] = client_security_token if client_security_token
       headers['X-SECURITY-TOKEN'] = x_security_token if x_security_token
@@ -162,12 +164,12 @@ module IGMarkets
     def process_response(response, options)
       body = parse_body response
 
-      if body.key? :error_code
+      if body.is_a?(Hash) && body.key?(:error_code)
         error = IGMarketsError.build body[:error_code]
 
         raise error unless should_retry_request? error, options
 
-        execute_request options.merge(retry: true)
+        execute_request options.merge(retry: true, headers: request_headers(options))
       else
         { response: response, body: body }
       end

data/lib/ig_markets/version.rb

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

data/lib/ig_markets/working_order.rb

@@ -56,9 +56,9 @@ module IGMarkets
       model = WorkingOrderUpdateAttributes.new existing_attributes, new_attributes
       model.validate
 
-      payload = PayloadFormatter.format model
+      body = RequestBodyFormatter.format model
 
-      @dealing_platform.session.put("workingorders/otc/#{deal_id}", payload, API_V2).fetch(:deal_reference)
+      @dealing_platform.session.put("workingorders/otc/#{deal_id}", body, API_V2).fetch(:deal_reference)
     end
 
     # Internal model used by {#update}.

data/lib/ig_markets.rb

@@ -39,8 +39,8 @@ require 'ig_markets/market'
 require 'ig_markets/market_overview'
 require 'ig_markets/market_hierarchy_result'
 require 'ig_markets/password_encryptor'
-require 'ig_markets/payload_formatter'
 require 'ig_markets/position'
+require 'ig_markets/request_body_formatter'
 require 'ig_markets/request_printer'
 require 'ig_markets/response_parser'
 require 'ig_markets/session'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ig_markets
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - Richard Viney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -236,6 +236,7 @@ files:
 - lib/ig_markets/cli/commands/self_test_command.rb
 - lib/ig_markets/cli/commands/sentiment_command.rb
 - lib/ig_markets/cli/commands/sprints_command.rb
+- lib/ig_markets/cli/commands/stream_command.rb
 - lib/ig_markets/cli/commands/transactions_command.rb
 - lib/ig_markets/cli/commands/watchlists_command.rb
 - lib/ig_markets/cli/config_file.rb
@@ -273,9 +274,9 @@ files:
 - 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
 - lib/ig_markets/regex.rb
+- lib/ig_markets/request_body_formatter.rb
 - lib/ig_markets/request_printer.rb
 - lib/ig_markets/response_parser.rb
 - lib/ig_markets/session.rb