mandarin-api 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1643d81e6774e7c811abcf111b636a289aa8839a
-  data.tar.gz: 63300bd786765890c7111e1d8d820c3d5fbe2558
+  metadata.gz: 0d8c32b764a06d6f92e22c34b1d0fb9c4f83da00
+  data.tar.gz: 45cf6c66143f1d691ef20293f4d91ba2f27585c1
 SHA512:
-  metadata.gz: 122c5becef312f7e3a912e6c507dfb73b35e7a967acf70609996d6187c05989fc415344277b92ed964a6a4ac85c45d3c26c2aa19fedb0aa476420f19bace4817
-  data.tar.gz: 8be0eb3138d8d5fc5e176d9b84cad6ac4e36e8df9d6bd4b5a80255ae6087f325ab6ec64d5cddec7ce104f860add2275d63e0660a670574112818ec0b80c9a913
+  metadata.gz: df00ea5909bad4ab9028976ba2cd0a1cdc84657ee67a49cce9a709997a8097054626fd80ba4b3ea0a252ed5c5297b68505a69994ed2f6f9a09fc7ce7a14fbb23
+  data.tar.gz: da75dc387ff5c3271c16b24303498dfd6035beb6c64f657bfddbe6b7d5eb86298a63dac89ccd9f8adb43ed92133fb52c2d1aa651e605daabe08dc3476d8b6d19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mandarin-api (0.2.0)
+    mandarin-api (0.2.1)
       rest-client (>= 2.0, < 3.0)
 
 GEM

data/README.md

@@ -65,7 +65,7 @@ Oneway binded card can only be used for payouts.
 # order_id - id of order/bill, etc. in your system.
 # amount - sum of payout
 # assigned_card_uuid - the id you received assigning the card
-# extra - an hash to keep your additional data
+# extra - an array of hashes to keep your additional data
 MandarinApi.payment(order_id, amount, assigned_card_uuid, extra)
 ```
 `#payment` will return a hash with transaction id.
@@ -81,7 +81,7 @@ MandarinApi.payment(order_id, amount, assigned_card_uuid, extra)
 # order_id - id of order/bill, etc. in your system.
 # amount - sum of payout
 # assigned_card_uuid - the id you received assigning the card
-# extra - an hash to keep your additional data
+# extra - an array of hashes to keep your additional data
 MandarinApi.payout(order_id, amount, assigned_card_uuid, extra)
 ```
 `#payout` will return a hash with transaction id.
@@ -107,8 +107,10 @@ MandarinApi.charge(order_id, amount, user, optional)
     return: 'https://www.your-page-to-return-user-to.com',
     callback: 'https:/www.your-endpoint-for-callbacks.com'
   },
-  visible: { a: 'This value will be visible during payment process on Mandarin page' },
-  invisible: { some_additional_id: 12} # this value won't be visible and will be returned in callback
+  custom_values: [
+    { name: 'A name for value', value: 'This value will be visible during payment process on Mandarin page and return in callback' },
+    { name: 'Another value name', value: 'another value' }
+  ]
 }
 ```
 `#charge` will return a hash.

data/lib/mandarin_api/payment_manager.rb

@@ -34,9 +34,9 @@ module MandarinApi
     def normal_request_body(params, action)
       body = {
         payment: payment(params, action),
-        target: { card: params[:assigned_card_uuid] },
+        target: { card: params[:assigned_card_uuid] }
       }
-      body[:extra] = systemize(params[:extra]) unless params[:extra].empty?
+      body[:custom_values] = params[:custom_values] unless params[:custom_values].empty?
       body
     end
 
@@ -45,9 +45,8 @@ module MandarinApi
         payment: payment(params, action),
         customer_info: { email: params[:email], phone: phone(params[:phone]) }
       }
-      body[:custom_values] = systemize(params[:custom_values]) if params[:custom_values]
+      body[:custom_values] = params[:custom_values] if params[:custom_values]
       body[:urls] = params[:urls] if params[:urls]
