fidor_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35bab1256f83d253acc2cadc504cb76446365ae5
-  data.tar.gz: 045a5090ae3dbbb4397795479782c5a3117a6795
+  metadata.gz: b18d0f77a280f02bee3ddf6b2bce5a3c4d598644
+  data.tar.gz: 820e2789982d1376be43f2b95be4c4e448c25902
 SHA512:
-  metadata.gz: d8db1a19cf9c1f401f157d4549cbc6abb865e470b6067e12388d83f5afcabcad23b73aaaa7a327e1fc169b09ed779fb2b60ee687432826e0d65d9e66b1e22b5f
-  data.tar.gz: 8a44e7020efbb525d8a07838cdf0a543fde15e6ffbbc883db9346c44c061176636479536fffdceeeb1be5f6ffecbb4ce6f6000c4c5e4817dcfd2c092eb0e6a6c
+  metadata.gz: a69f553f0953fb1967527fb58e50db7d4903fc39087ddfbc89d8d2f7cb3e0c8e50546b9a7c87f3d6b7f9da05b4ef5e1b4f7ec03cae0a68c69078570089224c39
+  data.tar.gz: 06e0802e771bcf251e7d8ef8e0f7f5e9be435740702c5fc7f74a5e1eae30ef584529a368cbac37d481e34872b744ba517ef90cec6dd4bc713846801314001688

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - "2.1.10"
+  - "2.2.5"
+  - "2.3.1"
 addons:
   code_climate:
-    repo_token: 2ffd456a223e8c95dbd79a25a5ea3dca9899ece93fce3cfdfae3723a76f0028e
+    repo_token: 2ffd456a223e8c95dbd79a25a5ea3dca9899ece93fce3cfdfae3723a76f0028e

data/Gemfile

@@ -1,6 +1,14 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fidor_api.gemspec
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+group :development, :test do
+  gem "bundler", "~> 1.10"
+  gem "byebug", "~> 8.2"
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 3.3"
+  gem "shoulda-matchers", "~> 2.8"
+  gem "vcr", "~> 2.9"
+  gem "simplecov", "~> 0.10"
+  gem "codeclimate-test-reporter", group: :test, require: nil
+end

data/README.md

@@ -1,5 +1,6 @@
 # FidorApi
 
