mollie-api-ruby 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239cb83379085baf41a992d159a0d9d04d14ad98b4420f369fbb4a661c3d98a7
-  data.tar.gz: e7eb83f458608cefa2d2637372ddaf1382a667ce26dcdc6b17fc9cc9ccb53257
+  metadata.gz: 199d37cfa91ad1e3132c095248ea54a26e7a25dddb748b02b2fa17b7d58334a3
+  data.tar.gz: 30ad0213bd7ed35038eecac7c48e4c3b965ca56b9f445c2ff6d723d2f223b741
 SHA512:
-  metadata.gz: 4fb66ad436eddf5711ff2a3a5be4d1d77a27e3e41138e51af8deee84993418f1d7355abca6c79f1b1e31886ac4bf07b5faf60743288d7abf98f4cc1a520e76f2
-  data.tar.gz: 5f0ecba60b5e49674bb1bf8b06663f62c7c1e515ff0d8e652176bd41dd36c70b133f09852d10e3ab730ba0fe34bc4755da69f9ff0b8eb1335f278d03fd377392
+  metadata.gz: 3bee04cf11e085a6886ded95949e996f66d78d4a5a5479b96fb6c4d74d8ef588ae2de6040966df27432c147062988370667c0ef601b908feeeca55b7cadb4eb5
+  data.tar.gz: '080873b112c5878455a65faad416ce9e5fa6af4c8acf0f3784986c5a2c8ea52895740c3d55a2fd84dff672ad83031d08b85d7a1a86c1b58aeffe7deaf2d21bb6'

data/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## 4.7.0 - 2020-02-03
+
+  - Implemented various API features from the changelog up to and including Tuesday, September 24th, 2019.
+
+## 4.6.2 - 2019-11-21
+
+  - Added timeouts configuration for Net::HTTP
+
+## 4.6.1 - 2019-11-20
+
+  - Update root certificates
+
 ## 4.6.0 - 2019-10-01
 
   - Add Onboarding APIs (Get onboarding status, Submit onboarding data)

data/examples/methods/get.rb

@@ -1,4 +1,11 @@
 method = Mollie::Method.get('ideal')
 
-# Include iDEAL issuers
+# Include issuers available for the payment method (e.g. for
+# iDEAL, KBC/CBC payment button or gift cards).
 method = Mollie::Method.get('ideal', include: 'issuers')
+
+# Include pricing for each payment method
+method = Mollie::Method.get('ideal', include: 'pricing')
+
+# Include both issuers and pricing
+method = Mollie::Method.get('ideal', include: 'issuers,pricing')

data/examples/payments/update.rb

@@ -0,0 +1,7 @@
+payment = Mollie::Payment.update(
+  'tr_7UhSN1zuXS',
+  description: 'Order #98765',
+  metadata: {
+    order_id: '98765'
+  }
+)

data/examples/subscriptions/list.rb

@@ -1 +1,5 @@
+# List all subscriptions
+subscriptions = Mollie::Subscription.all
+
+# List all subscriptions for a customer
 subscriptions = Mollie::Customer::Subscription.all(customer_id: 'cst_5a2pPrwaWy')

data/lib/mollie.rb

@@ -16,8 +16,6 @@ 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/list'
 require 'mollie/method'
@@ -28,8 +26,11 @@ require 'mollie/permission'
 require 'mollie/profile'
 require 'mollie/refund'
 require 'mollie/settlement'
+require 'mollie/subscription'
 
+require 'mollie/customer/mandate'
 require 'mollie/customer/payment'
+require 'mollie/customer/subscription'
 require 'mollie/onboarding'
 require 'mollie/order/line'
 require 'mollie/order/refund'

data/lib/mollie/client.rb

@@ -123,6 +123,10 @@ module Mollie
         Util.nested_underscore_keys(JSON.parse(response.body))
       when 204
         {} # No Content
+      when 404
+        json = JSON.parse(response.body)
+        exception = ResourceNotFoundError.new(json)
+        raise exception
       else
         json = JSON.parse(response.body)
         exception = Mollie::RequestError.new(json)

