mollie-api-ruby 3.1.5 → 4.0.0.pre.alpha.1

data/lib/mollie.rb

@@ -13,21 +13,19 @@ require 'mollie/util'
 require 'mollie/version'
 
 require 'mollie/base'
-require 'mollie/relation'
+require 'mollie/amount'
 require 'mollie/chargeback'
 require 'mollie/client'
 require 'mollie/customer'
 require 'mollie/customer/mandate'
 require 'mollie/customer/subscription'
 require 'mollie/invoice'
-require 'mollie/issuer'
 require 'mollie/list'
 require 'mollie/method'
 require 'mollie/organization'
 require 'mollie/payment'
 require 'mollie/permission'
 require 'mollie/profile'
-require 'mollie/profile/api_key'
 require 'mollie/refund'
 require 'mollie/settlement'
 

data/lib/mollie/amount.rb

@@ -0,0 +1,20 @@
+module Mollie
+  class Amount < Base
+    attr_accessor :value, :currency
+
+    def initialize(attributes)
+      super unless attributes.nil?
+    end
+
+    def value=(val)
+      @value = BigDecimal.new(val.to_s)
+    end
+
+    def to_h
+      {
+        value: attributes['value'],
+        currency: attributes['currency']
+      }
+    end
+  end
+end

data/lib/mollie/base.rb

@@ -20,10 +20,11 @@ module Mollie
         end
       end
 
-      def all(*args)
-        options       = args.last.is_a?(Hash) ? args.pop : {}
-        offset, limit = args
-        request("GET", nil, {}, { offset: offset || 0, count: limit || 50 }.merge(options)) do |response|
+      def all(options = {})
+        id      = nil
+        data    = {}
+
+        request("GET", id, data, options) do |response|
           Mollie::List.new(response, self)
         end
       end
@@ -35,7 +36,7 @@ module Mollie
       end
 
       def update(id, data = {})
-        request("POST", id, data) do |response|
+        request("PATCH", id, data) do |response|
           new(response)
         end
       end
@@ -44,9 +45,9 @@ module Mollie
         request("DELETE", id, options)
       end
 
-      def request(method, id = 0, data = {}, query = {})
-        parent_id = query.delete(self.parent_id) || data.delete(self.parent_id)
-        response  = Mollie::Client.instance.perform_http_call(method, resource_name(parent_id), id, data, query)
+      def request(method, id = 0, data = {}, options = {})
+        parent_id = options.delete(self.parent_id) || data.delete(self.parent_id)
+        response  = Mollie::Client.instance.perform_http_call(method, resource_name(parent_id), id, data, options)
         yield(response) if block_given?
       end
 

data/lib/mollie/chargeback.rb

@@ -4,33 +4,43 @@ module Mollie
     attr_accessor :id,
                   :payment,
                   :amount,
-                  :chargeback_datetime,
-                  :settlement_id,
-                  :reversed_datetime
+                  :settlement_amount,
+                  :created_at,
+                  :payment_id,
+                  :reversed_at,
+                  :_links
 
+    alias_method :links, :_links
 
     def reversed?
-      !!reversed_datetime
+      !!reversed_at
     end
 
-    def reversed_datetime=(reversed_datetime)
-      @reversed_datetime = Time.parse(reversed_datetime) rescue nil
+    def reversed_at=(reversed_at)
+      @reversed_at = Time.parse(reversed_at) rescue nil
     end
 
-    def chargeback_datetime=(chargeback_datetime)
-      @chargeback_datetime = Time.parse(chargeback_datetime) rescue nil
+    def created_at=(created_at)
+      @created_at = Time.parse(created_at) rescue nil
     end
 
     def amount=(amount)
-      @amount = BigDecimal.new(amount.to_s) if amount
+      @amount = Mollie::Amount.new(amount)
     end
 
-    def payment=(payment)
-      if payment.is_a?(Hash)
-        @payment = Payment.new(payment)
-      else
-        @payment = payment
-      end
+    def settlement_amount=(settlement_amount)
+      @settlement_amount = Mollie::Amount.new(settlement_amount)
     end
+
+    def payment(options = {})
+      Payment.get(payment_id, options)
+    end
+
+    def settlement(options = {})
+      settlement_id = Util.extract_id(links, "settlement")
+      return if settlement_id.nil?
+      Settlement.get(settlement_id, options)
+    end
+
   end
 end

data/lib/mollie/client.rb

@@ -1,7 +1,7 @@
 module Mollie
   class Client
