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

data/lib/mollie/list.rb

@@ -2,39 +2,48 @@ module Mollie
   class List < Base
     include Enumerable
 
-    attr_accessor :total_count,
-                  :offset,
-                  :count,
-                  :links,
-                  :data
+    attr_accessor :klass, :items, :_links
+    alias_method :links, :_links
 
     def initialize(list_attributes, klass)
-      list_attributes['data'] ||= []
+      @klass = klass
+
+      if list_attributes['_embedded']
+        list_attributes['items'] ||= list_attributes['_embedded'].fetch(klass.resource_name, [])
+      else
+        list_attributes['items'] ||= []
+      end
       super list_attributes
 
-      @data = self.data.map do |attributes|
+      @items = self.items.map do |attributes|
         klass.new attributes
       end
     end
 
     def each(&block)
-      @data.each(&block)
+      @items.each(&block)
     end
 
-    def first_url
-      links && links['first']
-    end
+    def next(options = {})
+      if links['next'].nil?
+        return self.class.new({}, klass)
+      end
 
-    def previous_url
-      links && links['previous']
-    end
+      href = URI.parse(links['next']['href'])
+      query = URI.decode_www_form(href.query).to_h
 
-    def next_url
-      links && links['next']
+      klass.all(options.merge(query))
     end
 
-    def last_url
-      links && links['last']
+    def previous(options = {})
+      if links['previous'].nil?
+        return self.class.new({}, klass)
+      end
+
+      href = URI.parse(links['previous']['href'])
+      query = URI.decode_www_form(href.query).to_h
+
+      klass.all(options.merge(query))
     end
   end
 end

data/lib/mollie/method.rb

@@ -1,40 +1,32 @@
 module Mollie
   class Method < Base
-    IDEAL             = "ideal"
-    CREDITCARD        = "creditcard"
-    MISTERCASH        = "mistercash"
-    SOFORT            = "sofort"
-    BANKTRANSFER      = "banktransfer"
-    DIRECTDEBIT       = "directdebit"
-    BITCOIN           = "bitcoin"
-    PAYPAL            = "paypal"
-    KBC               = "kbc"
-    BELFIUS           = "belfius"
-    PAYSAFECARD       = "paysafecard"
-    PODIUMCADEAUKAART = "podiumcadeaukaart"
-    GIFTCARD          = "giftcard"
-    INGHOMEPAY        = "inghomepay"
+    BANCONTACT    = "bancontact"
+    BANKTRANSFER  = "banktransfer"
+    BELFIUS       = "belfius"
+    BITCOIN       = "bitcoin"
+    CREDITCARD    = "creditcard"
+    DIRECTDEBIT   = "directdebit"
+    EPS           = "eps"
+    GIFTCARD      = "giftcard"
+    GIROPAY       = "giropay"
+    IDEAL         = "ideal"
+    INGHOMEPAY    = "inghomepay"
+    KBC           = "kbc"
+    PAYPAL        = "paypal"
+    PAYSAFECARD   = "paysafecard"
+    SOFORT        = "sofort"
 
     attr_accessor :id,
                   :description,
-                  :amount,
                   :image,
                   :issuers
 
     def normal_image
-      image['normal']
+      image['size1x']
     end
 
     def bigger_image
-      image['bigger']
-    end
-
-    def minimum_amount
-      BigDecimal.new(amount['minimum'].to_s)
-    end
-
-    def maximum_amount
-      BigDecimal.new(amount['maximum'].to_s)
+      image['size2x']
     end
   end
 end

data/lib/mollie/organization.rb

@@ -4,21 +4,15 @@ module Mollie
                   :name,
                   :email,
                   :address,
-                  :postal_code,
-                  :city,
-                  :country,
-                  :country_code,
-                  :registration_type,
                   :registration_number,
-                  :registration_datetime,
-                  :verified_datetime
+                  :vat_number
 
-    def registration_datetime=(registration_datetime)
-      @registration_datetime = Time.parse(registration_datetime.to_s) rescue nil
+    def self.current(options = {})
+      self.get("me", options)
     end
 
-    def verified_datetime=(verified_datetime)
-      @verified_datetime = Time.parse(verified_datetime.to_s) rescue nil
+    def address=(address)
+      @address = OpenStruct.new(address) if address.is_a?(Hash)
     end
   end
 end

data/lib/mollie/payment.rb

@@ -1,14 +1,11 @@
 module Mollie
   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_PENDING      = "pending"