data/lib/mollie/customer/subscription.rb

@@ -1,109 +1,6 @@
 module Mollie
   class Customer
-    class Subscription < Base
-      STATUS_ACTIVE    = 'active'.freeze
-      STATUS_PENDING   = 'pending'.freeze # Waiting for a valid mandate.
-      STATUS_CANCELED  = 'canceled'.freeze
-      STATUS_SUSPENDED = 'suspended'.freeze # Active, but mandate became invalid.
-      STATUS_COMPLETED = 'completed'.freeze
-
-      attr_accessor :id,
-                    :customer_id,
-                    :mode,
-                    :created_at,
-                    :status,
-                    :amount,
-                    :times,
-                    :times_remaining,
-                    :interval,
-                    :next_payment_date,
-                    :description,
-                    :method,
-                    :mandate_id,
-                    :canceled_at,
-                    :webhook_url,
-                    :metadata,
-                    :application_fee,
-                    :_links
-
-      alias links _links
-
-      def active?
-        status == STATUS_ACTIVE
-      end
-
-      def pending?
-        status == STATUS_PENDING
-      end
-
-      def suspended?
-        status == STATUS_SUSPENDED
-      end
-
-      def canceled?
-        status == STATUS_CANCELED
-      end
-
-      def completed?
-        status == STATUS_COMPLETED
-      end
-
-      def created_at=(created_at)
-        @created_at = begin
-                        Time.parse(created_at.to_s)
-                      rescue StandardError
-                        nil
-                      end
-      end
-
-      def canceled_at=(canceled_at)
-        @canceled_at = begin
-                         Time.parse(canceled_at.to_s)
-                       rescue StandardError
-                         nil
-                       end
-      end
-
-      def amount=(amount)
-        @amount = Mollie::Amount.new(amount)
-      end
-
-      def times=(times)
-        @times = times.to_i
-      end
-
-      def next_payment_date=(next_payment_date)
-        @next_payment_date = begin
-                               Date.parse(next_payment_date)
-                             rescue StandardError
-                               nil
-                             end
-      end
-
-      def customer(options = {})
-        Customer.get(customer_id, options)
-      end
-
-      def payments(options = {})
-        resource_url = Util.extract_url(links, 'payments')
-        return if resource_url.nil?
-        response = Mollie::Client.instance.perform_http_call('GET', resource_url, nil, {}, options)
-        Mollie::List.new(response, Payment)
-      end
-
-      def metadata=(metadata)
-        @metadata = OpenStruct.new(metadata) if metadata.is_a?(Hash)
-      end
-
-      def application_fee=(application_fee)
-        amount      = Amount.new(application_fee['amount'])
-        description = application_fee['description']
-
-        @application_fee = OpenStruct.new(
-          amount: amount,
-          description: description
-        )
-      end
+    class Subscription < Mollie::Subscription
     end
   end
 end

data/lib/mollie/exception.rb

@@ -17,4 +17,7 @@ module Mollie
       "#{status} #{title}: #{detail}"
     end
   end
+
+  class ResourceNotFoundError < RequestError
+  end
 end

data/lib/mollie/organization.rb

@@ -7,6 +7,7 @@ module Mollie
                   :address,
                   :registration_number,
                   :vat_number,
+                  :vat_regulation,
                   :_links
 
     alias links _links

data/lib/mollie/refund.rb

@@ -8,12 +8,14 @@ module Mollie
 
     attr_accessor :id,
                   :amount,
+                  :settlement_id,
                   :settlement_amount,
                   :status,
                   :lines,
                   :payment_id,
                   :order_id,
                   :description,
+                  :metadata,
                   :created_at,
                   :_links
 
@@ -47,6 +49,10 @@ module Mollie
       @settlement_amount = Amount.new(settlement_amount)
     end
 
+    def metadata=(metadata)
+      @metadata = OpenStruct.new(metadata) if metadata.is_a?(Hash)
+    end
+
     def lines=(lines)
       @lines = lines.map { |line| Order::Line.new(line) }
     end
