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

data/lib/mollie/settlement.rb

@@ -1,13 +1,21 @@
 module Mollie
   class Settlement < Base
+    STATUS_OPEN    = "open"
+    STATUS_PENDING = "pending"
+    STATUS_PAIDOUT = "paidout"
+    STATUS_FAILED  = "failed"
+
     attr_accessor :id,
                   :reference,
-                  :settled_datetime,
+                  :created_at,
+                  :settled_at,
+                  :status,
                   :amount,
                   :periods,
-                  :payment_ids,
-                  :refund_ids,
-                  :links
+                  :invoice_id,
+                  :_links
+
+    alias_method :links, :_links
 
     def self.open(options = {})
       get("open", options)
@@ -17,20 +25,53 @@ module Mollie
       get("next", options)
     end
 
-    def settled_datetime=(settled_datetime)
-      @settled_datetime = Time.parse(settled_datetime.to_s) rescue nil
+    def open?
+      status == STATUS_OPEN
+    end
+
+    def pending?
+      status == STATUS_PENDING
+    end
+
+    def paidout?
+      status == STATUS_PAIDOUT
+    end
+
+    def failed?
+      status == STATUS_FAILED
+    end
+
+    def created_at=(created_at)
+      @created_at = Time.parse(created_at.to_s) rescue nil
+    end
+
+    def settled_at=(settled_at)
+      @settled_at = Time.parse(settled_at.to_s) rescue nil
     end
 
     def amount=(amount)
-      @amount = BigDecimal.new(amount.to_s) if amount
+      @amount = Mollie::Amount.new(amount)
     end
 
     def periods=(periods)
       @periods = Util.nested_openstruct(periods) if periods.is_a?(Hash)
     end
 
-    def payments
-      links && links['payments']
+    def payments(options = {})
+      Settlement::Payment.all(options.merge(settlement_id: id))
+    end
+
+    def refunds(options = {})
+      Settlement::Refund.all(options.merge(settlement_id: id))
+    end
+
+    def chargebacks(options = {})
+      Settlement::Chargeback.all(options.merge(settlement_id: id))
+    end
+
+    def invoice(options = {})
+      return if invoice_id.nil?
+      Invoice.get(invoice_id, options)
     end
   end
 end

data/lib/mollie/util.rb

@@ -53,5 +53,16 @@ module Mollie
         obj
       end
     end
+
+    def extract_url(links, type)
+      links && links[type] && links[type]['href']
+    end
+
+    def extract_id(links, type)
+      href = extract_url(links, type)
+      return if href.nil?
+      uri = URI.parse(href)
+      File.basename(uri.path)
+    end
   end
 end

data/lib/mollie/version.rb

@@ -1,3 +1,3 @@
 module Mollie
-  VERSION = "3.1.5"
+  VERSION = "4.0.0-alpha.1"
 end

data/mollie-api-ruby.gemspec

@@ -23,11 +23,4 @@ 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

data/test/mollie/amount_test.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+module Mollie
+  class AmountTest  < Test::Unit::TestCase
+    def test_value
+      amount = Amount.new('value' => '42.10', 'currency' => 'EUR')
+      assert_equal 0.421e2, amount.value
+    end
+
+    def test_currency
+      amount = Amount.new('currency' => 'EUR')
+      assert_equal 'EUR', amount.currency
+    end
+
+    def test_to_hash
+      amount = Amount.new('value' => '42.10', 'currency' => 'EUR')
+
+      assert_equal(
+        { value: '42.10', currency: 'EUR' },
+        amount.to_h
+      )
+    end
+
+    def test_nil
+      amount = Mollie::Amount.new(nil)
+      assert_nil amount.value
+      assert_nil amount.currency
+    end
+  end
+end

data/test/mollie/base_test.rb

@@ -2,10 +2,10 @@ require 'helper'
 
 module Mollie
   class TestObject < Base