-    STATUS_CHARGED_BACK = "charged_back"
+    STATUS_OPEN      = "open"
+    STATUS_CANCELED  = "canceled"
+    STATUS_PENDING   = "pending"
+    STATUS_EXPIRED   = "expired"
+    STATUS_FAILED    = "failed"
+    STATUS_PAID      = "paid"
 
     RECURRINGTYPE_NONE      = nil
     RECURRINGTYPE_FIRST     = "first"
@@ -16,12 +13,14 @@ module Mollie
 
     attr_accessor :id,
                   :mode,
-                  :created_datetime,
+                  :created_at,
                   :status,
-                  :paid_datetime,
-                  :cancelled_datetime,
-                  :expired_datetime,
-                  :expiry_period,
+                  :paid_at,
+                  :is_cancelable,
+                  :canceled_at,
+                  :expired_at,
+                  :expires_at,
+                  :failed_at,
                   :amount,
                   :amount_refunded,
                   :amount_remaining,
@@ -29,50 +28,54 @@ module Mollie
                   :method,
                   :metadata,
                   :locale,
+                  :country_code,
                   :profile_id,
+                  :settlement_amount,
                   :settlement_id,
                   :customer_id,
-                  :recurring_type,
+                  :sequence_type,
                   :mandate_id,
                   :subscription_id,
-                  :country_code,
-                  :links,
-                  :details
+                  :application_fee,
+                  :_links,
+                  :details,
+                  :redirect_url,
+                  :webhook_url
+
+    alias_method :links, :_links
 
     def open?
       status == STATUS_OPEN
     end
 
-    def cancelled?
-      status == STATUS_CANCELLED
-    end
-
-    def expired?
-      status == STATUS_EXPIRED
+    def canceled?
+      status == STATUS_CANCELED
     end
 
-    def paid?
-      !!paid_datetime
-    end
-
-    def paidout?
-      status == STATUS_PAIDOUT
+    def pending?
+      status == STATUS_PENDING
     end
 
-    def refunded?
-      status == STATUS_REFUNDED
+    def expired?
+      status == STATUS_EXPIRED
     end
 
     def failed?
       status == STATUS_FAILED
     end
 
-    def pending?
-      status == STATUS_PENDING
+    def paid?
+      status == STATUS_PAID
     end
 
-    def charged_back?
-      status == STATUS_CHARGED_BACK
+    def application_fee=(application_fee)
+      amount      = Amount.new(application_fee["amount"])
+      description = application_fee["description"]
+
+      @application_fee = OpenStruct.new(
+        amount: amount,
+        description: description
+      )
     end
 
     def details=(details)
@@ -83,60 +86,85 @@ module Mollie
       @metadata = OpenStruct.new(metadata) if metadata.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 paid_at=(paid_at)
+      @paid_at = Time.parse(paid_at.to_s) rescue nil
     end
 
-    def paid_datetime=(paid_datetime)
-      @paid_datetime = Time.parse(paid_datetime.to_s) rescue nil
+    def canceled_at=(canceled_at)
+      @canceled_at = Time.parse(canceled_at.to_s) rescue nil
     end
 
-    def cancelled_datetime=(cancelled_datetime)
-      @cancelled_datetime = Time.parse(cancelled_datetime.to_s) rescue nil
+    def expired_at=(expired_at)
+      @expired_at = Time.parse(expired_at.to_s) rescue nil
     end
 
-    def expired_datetime=(expired_datetime)
-      @expired_datetime = Time.parse(expired_datetime.to_s) rescue nil
+    def expires_at=(expires_at)
+      @expires_at = Time.parse(expires_at.to_s) rescue nil
+    end
+
+    def failed_at=(failed_at)
+      @failed_at = Time.parse(failed_at)
     end
 
     def amount=(amount)
-      @amount = BigDecimal.new(amount.to_s) if amount
+      @amount = Mollie::Amount.new(amount)
+    end
+
+    def settlement_amount=(settlement_amount)
+      @settlement_amount = Mollie::Amount.new(settlement_amount)
     end
 
     def amount_remaining=(amount_remaining)
-      @amount_remaining = BigDecimal.new(amount_remaining.to_s) if amount_remaining
+      @amount_remaining = Mollie::Amount.new(amount_remaining)
     end
 
     def amount_refunded=(amount_refunded)
-      @amount_refunded = BigDecimal.new(amount_refunded.to_s) if amount_refunded
+      @amount_refunded = Mollie::Amount.new(amount_refunded)
+    end
+
+    def checkout_url
+      Util.extract_url(links, 'checkout')
     end
 
