mollie-api-ruby 2.2.0 → 2.2.1

data/examples/public/stylesheets/swagger_docs.css

@@ -0,0 +1,4 @@
+/*
+ *= require typography
+ *= require screen
+ */

data/lib/mollie/api/client.rb

@@ -2,6 +2,7 @@ require "json"
 require "time"
 require "ostruct"
 require "bigdecimal"
+require "net/https"
 
 ["exception",
  "util",
@@ -11,20 +12,24 @@ require "bigdecimal"
  "resource/customers/mandates",
  "resource/customers/payments",
  "resource/customers/subscriptions",
+ "resource/invoices",
  "resource/issuers",
  "resource/methods",
  "resource/organizations",
  "resource/payments",
  "resource/payments/refunds",
+ "resource/refunds",
  "resource/permissions",
  "resource/profiles",
  "resource/profiles/apikeys",
  "resource/settlements",
+ "resource/settlements/payments",
  "object/base",
  "object/list",
  "object/customer",
  "object/customer/mandate",
  "object/customer/subscription",
+ "object/invoice",
  "object/issuer",
  "object/method",
  "object/organization",
@@ -46,8 +51,8 @@ module Mollie
 
       attr_accessor :api_key
       attr_reader :customers, :customers_payments, :customers_mandates, :customers_subscriptions,
-                  :issuers, :methods, :organizations, :payments, :payments_refunds,
-                  :permissions, :profiles, :profiles_api_keys, :settlements,
+                  :issuers, :methods, :organizations, :payments, :payments_refunds, :refunds,
+                  :permissions, :profiles, :profiles_api_keys, :settlements, :settlements_payments, :invoices,
                   :api_endpoint
 
       def initialize(api_key)
@@ -60,10 +65,13 @@ module Mollie
         @organizations           = Mollie::API::Resource::Organizations.new self
         @payments                = Mollie::API::Resource::Payments.new self
         @payments_refunds        = Mollie::API::Resource::Payments::Refunds.new self
+        @refunds                 = Mollie::API::Resource::Refunds.new self
         @permissions             = Mollie::API::Resource::Permissions.new self
         @profiles                = Mollie::API::Resource::Profiles.new self
         @profiles_api_keys       = Mollie::API::Resource::Profiles::ApiKeys.new self
         @settlements             = Mollie::API::Resource::Settlements.new self
+        @settlements_payments    = Mollie::API::Resource::Settlements::Payments.new self
+        @invoices                = Mollie::API::Resource::Invoices.new self
 
         @api_endpoint    = API_ENDPOINT
         @api_key         = api_key
@@ -84,44 +92,56 @@ module Mollie
 
       def perform_http_call(http_method, api_method, id = nil, http_body = {}, query = {})
         path = "/#{API_VERSION}/#{api_method}/#{id}".chomp('/')
-        path += "?#{URI.encode_www_form(query)}" if query.length > 0
+        if query.length > 0
+          camelized_query = Util.camelize_keys(query)
+          path            += "?#{URI.encode_www_form(camelized_query)}"
+        end
 
         case http_method
-          when 'GET'
-            request = Net::HTTP::Get.new(path)
-          when 'POST'
-            http_body.delete_if { |k, v| v.nil? }
-            request      = Net::HTTP::Post.new(path)
-            request.body = Util.camelize_keys(http_body).to_json
-          when 'DELETE'
-            request = Net::HTTP::Delete.new(path)
-          else
-            raise Mollie::API::Exception.new("Invalid HTTP Method: #{http_method}")
+        when 'GET'
+          request = Net::HTTP::Get.new(path)
+        when 'POST'
+          http_body.delete_if { |k, v| v.nil? }
+          request      = Net::HTTP::Post.new(path)
+          request.body = Util.camelize_keys(http_body).to_json
+        when 'DELETE'
+          http_body.delete_if { |k, v| v.nil? }
+          request = Net::HTTP::Delete.new(path)
+          request.body = Util.camelize_keys(http_body).to_json
+        else
+          raise Mollie::API::Exception.new("Invalid HTTP Method: #{http_method}")
         end
 
         request['Accept']        = 'application/json'
+        request['Content-Type']  = 'application/json'
         request['Authorization'] = "Bearer #{@api_key}"
         request['User-Agent']    = @version_strings.join(" ")
 
         begin
           response = client.request(request)
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-            Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+          Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
           raise Mollie::API::Exception.new(e.message)
         end
 
         http_code = response.code.to_i
         case http_code
-          when 200, 201
-            Util.nested_underscore_keys(JSON.parse(response.body))
-          when 204
-            {} # No Content
-          else
-            response        = JSON.parse(response.body)
+        when 200, 201
+          Util.nested_underscore_keys(JSON.parse(response.body))
+        when 204
+          {} # No Content
+        else
+          response = JSON.parse(response.body)
+          if response['error']
             exception       = Mollie::API::Exception.new response['error']['message']
-            exception.code  = http_code
             exception.field = response['error']['field'] unless response['error']['field'].nil?
-            raise exception
+          elsif response['errors']
+            exception = Mollie::API::Exception.new response['errors'].values.join(", ")
+          else
+            exception = Mollie::API::Exception.new response.body
+          end
+          exception.code = http_code
+          raise exception
         end
       end
 

data/lib/mollie/api/client/version.rb

@@ -1,7 +1,7 @@
 module Mollie
   module API
     class Client
-      VERSION = "2.2.0"
+      VERSION = "2.2.1"
     end
   end
 end

data/lib/mollie/api/object/invoice.rb

@@ -0,0 +1,70 @@
+module Mollie
+  module API
+    module Object
+      class Invoice < Base
+        STATUS_OPEN    = "open"
+        STATUS_PAID    = "paid"
+        STATUS_OVERDUE = "overdue"
+
+        class Amount < Base
+          attr_accessor :net, :vat, :gross
+
+          def net=(net)
+            @net = BigDecimal.new(net.to_s)
+          end
+
+          def vat=(vat)
+            @vat = BigDecimal.new(vat.to_s, 2)
+          end
+
+          def gross=(gross)
+            @gross = BigDecimal.new(gross.to_s)
+          end
+        end
+
+        class Line < Base
+          attr_accessor :period, :description, :count, :vat_percentage, :amount
+
+          def amount=(amount)
+            @amount = BigDecimal.new(amount.to_s)
+          end
+        end
+
+        attr_accessor :resource, :id, :reference, :vat_number, :status,
+                      :issue_date, :due_date, :amount, :lines, :links
+
+        def open?
+          status == STATUS_OPEN
+        end
+
+        def paid?
+          status == STATUS_PAID
+        end
+
+        def overdue?
+          status == STATUS_OVERDUE
+        end
+
+        def amount=(amount)
+          @amount = Amount.new(amount)
+        end
+
+        def issue_date=(issue_date)
+          @issue_date = Time.parse(issue_date) rescue nil
+        end
+
+        def due_date=(due_date)
+          @due_date = Time.parse(due_date) rescue nil
+        end
+
+        def lines=(lines)
+          @lines = lines.map { |line| Line.new(line) }
+        end
+
+        def pdf
+          links && links['pdf']
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/object/method.rb

@@ -14,6 +14,7 @@ module Mollie
         BELFIUS           = "belfius"
         PAYSAFECARD       = "paysafecard"
         PODIUMCADEAUKAART = "podiumcadeaukaart"
+        GIFTCARD          = "giftcard"
 
         attr_accessor :id,
                       :description,

data/lib/mollie/api/object/organization.rb

@@ -16,7 +16,7 @@ module Mollie
                       :verified_datetime
 
         def registration_datetime=(registration_datetime)
-          @registration_datetime = Time.parse(registration_datetime.to_s)
+          @registration_datetime = Time.parse(registration_datetime.to_s) rescue nil
         end
 
         def verified_datetime=(verified_datetime)

data/lib/mollie/api/object/payment.rb

@@ -2,13 +2,15 @@ module Mollie
   module API
     module Object
       class Payment < Base
-        STATUS_OPEN      = "open"
-        STATUS_CANCELLED = "cancelled"
-        STATUS_EXPIRED   = "expired"
-        STATUS_PAID      = "paid"
-        STATUS_PAIDOUT   = "paidout"
-        STATUS_FAILED    = "failed"
-        STATUS_REFUNDED  = "refunded"
+        STATUS_OPEN         = "open"
+        STATUS_CANCELLED    = "cancelled"
+        STATUS_EXPIRED      = "expired"
+        STATUS_PAID         = "paid"
+        STATUS_PAIDOUT      = "paidout"
+        STATUS_FAILED       = "failed"
+        STATUS_REFUNDED     = "refunded"
+        STATUS_PENDING      = "pending"
+        STATUS_CHARGED_BACK = "charged_back"
 
         RECURRINGTYPE_NONE      = nil
         RECURRINGTYPE_FIRST     = "first"
@@ -62,6 +64,18 @@ module Mollie
           status == STATUS_REFUNDED
         end
 
+        def failed?
+          status == STATUS_FAILED
+        end
+
+        def pending?
+          status == STATUS_PENDING
+        end
+
+        def charged_back?
+          status == STATUS_CHARGED_BACK
+        end
+
         def details=(details)
           @details = OpenStruct.new(details) if details.is_a?(Hash)
         end

data/lib/mollie/api/object/payment/refund.rb

@@ -3,6 +3,7 @@ module Mollie
     module Object
       class Payment
         class Refund < Base
+          STATUS_QUEUED     = "queued"
           STATUS_PENDING    = "pending"
           STATUS_PROCESSING = "processing"
           STATUS_REFUNDED   = "refunded"
@@ -12,7 +13,10 @@ module Mollie
                         :amount,
                         :status,
                         :refunded_datetime
-
+          def queued?
+            status == STATUS_QUEUED
+          end
+          
           def pending?
             status == STATUS_PENDING
           end

data/lib/mollie/api/resource/base.rb

@@ -16,8 +16,8 @@ module Mollie
           }
         end
 