-    API_ENDPOINT = 'https://api.mollie.nl'
-    API_VERSION  = 'v1'
+    API_ENDPOINT = 'https://api.mollie.com'
+    API_VERSION  = 'v2'
 
     MODE_TEST = 'test'
     MODE_LIVE = 'live'
@@ -68,7 +68,7 @@ module Mollie
 
       if query.length > 0
         camelized_query = Util.camelize_keys(query)
-        path            += "?#{URI.encode_www_form(camelized_query)}"
+        path            += "?#{build_nested_query(camelized_query)}"
       end
 
       uri                = URI.parse(api_endpoint)
@@ -84,6 +84,10 @@ module Mollie
         http_body.delete_if { |k, v| v.nil? }
         request      = Net::HTTP::Post.new(path)
         request.body = Util.camelize_keys(http_body).to_json
+      when 'PATCH'
+        http_body.delete_if { |k, v| v.nil? }
+        request      = Net::HTTP::Patch.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)
@@ -111,18 +115,34 @@ module Mollie
       when 204
         {} # No Content
       else
-        response = JSON.parse(response.body)
-        if response['error']
-          exception       = Mollie::Exception.new response['error']['message']
-          exception.field = response['error']['field'] unless response['error']['field'].nil?
-        elsif response['errors']
-          exception = Mollie::Exception.new response['errors'].values.join(', ')
-        else
-          exception = Mollie::Exception.new response.body
-        end
-        exception.code = http_code
+        json = JSON.parse(response.body)
+        exception = Mollie::RequestError.new(json)
         raise exception
       end
     end
+
+    private
+
+    def build_nested_query(value, prefix = nil)
+      case value
+      when Array
+        value.map { |v|
+          build_nested_query(v, "#{prefix}[]")
+        }.join("&")
+      when Hash
+        value.map { |k, v|
+          build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+        }.reject(&:empty?).join('&')
+      when nil
+        prefix
+      else
+        raise ArgumentError, "value must be a Hash" if prefix.nil?
+        "#{prefix}=#{escape(value)}"
+      end
+    end
+
+    def escape(s)
+      URI.encode_www_form_component(s)
+    end
   end
 end

data/lib/mollie/customer.rb

@@ -6,31 +6,26 @@ module Mollie
                   :email,
                   :locale,
                   :metadata,
-                  :recently_used_methods,
-                  :created_datetime
+                  :created_at
 
-    def created_datetime=(created_datetime)
-      @created_datetime = Time.parse(created_datetime.to_s)
-    end
-
-    def recently_used_methods=(methods)
-      @recently_used_methods = Array(methods).map(&:to_s)
+    def created_at=(created_at)
+      @created_at = Time.parse(created_at.to_s)
     end
 
     def metadata=(metadata)
       @metadata = OpenStruct.new(metadata) if metadata.is_a?(Hash)
     end
 
-    def payments
-      Relation.new(self, Customer::Payment)
+    def mandates(options = {})
+      Mandate.all(options.merge(customer_id: id))
     end
 
-    def mandates
-      Relation.new(self, Customer::Mandate)
+    def payments(options = {})
+      Payment.all(options.merge(customer_id: id))
     end
 
-    def subscriptions
-      Relation.new(self, Customer::Subscription)
+    def subscriptions(options = {})
+      Subscription.all(options.merge(customer_id: id))
     end
   end
 end

data/lib/mollie/customer/mandate.rb

@@ -3,31 +3,43 @@ module Mollie
     class Mandate < Base
       STATUS_VALID   = "valid"
       STATUS_INVALID = "invalid"
+      STATUS_PENDING = "pending"
 
       attr_accessor :id,
                     :status,
                     :method,
-                    :customer_id,
                     :details,
-                    :created_datetime,
-                    :mandate_reference
+                    :mandate_reference,
+                    :signature_date,
+                    :created_at,
+                    :_links
 
+      alias_method :links, :_links
 
       def details=(details)
         @details = OpenStruct.new(details) if details.is_a?(Hash)
       end
 
-      def created_datetime=(created_datetime)
-        @created_datetime = Time.parse(created_datetime.to_s) rescue nil
+      def created_at=(created_at)
+        @created_at = Time.parse(created_at.to_s) rescue nil
       end
 
       def valid?
         status == STATUS_VALID
       end
 
+      def pending?
+        status == STATUS_PENDING
+      end
+
       def invalid?
         status == STATUS_INVALID
       end
+
+      def customer(options = {})
+        customer_id = Util.extract_id(links, "customer")
+        Customer.get(customer_id, options)
+      end
     end
   end
 end

