mollie-api-ruby 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b228303449f153b39e3ee2ce64035412d17a8b0e
-  data.tar.gz: 90fe25b682947ca412791365bf3dcfce87c64a47
+  metadata.gz: 719ea9fd2cb5e56072dc35c2f66efdd2c87e278b
+  data.tar.gz: 3c460d1338c55e3fb80449da019ad5702e65b0a7
 SHA512:
-  metadata.gz: d6ef48f0f3aeb0fb19ad136f0fc64c06512ae509676775cfe81062a97d7e988a8a26e689248b4e835b234b379a42c15a487992edd2ee440b10c5f0710e5cefa6
-  data.tar.gz: fd4dae4d7fd3ea510cb8890cf2ffcaf6dc1d478086b73b1810f0e4804f826de50a8718ccdb5614b16e66e001d20558bac7e8f56cbcc6898c4373298389dc4566
+  metadata.gz: 6035c6b84b160788f7f9ea14259bcc8ac1fe64e71e676e5227b8bf45f7dd0cad717b1fc7ed04a2a98b7655977e1c8d32863bcdf579beaeb312f0c5dc991b4665
+  data.tar.gz: d69710e8d191ed705a3b391f3d08bb29868d38d30e67f7e77741d1f329546605772b8da1de98c944e11404d1d3182e6ca49cbac6e2b1b95de015c3f6bd140621

data/.travis.yml

@@ -5,8 +5,6 @@ rvm:
  - 2.1
  - 2.2
  - 2.3.0
- - jruby
 matrix:
   allow_failures:
   - rvm: 2.0.0
-  - rvm: jruby

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 All notable changes to this project will be documented in this file.
 
