fidor_api 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8944ad25911d10532ed19ee8bbf5b6968439d9db016c97edce87d3d7da9a3ad1
-  data.tar.gz: 23d49db5a67f42e7473125add78ca3e0b7e882a84208039fb578cc5e124322b7
+  metadata.gz: 5dd37e81db3e11e356adccfa11fb66235fa3370e1220581da482d88417b25442
+  data.tar.gz: 7fee31a5205c39f66d15dde3714d07cfbde6e414e6e1a48a0f4e8f7b45802e2d
 SHA512:
-  metadata.gz: 8c62f6ccabf05f4e39bb5a9392bf7717e791f4aaf0f19d290e2ee1aa7132b3676c447fd19dc2311178908113eb55b3cd2cd191c970642b8fff510744c88d4e0a
-  data.tar.gz: 071c692a57132772a0a464e6b4458c0d8ce7fa6f97189302903a3f6750893ed06406a492f76cba1634aa6336b66c884d3c85466712c297c694cbf51fc9555493
+  metadata.gz: 49ae375b0fd5100dc744a03713cba67cd77cbc2d4712e9369cf16bf8a7b4967a1e77777d50affd97aee9391cdce83dd6cf772b297b49db90552d3ca58bf10771
+  data.tar.gz: 1a0a82c9a8e80dc9dc9d31e6b4b4436c5683943eca65ca6aaea24d42268e60a65106adbac203e85393ba1d6e4b519d2ab9b2fac4fa4474abc8b6853dc50476ec

data/lib/fidor_api/client/dsl/accounts.rb

@@ -3,7 +3,7 @@ module FidorApi
     module DSL
       module Accounts
         def account_transactions(id, options = {})
-          fetch(:collection, Model::Transaction, "/accounts/#{id}/transactions", options)
+          fetch(:collection, Model::Transaction, "accounts/#{id}/transactions", options)
         end
       end
     end

data/lib/fidor_api/client/dsl/cards.rb

@@ -3,11 +3,11 @@ module FidorApi
     module DSL
       module Cards
         def cards(options = {})
-          fetch(:collection, Model::Card, '/cards', options)
+          fetch(:collection, Model::Card, 'cards', options)
         end
 
         def card(id, options = {})
-          fetch(:single, Model::Card, "/cards/#{id}", options)
+          fetch(:single, Model::Card, "cards/#{id}", options)
         end
       end
     end

data/lib/fidor_api/client/dsl/confirmable_actions.rb

@@ -3,15 +3,15 @@ module FidorApi
     module DSL
       module ConfirmableActions
         def confirmable_action(id, options = {})
-          fetch(:single, Model::ConfirmableAction, "/confirmable/actions/#{id}", options)
+          fetch(:single, Model::ConfirmableAction, "confirmable/actions/#{id}", options)
         end
 
         def refresh_confirmable_action(id, options = {})
-          update(Model::ConfirmableAction, "/confirmable/actions/#{id}/refresh", id, options)
+          update(Model::ConfirmableAction, "confirmable/actions/#{id}/refresh", id, options)
         end
 
         def update_confirmable_action(id, attributes = {})
-          update(Model::ConfirmableAction, "/confirmable/actions/#{id}", id, attributes)
+          update(Model::ConfirmableAction, "confirmable/actions/#{id}", id, attributes)
         end
       end
     end

data/lib/fidor_api/client/dsl/core_data.rb

@@ -3,15 +3,15 @@ module FidorApi
     module DSL
       module CoreData
         def user(options = {})
-          fetch(:single, Model::User, '/users/current', options)
+          fetch(:single, Model::User, 'users/current', options)
         end
 
         def customers(options = {})
-          fetch(:collection, Model::Customer, '/customers', options)
+          fetch(:collection, Model::Customer, 'customers', options)
         end
 
         def accounts(options = {})
-          fetch(:collection, Model::Account, '/accounts', options)
+          fetch(:collection, Model::Account, 'accounts', options)
         end
       end
     end

data/lib/fidor_api/client/dsl/messages.rb

@@ -3,15 +3,15 @@ module FidorApi
     module DSL
       module Messages
         def messages(options = {})
