fidor_api 0.0.2 → 0.1.0

data/lib/fidor_api/transfer/internal.rb

@@ -0,0 +1,53 @@
+module FidorApi
+  module Transfer
+    class Internal < Base
+      extend ModelAttribute
+      extend AmountAttributes
+
+      self.endpoint = Connectivity::Endpoint.new('/internal_transfers', :collection)
+
+      attribute :id,             :integer
+      attribute :account_id,     :string
+      attribute :user_id,        :string
+      attribute :transaction_id, :string
+      attribute :receiver,       :string
+      attribute :external_uid,   :string
+      attribute :currency,       :string
+      attribute :subject,        :string
+      attribute :state,          :string
+      attribute :created_at,     :time
+      attribute :updated_at,     :time
+      amount_attribute :amount
+
+      def self.required_attributes
+        [ :account_id, :receiver, :external_uid, :amount, :subject ]
+      end
+
+      def self.writeable_attributes
+        required_attributes
+      end
+
+      validates *required_attributes, presence: true
+
+      def as_json
+        attributes.slice *self.class.writeable_attributes
+      end
+
+      private
+
+      module ClientSupport
+        def internal_transfers(options = {})
+          Transfer::Internal.all(options)
+        end
+
+        def internal_transfer(id)
+          Transfer::Internal.find(id)
+        end
+
+        def build_internal_transfer(attributes = {})
+          Transfer::Internal.new(attributes)
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/p2p_account_number.rb

@@ -0,0 +1,45 @@
+module FidorApi
+  module Transfer
+    class P2pAccountNumber < Base
+      include Generic
+
+      attribute :account_number, :string
+
+      validates :account_number, presence: true, unless: :beneficiary_reference_passed?
+
+      def set_attributes(attrs = {})
+        set_beneficiary_attributes(attrs)
+        self.account_number = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["account_number"]
+        super(attrs.except("beneficiary"))
+      end
+
+      def as_json_routing_type
+        "FOS_P2P_ACCOUNT_NUMBER".freeze
+      end
+
+      def as_json_routing_info
+        {
+          account_number: account_number
+        }
+      end
+
+      module ClientSupport
+        def p2p_account_number_transfers(options = {})
+          Transfer::P2pAccountNumber.all(options)
+        end
+
+        def p2p_account_number_transfer(id)
+          Transfer::P2pAccountNumber.find(id)
+        end
+
+        def build_p2p_account_number_transfer(attributes = {})
+          Transfer::P2pAccountNumber.new(attributes)
+        end
+
+        def update_p2p_account_number_transfer(id, attributes = {})
+          Transfer::P2pAccountNumber.new(attributes.merge(id: id))
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/p2p_phone.rb

@@ -0,0 +1,45 @@
+module FidorApi
+  module Transfer
+    class P2pPhone < Base
+      include Generic
+
+      attribute :mobile_phone_number, :string
+
+      validates :mobile_phone_number, presence: true, unless: :beneficiary_reference_passed?
+
+      def set_attributes(attrs = {})
+        set_beneficiary_attributes(attrs)
+        self.mobile_phone_number = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["mobile_phone_number"]
+        super(attrs.except("beneficiary"))
+      end
+
+      def as_json_routing_type
+        "FOS_P2P_PHONE"
+      end
+
+      def as_json_routing_info
+        {
+          mobile_phone_number: mobile_phone_number
+        }
+      end
+
+      module ClientSupport
+        def p2p_phone_transfers(options = {})
+          Transfer::P2pPhone.all(options)
+        end
+
+        def p2p_phone_transfer(id)
+          Transfer::P2pPhone.find(id)
+        end
+
+        def build_p2p_phone_transfer(attributes = {})
+          Transfer::P2pPhone.new(attributes)
+        end
+
+        def update_p2p_phone_transfer(id, attributes = {})
+          Transfer::P2pPhone.new(attributes.merge(id: id))
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/p2p_username.rb