-    attr_accessor :id, :amount, :my_field
+    attr_accessor :id, :foo, :my_field
 
     class NestedObject < Base
-      attr_accessor :id, :testobject_id, :amount
+      attr_accessor :id, :testobject_id, :foo
     end
   end
 
@@ -27,7 +27,7 @@ module Mollie
     end
 
     def test_get
-      stub_request(:get, "https://api.mollie.nl/v1/testobjects/my-id")
+      stub_request(:get, "https://api.mollie.com/v2/testobjects/my-id")
         .to_return(:status => 200, :body => %{{"id":"my-id"}}, :headers => {})
 
       resource = TestObject.get("my-id")
@@ -36,7 +36,7 @@ module Mollie
     end
 
     def test_nested_get
-      stub_request(:get, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects/my-id")
+      stub_request(:get, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects/my-id")
         .to_return(:status => 200, :body => %{{"id":"my-id", "testobject_id":"object-id"}}, :headers => {})
 
       resource = TestObject::NestedObject.get("my-id", testobject_id: 'object-id')
@@ -46,78 +46,78 @@ module Mollie
     end
 
     def test_create
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.00}}, :headers => {})
+      stub_request(:post, "https://api.mollie.com/v2/testobjects")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "foo":1.00}}, :headers => {})
 
-      resource = TestObject.create(amount: 1.95)
+      resource = TestObject.create(foo: 1.95)
 
       assert_equal "my-id", resource.id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_nested_create
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "amount":1.00}}, :headers => {})
+      stub_request(:post, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "foo":1.00}}, :headers => {})
 
-      resource = TestObject::NestedObject.create(amount: 1.95, testobject_id: "object-id")
+      resource = TestObject::NestedObject.create(foo: 1.95, testobject_id: "object-id")
 
       assert_equal "my-id", resource.id
       assert_equal "object-id", resource.testobject_id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_update
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects/my-id")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.00}}, :headers => {})
+      stub_request(:patch, "https://api.mollie.com/v2/testobjects/my-id")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "foo":1.00}}, :headers => {})
 
-      resource = TestObject.update("my-id", amount: 1.95)
+      resource = TestObject.update("my-id", foo: 1.95)
 
       assert_equal "my-id", resource.id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_update_instance
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects/my-id")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "amount":1.00}}, :headers => {})
+      stub_request(:patch, "https://api.mollie.com/v2/testobjects/my-id")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "foo":1.00}}, :headers => {})
 
       resource = TestObject.new(id: "my-id")