-          fetch(:collection, Model::Message, '/messages', options)
+          fetch(:collection, Model::Message, 'messages', options)
         end
 
         def message(id, options = {})
-          fetch(:single, Model::Message, "/messages/#{id}", options)
+          fetch(:single, Model::Message, "messages/#{id}", options)
         end
 
         def message_attachment(id)
-          response = connection.get("/messages/#{id}/attachment")
+          response = connection.get("messages/#{id}/attachment")
 
           Model::Message::Attachment.new(
             type:     response.headers['content-type'],
@@ -21,7 +21,7 @@ module FidorApi
         end
 
         def message_content(id)
-          response = connection.get("/messages/#{id}/content")
+          response = connection.get("messages/#{id}/content")
 
           Model::Message::Content.new(raw: response.body)
         end

data/lib/fidor_api/client/dsl/preauths.rb

@@ -3,11 +3,11 @@ module FidorApi
     module DSL
       module Preauths
         def preauths(options = {})
-          fetch(:collection, Model::Preauth, '/preauths', options)
+          fetch(:collection, Model::Preauth, 'preauths', options)
         end
 
         def preauth(id, options = {})
-          fetch(:single, Model::Preauth, "/preauths/#{id}", options)
+          fetch(:single, Model::Preauth, "preauths/#{id}", options)
         end
       end
     end

data/lib/fidor_api/client/dsl/standing_orders.rb

@@ -0,0 +1,19 @@
+module FidorApi
+  class Client
+    module DSL
+      module StandingOrders
+        def standing_order(id, options = {})
+          fetch(:single, FidorApi::Model::StandingOrder, "standing_orders/#{id}", options)
+        end
+
+        def new_standing_order(attributes = {})
+          FidorApi::Model::StandingOrder.new(attributes)
+        end
+
+        def create_standing_order(attributes = {})
+          create(FidorApi::Model::StandingOrder, 'standing_orders', attributes)
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/client/dsl/transactions.rb

@@ -3,11 +3,11 @@ module FidorApi
     module DSL
       module Transactions
         def transactions(options = {})
-          fetch(:collection, Model::Transaction, '/transactions', options)
+          fetch(:collection, Model::Transaction, 'transactions', options)
         end
 
         def transaction(id, options = {})
-          fetch(:single, Model::Transaction, "/transactions/#{id}", options)
+          fetch(:single, Model::Transaction, "transactions/#{id}", options)
         end
       end
     end

data/lib/fidor_api/client/dsl/transfers/classic.rb

@@ -5,12 +5,12 @@ module FidorApi
         module Classic
           def internal_transfers(options = {})
             check_transfer_support! :classic
-            fetch(:collection, FidorApi::Model::Transfer::Classic::Internal, '/internal_transfers', options)
+            fetch(:collection, FidorApi::Model::Transfer::Classic::Internal, 'internal_transfers', options)
           end
 
           def internal_transfer(id, options = {})
             check_transfer_support! :classic
-            fetch(:single, FidorApi::Model::Transfer::Classic::Internal, "/internal_transfers/#{id}", options)
+            fetch(:single, FidorApi::Model::Transfer::Classic::Internal, "internal_transfers/#{id}", options)
           end
 
           def new_internal_transfer(attributes = {})
@@ -20,17 +20,17 @@ module FidorApi
 
           def create_internal_transfer(attributes = {})
             check_transfer_support! :classic
-            create(FidorApi::Model::Transfer::Classic::Internal, '/internal_transfers', attributes)
+            create(FidorApi::Model::Transfer::Classic::Internal, 'internal_transfers', attributes)
           end
 
           def sepa_transfers(options = {})
             check_transfer_support! :classic
-            fetch(:collection, FidorApi::Model::Transfer::Classic::SEPA, '/sepa_credit_transfers', options)
+            fetch(:collection, FidorApi::Model::Transfer::Classic::SEPA, 'sepa_credit_transfers', options)
           end
 
           def sepa_transfer(id, options = {})
             check_transfer_support! :classic
-            fetch(:single, FidorApi::Model::Transfer::Classic::SEPA, "/sepa_credit_transfers/#{id}", options)
+            fetch(:single, FidorApi::Model::Transfer::Classic::SEPA, "sepa_credit_transfers/#{id}", options)
           end
 
           def new_sepa_transfer(attributes = {})
@@ -40,7 +40,7 @@ module FidorApi
 
           def create_sepa_transfer(attributes = {})
             check_transfer_support! :classic
-            create(FidorApi::Model::Transfer::Classic::SEPA, '/sepa_credit_transfers', attributes)
+            create(FidorApi::Model::Transfer::Classic::SEPA, 'sepa_credit_transfers', attributes)
           end
         end
       end

data/lib/fidor_api/client/dsl/transfers/generic.rb

@@ -5,12 +5,12 @@ module FidorApi
         module Generic
           def transfers(options = {})
             check_transfer_support! :generic
-            fetch(:collection, FidorApi::Model::Transfer::Generic, '/transfers', options)
+            fetch(:collection, FidorApi::Model::Transfer::Generic, 'transfers', options)
           end
 
           def transfer(id, options = {})
             check_transfer_support! :generic
-            fetch(:single, FidorApi::Model::Transfer::Generic, "/transfers/#{id}", options)
+            fetch(:single, FidorApi::Model::Transfer::Generic, "transfers/#{id}", options)
           end
 
           def new_transfer(attributes = {})
@@ -18,14 +18,19 @@ module FidorApi
             Model::Transfer::Generic.new(attributes)
           end
 
-          def create_transfer(attributes = {})
+          def create_transfer(attributes = {}, options = {})
             check_transfer_support! :generic
-            create(FidorApi::Model::Transfer::Generic, '/transfers', attributes)
+            create(FidorApi::Model::Transfer::Generic, 'transfers', attributes, options)
           end
 
-          def update_transfer(id, attributes = {})
+          def update_transfer(id, attributes = {}, options = {})
             check_transfer_support! :generic
-            update(FidorApi::Model::Transfer::Generic, "/transfers/#{id}", id, attributes)
+            update(FidorApi::Model::Transfer::Generic, "transfers/#{id}", id, attributes, options)
+          end
+
+          def confirm_transfer(id, options = {})
+            check_transfer_support! :generic
+            request(:put, "/transfers/#{id}/confirm", {}, options.delete(:headers)).headers['Location']
           end
         end
       end

data/lib/fidor_api/client/dsl.rb

@@ -7,6 +7,7 @@ module FidorApi
       autoload :CoreData,           'fidor_api/client/dsl/core_data'
       autoload :Messages,           'fidor_api/client/dsl/messages'
       autoload :Preauths,           'fidor_api/client/dsl/preauths'
+      autoload :StandingOrders,     'fidor_api/client/dsl/standing_orders'
       autoload :Transactions,       'fidor_api/client/dsl/transactions'
       autoload :Transfers,          'fidor_api/client/dsl/transfers'
 
@@ -17,6 +18,7 @@ module FidorApi
         klass.include CoreData
         klass.include Messages
         klass.include Preauths
+        klass.include StandingOrders
         klass.include Transactions
         klass.include Transfers
       end
@@ -24,28 +26,34 @@ module FidorApi
       private
 
       def fetch(type, klass, endpoint, options)
+        headers = options.delete(:headers) || {}
+
         case type
         when :single
-          klass.new(connection.get(endpoint, query: options).body)
+          klass.new(connection.get(endpoint, query: options, headers: headers).body)
         when :collection
-          Collection.new(klass: klass, raw: connection.get(endpoint, query: options).body)
+          Collection.new(klass: klass, raw: connection.get(endpoint, query: options, headers: headers).body)
         else
           raise ArgumentError
         end
       end
 
-      def create(klass, endpoint, attributes)
-        request(klass, endpoint, :post, attributes)
+      def create(klass, endpoint, attributes, options = {})
+        headers = options.delete(:headers) || {}
+
+        request_model(klass, endpoint, :post, attributes, headers)
       end
 
-      def update(klass, endpoint, id, attributes, headers = {})
-        request(klass, endpoint, :put, attributes.merge(id: id), headers)
+      def update(klass, endpoint, id, attributes, options = {})
+        headers = options.delete(:headers) || {}
+
+        request_model(klass, endpoint, :put, attributes.merge(id: id), headers)
       end
 
-      def request(klass, endpoint, method, attributes, headers = {}) # rubocop:disable Metrics/AbcSize
+      def request_model(klass, endpoint, method, attributes, headers = {}) # rubocop:disable Metrics/AbcSize
         model = klass.new(attributes)
         model.tap do |m|
-          response = connection.public_send(method, endpoint, body: m.as_json, headers: headers)
+          response = request(method, endpoint, m.as_json, headers)
           m.set_attributes(response.body) if response.body.is_a?(Hash)
           m.confirmable_action_id = extract_confirmable_id(response.headers)
         end
@@ -55,6 +63,10 @@ module FidorApi
         model.tap { |m| m.parse_errors(e.response[:body]) }
       end
 
+      def request(method, endpoint, attributes, headers = {})
+        connection.public_send(method, endpoint, body: attributes, headers: headers)
+      end
+
       POSSIBLE_CONFIRMABLE_HEADERS = %w[x-fidor-confirmation-path location].freeze
 
       def extract_confirmable_id(headers)

data/lib/fidor_api/model/beneficiary_helper.rb

@@ -0,0 +1,38 @@
+module FidorApi
+  module Model
+    module BeneficiaryHelper
+      SUPPORTED_ROUTING_TYPES = {
+        'SEPA'                   => %w[remote_iban remote_bic instant],
+        'FOS_P2P_EMAIL'          => %w[email],
+        'FOS_P2P_PHONE'          => %w[mobile_phone_number],
+        'FOS_P2P_ACCOUNT_NUMBER' => %w[account_number],
+        'FOS_P2P_USERNAME'       => %w[username],
+        'FPS'                    => %w[remote_account_number remote_sort_code instant]
+      }.freeze
+
+      def define_methods_for(properties) # rubocop:disable Metrics/MethodLength
+        properties.each do |name|
+          next if respond_to?(name)
+
+          self.class.define_method name do
+            @beneficiary ||= {}
+            @beneficiary.dig('routing_info', name)
+          end
+
+          self.class.define_method "#{name}=" do |value|
+            @beneficiary ||= {}
+            @beneficiary['routing_info'] ||= {}
+            @beneficiary['routing_info'][name] = value
+          end
+        end
+      end
+
+      def parse_errors(body)
+        body['errors'].each do |hash|
+          hash['field'].sub!('beneficiary.routing_info.', '')
+        end
+        super(body)
+      end
+    end
+  end
+end

data/lib/fidor_api/model/standing_order.rb

@@ -0,0 +1,50 @@
+require 'fidor_api/model/beneficiary_helper'
+
+module FidorApi
+  module Model
+    class StandingOrder < Model::Base
+      include BeneficiaryHelper
+
+      attribute :id,           :string
+      attribute :account_id,   :string
+      attribute :external_uid, :string
+      attribute :amount,       :integer
+      attribute :currency,     :string
+      attribute :subject,      :string
+      attribute :beneficiary,  :json
+      attribute :schedule,     :json
+
+      attribute_decimal_methods :amount
+
+      def beneficiary=(value)
+        write_attribute(:beneficiary, value)
+        define_methods_for(SUPPORTED_ROUTING_TYPES[beneficiary['routing_type']])
+      end
+
+      def routing_type
+        @beneficiary ||= {}
+        @beneficiary.dig('routing_type')
+      end
+
+      def routing_type=(type)
+        raise Errors::NotSupported unless SUPPORTED_ROUTING_TYPES.key?(type)
+
+        @beneficiary ||= {}
+        @beneficiary['routing_type'] = type
+        define_methods_for(SUPPORTED_ROUTING_TYPES[type])
+      end
+
+      %w[rhythm runtime_day_of_month runtime_day_of_week start_date ultimate_run].each do |attribute|
+        define_method attribute do
+          @schedule ||= {}
+          @schedule[attribute]
+        end
+
+        define_method "#{attribute}=" do |value|
+          @schedule ||= {}
+          @schedule[attribute] = value
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/model/transfer/generic.rb

@@ -1,15 +1,10 @@
+require 'fidor_api/model/beneficiary_helper'
+
 module FidorApi
   module Model
     module Transfer
       class Generic < Model::Base
-        SUPPORTED_ROUTING_TYPES = {
-          'SEPA'                   => %w[remote_iban remote_bic instant],
-          'FOS_P2P_EMAIL'          => %w[email],
-          'FOS_P2P_PHONE'          => %w[mobile_phone_number],
-          'FOS_P2P_ACCOUNT_NUMBER' => %w[account_number],
-          'FOS_P2P_USERNAME'       => %w[username],
-          'FPS'                    => %w[remote_account_number remote_sort_code instant]
-        }.freeze
+        include BeneficiaryHelper
 
         attribute :id,           :string
         attribute :account_id,   :string
@@ -28,7 +23,7 @@ module FidorApi
 
         def beneficiary=(value)
           write_attribute(:beneficiary, value)
-          define_methods_for(beneficiary['routing_type'])
+          define_methods_for(SUPPORTED_ROUTING_TYPES[beneficiary['routing_type']])
         end
 
         def routing_type
@@ -41,24 +36,7 @@ module FidorApi
 
           @beneficiary ||= {}
           @beneficiary['routing_type'] = type
-          define_methods_for(type)
-        end
-
-        def define_methods_for(type) # rubocop:disable Metrics/MethodLength
-          SUPPORTED_ROUTING_TYPES[type].each do |name|
-            next if respond_to?(name)
-
-            self.class.define_method name do
-              @beneficiary ||= {}
-              @beneficiary.dig('routing_info', name)
-            end
-
-            self.class.define_method "#{name}=" do |value|
-              @beneficiary ||= {}
-              @beneficiary['routing_info'] ||= {}
-              @beneficiary['routing_info'][name] = value
-            end
-          end
+          define_methods_for(SUPPORTED_ROUTING_TYPES[type])
         end
 
         %w[bank contact].each do |category|
@@ -75,13 +53,6 @@ module FidorApi
             end
           end
         end
-
-        def parse_errors(body)
-          body['errors'].each do |hash|
-            hash['field'].sub!('beneficiary.routing_info.', '')
-          end
-          super(body)
-        end
       end
     end
   end

data/lib/fidor_api/model.rb

@@ -8,6 +8,7 @@ module FidorApi
     autoload :Helpers,           'fidor_api/model/helpers'
     autoload :Message,           'fidor_api/model/message'
     autoload :Preauth,           'fidor_api/model/preauth'
+    autoload :StandingOrder,     'fidor_api/model/standing_order'
     autoload :Transaction,       'fidor_api/model/transaction'
     autoload :Transfer,          'fidor_api/model/transfer'
     autoload :User,              'fidor_api/model/user'

data/lib/fidor_api/version.rb

@@ -1,3 +1,3 @@
 module FidorApi
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fidor_api
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Fidor Solutions AG
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +171,7 @@ files:
 - lib/fidor_api/client/dsl/core_data.rb
 - lib/fidor_api/client/dsl/messages.rb
 - lib/fidor_api/client/dsl/preauths.rb
+- lib/fidor_api/client/dsl/standing_orders.rb
 - lib/fidor_api/client/dsl/transactions.rb
 - lib/fidor_api/client/dsl/transfers.rb
 - lib/fidor_api/client/dsl/transfers/classic.rb
@@ -201,6 +188,7 @@ files:
 - lib/fidor_api/model.rb
 - lib/fidor_api/model/account.rb
 - lib/fidor_api/model/base.rb
+- lib/fidor_api/model/beneficiary_helper.rb
 - lib/fidor_api/model/card.rb
 - lib/fidor_api/model/confirmable_action.rb
 - lib/fidor_api/model/customer.rb
@@ -209,6 +197,7 @@ files:
 - lib/fidor_api/model/helpers/attribute_decimal_methods.rb
 - lib/fidor_api/model/message.rb
 - lib/fidor_api/model/preauth.rb
+- lib/fidor_api/model/standing_order.rb
 - lib/fidor_api/model/transaction.rb
 - lib/fidor_api/model/transfer.rb
 - lib/fidor_api/model/transfer/classic.rb