@@ -0,0 +1,45 @@
+module FidorApi
+  module Transfer
+    class P2pUsername < Base
+      include Generic
+
+      attribute :username, :string
+
+      validates :username, presence: true, unless: :beneficiary_reference_passed?
+
+      def set_attributes(attrs = {})
+        set_beneficiary_attributes(attrs)
+        self.username = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["username"]
+        super(attrs.except("beneficiary"))
+      end
+
+      def as_json_routing_type
+        "FOS_P2P_USERNAME"
+      end
+
+      def as_json_routing_info
+        {
+          username: username
+        }
+      end
+
+      module ClientSupport
+        def p2p_username_transfers(options = {})
+          Transfer::P2pUsername.all(options)
+        end
+
+        def p2p_username_transfer(id)
+          Transfer::P2pUsername.find(id)
+        end
+
+        def build_p2p_username_transfer(attributes = {})
+          Transfer::P2pUsername.new(attributes)
+        end
+
+        def update_p2p_username_transfer(id, attributes = {})
+          Transfer::P2pUsername.new(attributes.merge(id: id))
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/sepa.rb

@@ -0,0 +1,56 @@
+module FidorApi
+  module Transfer
+    class SEPA < Base
+      extend ModelAttribute
+      extend AmountAttributes
+
+      self.endpoint = Connectivity::Endpoint.new('/sepa_credit_transfers', :collection)
+
+      attribute :id,             :integer
+      attribute :account_id,     :string
+      attribute :user_id,        :string
+      attribute :transaction_id, :string
+      attribute :remote_iban,    :string
+      attribute :remote_bic,     :string
+      attribute :remote_name,    :string
+      attribute :external_uid,   :string
+      attribute :subject,        :string
+      attribute :currency,       :string
+      attribute :subject,        :string
+      attribute :state,          :string
+      attribute :created_at,     :time
+      attribute :updated_at,     :time
+      amount_attribute :amount
+
+      def self.required_attributes
+        [ :account_id, :external_uid, :remote_iban, :remote_name, :amount, :subject ]
+      end
+
+      def self.writeable_attributes
+        required_attributes + [:remote_bic]
+      end
+
+      validates *required_attributes, presence: true
+
+      def as_json
+        attributes.slice *self.class.writeable_attributes
+      end
+
+      private
+
+      module ClientSupport
+        def sepa_transfers(options = {})
+          Transfer::SEPA.all(options)
+        end
+
+        def sepa_transfer(id)
+          Transfer::SEPA.find(id)
+        end
+
+        def build_sepa_transfer(attributes = {})
+          Transfer::SEPA.new(attributes)
+        end
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/swift.rb

@@ -0,0 +1,49 @@
+module FidorApi
+  module Transfer
+    class Swift < Base
+      include Generic
+
+      validates :contact_name, presence: true, unless: :beneficiary_reference_passed?
+
+      attribute :account_number,   :string
+      attribute :swift_code,       :string
+      attribute :account_currency, :string
+
+      validates :account_number,   presence: true, unless: :beneficiary_reference_passed?
+      validates :swift_code,       presence: true, unless: :beneficiary_reference_passed?
+      validates :account_currency, presence: true, unless: :beneficiary_reference_passed?
+
+      def set_attributes(attrs = {})
+        set_beneficiary_attributes(attrs)
+        self.account_number   = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["account_number"]
+        self.swift_code       = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["swift_code"]
+        self.account_currency = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["account_currency"]
+        super(attrs.except("beneficiary"))
+      end
+
+      def as_json_routing_type
+        "SWIFT"
+      end
+
+      def as_json_routing_info
+        {
+          account_number:   account_number,
+          swift_code:       swift_code,
+          account_currency: account_currency
+        }
+      end
+
+      private
+
+      def remote_create
+        response = endpoint.for(self).post(payload: self.as_json)
+
+        if path = response.headers["X-Fidor-Confirmation-Path"]
+          self.confirmable_action = ConfirmableAction.new(id: path.split("/").last)
+        end
+
+        response
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer/utility.rb

