mangopay 3.0.33 → 3.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa62f07baf4f2f9a60c0477b5a7dea909afe7e8a65a35482b2739590c4059f1
-  data.tar.gz: 8c886e16b34503ddcdb574a09203acd0b27b301ddf5c334a94d2c2b11efe2dde
+  metadata.gz: cb254e350875d634519586fc4e451a4c83148886522287f266ed1306131235b4
+  data.tar.gz: ef04474a28bf48dbef09cb20cf48375fdac3183546d30631b1f443aa0f9f21b8
 SHA512:
-  metadata.gz: 2a6f3b71c8625444bb044cc110e00da1beb9e5337e68808b3e18b49e0607ca239d56e9837b269827a685c269c1d5cb4448c004e322c08888613ebd76266fafc6
-  data.tar.gz: b7565b1c8c65ff20e20b04eeab7b75acb1495cdb69b1d44ae806b170be4c237c44911a9d14cfaa1151cfaa7ee8bbe9a3c9203d3030f6b44efaf8eb7abedfbd8e
+  metadata.gz: c8ddc8e015f6ffe95c3947f063a2736a9863b19cf24a02d389fa00d9b9f623c27e083468e7c6eb9d2fcde31a974d3cb73da2674e76b09f53a14b80aaf6c59ca4
+  data.tar.gz: 49ce455ede60281e5c6b430c2c722d7c0c0f3abcc15204beaedd8c3954621d8f0057f05493ebd47df84f02cb91ea0d63db4e247b984f28091edcb525326b7158

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
 rvm:
