degiro 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3fdf274ef1ecfe828dbd3bce645f48902385ecc3
-  data.tar.gz: a9bcf0d7f10142414210e1959cbb122e8e5622fb
+SHA256:
+  metadata.gz: 0eb7bd4ae0b88684e4cd8daa8281e4dbc0600b46fecb014fa5a179bda7613b0a
+  data.tar.gz: 1dd27d12ea53f6fe7d160555ef8f2c32e5b528b8c829e6751df1a5afa9cb4eb1
 SHA512:
-  metadata.gz: 670df722f90df0bf0dc21220ebfaae01dfbcd5ff040a0bf110b97f8362655406e4ecb80302e3077c1ac306d67fc0257e839402b5ecff0eaf2d4f62882494a272
-  data.tar.gz: 9c90dbb6cc8e70f7616a68e15a8d1f7f370f1de79bfc83d3f8c3f4b885f3159a4fd69e9d9be186997016b968a522f802236a24719c0b5c493c9d114956173e9d
+  metadata.gz: a24ff3c6e66b448b2509c98ca1760b28fb8460beed53ebed4af68694f27bbb8a5898f6dd8f28f4e7751204596fa098fde728d4ebf8a4bce7093fffcfcb6207f6
+  data.tar.gz: aacd072df6aa6d4139107186494da4e31a58203b5eed3e38ca9533d8403d76ee00648097548290a76799dc93df422daf13a3e2c701ce1ad5cb88ce9b3afdb6ef

data/lib/degiro/client.rb

@@ -13,7 +13,10 @@ module DeGiro
   class Client
     extend Forwardable
 
-    def_delegators :@create_order,       :create_buy_order, :create_sell_order
+    def_delegators :@create_order,       :create_market_buy_order
+    def_delegators :@create_order,       :create_market_sell_order
+    def_delegators :@create_order,       :create_limit_buy_order
+    def_delegators :@create_order,       :create_limit_sell_order
     def_delegators :@find_product_by_id, :find_product_by_id
     def_delegators :@find_products,      :find_products
     def_delegators :@get_cash_funds,     :get_cash_funds

data/lib/degiro/connection.rb

@@ -37,7 +37,7 @@ module DeGiro
       raise MissingSessionIdError, 'Could not find valid session id' if @session_id == '' || @session_id.nil?
 
       @urls_map = UrlsMap.new(JSON.parse(@conn.get('/login/secure/config').body))
-      @user_data = UserData.new(JSON.parse(@conn.get("#{@urls_map['pa_url']}/client?sessionId=#{@session_id}").body))
+      @user_data = UserData.new(JSON.parse(@conn.get("#{@urls_map['pa_url']}/client?sessionId=#{@session_id}").body)['data'])
     end
   end
 end

data/lib/degiro/create_order.rb

@@ -2,31 +2,53 @@ require 'json'
 
 module DeGiro
   class CreateOrder
-    BUY_SELL    = { buy: 0, sell: 1 }.freeze
-    ORDER_TYPES = { limited: 0, stop_limited: 1, market_order: 2, stop_loss: 3 }.freeze
+    BUY_SELL    = { buy: 'BUY', sell: 'SELL' }.freeze
+    ORDER_TYPES = { limited: 0, stop_limited: 1, market: 2, stop_loss: 3 }.freeze
     TIME_TYPES  = { day: 1, permanent: 3 }.freeze
 
     def initialize(connection)
       @connection = connection
     end
 
-    def create_buy_order(product_id:, size:, price:)
-      order = order(BUY_SELL[:buy], product_id, size, price)
-      confirmation_id = JSON.parse(check_order(order).body)['confirmationId']
+    def create_market_buy_order(product_id:, size:)
+      order = market_order(BUY_SELL[:buy], product_id, size)
+      confirmation_id = JSON.parse(check_order(order).body)['data']['confirmationId']
       confirm_order(order, confirmation_id)
     end
 
-    def create_sell_order(product_id:, size:, price:)
-      order = order(BUY_SELL[:sell], product_id, size, price)
-      confirmation_id = JSON.parse(check_order(order).body)['confirmationId']
+    def create_market_sell_order(product_id:, size:)
+      order = market_order(BUY_SELL[:sell], product_id, size)
+      confirmation_id = JSON.parse(check_order(order).body)['data']['confirmationId']
+      confirm_order(order, confirmation_id)
+    end
+
+    def create_limit_buy_order(product_id:, size:, price:)
+      order = limit_order(BUY_SELL[:buy], product_id, size, price)
+      confirmation_id = JSON.parse(check_order(order).body)['data']['confirmationId']
+      confirm_order(order, confirmation_id)
+    end
+
+    def create_limit_sell_order(product_id:, size:, price:)
+      order = limit_order(BUY_SELL[:sell], product_id, size, price)
+      confirmation_id = JSON.parse(check_order(order).body)['data']['confirmationId']
       confirm_order(order, confirmation_id)
     end
 
     private
 
-    def order(type, product_id, size, price)
+    def market_order(type, product_id, size)
+      {
+        buySell:   type,
+        orderType: ORDER_TYPES[:market],
+        productId: product_id,
+        size:      size,
+        timeType:  TIME_TYPES[:permanent]
+      }
+    end
+
+    def limit_order(type, product_id, size, price)
       {
-        buysell:   type,
+        buySell:   type,
         orderType: ORDER_TYPES[:limited],
         productId: product_id,
         size:      size,

data/lib/degiro/get_portfolio.rb

@@ -18,8 +18,7 @@ module DeGiro
         {
           size:       order['value'].find { |field| field['name'] == 'size' }['value'],
           value:      order['value'].find { |field| field['name'] == 'price' }['value'],
-          product_id: order['value'].find { |field| field['name'] == 'id' }['value'].to_s,
-          product:    order['value'].find { |field| field['name'] == 'product' }['value']
+          product_id: order['value'].find { |field| field['name'] == 'id' }['value'].to_s
         }
       end
       portfolio.select { |entry| entry[:size] > 0 }

data/lib/degiro/version.rb

@@ -1,3 +1,3 @@
 module DeGiro
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: degiro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Van Eyck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -92,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the unofficial DeGiro API