-      resource.update(amount: 1.95)
+      resource.update(foo: 1.95)
 
       assert_equal "my-id", resource.id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_nested_update
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects/my-id")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "amount":1.00}}, :headers => {})
+      stub_request(:patch, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects/my-id")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "foo":1.00}}, :headers => {})
 
-      resource = TestObject::NestedObject.update("my-id", amount: 1.95, testobject_id: "object-id")
+      resource = TestObject::NestedObject.update("my-id", foo: 1.95, testobject_id: "object-id")
 
       assert_equal "my-id", resource.id
       assert_equal "object-id", resource.testobject_id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_nested_update_instance
-      stub_request(:post, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects/my-id")
-        .with(body: %{{"amount":1.95}})
-        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "amount":1.00}}, :headers => {})
+      stub_request(:patch, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects/my-id")
+        .with(body: %{{"foo":1.95}})
+        .to_return(:status => 201, :body => %{{"id":"my-id", "testobject_id":"object-id", "foo":1.00}}, :headers => {})
 
       resource = TestObject::NestedObject.new(id: "my-id", testobject_id: "object-id")
-      resource.update(amount: 1.95)
+      resource.update(foo: 1.95)
 
       assert_equal "my-id", resource.id
       assert_equal "object-id", resource.testobject_id
-      assert_equal BigDecimal.new("1.00"), resource.amount
+      assert_equal BigDecimal.new("1.00"), resource.foo
     end
 
     def test_delete
-      stub_request(:delete, "https://api.mollie.nl/v1/testobjects/my-id")
+      stub_request(:delete, "https://api.mollie.com/v2/testobjects/my-id")
         .to_return(:status => 204, :headers => {})
 
       resource = TestObject.delete("my-id")
@@ -126,7 +126,7 @@ module Mollie
     end
 
     def test_delete_instance
-      stub_request(:delete, "https://api.mollie.nl/v1/testobjects/my-id")
+      stub_request(:delete, "https://api.mollie.com/v2/testobjects/my-id")
         .to_return(:status => 204, :headers => {})
 
       resource = TestObject.new(id: "my-id")
@@ -135,7 +135,7 @@ module Mollie
     end
 
     def test_nested_delete
-      stub_request(:delete, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects/my-id")
+      stub_request(:delete, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects/my-id")
         .to_return(:status => 204, :headers => {})
 
       resource = TestObject::NestedObject.delete("my-id", testobject_id: "object-id")
@@ -144,7 +144,7 @@ module Mollie
     end
 
     def test_nested_delete_instance
-      stub_request(:delete, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects/my-id")
+      stub_request(:delete, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects/my-id")
         .to_return(:status => 204, :headers => {})
 
       resource = TestObject::NestedObject.new(id: "my-id", testobject_id: "object-id")
@@ -153,8 +153,8 @@ module Mollie
     end
 
     def test_all
-      stub_request(:get, "https://api.mollie.nl/v1/testobjects?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data":[{"id":"my-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/testobjects")
+        .to_return(:status => 200, :body => %{{"_embedded": {"testobjects": [{"id":"my-id"}]}}}, :headers => {})
 
       resource = TestObject.all
 
@@ -162,8 +162,8 @@ module Mollie
     end
 
     def test_nested_all
-      stub_request(:get, "https://api.mollie.nl/v1/nestedobjects?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data":[{"id":"my-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/nestedobjects")
+        .to_return(:status => 200, :body => %{{"_embedded": {"nestedobjects": [{"id":"my-id"}]}}}, :headers => {})
 
       resource = TestObject::NestedObject.all
 
@@ -171,8 +171,8 @@ module Mollie
     end
 
     def test_nested_all_scoped
-      stub_request(:get, "https://api.mollie.nl/v1/testobjects/object-id/nestedobjects?count=50&offset=0")
-        .to_return(:status => 200, :body => %{{"data":[{"id":"my-id"}]}}, :headers => {})
+      stub_request(:get, "https://api.mollie.com/v2/testobjects/object-id/nestedobjects")
+        .to_return(:status => 200, :body => %{{"_embedded": {"nestedobjects": [{"id":"my-id"}]}}}, :headers => {})
 
       resource = TestObject::NestedObject.all(testobject_id: 'object-id')
 

data/test/mollie/chargeback_test.rb

@@ -4,32 +4,93 @@ module Mollie
   class ChargebackTest < Test::Unit::TestCase
     def test_setting_attributes
       attributes = {
-        id:                  "re_4qqhO89gsT",
-        payment:             {
-          id: "tr_WDqYK6vllg",
-        },
-        amount:              "5.95",
-        chargeback_datetime: "2016-10-08T07:59:53.0Z",
-        reversed_datetime:   "2016-10-08T07:59:53.0Z",
+        id:          "re_4qqhO89gsT",
+        amount:      { "value" => "5.95", "currency" => "EUR" },
+        created_at:  "2016-10-08T07:59:53.0Z",
+        reversed_at: "2016-10-08T07:59:53.0Z",
+        payment_id:  "tr_WDqYK6vllg",
+        settlement_amount: { "value" => "-5.95", "currency" => "EUR" }
       }
 
       chargeback = Chargeback.new(attributes)
 
       assert_equal "re_4qqhO89gsT", chargeback.id
-      assert_equal BigDecimal.new("5.95"), chargeback.amount
-      assert_kind_of Payment, chargeback.payment
-      assert_equal Time.parse("2016-10-08T07:59:53.0Z"), chargeback.chargeback_datetime
-      assert_equal Time.parse("2016-10-08T07:59:53.0Z"), chargeback.reversed_datetime
+      assert_equal BigDecimal.new("5.95"), chargeback.amount.value
+      assert_equal "EUR", chargeback.amount.currency
+      assert_equal Time.parse("2016-10-08T07:59:53.0Z"), chargeback.created_at
+      assert_equal Time.parse("2016-10-08T07:59:53.0Z"), chargeback.reversed_at
+      assert_equal "tr_WDqYK6vllg", chargeback.payment_id
+      assert_equal BigDecimal.new("-5.95"), chargeback.settlement_amount.value
+      assert_equal "EUR", chargeback.settlement_amount.currency
     end
 
-    def test_payment
-      assert_equal "pay-id", Chargeback.new(payment: "pay-id").payment
-      assert_equal "pay-id", Chargeback.new(payment: {id: "pay-id"}).payment.id
+    def test_reversed?
+      assert Chargeback.new(reversed_at: "2016-10-08T07:59:53.0Z").reversed?
+      assert !Chargeback.new(reversed_at: nil).reversed?
     end
 
-    def test_reversed?
-      assert Chargeback.new(reversed_datetime: "2016-10-08T07:59:53.0Z").reversed?
-      assert !Chargeback.new(reversed_datetime: nil).reversed?
+    def test_get_chargeback
+      stub_request(:get, "https://api.mollie.com/v2/payments/pay-id/chargebacks/chb-id")
+        .to_return(:status => 200, :body => %{{"id":"chb-id"}}, :headers => {})
+
+      chargeback = Payment::Chargeback.get("chb-id", payment_id: "pay-id")
+      assert_equal "chb-id", chargeback.id
+    end
+
+    def test_get_payment
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg/chargebacks/chb_n9z0tp")
+        .to_return(:status => 200, :body => %{
+          {
+            "resource": "chargeback",
+            "id": "chb_n9z0tp",
+            "paymentId": "tr_WDqYK6vllg"
+          }
+        }, :headers => {})
+
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg")
+        .to_return(:status => 200, :body => %{
+          {
+            "resource": "payment",
+            "id": "tr_WDqYK6vllg"
+          }
+        }, :headers => {})
+
+      chargeback = Payment::Chargeback.get("chb_n9z0tp", payment_id: "tr_WDqYK6vllg")
+      assert_equal "tr_WDqYK6vllg", chargeback.payment.id
     end
+
+    def test_get_settlement
+      stub_request(:get, "https://api.mollie.com/v2/payments/tr_WDqYK6vllg/chargebacks/chb_n9z0tp")
+        .to_return(:status => 200, :body => %{
+          {
+            "resource": "chargeback",
+            "id": "chb_n9z0tp",
+            "paymentId": "tr_WDqYK6vllg",
+            "_links": {
+              "settlement": {
+                "href": "https://api.mollie.com/v2/settlements/stl_jDk30akdN",
+                "type": "application/hal+json"
+              }
+            }
+          }
+        }, :headers => {})
+
+      stub_request(:get, "https://api.mollie.com/v2/settlements/stl_jDk30akdN")
+        .to_return(:status => 200, :body => %{
+          {
+            "resource": "settlement",
+            "id": "stl_jDk30akdN"
+          }
+        }, :headers => {})
+
+      chargeback = Payment::Chargeback.get("chb_n9z0tp", payment_id: "tr_WDqYK6vllg")
+      assert_equal "stl_jDk30akdN", chargeback.settlement.id
+    end
+
+    def test_nil_settlement
+      chargeback = Payment::Chargeback.new(id: "chb_n9z0tp")
+      assert_nil chargeback.settlement
+    end
+
   end
 end