+[![Gem Version](https://badge.fury.io/rb/fidor_api.svg)](https://badge.fury.io/rb/fidor_api)
 [![Build Status](https://travis-ci.org/klausmeyer/fidor_api.svg?branch=master)](https://travis-ci.org/klausmeyer/fidor_api)
 [![Test Coverage](https://codeclimate.com/github/klausmeyer/fidor_api/badges/coverage.svg)](https://codeclimate.com/github/klausmeyer/fidor_api/coverage)
 [![Code Climate](https://codeclimate.com/github/klausmeyer/fidor_api/badges/gpa.svg)](https://codeclimate.com/github/klausmeyer/fidor_api)
@@ -24,15 +25,48 @@ Or install it yourself as:
 
 ## Usage
 
-Examples:
+### 0. Configure
 
-1. oAuth
+```ruby
+FidorApi.configure do |config|
+  config.oauth_url       = ENV["FIDOR_OAUTH_URL"]
+  config.api_url         = ENV["FIDOR_API_URL"]
+  config.callback_url    = ENV["FIDOR_API_CALLBACK"]
+  config.client_id       = ENV["FIDOR_API_CLIENT_ID"]
+  config.client_secret   = ENV["FIDOR_API_CLIENT_SECRET"]
+  config.htauth_user     = ENV["FIDOR_API_HTAUTH_USER"]
+  config.htauth_password = ENV["FIDOR_API_HTAUTH_PASSWORD"]
+  config.affiliate_uid   = ENV["FIDOR_API_AFFILIATE_UID"]
+end
+```
+
+### 1. oAuth (Rails)
+
+Redirect the user to the authorize URL:
 
 ```ruby
-todo
+redirect_to FidorApi::Auth.authorize_url
+```
+
+Use code passed to the callback URL and fetch the access token:
+
+```ruby
+session[:api_token] = FidorApi::Auth.fetch_token(params[:code]).to_hash
+```
+
+Renew token after it has expired:
+
+```ruby
+def api_token
+  FidorApi::Token.new session[:api_token] if session[:api_token]
+end
+
+if api_token && !api_token.valid?
+  session[:api_token] = FidorApi::Auth.refresh_token(api_token).to_hash
+end
 ```
 
-2. Fetching data
+### 2. Fetching data
 
 ```ruby
 token = FidorApi::Token.new(access_token: "f859032a6ca0a4abb2be0583b8347937")
@@ -48,7 +82,7 @@ transaction = transactions.first
 # => FidorApi::Transaction
 ```
 
-3. Creating transfers
+### 3. Creating transfers
 
 ```ruby
 token = FidorApi::Token.new(access_token: "f859032a6ca0a4abb2be0583b8347937")

data/fidor_api.gemspec

@@ -18,15 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday", "~> 0.8"
-  spec.add_dependency "activesupport", "~> 4.2"
-  spec.add_dependency "activemodel", "~> 4.2"
+  spec.add_dependency "activesupport", ">= 4.2", "< 5.1"
+  spec.add_dependency "activemodel", ">= 4.2", "< 5.1"
   spec.add_dependency "model_attribute", "~> 2.1"
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "byebug", "~> 8.2"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "shoulda-matchers", "~> 2.8"
-  spec.add_development_dependency "vcr", "~> 2.9"
-  spec.add_development_dependency "simplecov", "~> 0.10"
 end

data/lib/fidor_api.rb

@@ -11,12 +11,14 @@ module FidorApi
   attr_accessor :configuration
 
   class Configuration
-    attr_accessor :callback_url, :oauth_url, :api_url, :client_id, :client_secret, :logging
+    attr_accessor :callback_url, :oauth_url, :api_url, :client_id, :client_secret, :htauth_user, :htauth_password, :affiliate_uid, :os_type, :logging
   end
 
   def configure
-    self.configuration = Configuration.new
-    self.configuration.logging = true
+    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 ;)
+    end
     yield configuration
   end
 end
@@ -27,9 +29,14 @@ 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"

data/lib/fidor_api/account.rb

@@ -2,26 +2,28 @@ module FidorApi
 
   class Account < Resource
     extend ModelAttribute
+    extend AmountAttributes
 
     attribute :id,                    :integer
     attribute :account_number,        :string
     attribute :iban,                  :string
     attribute :bic,                   :string
-    attribute :balance,               :integer
-    attribute :balance_available,     :integer
-    attribute :preauth_amount,        :integer
-    attribute :cash_flow_per_year,    :integer
     attribute :is_debit_note_enabled, :boolean
     attribute :is_trusted,            :boolean
     attribute :is_locked,             :boolean
     attribute :currency,              :string
-    attribute :overdraft,             :integer
     attribute :created_at,            :time
     attribute :updated_at,            :time
     attribute :customers,             :string
 
+    amount_attribute :balance
+    amount_attribute :balance_available
+    amount_attribute :preauth_amount
+    amount_attribute :cash_flow_per_year
+    amount_attribute :overdraft
+
     def self.all(access_token, options = {})
-      Collection.build(self, request(:get, access_token, "/accounts", options))
+      Collection.build(self, request(access_token: access_token, endpoint: "/accounts", query_params: options).body)
     end
 
     def self.first(access_token)

data/lib/fidor_api/amount_attributes.rb

@@ -0,0 +1,27 @@
+module AmountAttributes
+  def self.extended(base)
+    base.instance_variable_set('@amount_attributes', [])
+  end
+
+  def amount_attribute(name)
+    @amount_attributes << name
+
+    define_method name do
+      BigDecimal.new((instance_variable_get("@#{name}") / 100.00).to_s) if instance_variable_get("@#{name}").present?
+    end
+
+    define_method "#{name}=" do |value|
+      if value.instance_of?(BigDecimal)
+        instance_variable_set("@#{name}", (value * 100.00).to_i)
+      elsif value.instance_of?(Fixnum) || value.instance_of?(NilClass)
+        instance_variable_set("@#{name}", value)
+      else
+        raise ArgumentError, "Must be either Fixnum (1234) or BigDecimal (12.34)."
+      end
+    end
+  end
+
+  def attributes
+    super + @amount_attributes
+  end
+end

data/lib/fidor_api/auth.rb

@@ -31,7 +31,7 @@ module FidorApi
       Faraday.new(url: FidorApi.configuration.oauth_url) do |config|
         config.use      Faraday::Request::BasicAuthentication, FidorApi.configuration.client_id, FidorApi.configuration.client_secret
         config.request  :url_encoded
-        config.response :logger       if FidorApi.configuration.logging
+        config.response :logger if FidorApi.configuration.logging
         config.response :raise_error
         config.adapter  Faraday.default_adapter
       end

data/lib/fidor_api/card.rb

@@ -0,0 +1,94 @@
+module FidorApi
+
+  class Card < Resource
+    extend ModelAttribute
+    extend AmountAttributes
+
+    attribute :id,                        :integer
+    attribute :account_id,                :string
+    attribute :inscription,               :string
+    attribute :pin,                       :string
+    attribute :type,                      :string
+    attribute :design,                    :string
+    attribute :currency,                  :string
+    attribute :physical,                  :boolean
+    attribute :email_notification,        :boolean
+    attribute :sms_notification,          :boolean
+    attribute :payed,                     :boolean
+    attribute :state,                     :string
+    attribute :lock_reason,               :string
+    attribute :disabled,                  :boolean
+    attribute :created_at,                :time
+    attribute :updated_at,                :time
+
+    amount_attribute :balance
+    amount_attribute :atm_limit
+    amount_attribute :transaction_single_limit
+    amount_attribute :transaction_volume_limit
+
+    def self.required_attributes
+      [ :account_id, :type, :design, :currency, :pin ]
+    end
+
+    validates *required_attributes, presence: true
+
+    def self.all(access_token, options = {})
+      Collection.build(self, request(access_token: access_token, endpoint: "/cards", query_params: options).body)
+    end
+
+    def self.find(access_token, id)
+      new(request(access_token: access_token, endpoint: "/cards/#{id}").body)
+    end
+
+    def self.lock(access_token, id)
+      request(method: :put, access_token: access_token, endpoint: "/cards/#{id}/lock")
+      true
+    end
+
+    def self.unlock(access_token, id)
+      request(method: :put, access_token: access_token, endpoint: "/cards/#{id}/unlock")
+      true
+    end
+
+    def save
+      if id.nil?
+        create
+      else
+        raise NoUpdatesAllowedError
+      end
+    end
+
+    def as_json
+      attributes.slice *self.class.required_attributes
+    end
+
+    private
+
+    def self.resource
+      "cards"
+    end
+
+    module ClientSupport
+      def cards(options = {})
+        Card.all(token.access_token, options)
+      end
+
+      def card(id)
+        Card.find(token.access_token, id)
+      end
+
+      def lock_card(id)
+        Card.lock(token.access_token, id)
+      end
+
+      def unlock_card(id)
+        Card.unlock(token.access_token, id)
+      end
+
+      def build_card(attributes = {})
+        Card.new(attributes.merge(client: self))
+      end
+    end
+  end
+
+end

data/lib/fidor_api/card_limits.rb

@@ -0,0 +1,42 @@
+module FidorApi
+
+  class CardLimits < Resource
+    extend ModelAttribute
+    extend AmountAttributes
+
+    attribute :id, :integer
+    amount_attribute :atm_limit
+    amount_attribute :transaction_single_limit
+    amount_attribute :transaction_volume_limit
+
+    def self.find(access_token, id)
+      attributes = request(access_token: access_token, endpoint: "/cards/#{id}/limits").body
+      attributes.merge!(id: id)
+      new(attributes)
+    end
+
+    def self.change(access_token, id, limits = {})
+      attributes = limits.merge(id: id)
+
+      new(attributes).tap do |record|
+        record.set_attributes request(
+          method:       :put,
+          access_token: access_token,
+          endpoint:     "/cards/#{id}/limits",
+          body:         record.as_json
+        ).body
+      end
+    end
+
+    module ClientSupport
+      def card_limits(id)
+        CardLimits.find(token.access_token, id)
+      end
+
+      def change_card_limits(id, limits)
+        CardLimits.change(token.access_token, id, limits)
+      end
+    end
+  end
+
+end

data/lib/fidor_api/client.rb

@@ -6,11 +6,15 @@ module FidorApi
     attr_accessor :token
 
     include Account::ClientSupport
+    include Card::ClientSupport
+    include CardLimits::ClientSupport
     include Customer::ClientSupport
+    include Message::ClientSupport
     include Preauth::ClientSupport
     include Transaction::ClientSupport
     include Transfer::Internal::ClientSupport
     include Transfer::SEPA::ClientSupport
+    include Transfer::FPS::ClientSupport
     include User::ClientSupport
   end
 

data/lib/fidor_api/collection.rb

@@ -2,25 +2,17 @@ module FidorApi
 
   class Collection
     include ActiveModel::Model
+    include Enumerable
 
     attr_accessor :records
     attr_accessor :total_pages, :current_page, :limit_value
 
-    delegate :each, :first, to: :records
-
     def self.build(klass, response)
       new.tap do |object|
-        # NOTE: We need this ugly hack since the sandbox is not wrapping records into data key.
-        # Will hopefully go away in future.
-        if response.is_a? Hash
-          data       = response["data"]
-          collection = response["collection"]
-        else
-          data       = response
-          collection = collection_from_array response
-        end
-
-        object.records      = data.map { |record| klass.new(record) }
+        data       = response["data"]
+        collection = response["collection"]
+
+        object.records = data.map { |record| klass.new(record) }
 
         object.total_pages  = collection["total_pages"]
         object.current_page = collection["current_page"]
@@ -28,8 +20,8 @@ module FidorApi
       end
     end
 
-    def to_a
-      records
+    def each(&block)
+      records.each(&block)
     end
 
     # --- kaminari stuff -- maybe move somewhere else
@@ -40,16 +32,6 @@ module FidorApi
     def next_page
       current_page + 1
     end
-
-    private
-
-    def self.collection_from_array(array)
-      {
-        "total_pages"  => 1,
-        "current_page" => 1,
-        "per_page"     => array.count
-      }
-    end
   end
 
 end

data/lib/fidor_api/customer.rb

@@ -3,6 +3,31 @@ module FidorApi
   class Customer < Resource
     extend ModelAttribute
 
+    module Gender
+      extend self
+
+      class Base
+        include Singleton
+      end
+
+      class Male    < Base; end
+      class Female  < Base; end
+      class Unknonw < Base; end
+
+      MAPPING = {
+        Male   => "m",
+        Female => "f"
+      }
+
+      def for_api_value(api_value)
+        MAPPING.key(api_value) || Unknonw
+      end
+
+      def object_to_string(object)
+        MAPPING[object]
+      end
+    end
+
     attribute :id,                        :integer
     attribute :email,                     :string
     attribute :first_name,                :string
@@ -31,15 +56,58 @@ module FidorApi
     attribute :created_at,                :time
     attribute :updated_at,                :time
     attribute :creditor_identifier,       :string
+    attribute :affiliate_uid,             :string
+    attribute :verification_token,        :string
+    attribute :password,                  :string
+    attribute :tos,                       :boolean
+    attribute :privacy_policy,            :boolean
+    attribute :own_interest,              :boolean
+    attribute :us_citizen,                :boolean
+    attribute :us_tax_payer,              :boolean
 
     def self.all(access_token, options = {})
-      Collection.build(self, request(:get, access_token, "/customers", options))
+      Collection.build(self, request(access_token: access_token, endpoint: "/customers", query_params: options).body)
     end
 
     def self.first(access_token)
       all(access_token, page: 1, per_page: 1).first
     end
 
+    def initialize(*args)
+      super
+      self.affiliate_uid = FidorApi.configuration.affiliate_uid
+    end
+
+    def gender
+      Gender.for_api_value(@gender)
+    end
+
+    def gender=(value)
+      @gender = if value.class == Class && value.instance.is_a?(FidorApi::Customer::Gender::Base)
+        Gender.object_to_string(value)
+      else
+        value
+      end
+    end
+
+    def as_json(options = nil)
+      attributes.tap { |a| a[:birthday] = a[:birthday].try(:to_date) }
+    end
+
+    def save
+      if id.nil?
+        create(htauth: true, access_token: nil)
+      else
+        raise NoUpdatesAllowedError
+      end
+    end
+
+    private
+
+    def self.resource
+      "customers"
+    end
+
     module ClientSupport
       def customers(options = {})
         Customer.all(token.access_token, options)

data/lib/fidor_api/errors.rb

@@ -4,5 +4,15 @@ module FidorApi
   ClientError            = Class.new(Error)
   UnauthorizedTokenError = Class.new(Error)
   InvalidRecordError     = Class.new(Error)
+  NoUpdatesAllowedError  = Class.new(Error)
+
+  class ValidationError < Error
+    attr_accessor :fields
+
+    def initialize(message, fields)
+      super(message)
+      self.fields = fields
+    end
+  end
 
 end

data/lib/fidor_api/message.rb

@@ -0,0 +1,53 @@
+module FidorApi
+
+  class Message < Resource
+    extend ModelAttribute
+    extend AmountAttributes
+
+    attribute :id,         :integer
+    attribute :subject,    :string
+    attribute :type,       :string
+    attribute :opened_at,  :time
+    attribute :created_at, :time
+    attribute :updated_at, :time
+    attribute :category,   :string
+
+    class Attachment
+      include ActiveModel::Model
+      attr_accessor :type, :filename, :content
+    end
+
+    def self.all(access_token, options = {})
+      Collection.build(self, request(access_token: access_token, endpoint: "/messages", query_params: options).body)
+    end
+
+    def self.find(access_token, id)
+      new(request(access_token: access_token, endpoint: "/messages/#{id}").body)
+    end
+
+    def self.attachment(access_token, id)
+      response = request(access_token: access_token, endpoint: "/messages/#{id}/attachment")
+
+      Attachment.new(
+        type:     response.headers["content-type"],
+        filename: response.headers["content-disposition"][/filename="([^"]+)"/, 1],
+        content:  response.body,
+      )
+    end
+
+    module ClientSupport
+      def messages(options = {})
+        Message.all(token.access_token, options)
+      end
+
+      def message(id)
+        Message.find(token.access_token, id)
+      end
+
+      def message_attachment(id)
+        Message.attachment(token.access_token, id)
+      end
+    end
+  end
+
+end

data/lib/fidor_api/msisdn.rb

@@ -0,0 +1,45 @@
+module FidorApi
+
+  module Msisdn
+    extend self
+
+    def check(msisdn)
+      post "/msisdn/check", {
+        msisdn:        msisdn,
+        os_type:       FidorApi.configuration.os_type,
+        affiliate_uid: FidorApi.configuration.affiliate_uid
+      }
+    end
+
+    def verify(msisdn, code)
+      post "/msisdn/verify", {
+        msisdn: msisdn,
+        code:   code
+      }
+    end
+
+    private
+
+    def connection
+      Faraday.new(url: FidorApi.configuration.oauth_url) do |config|
+        config.use      Faraday::Request::BasicAuthentication, FidorApi.configuration.htauth_user, FidorApi.configuration.htauth_password
+        config.request  :url_encoded
+        config.response :logger if FidorApi.configuration.logging
+        config.response :raise_error
+        config.adapter  Faraday.default_adapter
+      end
+    end
+
+    def post(endpoint, body)
+      response = connection.post endpoint do |request|
+        request.headers = {
+          "Accept"       => "application/vnd.fidor.de; version=1,text/json",
+          "Content-Type" => "application/json"
+        }
+        request.body = body.to_json
+      end
+      response.body
+    end
+  end
+
+end

data/lib/fidor_api/preauth.rb

@@ -2,23 +2,24 @@ module FidorApi
 
   class Preauth < Resource
     extend ModelAttribute
+    extend AmountAttributes
 
     attribute :id,                   :integer
     attribute :account_id,           :string
     attribute :preauth_type,         :string
     attribute :preauth_type_details, :json
-    attribute :amount,               :integer
     attribute :expires_at,           :time
     attribute :created_at,           :time
     attribute :updated_at,           :time
     attribute :currency,             :string
+    amount_attribute :amount
 
     def self.all(access_token, options = {})
-      Collection.build(self, request(:get, access_token, "/preauths", options))
+      Collection.build(self, request(access_token: access_token, endpoint: "/preauths", query_params: options).body)
     end
 
     def self.find(access_token, id)
-      new(request(:get, access_token, "/preauths/#{id}"))
+      new(request(access_token: access_token, endpoint: "/preauths/#{id}").body)
     end
 
     def preauth_type_details

data/lib/fidor_api/preauth_details.rb

@@ -44,7 +44,7 @@ module FidorApi
       attribute :remote_subject, :string
 
       def description
-        remote_nick || remote_name || super
+        remote_name || remote_nick || super
       end
     end
 

data/lib/fidor_api/resource.rb

@@ -5,41 +5,80 @@ module FidorApi
 
     attr_accessor :client
 
+    class Response
+      include ActiveModel::Model
+
+      attr_accessor :headers, :body
+
+      def body
+        if headers["content-type"] =~ /json/
+          JSON.parse(@body)
+        else
+          @body
+        end
+      end
+    end
+
     def initialize(attributes = {})
-      self.client = client
       set_attributes(attributes)
     end
 
-    def self.request(method, access_token, endpoint, query_params = {}, body = {})
-      response = connection.public_send(method, endpoint) do |request|
+    def self.request(method: :get, access_token: nil, endpoint: nil, query_params: {}, body: {}, htauth: false)
+      response = connection(htauth: htauth).public_send(method, endpoint) do |request|
         request.params = query_params
-        request.headers = {
-          "Authorization" => "Bearer #{access_token}",
-          "Accept"        => "application/vnd.fidor.de; version=1,text/json",
-          "Content-Type"  => "application/json"
-        }
+        request.headers = {}
+        request.headers["Authorization"] = "Bearer #{access_token}" if access_token
+        request.headers["Accept"]        = "application/vnd.fidor.de; version=1,text/json"
+        request.headers["Content-Type"]  = "application/json"
         request.body = body.to_json unless body.empty?
       end
-      JSON.parse response.body
+      Response.new(headers: response.headers, body: response.body)
     rescue Faraday::Error::ClientError => e
-      if e.response[:status] == 401 && e.response[:body] =~ /token_not_found|Unauthorized token|expired/
+      case e.response[:status]
+      when 401
         raise UnauthorizedTokenError
+      when 422
+        body = JSON.parse(e.response[:body])
+        raise ValidationError.new(body["message"], body["errors"])
       else
         raise ClientError
       end
     end
 
+    def self.model_name
+      ActiveModel::Name.new(self, nil, self.name.sub("FidorApi::", ""))
+    end
+
+    def persisted?
+      id.present?
+    end
+
     private
 
-    def self.connection
+    def self.connection(htauth: false)
       Faraday.new(url: FidorApi.configuration.api_url) do |config|
-        config.use      Faraday::Request::BasicAuthentication, FidorApi.configuration.client_id, FidorApi.configuration.client_secret
+        config.use      Faraday::Request::BasicAuthentication, FidorApi.configuration.htauth_user, FidorApi.configuration.htauth_password if htauth
         config.request  :url_encoded
-        config.response :logger      if FidorApi.configuration.logging
+        config.response :logger if FidorApi.configuration.logging
         config.response :raise_error
         config.adapter  Faraday.default_adapter
       end
     end
+
+    def create(options = {})
+      raise InvalidRecordError unless valid?
+      set_attributes self.class.request({ method: :post, access_token: client.try { |c| c.token.access_token }, endpoint: self.class.resource, body: as_json }.merge(options)).body
+      true
+    rescue ValidationError => e
+      map_errors(e.fields)
+      false
+    end
+
+    def map_errors(fields)
+      fields.each do |hash|
+        errors.add(hash["field"].to_sym, hash["message"]) if respond_to? hash["field"].to_sym
+      end
+    end
   end
 
 end

data/lib/fidor_api/transaction.rb

@@ -2,13 +2,13 @@ module FidorApi
 
   class Transaction < Resource
     extend ModelAttribute
+    extend AmountAttributes
 
     attribute :id,                       :integer
     attribute :account_id,               :string
     attribute :transaction_type,         :string
     attribute :transaction_type_details, :json
     attribute :subject,                  :string
-    attribute :amount,                   :integer
     attribute :currency,                 :string
     attribute :booking_date,             :time
     attribute :value_date,               :time
@@ -16,13 +16,14 @@ module FidorApi
     attribute :return_transaction_id,    :string
     attribute :created_at,               :time
     attribute :updated_at,               :time
+    amount_attribute :amount
 
     def self.all(access_token, options = {})
-      Collection.build(self, request(:get, access_token, "/transactions", options))
+      Collection.build(self, request(access_token: access_token, endpoint: "/transactions", query_params: options).body)
     end
 
     def self.find(access_token, id)
-      new(request(:get, access_token, "/transactions/#{id}"))
+      new(request(access_token: access_token, endpoint: "/transactions/#{id}").body)
     end
 
     def transaction_type_details

data/lib/fidor_api/transfer.rb

@@ -5,25 +5,26 @@ module FidorApi
     class Base < Resource
 
       def save
-        raise InvalidRecordError unless valid?
-
-        set_attributes self.class.request(:post, client.token.access_token, self.class.resource, {}, as_json)
-
-        true
+        if id.nil?
+          create
+        else
+          raise NoUpdatesAllowedError
+        end
       end
 
       def self.all(access_token, options = {})
-        Collection.build(self, request(:get, access_token, resource, options))
+        Collection.build(self, request(access_token: access_token, endpoint: resource, query_params: options).body)
       end
 
       def self.find(access_token, id)
-        new(request(:get, access_token, "/#{resource}/#{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
@@ -31,29 +32,33 @@ module FidorApi
       attribute :transaction_id, :string
       attribute :receiver,       :string
       attribute :external_uid,   :string
-      attribute :amount,         :integer
       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
 
-      def as_json
-        attributes.slice *self.class.required_attributes
-      end
-
       module ClientSupport
         def internal_transfers(options = {})
           Transfer::Internal.all(token.access_token, options)
@@ -71,6 +76,7 @@ module FidorApi
 
     class SEPA < Base
       extend ModelAttribute
+      extend AmountAttributes
 
       attribute :id,             :integer
       attribute :account_id,     :string
@@ -79,7 +85,6 @@ module FidorApi
       attribute :remote_iban,    :string
       attribute :remote_bic,     :string
       attribute :remote_name,    :string
-      attribute :amount,         :integer
       attribute :external_uid,   :string
       attribute :subject,        :string
       attribute :currency,       :string
@@ -87,23 +92,28 @@ module FidorApi
       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_bic, :remote_name, :amount, :subject ]
+        [ :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
 
-      def as_json
-        attributes.slice *self.class.required_attributes
-      end
-
       module ClientSupport
         def sepa_transfers(options = {})
           Transfer::SEPA.all(token.access_token, options)
@@ -119,6 +129,61 @@ module FidorApi
       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
+
   end
 
 end

data/lib/fidor_api/user.rb

@@ -10,7 +10,7 @@ module FidorApi
     attribute :updated_at,      :time
 
     def self.current(access_token)
-      new(request(:get, access_token, "/users/current"))
+      new(request(access_token: access_token, endpoint: "/users/current").body)
     end
 
     module ClientSupport

data/lib/fidor_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fidor_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Klaus Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,30 +28,42 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: model_attribute
   requirement: !ruby/object:Gem::Requirement
@@ -66,104 +78,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 description: Connect to the Fidor Bank API
 email:
 - spam@klaus-meyer.net
@@ -185,11 +99,16 @@ files:
 - fidor_api.gemspec
 - lib/fidor_api.rb
 - lib/fidor_api/account.rb
+- lib/fidor_api/amount_attributes.rb
 - lib/fidor_api/auth.rb
+- lib/fidor_api/card.rb
+- lib/fidor_api/card_limits.rb
 - lib/fidor_api/client.rb
 - lib/fidor_api/collection.rb
 - lib/fidor_api/customer.rb
 - lib/fidor_api/errors.rb
+- lib/fidor_api/message.rb
+- lib/fidor_api/msisdn.rb
 - lib/fidor_api/preauth.rb
 - lib/fidor_api/preauth_details.rb
 - lib/fidor_api/resource.rb
@@ -219,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple ruby client for the Fidor Bank API