@@ -0,0 +1,50 @@
+module FidorApi
+  module Transfer
+    class Utility < Base
+      include Generic
+
+      attribute :utility_provider,        :string
+      attribute :utility_service,         :string
+      attribute :utility_service_number,  :string
+      attribute :inquiry_ref_num,         :string
+
+      validates :utility_provider,        presence: true
+      validates :utility_service,         presence: true
+      validates :utility_service_number,  presence: true
+      validates :inquiry_ref_num,         presence: true
+
+      def set_attributes(attrs = {})
+        self.utility_provider        = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["utility_provider"]
+        self.utility_service         = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["utility_service"]
+        self.utility_service_number  = attrs.fetch("beneficiary", {}).fetch("routing_info", {})["utility_service_number"]
+        self.inquiry_ref_num         = attrs.fetch("routing_info", {})["inquiry_ref_num"]
+        super(attrs.except("routing_type", "routing_info"))
+      end
+
+      def as_json_routing_type
+        "UTILITY"
+      end
+
+      def as_json_routing_info
+        {
+          utility_provider:        utility_provider,
+          utility_service:         utility_service,
+          utility_service_number:  utility_service_number,
+          inquiry_ref_num:         inquiry_ref_num
+        }
+      end
+
+      private
+
+      def remote_create
+        response = endpoint.for(self).post(payload: self.as_json)
+
+        if path = response.headers["X-Fidor-Confirmation-Path"]
+          self.confirmable_action = ConfirmableAction.new(id: path.split("/").last)
+        end
+
+        response
+      end
+    end
+  end
+end

data/lib/fidor_api/transfer.rb

@@ -1,190 +1,17 @@
 module FidorApi
-
   module Transfer
