degiro_client 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da9cf0fe579f0f1c213a32b17c2901db5381d1d0b8b4098eea76a5df983f8cef
-  data.tar.gz: e35647671e6e281746b231a0d0c988b32daa46c22375451a72db36ec1b97d11d
+  metadata.gz: 89680b852755e037aff1d51e84abbc4bee529c240904c4a3359d60a225a581f7
+  data.tar.gz: 50754758a586d5816eb45b0037989d77e8fdea620a14f8293c21ec24d9267e90
 SHA512:
-  metadata.gz: a69fc835f4f1cbb58cdb361a8edfca33eaada0c8db553f6b0a8fb9ff83550451ca5c877d2ee52361ce55bcc3f07eab19b4d8c3819e8848c04a3e97075d9a5c97
-  data.tar.gz: decada6030e3f01130769a877266998708b2dbf8452f6c996e7535ce16a72d9b21269242ccd8a6a45e13d3a461a452d88b511ad2516d8b671369cb0d153bbc79
+  metadata.gz: ccc8137c988a69429de2069354c76c3887eefe5489759603582ee6606f697582e441c8442f8107f471ade685074d2bce40b24439e535e35100bf564b3cc58899
+  data.tar.gz: 2b84e410fc3a476aefaf023d6a74d45f6dd3911a871281963ffa2cd891e98e1f8924ccdc6d66cedee50ce81416cae03c8ae9ba52cd419b1da6485f07f5eccc95

data/lib/degiro_client.rb

@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+require_relative 'degiro_client/client.rb'

data/lib/{degiro → degiro_client}/client.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 
 require_relative 'connection.rb'
 require_relative 'create_order.rb'
+require_relative 'delete_order.rb'
 require_relative 'find_product_by_id.rb'
 require_relative 'find_products.rb'
 require_relative 'get_cash_funds.rb'
@@ -14,6 +15,7 @@ module DeGiro
     extend Forwardable
 
     def_delegators :@create_order,       :create_buy_order, :create_sell_order
+    def_delegators :@delete_order,       :delete_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
@@ -25,6 +27,7 @@ module DeGiro
       connection = Connection.new(login, password)
 
       @create_order       = CreateOrder.new(connection)
+      @delete_order       = DeleteOrder.new(connection)
       @find_product_by_id = FindProductById.new(connection)
       @find_products      = FindProducts.new(connection)
       @get_cash_funds     = GetCashFunds.new(connection)

data/lib/{degiro → degiro_client}/connection.rb

@@ -1,6 +1,8 @@
 require 'json'
 require 'faraday'
+require 'faraday/detailed_logger'
 require 'faraday-cookie_jar'
+require 'logger'
 
 require_relative 'urls_map.rb'
 require_relative 'user_data.rb'
@@ -10,15 +12,20 @@ module DeGiro
   class Connection
     extend Forwardable
 
-    def_delegators :@conn, :get, :post
+    def_delegators :@conn, :get, :post, :delete
     attr_reader :urls_map, :user_data, :session_id
 
     BASE_TRADER_URL = 'https://trader.degiro.nl'.freeze
 
     def initialize(login, password)
+
+      my_logger = Logger.new("degiro_client.log")
+      my_logger.level = Logger::DEBUG
+
       @conn = Faraday.new(url: BASE_TRADER_URL) do |builder|
         builder.use :cookie_jar
         builder.use Faraday::Response::RaiseError
+        builder.response :detailed_logger, my_logger
         builder.adapter Faraday.default_adapter
       end
 
@@ -37,7 +44,8 @@ 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)["data"])
+      url = "#{@urls_map['pa_url']}/client?sessionId=#{@session_id}"
+      @user_data = UserData.new(JSON.parse(@conn.get(url).body)["data"])
     end
   end
 end

data/lib/{degiro → degiro_client}/create_order.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module DeGiro
   class CreateOrder
-    BUY_SELL    = { buy: 0, sell: 1 }.freeze
+    BUY_SELL    = { buy: "BUY", sell: "SELL" }.freeze
     ORDER_TYPES = { limited: 0, stop_limited: 1, market_order: 2, stop_loss: 3 }.freeze
     TIME_TYPES  = { day: 1, permanent: 3 }.freeze
 