+#### 2.2.0 - 2017-04-21
+  - Add support for organizations, permissions, profiles, settlement and profiles/apikeys resources ([#54](https://github.com/mollie/mollie-api-ruby/issues/54)).
+  - Remove `jruby` from the build.
+
 #### 2.1.0 - 2017-02-06
   - Add pagination support to resources ([#25](https://github.com/mollie/mollie-api-ruby/issues/25)).
 

data/{README.mdown → README.md}

@@ -1,7 +1,8 @@
-![Mollie](http://www.mollie.nl/files/Mollie-Logo-Style-Small.png)
+![Mollie](https://www.mollie.nl/files/Mollie-Logo-Style-Small.png)
 
 # Mollie API client for Ruby #
 
+[![Gem Version](https://badge.fury.io/rb/mollie-api-ruby.svg)](https://badge.fury.io/rb/mollie-api-ruby)
 [![](https://travis-ci.org/mollie/mollie-api-ruby.png)](https://travis-ci.org/mollie/mollie-api-ruby)
 
 Accepting [iDEAL](https://www.mollie.com/ideal/), [Bancontact/Mister Cash](https://www.mollie.com/mistercash/), [SOFORT Banking](https://www.mollie.com/sofort/), [Creditcard](https://www.mollie.com/creditcard/), [SEPA Bank transfer](https://www.mollie.com/overboeking/), [SEPA Direct debit](https://www.mollie.com/directdebit/), [Bitcoin](https://www.mollie.com/bitcoin/), [PayPal](https://www.mollie.com/paypal/), [KBC/CBC Payment Button](https://www.mollie.com/kbccbc/), [Belfius Direct Net](https://www.mollie.com/belfiusdirectnet/) and [paysafecard](https://www.mollie.com/paysafecard/) online payments without fixed monthly costs or any punishing registration procedures. Just use the Mollie API to receive payments directly on your website or easily refund transactions to your customers.
@@ -52,9 +53,10 @@ Creating a new payment.
 
 ```ruby
 payment = mollie.payments.create(
-  amount: 10.00,
-  description: 'My first API payment',
-  redirect_url: 'https://webshop.example.org/order/12345/'
+  amount:       10.00,
+  description:  'My first API payment',
+  redirect_url: 'https://webshop.example.org/order/12345/',
+  webhook_url:  'https://webshop.example.org/mollie-webhook/'
 )
 ```
 
@@ -92,8 +94,8 @@ $ ruby examples/app.rb
 If you wish to learn more about our API, please visit the [Mollie Developer Portal](https://www.mollie.com/developer/). API Documentation is available in both Dutch and English.
 
 ## License ##
-[BSD (Berkeley Software Distribution) License](http://www.opensource.org/licenses/bsd-license.php).
-Copyright (c) 2014-2015, Mollie B.V.
+[BSD (Berkeley Software Distribution) License](https://opensource.org/licenses/bsd-license.php).
+Copyright (c) 2014-2017, Mollie B.V.
 
 ## Support ##
 Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20-612 88 55
@@ -109,5 +111,3 @@ Contact: [www.mollie.com](https://www.mollie.com) — info@mollie.com — +31 20
 + [More information about KBC/CBC Payment Button via Mollie](https://www.mollie.com/kbccbc/)
 + [More information about Belfius Direct Net via Mollie](https://www.mollie.com/belfiusdirectnet/)
 + [More information about paysafecard via Mollie](https://www.mollie.com/paysafecard/)
-
-![Powered By Mollie](https://www.mollie.com/images/badge-betaling-medium.png)

data/examples/1-new-payment.rb

@@ -30,13 +30,15 @@ begin
   # Payment parameters:
   #   amount        Amount in EUROs. This example creates a € 10,- payment.
   #   description   Description of the payment.
-  #   redirectUrl   Redirect location. The customer will be redirected there after the payment.
+  #   redirect_url  Redirect location. The customer will be redirected there after the payment.
+  #   webhook_url   Webhook location, used to report when the payment changes state.
   #   metadata      Custom metadata that is stored with the payment.
   #
   payment = mollie.payments.create \
     :amount       => 10.00,
     :description  => "My first API payment",
-    :redirect_url  => "#{protocol}://#{hostname}:#{port}#{path}/3-return-page?order_id=#{order_id}",
+    :redirect_url => "#{protocol}://#{hostname}:#{port}#{path}/3-return-page?order_id=#{order_id}",
+    :webhook_url  => "#{protocol}://#{hostname}:#{port}#{path}/2-webhook-verification",
     :metadata     => {
       :order_id => order_id
     }

data/examples/4-ideal-payment.rb

@@ -47,7 +47,8 @@ begin
     # Payment parameters:
     #   amount        Amount in EUROs. This example creates a € 27,50 payment.
     #   description   Description of the payment.
-    #   redirectUrl   Redirect location. The customer will be redirected there after the payment.
+    #   redirect_url  Redirect location. The customer will be redirected there after the payment.
+    #   webhook_url   Webhook location, used to report when the payment changes state.
     #   metadata      Custom metadata that is stored with the payment.
     #   method        Payment method "ideal".
     #   issuer        The customer's bank. If empty the customer can select it later.
@@ -55,7 +56,8 @@ begin
     payment = mollie.payments.create \
       :amount       => 27.50,
       :description  => "My first API payment",
-      :redirectUrl  => "#{protocol}://#{hostname}:#{port}#{path}/3-return-page?order_id=#{order_id}",
+      :redirect_url => "#{protocol}://#{hostname}:#{port}#{path}/3-return-page?order_id=#{order_id}",
+      :webhook_url  => "#{protocol}://#{hostname}:#{port}#{path}/2-webhook-verification",
       :metadata     => {
         :order_id => order_id
       },

data/lib/mollie/api/client.rb

@@ -8,22 +8,32 @@ require "bigdecimal"
  "client/version",
  "resource/base",
  "resource/customers",
- "resource/customers/payments",
  "resource/customers/mandates",
+ "resource/customers/payments",
  "resource/customers/subscriptions",
- "resource/payments",
- "resource/payments/refunds",
  "resource/issuers",
  "resource/methods",
+ "resource/organizations",
+ "resource/payments",
+ "resource/payments/refunds",
+ "resource/permissions",
+ "resource/profiles",
+ "resource/profiles/apikeys",
+ "resource/settlements",
  "object/base",
  "object/list",
  "object/customer",
- "object/mandate",
- "object/subscription",
+ "object/customer/mandate",
+ "object/customer/subscription",
+ "object/issuer",
+ "object/method",
+ "object/organization",
  "object/payment",
  "object/payment/refund",
- "object/issuer",
- "object/method"].each { |file| require File.expand_path file, File.dirname(__FILE__) }
+ "object/permission",
+ "object/profile",
+ "object/profile/apikey",
+ "object/settlement"].each { |file| require File.expand_path file, File.dirname(__FILE__) }
 
 module Mollie
   module API
@@ -31,20 +41,29 @@ module Mollie
       API_ENDPOINT = "https://api.mollie.nl"
       API_VERSION  = "v1"
 
+      MODE_TEST = "test"
+      MODE_LIVE = "live"
+
       attr_accessor :api_key
-      attr_reader :payments, :issuers, :methods, :payments_refunds,
-                  :customers, :customers_payments, :customers_mandates, :customers_subscriptions,
+      attr_reader :customers, :customers_payments, :customers_mandates, :customers_subscriptions,
+                  :issuers, :methods, :organizations, :payments, :payments_refunds,
+                  :permissions, :profiles, :profiles_api_keys, :settlements,
                   :api_endpoint
 
       def initialize(api_key)
-        @payments                = Mollie::API::Resource::Payments.new self
-        @issuers                 = Mollie::API::Resource::Issuers.new self
-        @methods                 = Mollie::API::Resource::Methods.new self
-        @payments_refunds        = Mollie::API::Resource::Payments::Refunds.new self
         @customers               = Mollie::API::Resource::Customers.new self
         @customers_payments      = Mollie::API::Resource::Customers::Payments.new self
         @customers_mandates      = Mollie::API::Resource::Customers::Mandates.new self
         @customers_subscriptions = Mollie::API::Resource::Customers::Subscriptions.new self
+        @issuers                 = Mollie::API::Resource::Issuers.new self
+        @methods                 = Mollie::API::Resource::Methods.new self
+        @organizations           = Mollie::API::Resource::Organizations.new self
+        @payments                = Mollie::API::Resource::Payments.new self
+        @payments_refunds        = Mollie::API::Resource::Payments::Refunds.new self
+        @permissions             = Mollie::API::Resource::Permissions.new self
+        @profiles                = Mollie::API::Resource::Profiles.new self
+        @profiles_api_keys       = Mollie::API::Resource::Profiles::ApiKeys.new self
+        @settlements             = Mollie::API::Resource::Settlements.new self
 
         @api_endpoint    = API_ENDPOINT
         @api_key         = api_key

data/lib/mollie/api/client/version.rb

@@ -1,7 +1,7 @@
 module Mollie
   module API
     class Client
-      VERSION = "2.1.0"
+      VERSION = "2.2.0"
     end
   end
 end

data/lib/mollie/api/object/customer/mandate.rb

@@ -0,0 +1,37 @@
+module Mollie
+  module API
+    module Object
+      class Customer
+        class Mandate < Base
+          STATUS_VALID   = "valid"
+          STATUS_INVALID = "invalid"
+
+          attr_accessor :id,
+                        :status,
+                        :method,
+                        :customer_id,
+                        :details,
+                        :created_datetime,
+                        :mandate_reference
+
+
+          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
+          end
+
+          def valid?
+            status == STATUS_VALID
+          end
+
+          def invalid?
+            status == STATUS_INVALID
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/object/customer/subscription.rb

@@ -0,0 +1,69 @@
+module Mollie
+  module API
+    module Object
+      class Customer
+        class Subscription < Base
+          STATUS_ACTIVE    = "active"
+          STATUS_PENDING   = "pending" # Waiting for a valid mandate.
+          STATUS_CANCELLED = "cancelled"
+          STATUS_SUSPENDED = "suspended" # Active, but mandate became invalid.
+          STATUS_COMPLETED = "completed"
+
+          attr_accessor :resource,
+                        :id,
+                        :customer_id,
+                        :mode,
+                        :created_datetime,
+                        :status,
+                        :amount,
+                        :times,
+                        :interval,
+                        :description,
+                        :method,
+                        :cancelled_datetime,
+                        :links
+
+          def active?
+            status == STATUS_ACTIVE
+          end
+
+          def pending?
+            status == STATUS_PENDING
+          end
+
+          def suspended?
+            status == STATUS_SUSPENDED
+          end
+
+          def cancelled?
+            status == STATUS_CANCELLED
+          end
+
+          def completed?
+            status == STATUS_COMPLETED
+          end
+
+          def created_datetime=(created_datetime)
+            @created_datetime = Time.parse(created_datetime.to_s) rescue nil
+          end
+
+          def cancelled_datetime=(cancelled_datetime)
+            @cancelled_datetime = Time.parse(cancelled_datetime.to_s) rescue nil
+          end
+
+          def amount=(amount)
+            @amount = BigDecimal.new(amount.to_s)
+          end
+
+          def times=(times)
+            @times = times.to_i
+          end
+
+          def webhook_url
+            links && links['webhook_url']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/object/organization.rb

@@ -0,0 +1,28 @@
+module Mollie
+  module API
+    module Object
+      class Organization < Base
+        attr_accessor :id,
+                      :name,
+                      :email,
+                      :address,
+                      :postal_code,
+                      :city,
+                      :country,
+                      :country_code,
+                      :registration_type,
+                      :registration_number,
+                      :registration_datetime,
+                      :verified_datetime
+
+        def registration_datetime=(registration_datetime)
+          @registration_datetime = Time.parse(registration_datetime.to_s)
+        end
+
+        def verified_datetime=(verified_datetime)
+          @verified_datetime = Time.parse(verified_datetime.to_s) rescue nil
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/object/permission.rb

@@ -0,0 +1,12 @@
+module Mollie
+  module API
+    module Object
+      class Permission < Base
+        attr_accessor :id,
+                      :description,
+                      :warning,
+                      :granted
+      end
+    end
+  end
+end

data/lib/mollie/api/object/profile.rb

@@ -0,0 +1,78 @@
+module Mollie
+  module API
+    module Object
+      class Profile < Base
+        CATEGORY_CODE_GENERAL_MERCHANDISE                = 5399
+        CATEGORY_CODE_ELECTRONICS_COMPUTERS_AND_SOFTWARE = 5732
+        CATEGORY_CODE_TRAVEL_RENTAL_AND_TRANSPORTATION   = 4121
+        CATEGORY_CODE_FINANCIAL_SERVICES                 = 6012
+        CATEGORY_CODE_FOOD_AND_DRINKS                    = 5499
+        CATEGORY_CODE_EVENTS_FESTIVALS_AND_RECREATION    = 7999
+        CATEGORY_CODE_BOOKS_MAGAZINES_AND_NEWSPAPERS     = 5192
+        CATEGORY_CODE_PERSONAL_SERVICES                  = 7299
+        CATEGORY_CODE_CHARITY_AND_DONATIONS              = 8398
+        CATEGORY_CODE_OTHER                              = 0
+
+        STATUS_UNVERIFIED = "unverified"
+        STATUS_VERIFIED   = "verified"
+        STATUS_BLOCKED    = "blocked"
+
+        REVIEW_STATUS_PENDING  = "pending"
+        REVIEW_STATUS_REJECTED = "rejected"
+
+        attr_accessor :id,
+                      :mode,
+                      :name,
+                      :website,
+                      :email,
+                      :phone,
+                      :category_code,
+                      :status,
+                      :review,
+                      :created_datetime,
+                      :updated_datetime,
+                      :links
+
+        def unverified?
+          status == STATUS_UNVERIFIED
+        end
+
+        def verified?
+          status == STATUS_VERIFIED
+        end
+
+        def blocked?
+          status == STATUS_BLOCKED
+        end
+
+        def review=(review)
+          @review = OpenStruct.new(review) if review.is_a?(Hash)
+        end
+
+        def review_pending?
+          @review && @review.status == REVIEW_STATUS_PENDING
+        end
+
+        def review_rejected?
+          @review && @review.status == REVIEW_STATUS_REJECTED
+        end
+
+        def created_datetime=(created_datetime)
+          @created_datetime = Time.parse(created_datetime.to_s) rescue nil
+        end
+
+        def updated_datetime=(updated_datetime)
+          @updated_datetime = Time.parse(updated_datetime.to_s) rescue nil
+        end
+
+        def apikeys
+          links && links['apikeys']
+        end
+
+        def checkout_preview_url
+          links && links['checkout_preview_url']
+        end
+      end
+    end
+  end
+end

data/lib/mollie/api/object/profile/apikey.rb

@@ -0,0 +1,23 @@
+module Mollie
+  module API
+    module Object
+      class Profile
+        class ApiKey < Base
+          attr_accessor :id, :key, :created_datetime
+
+          def testmode?
+            id == Mollie::API::Client::MODE_TEST
+          end
+
+          def livemode?
+            id == Mollie::API::Client::MODE_LIVE
+          end
+
+          def created_datetime=(created_datetime)
+            @created_datetime = Time.parse(created_datetime)
+          end
+        end
+      end
+    end
+  end
+end