@@ -64,7 +70,6 @@ module Mollie
     end
 
     def settlement(options = {})
-      settlement_id = Util.extract_id(links, 'settlement')
       return if settlement_id.nil?
       Settlement.get(settlement_id, options)
     end

data/lib/mollie/subscription.rb

@@ -0,0 +1,107 @@
+module Mollie
+  class Subscription < Base
+    STATUS_ACTIVE    = 'active'.freeze
+    STATUS_PENDING   = 'pending'.freeze # Waiting for a valid mandate.
+    STATUS_CANCELED  = 'canceled'.freeze
+    STATUS_SUSPENDED = 'suspended'.freeze # Active, but mandate became invalid.
+    STATUS_COMPLETED = 'completed'.freeze
+
+    attr_accessor :id,
+                  :customer_id,
+                  :mode,
+                  :created_at,
+                  :status,
+                  :amount,
+                  :times,
+                  :times_remaining,
+                  :interval,
+                  :next_payment_date,
+                  :description,
+                  :method,
+                  :mandate_id,
+                  :canceled_at,
+                  :webhook_url,
+                  :metadata,
+                  :application_fee,
+                  :_links
+
+    alias links _links
+
+    def active?
+      status == STATUS_ACTIVE
+    end
+
+    def pending?
+      status == STATUS_PENDING
+    end
+
+    def suspended?
+      status == STATUS_SUSPENDED
+    end
+
+    def canceled?
+      status == STATUS_CANCELED
+    end
+
+    def completed?
+      status == STATUS_COMPLETED
+    end
+
+    def created_at=(created_at)
+      @created_at = begin
+                      Time.parse(created_at.to_s)
+                    rescue StandardError
+                      nil
+                    end
+    end
+
+    def canceled_at=(canceled_at)
+      @canceled_at = begin
+                       Time.parse(canceled_at.to_s)
+                     rescue StandardError
+                       nil
+                     end
+    end
+
+    def amount=(amount)
+      @amount = Mollie::Amount.new(amount)
+    end
+
+    def times=(times)
+      @times = times.to_i
+    end
+
+    def next_payment_date=(next_payment_date)
+      @next_payment_date = begin
+                             Date.parse(next_payment_date)
+                           rescue StandardError
+                             nil
+                           end
+    end
+
+    def customer(options = {})
+      Customer.get(customer_id, options)
+    end
+
+    def payments(options = {})
+      resource_url = Util.extract_url(links, 'payments')
+      return if resource_url.nil?
+      response = Mollie::Client.instance.perform_http_call('GET', resource_url, nil, {}, options)
+      Mollie::List.new(response, Mollie::Payment)
+    end
+
+    def metadata=(metadata)
+      @metadata = OpenStruct.new(metadata) if metadata.is_a?(Hash)
+    end
+
+    def application_fee=(application_fee)
+      amount      = Amount.new(application_fee['amount'])
+      description = application_fee['description']
+
+      @application_fee = OpenStruct.new(
+        amount: amount,
+        description: description
+      )
+    end
+  end
+end

data/lib/mollie/version.rb

@@ -1,3 +1,3 @@
 module Mollie
-  VERSION = '4.6.2'.freeze
+  VERSION = '4.7.0'.freeze
 end

data/test/fixtures/refunds/get.json

@@ -8,6 +8,9 @@
     "status": "pending",
     "createdAt": "2018-09-25T17:40:23+00:00",
     "description": "Required quantity not in stock, refunding one photo book.",