-
-    class Base < Resource
-
-      def save
-        if id.nil?
-          create
-        else
-          raise NoUpdatesAllowedError
-        end
-      end
-
-      def self.all(access_token, options = {})
-        Collection.build(self, request(access_token: access_token, endpoint: resource, query_params: options).body)
-      end
-
-      def self.find(access_token, id)
-        new(request(access_token: access_token, endpoint: "/#{resource}/#{id}").body)
-      end
-
-    end
-
-    class Internal < Base
-      extend ModelAttribute
-      extend AmountAttributes
-
-      attribute :id,             :integer
-      attribute :account_id,     :string
-      attribute :user_id,        :string
-      attribute :transaction_id, :string
-      attribute :receiver,       :string
-      attribute :external_uid,   :string
-      attribute :currency,       :string
-      attribute :subject,        :string
-      attribute :state,          :string
-      attribute :created_at,     :time
-      attribute :updated_at,     :time
-      amount_attribute :amount
-
-      def self.required_attributes
-        [ :account_id, :receiver, :external_uid, :amount, :subject ]
-      end
-
-      def self.writeable_attributes
-        required_attributes
-      end
-
-      validates *required_attributes, presence: true
-
-      def as_json
-        attributes.slice *self.class.writeable_attributes
-      end
-
-      private
-
-      def self.resource
-        "internal_transfers"
-      end
-
-      module ClientSupport
-        def internal_transfers(options = {})
-          Transfer::Internal.all(token.access_token, options)
-        end
-
-        def internal_transfer(id)
-          Transfer::Internal.find(token.access_token, id)
-        end
-
-        def build_internal_transfer(attributes = {})
-          Transfer::Internal.new(attributes.merge(client: self))
-        end
-      end
-    end
-
-    class SEPA < Base
-      extend ModelAttribute
-      extend AmountAttributes
-
-      attribute :id,             :integer
-      attribute :account_id,     :string
-      attribute :user_id,        :string
-      attribute :transaction_id, :string
-      attribute :remote_iban,    :string
-      attribute :remote_bic,     :string
-      attribute :remote_name,    :string
-      attribute :external_uid,   :string
-      attribute :subject,        :string
-      attribute :currency,       :string
-      attribute :subject,        :string
-      attribute :state,          :string
-      attribute :created_at,     :time
-      attribute :updated_at,     :time
-      amount_attribute :amount
-
-      def self.required_attributes
-        [ :account_id, :external_uid, :remote_iban, :remote_name, :amount, :subject ]
-      end
-
-      def self.writeable_attributes
-        required_attributes + [:remote_bic]
-      end
-
-      validates *required_attributes, presence: true
-
-      def as_json
-        attributes.slice *self.class.writeable_attributes
-      end
-
-      private
-
-      def self.resource
-        "sepa_credit_transfers"
-      end
-
-      module ClientSupport
-        def sepa_transfers(options = {})
-          Transfer::SEPA.all(token.access_token, options)
-        end
-
-        def sepa_transfer(id)
-          Transfer::SEPA.find(token.access_token, id)
-        end
-
-        def build_sepa_transfer(attributes = {})
-          Transfer::SEPA.new(attributes.merge(client: self))
-        end
-      end
-    end
-
-    class FPS < Base
-      extend ModelAttribute
-      extend AmountAttributes
-
-      attribute :id,               :integer
-      attribute :account_id,       :string
-      attribute :user_id,          :string
-      attribute :transaction_id,   :string
-      attribute :remote_account,   :string
-      attribute :remote_sort_code, :string
-      attribute :remote_name,      :string
-      attribute :external_uid,     :string
-      attribute :subject,          :string
-      attribute :currency,         :string
-      attribute :subject,          :string
-      attribute :state,            :string
-      attribute :created_at,       :time
-      attribute :updated_at,       :time
-      amount_attribute :amount
-
-      def self.required_attributes
-        [ :account_id, :external_uid, :remote_account, :remote_sort_code, :remote_name, :amount, :subject ]
-      end
-
-      def self.writeable_attributes
-        required_attributes
-      end
-
-      validates *required_attributes, presence: true
-
-      def as_json
-        attributes.slice *self.class.writeable_attributes
-      end
-
-      private
-
-      def self.resource
-        "fps_transfers"
-      end
-
-      module ClientSupport
-        def fps_transfers(options = {})
-          Transfer::FPS.all(token.access_token, options)
-        end
-
-        def fps_transfer(id)
-          Transfer::FPS.find(token.access_token, id)
-        end
-
-        def build_fps_transfer(attributes = {})
-          Transfer::FPS.new(attributes.merge(client: self))
-        end
-      end
-    end
-
+    autoload :ACH,              'fidor_api/transfer/ach'
+    autoload :Base,             'fidor_api/transfer/base'
+    autoload :FPS,              'fidor_api/transfer/fps'
+    autoload :Generic,          'fidor_api/transfer/generic'
+    autoload :Internal,         'fidor_api/transfer/internal'
+    autoload :P2pAccountNumber, 'fidor_api/transfer/p2p_account_number'
+    autoload :P2pPhone,         'fidor_api/transfer/p2p_phone'
+    autoload :P2pUsername,      'fidor_api/transfer/p2p_username'
+    autoload :Pending,          'fidor_api/transfer/pending'
+    autoload :SEPA,             'fidor_api/transfer/sepa'
+    autoload :Swift,            'fidor_api/transfer/swift'
+    autoload :BankInternal,     'fidor_api/transfer/bank_internal'
+    autoload :Utility,          'fidor_api/transfer/utility'
   end
-
 end
-

data/lib/fidor_api/user.rb

@@ -1,23 +1,24 @@
 module FidorApi
-
-  class User < Resource
+  class User < Connectivity::Resource
     extend ModelAttribute
 
-    attribute :id,              :integer
-    attribute :email,           :string
-    attribute :last_sign_in_at, :string
-    attribute :created_at,      :time
-    attribute :updated_at,      :time
+    self.endpoint = Connectivity::Endpoint.new('/users', :collection)
+
+    attribute :id,                  :integer
+    attribute :email,               :string
+    attribute :msisdn_activated_at, :time
+    attribute :last_sign_in_at,     :string
+    attribute :created_at,          :time
+    attribute :updated_at,          :time
 
