portmone 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23038c64f8880639aca64c4e752025cad7ad925a
-  data.tar.gz: 247215a59bac78eaa85e662ecf5736c6e1bddcf6
+SHA256:
+  metadata.gz: 9a1600b423ce55672d03a7906e474823f73eeb0232e8fe08d9bec074c989e585
+  data.tar.gz: 3648a02b61846f275ae160acd9767017bed22cca5bf243915285a1a433d6b3c0
 SHA512:
-  metadata.gz: 94c9f01dffce261d68d1f44888c576ed2d3022386575000209dcc1250edd07bd3865716dd2d0864dd8705916f1c0d3269e4e32ffe2f682344c590498e8e8b045
-  data.tar.gz: c8d8f71f58f9e39cfdc764c03e005b526d6f2ca3c18d08bb26311eaa062345e66d7042d1a3ee0df40152fbac7540e6c35ed969d393b5db78efe2f25207049bdb
+  metadata.gz: 57b0d6f7188867345cb64c9069b931a86f53ee7b9527c0642d1d1c1a5c26f4d05e0cff30826ab973b67611342e23830eb4925afb55e2932f03b54026387d83f8
+  data.tar.gz: 177baf7c0a83e4bac731e4bbdfc8e52010bddceb1b1d467b77ee4441fc5d63e4cf4a835b43f28d799b908a60b36d5b358d927d17b30eb529bd32a7193322754e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    portmone (0.0.8)
+    portmone (0.0.9)
       activesupport
       faraday (~> 0.9)
       money (~> 6.0)
@@ -19,22 +19,22 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     hashdiff (0.3.7)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
-    money (6.13.2)
+    money (6.13.4)
       i18n (>= 0.6.4, <= 2)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)

data/lib/portmone.rb

@@ -13,4 +13,5 @@ require 'portmone/responses/base_response'
 require 'portmone/responses/generate_url'
 require 'portmone/responses/order_status'
 require 'portmone/responses/refund_order_status'
+require 'portmone/responses/mobile_pay_response'
 require 'portmone/client'

data/lib/portmone/client.rb

@@ -2,7 +2,8 @@ module Portmone
   class Error < StandardError; end
 
   class Client
-    BASE_URL = 'https://www.portmone.com.ua/gateway/'.freeze
+    API_URL = 'https://www.portmone.com.ua/gateway/'.freeze
+    MOBILE_API_URL = 'https://www.portmone.com.ua/r3/api/gateway/'.freeze
 
     def initialize(payee_id:,
                    login:,
@@ -60,7 +61,46 @@ module Portmone
       )
     end
 
-  private
+    def google_pay(token:, amount:, order_id:, currency:)
+      google_pay_params = {
+        gPayToken: token,
+      }
+      mobile_pay('GPay', google_pay_params, amount: amount, order_id: order_id, currency: currency)
+    end
+
+    def apple_pay(token:, amount:, order_id:, currency:, merchant_name:)
+      apple_pay_params = {
+        aPayMerchantName: merchant_name,
+        paymentData: token,
+      }
+      mobile_pay('APay', apple_pay_params, amount: amount, order_id: order_id, currency: currency)
+    end
+
+    private
+
+    def mobile_pay(payment_method, payment_system_params, amount:, order_id:, currency:)
+      order_params = {
+        billAmount: amount,
+        shopOrderNumber: order_id,
+        billCurrency: currency,
+      }
+
+      data = payment_system_params
+        .merge(order_params)
+        .merge(base_params)
+        .keep_if { |_, v| v.present? }
+      params = { params: { data: data }, method: payment_method, id: 1 }
+
+      make_json_request(MOBILE_API_URL, params, Portmone::Responses::MobilePayResponse)
+    end
+
+    def base_params
+      {
+        login: @login,
+        password: @password,
+        payeeId: @payee_id,
+      }
+    end
 
     # может возвращать как отдельный заказ по id, так и все заказы с опр. статусом или в опр. временном диапазоне
     def generic_report(shop_order_number: nil, status: nil, start_date: nil, end_date: nil)
@@ -104,16 +144,37 @@ module Portmone
 
     def send_request(**data)
       response_class = data.delete(:response_class)
-      response = http_client.post(BASE_URL) do |req|
-        req.body = data.merge(
-          payee_id: @payee_id,
-          lang: @locale,
-        ).delete_if { |_, v| v.nil? }
+      payload = compact(data.merge(mandatory_params))
+
+      response = http_client.post(API_URL) do |req|
+        req.body = payload
+      end
+
+      response_class.new(response, currency: @currency, timezone: @timezone)
+    end
+
+    def make_json_request(url, params, response_class)
+      conn = Faraday.new(url: url) do |builder|
+        builder.response(:detailed_logger, @logger)
+        builder.adapter Faraday.default_adapter
+      end
+
+      response = conn.post do |request|
+        request.headers['Content-Type'] = 'application/json'
+        request.body = params.to_json
       end
 
       response_class.new(response, currency: @currency, timezone: @timezone)
     end
 
+    def mandatory_params
+      { payee_id: @payee_id, lang: @locale }
+    end
+
+    def compact(**params)
+      params.delete_if { |_, v| v.nil? }
+    end
+
     def http_client
       @http_client ||= Faraday.new do |builder|
         builder.request :url_encoded

data/lib/portmone/responses/mobile_pay_response.rb

@@ -0,0 +1,28 @@
+class Portmone::Responses::MobilePayResponse
+  SUCCESS_STATUS = 'PAYED'.freeze
+
+  attr_reader :response
+
+  def initialize(faraday_response, currency:, timezone:)
+    @response = faraday_response
+    @response_body = JSON.parse(@response.body)
+    @currency = currency
+    @timezone = timezone
+  end
+
+  def http_status
+    response.status
+  end
+
+  def success?
+    @response_body['result']['status'] == SUCCESS_STATUS
+  end
+
+  def error_code
+    @response_body['result']['errorCode']
+  end
+
+  def error_description
+    @response_body['result']['error']
+  end
+end

data/lib/portmone/version.rb

@@ -1,3 +1,3 @@
 module Portmone
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portmone
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alexander Sviridov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,7 @@ files:
 - lib/portmone/client.rb
 - lib/portmone/responses/base_response.rb
 - lib/portmone/responses/generate_url.rb
+- lib/portmone/responses/mobile_pay_response.rb
 - lib/portmone/responses/order_status.rb
 - lib/portmone/responses/refund_order_status.rb
 - lib/portmone/transaction.rb
@@ -216,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for Portmone payment system API