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

data/test/mollie/client_test.rb

@@ -17,7 +17,7 @@ module Mollie
     end
 
     def test_perform_http_call_defaults
-      stub_request(:any, "https://api.mollie.nl/v1/my-method")
+      stub_request(:any, "https://api.mollie.com/v2/my-method")
         .with(:headers => { 'Accept'        => 'application/json',
                             'Content-type'  => 'application/json',
                             'Authorization' => 'Bearer test_dHar4XY7LxsDOtmnkVtjNVWXLSlXsM',
@@ -27,7 +27,7 @@ module Mollie
     end
 
     def test_perform_http_call_key_override
-      stub_request(:any, "https://localhost/v1/my-method")
+      stub_request(:any, "https://localhost/v2/my-method")
         .with(:headers => { 'Accept'        => 'application/json',
                             'Content-type'  => 'application/json',
                             'Authorization' => 'Bearer my_key',
@@ -38,7 +38,7 @@ module Mollie
     end
 
     def test_perform_http_call_with_api_key_block
-      stub_request(:any, "https://api.mollie.nl/v1/my-method")
+      stub_request(:any, "https://api.mollie.com/v2/my-method")
         .with(:headers => { 'Accept'        => 'application/json',
                             'Content-type'  => 'application/json',
                             'Authorization' => 'Bearer my_key',
@@ -54,7 +54,7 @@ module Mollie
     end
 
     def test_get_request_convert_to_camel_case
-      stub_request(:get, "https://api.mollie.nl/v1/my-method?myParam=ok")
+      stub_request(:get, "https://api.mollie.com/v2/my-method?myParam=ok")
         .to_return(:status => 200, :body => "{}", :headers => {})
       client.perform_http_call("GET", "my-method", nil, {}, { my_param: "ok" })
     end
@@ -81,7 +81,7 @@ module Mollie
         ]
       }
 
-      stub_request(:get, "https://api.mollie.nl/v1/my-method")
+      stub_request(:get, "https://api.mollie.com/v2/my-method")
         .to_return(:status => 200, :body => response_body, :headers => {})
       response = client.perform_http_call("GET", "my-method", nil, {})
 
@@ -91,7 +91,7 @@ module Mollie
     def test_post_requests_convert_to_camel_case
       expected_body = %{{"redirectUrl":"my-url"}}
 
-      stub_request(:post, "https://api.mollie.nl/v1/my-method")
+      stub_request(:post, "https://api.mollie.com/v2/my-method")
         .with(body: expected_body)
         .to_return(:status => 200, :body => "{}", :headers => {})
 
@@ -99,7 +99,7 @@ module Mollie
     end
 
     def test_delete_requests_with_no_content_responses
-      stub_request(:delete, "https://api.mollie.nl/v1/my-method/1")
+      stub_request(:delete, "https://api.mollie.com/v2/my-method/1")
         .to_return(:status => 204, :body => "", :headers => {})
 
       client.perform_http_call("DELETE", "my-method", "1")
@@ -107,16 +107,33 @@ module Mollie
 
     def test_error_response
       response = <<-JSON
-          {"error": {"message": "Error on field", "field": "my-field"}}
+        {
+            "status": 401,
+            "title": "Unauthorized Request",
+            "detail": "Missing authentication, or failed to authenticate",
+            "field": "test-field",
+            "_links": {
+                "documentation": {
+                    "href": "https://www.mollie.com/en/docs/authentication",
+                    "type": "text/html"
+                }
+            }
+        }
       JSON
-      stub_request(:post, "https://api.mollie.nl/v1/my-method")
-        .to_return(:status => 500, :body => response, :headers => {})
 
-      e = assert_raise Mollie::Exception.new("Error on field") do
+      json = JSON.parse(response)
+      stub_request(:post, "https://api.mollie.com/v2/my-method")
+        .to_return(:status => 401, :body => response, :headers => {})
+
+      e = assert_raise Mollie::RequestError.new(JSON.parse(response)) do
         client.perform_http_call("POST", "my-method", nil, {})
       end
 
-      assert_equal "my-field", e.field
+      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/mandate_test.rb

@@ -5,38 +5,114 @@ module Mollie
     class MandateTest < Test::Unit::TestCase
       def test_setting_attributes
         attributes = {
-          id:               "mdt_qtUgejVgMN",
+          id:               "mdt_h3gAaD5zP",
           status:           "valid",
           method:           "creditcard",
-          customer_id:      "cst_R6JLAuqEgm",
           details:          {
             card_holder:      "John Doe",
             card_expiry_date: "2016-03-31"
           },
-          created_datetime: "2016-04-13T11:32:38.0Z"
+          mandate_reference: "YOUR-COMPANY-MD1380",
+          signature_date: "2018-05-07",
+          created_at: "2016-04-13T11:32:38.0Z",
+          _links: {
+            "self" => {
+              "href" => "https://api.mollie.com/v2/customers/cst_4qqhO89gsT/mandates/mdt_h3gAaD5zP",
+              "type" => "application/hal+json"
+            },
+            "customer" => {
+              "href" => "https://api.mollie.com/v2/customers/cst_4qqhO89gsT",
+              "type" => "application/hal+json"
+            },
+            "documentation" => {
+              "href" => "https://docs.mollie.com/reference/v2/mandates-api/get-mandate",
+              "type" => "text/html"
+            }
+          }
         }
 
         mandate = Mandate.new(attributes)
 
-        assert_equal 'mdt_qtUgejVgMN', mandate.id
+        assert_equal 'mdt_h3gAaD5zP', mandate.id
         assert_equal 'valid', mandate.status
         assert_equal 'creditcard', mandate.method
-        assert_equal 'cst_R6JLAuqEgm', mandate.customer_id
-        assert_equal Time.parse('2016-04-13T11:32:38.0Z'), mandate.created_datetime
+        assert_equal 'YOUR-COMPANY-MD1380', mandate.mandate_reference
+        assert_equal '2018-05-07', mandate.signature_date
+        assert_equal Time.parse('2016-04-13T11:32:38.0Z'), mandate.created_at
 
         assert_equal 'John Doe', mandate.details.card_holder
         assert_equal '2016-03-31', mandate.details.card_expiry_date
         assert_equal nil, mandate.details.non_existing
       end
 
-      def test_valid_invalid
+      def test_valid_invalid_pending
         mandate = Mandate.new(status: Mandate::STATUS_VALID)
         assert mandate.valid?
-        assert !mandate.invalid?
 
         mandate = Mandate.new(status: Mandate::STATUS_INVALID)
-        assert !mandate.valid?
         assert mandate.invalid?
+
+        mandate = Mandate.new(status: Mandate::STATUS_PENDING)
+        assert mandate.pending?
+      end
+
+      def test_get_mandate
+        stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/mandates/man-id")
+          .to_return(:status => 200, :body => %{{"id":"man-id", "method":"directdebit"}}, :headers => {})
+
+        mandate = Customer::Mandate.get("man-id", customer_id: "cus-id")
+
+        assert_equal "man-id", mandate.id
+        assert_equal "directdebit", mandate.method
+      end
+
+      def test_create_mandate
+        stub_request(:post, "https://api.mollie.com/v2/customers/cus-id/mandates")
+          .with(body: %{{"method":"directdebit"}})
+          .to_return(:status => 201, :body => %{{"id":"my-id", "method":"directdebit"}}, :headers => {})
+
+        mandate = Customer::Mandate.create(
+          method: "directdebit",
+          customer_id: "cus-id"
+        )
+
+        assert_equal "my-id", mandate.id
+        assert_equal "directdebit", mandate.method
+      end
+
+      def test_delete_mandate
+        stub_request(:delete, "https://api.mollie.com/v2/customers/cus-id/mandates/man-id")
+          .to_return(:status => 204, :headers => {})
+
+        mandate = Customer::Mandate.delete("man-id", customer_id: "cus-id")
+        assert_equal nil, mandate
+      end
+
+      def test_get_customer
+        stub_request(:get, "https://api.mollie.com/v2/customers/cst_4qqhO89gsT/mandates/mdt_h3gAaD5zP")
+          .to_return(:status => 200, :body => %{
+            {
+              "resource": "mandate",
+              "id": "mdt_h3gAaD5zP",
+              "_links": {
+                "customer": {
+                  "href": "https://api.mollie.com/v2/customers/cst_4qqhO89gsT",
+                  "type": "application/hal+json"
+                }
+              }
+            }
+          }, :headers => {})
+
+        stub_request(:get, "https://api.mollie.com/v2/customers/cst_4qqhO89gsT")
+          .to_return(:status => 200, :body => %{
+            {
+              "resource": "customer",
+              "id": "cst_4qqhO89gsT"
+            }
+          }, :headers => {})
+
+        mandate = Customer::Mandate.get("mdt_h3gAaD5zP", customer_id: 'cst_4qqhO89gsT')
+        assert_equal "cst_4qqhO89gsT", mandate.customer.id
       end
     end
   end

data/test/mollie/customer/payment_test.rb

@@ -10,8 +10,8 @@ module Mollie
 
 
       def test_list_payments
-        stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/payments?count=50&offset=0")
-          .to_return(:status => 200, :body => %{{"data" : [{"id":"pay-id", "customer_id":"cus-id"}]}}, :headers => {})
+        stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/payments")
+          .to_return(:status => 200, :body => %{{"_embedded" : { "payments" : [{"id":"pay-id", "customer_id":"cus-id"}]}}}, :headers => {})
 
         payments = Payment.all(customer_id: "cus-id")
 

data/test/mollie/customer/subscription_test.rb

@@ -5,20 +5,18 @@ module Mollie
     class SubscriptionTest < Test::Unit::TestCase
       def test_setting_attributes
         attributes = {
-          id:                 "sub_rVKGtNd6s3",
-          customer_id:        "cst_stTC2WHAuS",
-          mode:               "live",
-          created_datetime:   "2016-06-01T12:23:34.0Z",
-          status:             "active",
-          amount:             "25.00",
-          times:              4,
-          interval:           "3 months",
-          description:        "Quarterly payment",
-          method:             "creditcard",
-          cancelled_datetime: "2016-06-01T12:23:34.0Z",
-          links:              {
-            'webhook_url' => "https://example.org/payments/webhook"
-          }
+          id:           "sub_rVKGtNd6s3",
+          customer_id:  "cst_stTC2WHAuS",
+          mode:         "live",
+          created_at:   "2016-06-01T12:23:34.0Z",
+          status:       "active",
+          amount:       { "value" => "25.00", "currency" => "EUR" },
+          times:        4,
+          interval:     "3 months",
+          description:  "Quarterly payment",
+          method:       "creditcard",
+          canceled_at:  "2016-06-01T12:23:34.0Z",
+          webhook_url:  "https://example.org/payments/webhook"
         }
 
         subscription = Subscription.new(attributes)
@@ -26,14 +24,15 @@ module Mollie
         assert_equal "sub_rVKGtNd6s3", subscription.id
         assert_equal "cst_stTC2WHAuS", subscription.customer_id
         assert_equal "live", subscription.mode
-        assert_equal Time.parse("2016-06-01T12:23:34.0Z"), subscription.created_datetime
+        assert_equal Time.parse("2016-06-01T12:23:34.0Z"), subscription.created_at
         assert_equal "active", subscription.status
-        assert_equal BigDecimal.new(25, 2), subscription.amount
+        assert_equal BigDecimal.new("25.00"), subscription.amount.value
+        assert_equal "EUR", subscription.amount.currency
         assert_equal 4, subscription.times
         assert_equal "3 months", subscription.interval
         assert_equal "Quarterly payment", subscription.description
         assert_equal "creditcard", subscription.method
-        assert_equal Time.parse("2016-06-01T12:23:34.0Z"), subscription.cancelled_datetime
+        assert_equal Time.parse("2016-06-01T12:23:34.0Z"), subscription.canceled_at
         assert_equal "https://example.org/payments/webhook", subscription.webhook_url
       end
 
@@ -52,15 +51,67 @@ module Mollie
         assert !Subscription.new(status: 'not-suspended').suspended?
       end
 
-      def test_status_cancelled
-        assert Subscription.new(status: Subscription::STATUS_CANCELLED).cancelled?
-        assert !Subscription.new(status: 'not-cancelled').cancelled?
+      def test_status_canceled
+        assert Subscription.new(status: Subscription::STATUS_CANCELED).canceled?
+        assert !Subscription.new(status: 'not-canceled').canceled?
       end
 
       def test_status_completed
         assert Subscription.new(status: Subscription::STATUS_COMPLETED).completed?
         assert !Subscription.new(status: 'not-completed').completed?
       end
+
+      def test_get_subscription
+        stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/subscriptions/sub-id")
+          .to_return(:status => 200, :body => %{{"id":"sub-id", "customer_id":"cus-id"}}, :headers => {})
+
+        subscription = Customer::Subscription.get("sub-id", customer_id: "cus-id")
+
+        assert_equal "sub-id", subscription.id
+        assert_equal "cus-id", subscription.customer_id
+      end
+
+      def test_create_subscription
+        stub_request(:post, "https://api.mollie.com/v2/customers/cus-id/subscriptions")
+          .with(body: %{{"amount":{"value":1.95,"currency":"EUR"}}})
+          .to_return(:status => 201, :body => %{{"id":"my-id", "amount": { "value" : 1.95, "currency": "EUR"}}}, :headers => {})
+
+        subscription = Customer::Subscription.create(customer_id: 'cus-id', amount: { value: 1.95, currency: "EUR" })
+
+        assert_equal "my-id", subscription.id
+        assert_equal BigDecimal.new("1.95"), subscription.amount.value
+      end
+
+      def test_delete_subscription
+        stub_request(:delete, "https://api.mollie.com/v2/customers/cus-id/subscriptions/sub-id")
+          .to_return(:status => 204, :headers => {})
+
+        subscription = Customer::Subscription.delete("sub-id", customer_id: "cus-id")
+        assert_equal nil, subscription
+      end
+
+      def test_get_customer
+        stub_request(:get, "https://api.mollie.com/v2/customers/cst_8wmqcHMN4U/subscriptions/sub_rVKGtNd6s3")
+          .to_return(:status => 200, :body => %{
+            {
+                "resource": "subscription",
+                "id": "sub_rVKGtNd6s3",
+                "customer_id": "cst_8wmqcHMN4U"
+            }
+          }, :headers => {})
+
+        stub_request(:get, "https://api.mollie.com/v2/customers/cst_8wmqcHMN4U")
+          .to_return(:status => 200, :body => %{
+            {
+                "resource": "customer",
+                "id": "cst_8wmqcHMN4U"
+            }
+          }, :headers => {})
+
+        payment  = Customer::Subscription.get("sub_rVKGtNd6s3", customer_id: "cst_8wmqcHMN4U")
+        customer = payment.customer
+        assert_equal "cst_8wmqcHMN4U", customer.id
+      end
     end
   end
 end

data/test/mollie/customer_test.rb

@@ -4,14 +4,13 @@ module Mollie
   class CustomerTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        id:                    'cst_vsKJpSsabw',
-        mode:                  'test',
-        name:                  'Customer A',
-        email:                 'customer@example.org',
-        locale:                'nl_NL',
-        metadata:              { my_field: 'value' },
-        recently_used_methods: 'creditcard',
-        created_datetime:      '2016-04-06T13:23:21.0Z'
+        id:         'cst_vsKJpSsabw',
+        mode:       'test',
+        name:       'Customer A',
+        email:      'customer@example.org',
+        locale:     'nl_NL',
+        metadata:   { my_field: 'value' },
+        created_at: '2016-04-06T13:23:21.0Z'
       }
 
       customer = Customer.new(attributes)
@@ -21,108 +20,37 @@ module Mollie
       assert_equal 'Customer A', customer.name
       assert_equal 'customer@example.org', customer.email
       assert_equal 'nl_NL', customer.locale
-      assert_equal ['creditcard'], customer.recently_used_methods
-      assert_equal Time.parse('2016-04-06T13:23:21.0Z'), customer.created_datetime
+      assert_equal Time.parse('2016-04-06T13:23:21.0Z'), customer.created_at
 
       assert_equal 'value', customer.metadata.my_field
       assert_equal nil, customer.metadata.non_existing
     end
 
     def test_list_mandates
-      stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/mandates?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data" : [{"id":"man-id", "customer_id":"cus-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/mandates")
+        .to_return(:status => 200, :body => %{{"_embedded" : { "mandates" : [{"id":"man-id", "customer_id":"cus-id"}]}} }, :headers => {})
 
-      mandates = Customer.new(id: "cus-id").mandates.all
+      mandates = Customer.new(id: "cus-id").mandates
 
       assert_equal "man-id", mandates.first.id
     end
 
-    def test_create_mandate
-      stub_request(:post, "https://api.mollie.nl/v1/customers/cus-id/mandates")
-        .with(body: %{{"method":"directdebit"}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "method":"directdebit"}}, :headers => {})
-
-      mandate = Customer.new(id: "cus-id").mandates.create(method: "directdebit")
-
-      assert_equal "my-id", mandate.id
-      assert_equal "directdebit", mandate.method
-    end
-
-    def test_delete_mandate
-      stub_request(:delete, "https://api.mollie.nl/v1/customers/cus-id/mandates/man-id")
-        .to_return(:status => 204, :headers => {})
-
-      mandate = Customer.new(id: "cus-id").mandates.delete("man-id")
-      assert_equal nil, mandate
-    end
-
-    def test_get_mandate
-      stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/mandates/man-id")
-        .to_return(:status => 200, :body => %{{"id":"man-id", "customer_id":"cus-id"}}, :headers => {})
-
-      mandate = Customer.new(id: "cus-id").mandates.get("man-id")
-
-      assert_equal "man-id", mandate.id
-      assert_equal "cus-id", mandate.customer_id
-    end
-
     def test_list_subscriptions
-      stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/subscriptions?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data" : [{"id":"sub-id", "customer_id":"cus-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/subscriptions")
+        .to_return(:status => 200, :body => %{{"_embedded" : {"subscriptions" : [{"id":"sub-id", "customer_id":"cus-id"}]}} }, :headers => {})
 
-      subscriptions = Customer.new(id: "cus-id").subscriptions.all
+      subscriptions = Customer.new(id: "cus-id").subscriptions
 
       assert_equal "sub-id", subscriptions.first.id
     end
 
-    def test_create_subscription
-      stub_request(:post, "https://api.mollie.nl/v1/customers/cus-id/subscriptions")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.95}}, :headers => {})
-
-      subscription = Customer.new(id: "cus-id").subscriptions.create(amount: 1.95)
-
-      assert_equal "my-id", subscription.id
-      assert_equal BigDecimal.new("1.95"), subscription.amount
-    end
-
-    def test_delete_subscription
-      stub_request(:delete, "https://api.mollie.nl/v1/customers/cus-id/subscriptions/sub-id")
-        .to_return(:status => 204, :headers => {})
-
-      subscription = Customer.new(id: "cus-id").subscriptions.delete("sub-id")
-      assert_equal nil, subscription
-    end
-
-    def test_get_subscription
-      stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/subscriptions/sub-id")
-        .to_return(:status => 200, :body => %{{"id":"sub-id", "customer_id":"cus-id"}}, :headers => {})
-
-      subscription = Customer.new(id: "cus-id").subscriptions.get("sub-id")
-
-      assert_equal "sub-id", subscription.id
-      assert_equal "cus-id", subscription.customer_id
-    end
-
     def test_list_payments
-      stub_request(:get, "https://api.mollie.nl/v1/customers/cus-id/payments?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data" : [{"id":"sub-id", "customer_id":"cus-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/customers/cus-id/payments")
+        .to_return(:status => 200, :body => %{{"_embedded" : { "payments" : [{"id":"sub-id", "customer_id":"cus-id"}]}}}, :headers => {})
 
-      payments = Customer.new(id: "cus-id").payments.all
+      payments = Customer.new(id: "cus-id").payments
 
       assert_equal "sub-id", payments.first.id
     end
-
-    def test_create_payment
-      stub_request(:post, "https://api.mollie.nl/v1/customers/cus-id/payments")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.95}}, :headers => {})
-
-      payment = Customer.new(id: "cus-id").payments.create(amount: 1.95)
-
-      assert_kind_of Mollie::Payment, payment
-      assert_equal "my-id", payment.id
-      assert_equal BigDecimal.new("1.95"), payment.amount
-    end
   end
 end