@@ -11,24 +11,27 @@ module DeGiro
     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']
-      confirm_order(order, confirmation_id)
+      create_order_with_confirmation(BUY_SELL[:buy], product_id, size, price)
     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']
-      confirm_order(order, confirmation_id)
+      create_order_with_confirmation(BUY_SELL[:sell], product_id, size, price)
     end
 
     private
 
+    def create_order_with_confirmation(buy_sell, product_id, size, price)
+      order = order(buy_sell, product_id, size, price)
+      response = check_order(order)
+      confirmation_id = JSON.parse(response.body)['data']['confirmationId']
+      confirm_order(order, confirmation_id)
+    end
+
     def order(type, product_id, size, price)
       {
-        buysell:   type,
+        buySell:   type,
         orderType: ORDER_TYPES[:limited],
-        productId: product_id,
+        productId: product_id.to_i,
         size:      size,
         timeType:  TIME_TYPES[:permanent],
         price:     price

data/lib/degiro_client/delete_order.rb

@@ -0,0 +1,24 @@
+require 'json'
+
+module DeGiro
+  class DeleteOrder
+
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def delete_order(id)
+      @connection.delete(url(id))
+    end
+
+    private
+
+    def url(confirmation_id)
+      "#{@connection.urls_map['trading_url']}/v5/order/#{confirmation_id}" \
+      ";jsessionid=#{@connection.session_id}" \
+      "?intAccount=#{@connection.user_data['int_account']}" \
+      "&sessionId=#{@connection.session_id}"
+    end
+
+  end
+end

data/lib/{degiro → degiro_client}/get_transactions.rb

@@ -7,7 +7,7 @@ module DeGiro
       @connection = connection
     end
 
-    def get_transactions(from: (Date.today - (365 * 5)).strftime('%d/%m/%Y'), to: Date.today.strftime('%d/%m/%Y'))
+    def get_transactions(from: (Date.zone.today - (365 * 5)).strftime('%d/%m/%Y'), to: Date.zone.today.strftime('%d/%m/%Y'))
       params = URI.encode_www_form(fromDate: from, toDate: to)
       parse_transactions(JSON.parse(@connection.get(url(params)).body))
     end

data/lib/degiro_client/version.rb

@@ -0,0 +1,3 @@
+module DeGiro
+  VERSION = '0.0.4'.freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: degiro_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Grzegorz Błaszczyk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: faraday-detailed_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.51.0
-description: Ruby Client for the unofficial DeGiro API
+description: Ruby Client for the unofficial DeGiro API - working version with all
+  basic methods
 email:
 - grzegorz.blaszczyk@gmail.com
 - tomvaneyck@gmail.com
@@ -75,20 +90,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/degiro.rb
-- lib/degiro/client.rb
-- lib/degiro/connection.rb
-- lib/degiro/create_order.rb
-- lib/degiro/errors.rb
-- lib/degiro/find_product_by_id.rb
-- lib/degiro/find_products.rb
-- lib/degiro/get_cash_funds.rb
-- lib/degiro/get_orders.rb
-- lib/degiro/get_portfolio.rb
-- lib/degiro/get_transactions.rb
-- lib/degiro/urls_map.rb
-- lib/degiro/user_data.rb
-- lib/degiro/version.rb
+- lib/degiro_client.rb
+- lib/degiro_client/client.rb
+- lib/degiro_client/connection.rb
+- lib/degiro_client/create_order.rb
+- lib/degiro_client/delete_order.rb
+- lib/degiro_client/errors.rb
+- lib/degiro_client/find_product_by_id.rb
+- lib/degiro_client/find_products.rb
+- lib/degiro_client/get_cash_funds.rb
+- lib/degiro_client/get_orders.rb
+- lib/degiro_client/get_portfolio.rb
+- lib/degiro_client/get_transactions.rb
+- lib/degiro_client/urls_map.rb
+- lib/degiro_client/user_data.rb
+- lib/degiro_client/version.rb
 homepage: https://github.com/grzegorzblaszczyk/degiro
 licenses:
 - MIT

data/lib/degiro.rb

@@ -1 +0,0 @@
-require_relative 'degiro/client.rb'

data/lib/degiro/version.rb

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