-      body[:extra] = systemize(params[:extra]) if params[:extra]
       body
     end
 
@@ -69,14 +68,6 @@ module MandarinApi
       { order_id: params[:order_id], action: action, price: params[:amount] }
     end
 
-    def systemize(options)
-      result = []
-      options.each do |key, value|
-        result << { name: key.to_s, value: value }
-      end
-      result
-    end
-
     def phone(phone)
       if phone.nil?
         '+70000000000'

data/lib/mandarin_api.rb

@@ -16,24 +16,23 @@ module MandarinApi
   def self.charge(order_id, amount, user, extra = {})
     params = {
       order_id: order_id, amount: amount, email: user.email, phone: user.phone,
-      urls: extra[:urls], custom_values: extra[:visible],
-      extra: extra[:invisible]
+      urls: extra[:urls], custom_values: extra[:custom_values]
     }
     MandarinApi::PaymentManager.new.perform_charge params
   end
 
-  def self.pay(order_id, amount, assigned_card_uuid, extra = {})
+  def self.pay(order_id, amount, assigned_card_uuid, custom_values = [])
     params = {
-      order_id: order_id, amount: amount, extra: extra,
+      order_id: order_id, amount: amount, custom_values: custom_values,
       assigned_card_uuid: assigned_card_uuid
     }
     MandarinApi::PaymentManager.new.perform_payment params
   end
 
-  def self.payout(order_id, amount, assigned_card_uuid, extra = {})
+  def self.payout(order_id, amount, assigned_card_uuid, custom_values = [])
     params = {
       order_id: order_id, amount: amount,
-      assigned_card_uuid: assigned_card_uuid, extra: extra
+      assigned_card_uuid: assigned_card_uuid, custom_values: custom_values
     }
     MandarinApi::PaymentManager.new.perform_payout params
   end

data/mandarin-api.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 Gem::Specification.new do |s|
   s.name = 'mandarin-api'
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.authors = ['Vladimir Bogaevsky']
   s.email = 'gitvbogaevsky@gmail.com'
   s.licenses = ['MIT']

data/spec/lib/mandarin_api/payment_manager_spec.rb

@@ -7,14 +7,14 @@ RSpec.describe MandarinApi::PaymentManager do
     {
       order_id: 123_321, amount: 35_000,
       assigned_card_uuid: '0eb51e74-e704-4c36-b5cb-8f0227621518',
-      extra: { a: 'A', b: 'B' }
+      custom_values: [{ name: 'a', value: 'A'}, { name: 'b', value: 'B' }]
     }
   end
   let(:normal_request_body) do
     {
       payment: { order_id: 123_321, action: action, price: 35_000 },
       target: { card: '0eb51e74-e704-4c36-b5cb-8f0227621518' },
-      extra: [{ name: 'a', value: 'A' }, { name: 'b', value: 'B' }]
+      custom_values: [{ name: 'a', value: 'A'}, { name: 'b', value: 'B' }]
     }
   end
   let(:charge_request_body) do
@@ -22,7 +22,6 @@ RSpec.describe MandarinApi::PaymentManager do
       payment: { order_id: 123_321, action: action, price: 35_000 },
       customer_info: { email: email, phone: phone },
       custom_values: [{ name: 'a', value: 'A'}, { name: 'b', value: 'B' }],
-      extra: [{ name: 'one', value: 'One'}, { name: 'two', value: 'Two' }],
       urls: { callback: 'callback', return: 'return' }
     }
   end
@@ -34,7 +33,7 @@ RSpec.describe MandarinApi::PaymentManager do
     let(:params) do
       {
         order_id: 123_321, amount: 35_000, email: email, phone: phone,
-        custom_values: { a: 'A', b: 'B' }, extra: { one: 'One', two: 'Two' },
+        custom_values: [{ name: 'a', value: 'A'}, { name: 'b', value: 'B' }],
         urls: { callback: 'callback', return: 'return' }
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandarin-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vladimir Bogaevsky