-    def self.current(access_token)
-      new(request(access_token: access_token, endpoint: "/users/current").body)
+    def self.current
+      new endpoint.for(self).get(action: 'current').body
     end
 
     module ClientSupport
       def current_user
-        User.current(token.access_token)
+        User.current
       end
     end
   end
-
 end

data/lib/fidor_api/version.rb

@@ -1,3 +1,3 @@
 module FidorApi
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/fidor_api.rb

@@ -10,36 +10,53 @@ module FidorApi
 
   attr_accessor :configuration
 
+  autoload :Account,            'fidor_api/account'
+  autoload :AmountAttributes,   'fidor_api/amount_attributes'
+  autoload :ApprovalRequired,   'fidor_api/approval_required'
+  autoload :Auth,               'fidor_api/auth'
+  autoload :Beneficiary,        'fidor_api/beneficiary'
+  autoload :Card,               'fidor_api/card'
+  autoload :CardLimitAttribute, 'fidor_api/card_limit_attribute'
+  autoload :CardLimits,         'fidor_api/card_limits'
+  autoload :Client,             'fidor_api/client'
+  autoload :Collection,         'fidor_api/collection'
+  autoload :ConfirmableAction,  'fidor_api/confirmable_action'
+  autoload :Connectivity,       'fidor_api/connectivity'
+  autoload :Customer,           'fidor_api/customer'
+  autoload :Customers,          'fidor_api/customers/confirmations'
+  autoload :Message,            'fidor_api/message'
+  autoload :Msisdn,             'fidor_api/msisdn'
+  autoload :Password,           'fidor_api/password'
+  autoload :Preauth,            'fidor_api/preauth'
+  autoload :PreauthDetails,     'fidor_api/preauth_details'
+  autoload :SessionToken,       'fidor_api/session_token'
+  autoload :Token,              'fidor_api/token'
+  autoload :TransactionDetails, 'fidor_api/transaction_details'
+  autoload :Transaction,        'fidor_api/transaction'
+  autoload :Transfer,           'fidor_api/transfer'
+  autoload :User,               'fidor_api/user'
+  autoload :Version,            'fidor_api/version'
+
   class Configuration
-    attr_accessor :callback_url, :oauth_url, :api_url, :client_id, :client_secret, :htauth_user, :htauth_password, :affiliate_uid, :os_type, :logging
+    attr_accessor :callback_url, :oauth_url, :api_url, :api_path, :client_id, :client_secret, :htauth_user, :htauth_password, :affiliate_uid, :os_type, :logging, :logger, :verify_ssl
   end
 
   def configure
     self.configuration = Configuration.new.tap do |config|
-      config.logging = true
-      config.os_type = "iOS" # NOTE: As long as there is only iOS or Android we have to tell a fib ;)
+      config.logging    = true
+      config.logger     = Logger.new(STDOUT)
+      config.os_type    = "iOS" # NOTE: As long as there is only iOS or Android we have to tell a fib ;)
+      config.verify_ssl = true
     end
     yield configuration
+
+    begin
+      require "faraday/detailed_logger"
+    rescue LoadError
+      configuration.logger.debug "NOTE: Install `faraday-detailed_logger` gem to get detailed log-output for debugging."
+    end
   end
 end
 
-require "fidor_api/version"
 require "fidor_api/errors"
-require "fidor_api/token"
-require "fidor_api/auth"
-require "fidor_api/resource"
-require "fidor_api/collection"
-require "fidor_api/amount_attributes"
-require "fidor_api/user"
-require "fidor_api/account"
-require "fidor_api/card"
-require "fidor_api/card_limits"
-require "fidor_api/customer"
-require "fidor_api/message"
-require "fidor_api/msisdn"
-require "fidor_api/transaction_details"
-require "fidor_api/transaction"
-require "fidor_api/preauth_details"
-require "fidor_api/preauth"
-require "fidor_api/transfer"
-require "fidor_api/client"
+require "fidor_api/constants"