-        def get(id)
-          request("GET", id, {}) { |response|
+        def get(id, options = {})
+          request("GET", id, {}, options) { |response|
             new_resource_object response
           }
         end
@@ -28,12 +28,12 @@ module Mollie
           }
         end
 
-        def delete(id)
-          request "DELETE", id, {}
+        def delete(id, options = {})
+          request "DELETE", id, options
         end
 
-        def all(offset = 0, limit = 50)
-          request("GET", nil, {}, { offset: offset, count: limit }) { |response|
+        def all(offset = 0, limit = 50, options = {})
+          request("GET", nil, {}, { offset: offset, count: limit }.merge(options)) { |response|
             Object::List.new response, resource_object
           }
         end

data/lib/mollie/api/resource/invoices.rb

@@ -0,0 +1,11 @@
+module Mollie
+  module API
+    module Resource
+      class Invoices < Base
+        def resource_object
+          Object::Invoice
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/resource/permissions.rb

@@ -2,6 +2,26 @@ module Mollie
   module API
     module Resource
       class Permissions < Base
+        def self.available
+          %w(
+                  payments.read
+                  payments.write
+                  refunds.read
+                  refunds.write
+                  customers.read
+                  customers.write
+                  mandates.read
+                  mandates.write
+                  subscriptions.read
+                  subscriptions.write
+                  profiles.read
+                  profiles.write
+                  invoices.read
+                  settlements.read
+                  organizations.read
+                  organizations.write)
+        end
+
         def resource_object
           Object::Permission
         end

data/lib/mollie/api/resource/profiles/apikeys.rb

@@ -20,6 +20,12 @@ module Mollie
             @profile_id = profile_or_id.is_a?(Object::Profile) ? profile_or_id.id : profile_or_id
             self
           end
+
+          def create(mode)
+            request("POST", mode, {}) { |response|
+              new_resource_object response
+            }
+          end
         end
       end
     end

data/lib/mollie/api/resource/refunds.rb

@@ -0,0 +1,11 @@
+module Mollie
+  module API
+    module Resource
+      class Refunds < Base
+        def resource_object
+          Object::Payment::Refund
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/resource/settlements.rb

@@ -5,6 +5,14 @@ module Mollie
         def resource_object
           Object::Settlement
         end
+
+        def next(options = {})
+          get("next", options)
+        end
+
+        def open(options = {})
+          get("open", options)
+        end
       end
     end
   end

data/lib/mollie/api/resource/settlements/payments.rb

@@ -0,0 +1,27 @@
+require 'open-uri'
+
+module Mollie
+  module API
+    module Resource
+      class Settlements
+        class Payments < Base
+          @settlement_id = nil
+
+          def resource_object
+            Object::Payment
+          end
+
+          def resource_name
+            settlement_id = URI::encode(@settlement_id)
+            "settlements/#{settlement_id}/payments"
+          end
+
+          def with(settlement_or_id)
+            @settlement_id = settlement_or_id.is_a?(Object::Settlement) ? settlement_or_id.id : settlement_or_id
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/mollie.gemspec

@@ -23,4 +23,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("webmock")
+  s.add_development_dependency("thin")
+  s.add_development_dependency("sinatra")
+  s.add_development_dependency("sinatra-contrib")
+  s.add_development_dependency("sinatra-cross_origin")
+  s.add_development_dependency("rack-oauth2")
+  s.add_development_dependency("swagger-blocks")
+  s.add_development_dependency("ngrok-tunnel")
 end