-- 2.0.0
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 script: bundle exec rspec
 deploy:
   provider: rubygems

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
-### New v4 SDK version (available as a beta version here: https://rubygems.org/gems/mangopay-v4) - will be shortly merged on master.
+ - New v4 SDK version (available as a beta version here: https://rubygems.org/gems/mangopay-v4) - will be shortly merged on master.
+ 
+## [3.0.34] - 2020-06-25
+### Added
+- This SDK is now GooglePay-ready ! Feel free to ask our lovely support for more infos about its activation.
+- `UBODeclaration` is now directly available through its ID.
+- If a bankwire is done from a UK bankaccount on one of your `BankingAlias`, you could find its `AccountNumber` on `GET /payins/` response
+- You can now send a `Culture` parameter for Paypal PayIns. Thanks to it, payment page can be displayed in various languages.
+
+### Changed
+- `PAYLINEV2`value for Payin Web has been added on `TemplateURLOptions` object. You now should use it instead of `PAYLINE` for page customization.
+
+### Fixed
+- Missing filters parameters have been added
+- You can now send headers in update requests
+- Loggers have been enhanced
 
 ## [3.0.33] - 2019-09-23
 ### Added

data/README.md

@@ -4,7 +4,7 @@ The gem for interacting with the version 2 of the Mangopay API.
 See the [API documentation](http://docs.mangopay.com/api-references/)
 for more details on the API.
 
-Tested on the following versions of Ruby: 1.9.2, 1.9.3, 2.0.0
+Tested on the following versions of Ruby: 1.9.2, 1.9.3, 2.0.0 and 2.x up to 2.5
 
 ## NEWS
 
@@ -102,7 +102,7 @@ Along with each request, the rate limiting headers are automatically updated in
   }
 ```
 
-Read more about rate limiting on [our documetiation](https://docs.mangopay.com/guide/rate-limiting).
+Read more about rate limiting on [our documentation](https://docs.mangopay.com/guide/rate-limiting).
 
 ### Log requests and responses
 You can easily enable logs by setting the ```log_file``` configuration option (see the section **configuration** above). If you don't want logs, remove the ```log_file``` line.

data/lib/mangopay.rb

@@ -49,7 +49,8 @@ module MangoPay
   class Configuration
     attr_accessor :preproduction, :root_url,
                   :client_id, :client_apiKey,
-                  :temp_dir, :log_file, :http_timeout
+                  :temp_dir, :log_file, :http_timeout,
+                  :logger
 
     def preproduction
       @preproduction || false
@@ -158,7 +159,7 @@ module MangoPay
           limit: res['x-ratelimit'].split(", "),
           remaining: res['x-ratelimit-remaining'].split(", "),
           reset: res['x-ratelimit-reset'].split(", ")
-        } 
+        }
       end
 
       data
@@ -204,10 +205,10 @@ module MangoPay
     end
 
     def do_request(http, req, uri)
-      if configuration.log_file.nil?
-        do_request_without_log(http, req)
-      else
+      if logs_required?
         do_request_with_log(http, req, uri)
+      else
+        do_request_without_log(http, req)
       end
     end
 
@@ -236,15 +237,23 @@ module MangoPay
     end
 
     def logger
-      raise NotImplementedError if configuration.log_file.nil?
-      if @logger.nil?
+      raise NotImplementedError unless logs_required?
+      return @logger if @logger
+
+      if !configuration.logger.nil?
+        @logger = configuration.logger
+      elsif !configuration.log_file.nil?
         @logger = Logger.new(configuration.log_file)
-        @logger.formatter = proc do |severity, datetime, progname, msg|
+        @logger.formatter = proc do |_, _, _, msg|
           "#{msg}\n"
         end
       end
+
       @logger
     end
 
+    def logs_required?
+      !configuration.log_file.nil? || !configuration.logger.nil?
+    end
   end
 end

data/lib/mangopay/filter_parameters.rb

@@ -13,7 +13,12 @@ module MangoPay
 
     def self.response(body)
       return '' if body.to_s.empty?
-      body = JSON.load(body)
+
+      begin
+        body = JSON.load(body)
+      rescue MultiJson::LoadError => e
+        return body
+      end
       filter_hash(body, res_confidential_params)
       JSON.dump(body)
     end

data/lib/mangopay/http_calls.rb

@@ -21,8 +21,8 @@ module MangoPay
 
     module Update
       module ClassMethods
-        def update(id = nil, params = {})
-          MangoPay.request(:put, url(id), params)
+        def update(id = nil, params = {}, idempotency_key = nil)
+          MangoPay.request(:put, url(id), params, {}, idempotency_key)
         end
       end
 
@@ -35,20 +35,20 @@ module MangoPay
       module ClassMethods
 
         # - Fetching _single_entity_ by +id+:
-        # 
+        #
         #   MangoPay::User.fetch("user-id") # => {"FirstName"=>"Mango", "LastName"=>"Pay", ...}
-        # 
+        #
         # - or fetching _multiple_entities_ with _optional_ +filters+ hash,
         #   including _pagination_ and _sorting_ params
         #   +page+, +per_page+, +sort+ (see http://docs.mangopay.com/api-references/pagination/):
-        #   
+        #
         #   MangoPay::User.fetch() # => [{...}, ...]: list of user data hashes (10 per page by default)
         #   MangoPay::User.fetch({'page' => 2, 'per_page' => 3}) # => list of 3 hashes from 2nd page
         #   MangoPay::BankAccount.fetch(user_id, {'sort' => 'CreationDate:desc'}) # => bank accounts by user, sorting by date descending (with default pagination)
         #   MangoPay::BankAccount.fetch(user_id, {'sort' => 'CreationDate:desc', 'page' => 2, 'per_page' => 3}) # both sorting and pagination params provided
-        # 
+        #
         # - For paginated queries the +filters+ param will be supplemented by +total_pages+ and +total_items+ info:
-        #   
+        #
         #   MangoPay::User.fetch(filter = {'page' => 2, 'per_page' => 3})
         #   filter # => {"page"=>2, "per_page"=>3, "total_pages"=>1969, "total_items"=>5905}
         #

data/lib/mangopay/pay_in.rb

@@ -116,5 +116,15 @@ module MangoPay
       end
     end
 
+    module GooglePay
+      class Direct < Resource
+        include HTTPCalls::Create
+
+        def self.url(*)
+          "#{MangoPay.api_path}/payins/googlepay/#{CGI.escape(class_name.downcase)}"
+        end
+      end
+    end
+
   end
 end

data/lib/mangopay/version.rb

@@ -1,3 +1,3 @@
 module MangoPay
-  VERSION = '3.0.33'
+  VERSION = '3.0.34'
 end

data/spec/mangopay/client_spec.rb

@@ -26,6 +26,7 @@ describe MangoPay::Client do
           Country: 'FR',
           PostalCode: '150770'
       }
+      clnt['TechEmails'] = ['support@mangopay.com']
       phoneNumber = rand(99999999).to_s
       clnt['HeadquartersPhoneNumber'] = phoneNumber
 

data/spec/mangopay/configuration_spec.rb

@@ -15,6 +15,58 @@ describe MangoPay::Configuration do
     expect(users).to be_kind_of(Array)
   end
 
+  describe 'logger' do
+    around(:each) do |example|
+      c = MangoPay.configuration
+      c.logger = logger
+      c.log_file = log_file
+      example.run
+      c.logger = nil
+      c.log_file = nil
+      MangoPay.instance_variable_set(:@logger, nil)
+    end
+
+    context 'when the logger is set' do
+      let(:logger) { Logger.new(STDOUT) }
+
+      context 'when the log_file is set' do
+        let(:log_file) { File.join(MangoPay.configuration.temp_dir, 'mangopay.log.tmp') }
+
+        it 'initializes the logger using the logger option' do
+          expect(MangoPay.send(:logger).instance_variable_get(:@logdev).dev).to(eq(STDOUT))
+        end
+      end
+
+      context 'when the log_file is not set' do
+        let(:log_file) { nil }
+
+        it 'initializes the logger using the logger option' do
+          expect(MangoPay.send(:logger).instance_variable_get(:@logdev).dev).to(eq(STDOUT))
+        end
+      end
+    end
+
+    context 'when the logger is not set' do
+      let(:logger) { nil }
+
+      context 'when the log_file is set' do
+        let(:log_file) { File.join(MangoPay.configuration.temp_dir, 'mangopay.log.tmp') }
+
+        it 'initializes the logger using the log file' do
+          expect(MangoPay.send(:logger).instance_variable_get(:@logdev).dev).to(be_an_instance_of(File))
+        end
+      end
+
+      context 'when the log_file is not set' do
+        let(:log_file) { nil }
+
+        it 'raises an error' do
+          expect{ MangoPay.send(:logger) }.to raise_error NotImplementedError
+        end
+      end
+    end
+  end
+
   context 'with multithreading' do
     after :all do
       reset_mangopay_configuration

data/spec/mangopay/payin_bankwire_external_instruction_spec.rb

@@ -27,6 +27,42 @@ describe MangoPay::PayIn::BankWire::ExternalInstruction, type: :feature do
       check_type_and_status(payIn)
       MangoPay.configuration = backupConfig
     end
+
+    it 'fetches a bankwire external instruction with iban' do
+      backupConfig = MangoPay.configuration.clone
+      MangoPay.configure do |c|
+        c.preproduction = true
+        c.client_id = 'sdk-unit-tests'
+        c.root_url = 'https://api.sandbox.mangopay.com'
+        c.client_apiKey = 'cqFfFrWfCcb7UadHNxx2C9Lo6Djw8ZduLi7J9USTmu8bhxxpju'
+        c.http_timeout = 10000
+      end
+
+      payInId = "74980101"
+      payIn = MangoPay::PayIn.fetch(payInId)
+      expect(payIn).to_not be(nil)
+      expect(payIn['Id']).to eq(payInId)
+      check_type_and_status(payIn)
+      MangoPay.configuration = backupConfig
+    end
+
+    it 'fetches a bankwire external instruction with account number' do
+      backupConfig = MangoPay.configuration.clone
+      MangoPay.configure do |c|
+        c.preproduction = true
+        c.client_id = 'sdk-unit-tests'
+        c.root_url = 'https://api.sandbox.mangopay.com'
+        c.client_apiKey = 'cqFfFrWfCcb7UadHNxx2C9Lo6Djw8ZduLi7J9USTmu8bhxxpju'
+        c.http_timeout = 10000
+      end
+
+      payInId = "74981216"
+      payIn = MangoPay::PayIn.fetch(payInId)
+      expect(payIn).to_not be(nil)
+      expect(payIn['Id']).to eq(payInId)
+      check_type_and_status(payIn)
+      MangoPay.configuration = backupConfig
+    end
   end
 
 ###############################################

data/spec/mangopay/payin_card_web_spec.rb

@@ -22,6 +22,15 @@ describe MangoPay::PayIn::Card::Web, type: :feature do
     end
   end
 
+  describe 'CREATE with PaylineV2' do
+    it 'creates a card web payin with payline v2' do
+      created = new_payin_card_web_payline
+      expect(created['Id']).not_to be_nil
+      expect(created['RedirectURL']).to include('https://www.maysite.com/payline_template/')
+      check_type_and_status(created)
+    end
+  end
+
   describe 'EXTENDED' do
     context 'when resource not exists' do
       it 'fetches extended information' do

data/spec/mangopay/shared_resources.rb

@@ -210,6 +210,7 @@ shared_context 'payins' do
         DebitedFunds: {Currency: 'EUR', Amount: 1000},
         Fees: {Currency: 'EUR', Amount: 0},
         ReturnURL: MangoPay.configuration.root_url,
+        Culture: "FR",
         Tag: 'Test PayIn/PayPal/Web'
     )
   end
@@ -237,6 +238,39 @@ shared_context 'payins' do
     )
   end
 
+  ###############################################
+  # CANNOT BE TESTED AS WE CAN'T MOCK TOKEN GENERATION
+  # googlepay/direct
+  ###############################################
+  let(:new_payin_googlepay_direct) do
+    MangoPay::PayIn::GooglePay::Direct.create(
+        AuthorId: new_natural_user['Id'],
+        CreditedUserId: new_wallet['Owners'][0],
+        CreditedWalletId: new_wallet['Id'],
+        DebitedFunds: {Currency: 'EUR', Amount: 199},
+        Fees: {Currency: 'EUR', Amount: 1},
+        PaymentData: {
+            TransactionId: '061EB32181A2D9CA42AD16031B476EEBAA62A9A095AD660E2759FBA52B51A61',
+            Network: 'VISA',
+            TokenData: "tokenData"
+        },
+        StatementDescriptor: "ruby",
+        ReturnURL: MangoPay.configuration.root_url,
+        Tag: 'Test PayIn/GooglePay/Direct',
+        Billing: {
+            Address: {
+                AddressLine1: 'AddressLine1',
+                AddressLine2: 'AddressLine2',
+                City: 'City',
+                Region: 'Region',
+                PostalCode: 'PostalCode',
+                CountryIso: 'FR'
+            }
+        }
+    )
+  end
+
+
   ###############################################
   # directdebit/direct
   ###############################################
@@ -272,6 +306,21 @@ shared_context 'payins' do
     )
   end
 
+  let(:new_payin_card_web_payline) do
+    MangoPay::PayIn::Card::Web.create(
+        AuthorId: new_natural_user['Id'],
+        CreditedUserId: new_wallet['Owners'][0],
+        CreditedWalletId: new_wallet['Id'],
+        DebitedFunds: {Currency: 'EUR', Amount: 1000},
+        Fees: {Currency: 'EUR', Amount: 0},
+        CardType: 'CB_VISA_MASTERCARD',
+        ReturnURL: MangoPay.configuration.root_url,
+        Culture: 'FR',
+        Tag: 'Test PayIn/Card/Web',
+        TemplateURLOptions: {PAYLINEV2: "https://www.maysite.com/payline_template/"}
+    )
+  end
+
   ###############################################
   # card/direct
   ###############################################

data/spec/mangopay/ubo_declaration_spec.rb

@@ -8,9 +8,10 @@ describe MangoPay::UboDeclaration do
 
       ubo_declaration = MangoPay::UboDeclaration.create(legal_user['Id'])
 
-      ubo_declaration = MangoPay::UboDeclaration.fetch(legal_user['Id'], ubo_declaration['Id'])
+      ubo_declaration_byId = MangoPay::UboDeclaration.fetch(legal_user['Id'], ubo_declaration['Id'])
 
       expect(ubo_declaration).not_to be_nil
+      expect(ubo_declaration_byId).not_to be_nil
     end
 
     describe 'UPDATE' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mangopay
 version: !ruby/object:Gem::Version
-  version: 3.0.33
+  version: 3.0.34
 platform: ruby
 authors:
 - Geoffroy Lorieux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json