-    def payment_url
-      links && links['payment_url']
+    def refund!(options = {})
+      options[:payment_id] = id
+      # refund full amount by default
+      options[:amount] ||= amount.to_h
+      Payment::Refund.create(options)
     end
 
-    def webhook_url
-      links && links['webhook_url']
+    def refunds(options = {})
+      Payment::Refund.all(options.merge(payment_id: id))
     end
 
-    def redirect_url
-      links && links['redirect_url']
+    def chargebacks(options = {})
+      Payment::Chargeback.all(options.merge(payment_id: id))
     end
 
-    def refunds_url
-      links && links['refunds']
+    def customer(options = {})
+      return if customer_id.nil?
+      Customer.get(customer_id, options)
     end
 
-    def settlement
-      links && links['settlement']
+    def mandate(options = {})
+      return if mandate_id.nil?
+      Customer::Mandate.get(mandate_id, options)
     end
 
-    def refunds
-      Relation.new(self, Payment::Refund)
+    def settlement(options = {})
+      return if settlement_id.nil?
+      Settlement.get(settlement_id, options)
     end
 
-    def chargebacks
-      Relation.new(self, Payment::Chargeback)
+    def subscription(options = {})
+      return if customer_id.nil?
+      return if subscription_id.nil?
+      options = options.merge(customer_id: customer_id)
+      Customer::Subscription.get(subscription_id, options)
     end
   end
 end

data/lib/mollie/permission.rb

@@ -20,7 +20,6 @@ module Mollie
 
     attr_accessor :id,
                   :description,
-                  :warning,
                   :granted
   end
 end

data/lib/mollie/profile.rb

@@ -27,9 +27,10 @@ module Mollie
                   :category_code,
                   :status,
                   :review,
-                  :created_datetime,
-                  :updated_datetime,
-                  :links
+                  :created_at,
+                  :_links
+
+    alias_method :links, :_links
 
     def unverified?
       status == STATUS_UNVERIFIED
@@ -55,24 +56,28 @@ module Mollie
       @review && @review.status == REVIEW_STATUS_REJECTED
     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 updated_datetime=(updated_datetime)
-      @updated_datetime = Time.parse(updated_datetime.to_s) rescue nil
+    def checkout_preview_url
+      Util.extract_url(links, 'checkout_preview_url')
     end
 
-    def apikeys_url
-      links && links['apikeys']
+    def chargebacks(options = {})
+      Chargeback.all(options.merge(profile_id: id))
     end
 
-    def checkout_preview_url
-      links && links['checkout_preview_url']
+    def methods(options = {})
+      Method.all(options.merge(profile_id: id))
+    end
+
+    def payments(options = {})
+      Payment.all(options.merge(profile_id: id))
     end
 
-    def apikeys
-      Relation.new(self, Profile::ApiKey)
+    def refunds(options = {})
+      Refund.all(options.merge(profile_id: id))
     end
   end
 end

data/lib/mollie/refund.rb

@@ -4,12 +4,18 @@ module Mollie
     STATUS_PENDING    = "pending"
     STATUS_PROCESSING = "processing"
     STATUS_REFUNDED   = "refunded"
+    STATUS_FAILED     = "failed"
 
     attr_accessor :id,
-                  :payment,
                   :amount,
+                  :settlement_amount,
                   :status,
-                  :refunded_datetime
+                  :payment_id,
+                  :description,
+                  :created_at,
+                  :_links
+
+    alias_method :links, :_links
 
     def queued?
       status == STATUS_QUEUED
@@ -27,16 +33,30 @@ module Mollie
       status == STATUS_REFUNDED
     end
 
-    def refunded_datetime=(refunded_datetime)
-      @refunded_datetime = Time.parse(refunded_datetime) rescue nil
+    def failed?
+      status == STATUS_FAILED
     end
 
     def amount=(amount)
-      @amount = BigDecimal.new(amount.to_s) if amount
+      @amount = Amount.new(amount)
+    end
+
+    def settlement_amount=(settlement_amount)
+      @settlement_amount = Amount.new(settlement_amount)
+    end
+
+    def created_at=(created_at)
+      @created_at = Time.parse(created_at) rescue nil
+    end
+
+    def payment(options = {})
+      Payment.get(payment_id, options)
     end
 
-    def payment=(payment)
-      @payment = Payment.new(payment)
+    def settlement(options = {})
+      settlement_id = Util.extract_id(links, "settlement")
+      return if settlement_id.nil?
+      Settlement.get(settlement_id, options)
     end
   end
 end