+    "metadata": {
+        "bookkeeping_id": 12345
+    },
     "orderId": "ord_stTC2WHAuS",
     "paymentId": "tr_WDqYK6vllg",
     "settlementAmount": {

data/test/mollie/client_test.rb

@@ -135,5 +135,35 @@ module Mollie
       assert_equal(json['field'],  e.field)
       assert_equal(json['_links'], e.links)
     end
+
+    def test_404_response
+      response = <<-JSON
+      {
+        "status": 404,
+        "title": "Not Found",
+        "detail": "No payment exists with token tr_WDqYK6vllg.",
+        "_links": {
+          "documentation": {
+            "href": "https://docs.mollie.com/guides/handling-errors",
+            "type": "text/html"
+          }
+        }
+      }
+      JSON
+
+      json = JSON.parse(response)
+      stub_request(:post, 'https://api.mollie.com/v2/my-method')
+        .to_return(status: 404, body: response, headers: {})
+
+      e = assert_raise ResourceNotFoundError.new(JSON.parse(response)) do
+        client.perform_http_call('POST', 'my-method', nil, {})
+      end
+
+      assert_equal(json['status'], e.status)
+      assert_equal(json['title'],  e.title)
+      assert_equal(json['detail'], e.detail)
+      assert_equal(json['field'],  e.field)
+      assert_equal(json['_links'], e.links)
+    end
   end
 end

data/test/mollie/customer/subscription_test.rb

@@ -154,8 +154,8 @@ module Mollie
         subscription = Customer::Subscription.get('sub_8JfGzs6v3K', customer_id: 'cst_8wmqcHMN4U')
         payments = subscription.payments
 
-        assert_equal payments.klass, Payment
-        assert_equal payments.first.id, 'tr_DtKxVP2AgW'
+        assert_equal Mollie::Payment, payments.klass
+        assert_equal 'tr_DtKxVP2AgW', payments.first.id
       end
     end
   end

data/test/mollie/organization_test.rb

@@ -16,6 +16,7 @@ module Mollie
         },
         registration_number: '30204462',
         vat_number:          'NL815839091B01',
+        vat_regulation:      'dutch',
         _links: {
           'self' => {
             'href' => 'https://api.mollie.com/v2/organizations/org_12345678',
@@ -40,6 +41,7 @@ module Mollie
       assert_equal 'NL', organization.address.country
       assert_equal '30204462', organization.registration_number
       assert_equal 'NL815839091B01', organization.vat_number
+      assert_equal 'dutch', organization.vat_regulation
       assert_equal 'https://api.mollie.com/v2/organizations/org_12345678', organization.links['self']['href']
     end
 

data/test/mollie/refund_test.rb

@@ -126,13 +126,7 @@ module Mollie
           {
             "resource": "refund",
             "id": "re_4qqhO89gsT",
-            "paymentId": "tr_WDqYK6vllg",
-            "_links": {
-              "settlement": {
-                "href": "https://api.mollie.com/v2/settlements/stl_jDk30akdN",
-                "type": "application/hal+json"
-              }
-            }
+            "settlementId": "stl_jDk30akdN"
           }
         ), headers: {})
 
@@ -180,5 +174,13 @@ module Mollie
       refund = Payment::Refund.new(id: 're_4qqhO89gsT')
       assert refund.order.nil?
     end
+
+    def test_metadata_struct
+      stub_request(:get, 'https://api.mollie.com/v2/payments/tr_WDqYK6vllg/refunds/re_4qqhO89gsT')
+        .to_return(status: 200, body: read_fixture('refunds/get.json'), headers: {})
+
+      refund = Payment::Refund.get('re_4qqhO89gsT', payment_id: 'tr_WDqYK6vllg')
+      assert_equal 12345, refund.metadata.bookkeeping_id
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mollie-api-ruby
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
 platform: ruby
 authors:
 - Mollie B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,6 +138,7 @@ files:
 - examples/payments/get-subscription.rb
 - examples/payments/get.rb
 - examples/payments/list.rb
+- examples/payments/update.rb
 - examples/payments/webhook.rb
 - examples/permissions/get.rb
 - examples/permissions/list.rb
@@ -205,6 +206,7 @@ files:
 - lib/mollie/settlement/chargeback.rb
 - lib/mollie/settlement/payment.rb
 - lib/mollie/settlement/refund.rb
+- lib/mollie/subscription.rb
 - lib/mollie/util.rb
 - lib/mollie/version.rb
 - mollie-api-ruby.gemspec