data/lib/mollie/customer/subscription.rb

@@ -3,23 +3,22 @@ module Mollie
     class Subscription < Base
       STATUS_ACTIVE    = "active"
       STATUS_PENDING   = "pending" # Waiting for a valid mandate.
-      STATUS_CANCELLED = "cancelled"
+      STATUS_CANCELED  = "canceled"
       STATUS_SUSPENDED = "suspended" # Active, but mandate became invalid.
       STATUS_COMPLETED = "completed"
 
-      attr_accessor :resource,
-                    :id,
+      attr_accessor :id,
                     :customer_id,
                     :mode,
-                    :created_datetime,
+                    :created_at,
                     :status,
                     :amount,
                     :times,
                     :interval,
                     :description,
                     :method,
-                    :cancelled_datetime,
-                    :links
+                    :canceled_at,
+                    :webhook_url
 
       def active?
         status == STATUS_ACTIVE
@@ -33,32 +32,32 @@ module Mollie
         status == STATUS_SUSPENDED
       end
 
-      def cancelled?
-        status == STATUS_CANCELLED
+      def canceled?
+        status == STATUS_CANCELED
       end
 
       def completed?
         status == STATUS_COMPLETED
       end
 
-      def created_datetime=(created_datetime)
-        @created_datetime = Time.parse(created_datetime.to_s) rescue nil
+      def created_at=(created_at)
+        @created_at = Time.parse(created_at.to_s) rescue nil
       end
 
-      def cancelled_datetime=(cancelled_datetime)
-        @cancelled_datetime = Time.parse(cancelled_datetime.to_s) rescue nil
+      def canceled_at=(canceled_at)
+        @canceled_at = Time.parse(canceled_at.to_s) rescue nil
       end
 
       def amount=(amount)
-        @amount = BigDecimal.new(amount.to_s)
+        @amount = Mollie::Amount.new(amount)
       end
 
       def times=(times)
         @times = times.to_i
       end
 
-      def webhook_url
-        links && links['webhook_url']
+      def customer(options = {})
+        Customer.get(customer_id, options)
       end
     end
   end

data/lib/mollie/exception.rb

@@ -1,8 +1,20 @@
 module Mollie
   class Exception < StandardError
-    @field = nil
-    @code = nil
+  end
+
+  class RequestError < Exception
+    attr_accessor :status, :title, :detail, :field, :links
+
+    def initialize(error)
+      exception.status = error['status']
+      exception.title  = error['title']
+      exception.detail = error['detail']
+      exception.field  = error['field']
+      exception.links  = error['_links']
+    end
 
-    attr_accessor :field, :code
+    def to_s
+      "#{status} #{title}: #{detail}"
+    end
   end
 end

data/lib/mollie/invoice.rb

@@ -4,32 +4,28 @@ module Mollie
     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)
+        @amount = Mollie::Amount.new(amount)
       end
     end
 
-    attr_accessor :resource, :id, :reference, :vat_number, :status,
-                  :issue_date, :due_date, :amount, :lines, :links
+    attr_accessor :id,
+                  :reference,
+                  :vat_number,
+                  :status,
+                  :issued_at,
+                  :paid_at,
+                  :due_at,
+                  :net_amount,
+                  :vat_amount,
+                  :gross_amount,
+                  :lines,
+                  :_links
+
+    alias_method :links, :_links
 
     def open?
       status == STATUS_OPEN
@@ -43,16 +39,24 @@ module Mollie
       status == STATUS_OVERDUE
     end
 
-    def amount=(amount)
-      @amount = Amount.new(amount)
+    def net_amount=(net_amount)
+      @net_amount = Mollie::Amount.new(net_amount)
+    end
+
+    def vat_amount=(vat_amount)
+      @vat_amount = Mollie::Amount.new(vat_amount)
+    end
+
+    def gross_amount=(gross_amount)
+      @gross_amount = Mollie::Amount.new(gross_amount)
     end
 
-    def issue_date=(issue_date)
-      @issue_date = Time.parse(issue_date) rescue nil
+    def issued_at=(issued_at)
+      @issued_at = Time.parse(issued_at) rescue nil
     end
 
-    def due_date=(due_date)
-      @due_date = Time.parse(due_date) rescue nil
+    def due_at=(due_at)
+      @due_at = Time.parse(due_at) rescue nil
     end
 
     def lines=(lines)
@@ -60,7 +64,7 @@ module Mollie
     end
 
     def pdf
-      links && links['pdf']
+      Util.extract_url(links, 'pdf')
     end
   end
 end