yaka 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974f7ba0a3bdd56aaddef4625ee7e57be4235fd09cb310b489b19c21bb59dd20
-  data.tar.gz: 2be2cf7054857aac7575a794ec8b99e4eb822f31362beca6c6e629775d5d38e7
+  metadata.gz: adbc706650cd04b94a1537131ddac857130956ab301f53202c75257089225550
+  data.tar.gz: f775b38a8ed44a1ccf60845948560c86699e55b822ee49eb8b0aa89837e7160a
 SHA512:
-  metadata.gz: 861fd5d7f14efb25be050277d31a03c6b268f3cf66b79cf18a079bfb2eb56481b2b0497b71148a1cca5a928680730c0010ee7cba227483c50965d73bf367184a
-  data.tar.gz: b9f0ec56e9d7ff01168043f8301984a923ca5bf5e84fcedb10660fa571b1a9097ac77458eb6ec13388dc8ff3f2b78254849b38fbb4c6ce9091ee8a273bfbb7d5
+  metadata.gz: e99179ad75402a594290e058d00779520ecaf7f4fa21a24916d5fef18ca3357e89cb47c68add3fc2c72ac39786b4423f12af3905dc6440d7255cad571a37bb6f
+  data.tar.gz: 60fa4d2e27900ab425011c39c7628a35f48ec392edd8492c08fb5817319e8df5354f4aabe88f5a9bf43406d4c58a07f1a059523ba9f0dd8780a31d4b74835e63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaka (1.0.0)
+    yaka (1.0.1)
       dry-configurable
       dry-struct
       faraday
@@ -37,7 +37,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-types (~> 1.0)
       ice_nine (~> 0.11)
-    dry-types (1.0.0)
+    dry-types (1.0.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)

data/lib/yaka/basic_struct.rb

@@ -2,7 +2,7 @@
 
 module Yaka
   module Types
-    include Dry::Types.module
+    include Dry::Types()
   end
 
   class BasicStruct < Dry::Struct

data/lib/yaka/class_methods.rb

@@ -3,10 +3,6 @@
 module Yaka
   module ClassMethods
     def publish_payment(data, token = nil)
-      payment = data.is_a?(Yaka::Payment) ? data : Yaka::Payment.new(data)
-
-      data = payment.to_json
-
       conn = Faraday.new(url: Yaka::HOST_URL) # create a new Connection with base URL
       conn.basic_auth(Yaka.config.shop_id, Yaka.config.private_key) # set the Authentication header
 
@@ -14,10 +10,13 @@ module Yaka
         req.url Yaka::PAYMENTS_URL
         req.headers['Content-Type'] = 'application/json'
         req.headers['Idempotence-Key'] = token
-        req.body = data
+        req.body = data.to_json
       end
 
-      Yaka::PaymentResponse.new(JSON.parse(@result.body))
+      body = JSON.parse(@result.body)
+      raise Yaka::Error, body['description'] if body.dig('code').to_s.include?('error')
+
+      body
     end
 
     def yandex_ip?(ip)

data/lib/yaka/payment.rb

@@ -3,34 +3,67 @@
 module Yaka
   class Payment < BasicStruct
     # This class is used for sending payments to Yandex Kassa.
+
+    # https://kassa.yandex.ru/developers/payments/54fz#54fz-payment-subject
+    # commodity	            Товар
+    # excise	              Подакцизный товар
+    # job	                  Работа
+    # service	              Услуга
+    # gambling_bet	        Ставка в азартной игре
+    # gambling_prize	      Выигрыш в азартной игре
+    # lottery	              Лотерейный билет
+    # lottery_prize	        Выигрыш в лотерею
+    # intellectual_activity	Результаты интеллектуальной деятельности
+    # payment	              Платеж
+    # agent_commission	    Агентское вознаграждение
+    # property_right	      Имущественные права
+    # non_operating_gain	  Внереализационный доход
+    # insurance_premium	    Страховой сбор
+    # sales_tax	            Торговый сбор
+    # resort_fee	          Курортный сбор
+    # composite	            Несколько вариантов
+    # another               Другое
+    PAYMENT_SUBJECTS = Types::Strict::String.enum(
+      'commodity', 'excise', 'job', 'service', 'gambling_bet',
+      'gambling_prize', 'lottery', 'lottery_prize', 'intellectual_activity',
+      'payment', 'agent_commission', 'property_right', 'non_operating_gain',
+      'insurance_premium', 'sales_tax', 'resort_fee', 'composite', 'another'
+    )
+
+
     attribute :amount, BasicStruct do
       attribute :value, Types::String
       attribute :currency, Types::String
     end
     attribute :confirmation, BasicStruct do
       attribute :type, Types::String.default('redirect')
-      attribute :return_url, Types::Strict::String
+      attribute :return_url, Types::Strict::String.meta(omittable: true)
     end
     attribute :capture, Types::Bool.default(true)
+    attribute :save_payment_method, Types::Bool.meta(omittable: true)
     attribute :description, Types::Strict::String
     attribute :receipt, BasicStruct.meta(omittable: true) do
-      attribute :items, Types::Array.of(BasicStruct).default([]) do
+      attribute :items, Types::Array.of(BasicStruct).default([].freeze) do
         attribute :description, Types::String
         attribute :amount, BasicStruct.meta(omittable: true) do
           attribute :value, Types::String.meta(omittable: true)
           attribute :currency, Types::String.meta(omittable: true)
         end
         attribute :quantity, Types::Integer
-        attribute :vat_code, Types::String
-        attribute :payment_mode, Types::Strict::String.meta(omittable: true)
-        attribute :payment_subject, Types::String.meta(omittable: true)
+        attribute :vat_code, Types::Integer # https://kassa.yandex.ru/docs/guides/#54fz-vat-codes
+        attribute :payment_mode, Types::Strict::String.meta(omittable: true) # https://kassa.yandex.ru/developers/payments/54fz#54fz-payment-mode
+        attribute :payment_subject, PAYMENT_SUBJECTS.meta(omittable: true)
       end
       attribute :phone, Types::String.meta(omittable: true)
       attribute :email, Types::String.meta(omittable: true)
-      attribute :tax_system_code, Types::String.meta(omittable: true)
+      attribute :tax_system_code, Types::String.meta(omittable: true) # https://kassa.yandex.ru/developers/payments/54fz#54fz-tax-systems
     end
-    attribute :payment_token, Types::String
+    attribute :payment_token, Types::String.meta(omittable: true)
     attribute :metadata, Types::Hash
     attribute :client_ip, Types::String
+    attribute :payment_method_data, BasicStruct.meta(omittable: true) do
+      attribute :type, Types::String
+      attribute :phone, Types::String.meta(omittable: true)
+    end
   end
 end

data/lib/yaka/payment_response.rb

@@ -11,20 +11,20 @@ module Yaka
       attribute :value, Types::String
       attribute :currency, Types::String
     end
-    attribute :authorization_details, BasicStruct do
+    attribute :authorization_details, BasicStruct.meta(omittable: true) do
       attribute :rrn, Types::String
       attribute :auth_code, Types::String
     end
-    attribute :captured_at, Types::DateTime
+    attribute :captured_at, Types::DateTime.meta(omittable: true)
     attribute :created_at, Types::DateTime
     attribute :description, Types::String
     attribute :metadata, Types::Hash
     attribute :payment_method, BasicStruct do
       attribute :id, Types::String
       attribute :type, Types::String
-      attribute :saved, Types::String
-      attribute :title, Types::String
-      attribute :card, BasicStruct do
+      attribute :saved, Types::String.meta(omittable: true)
+      attribute :title, Types::String.meta(omittable: true)
+      attribute :card, BasicStruct.meta(omittable: true) do
         attribute :first6, Types::String
         attribute :last4, Types::String
         attribute :expiry_month, Types::String
@@ -37,7 +37,7 @@ module Yaka
       attribute :gateway_id, Types::String
     end
     attribute :refundable, Types::Bool
-    attribute :refunded_amount, BasicStruct do
+    attribute :refunded_amount, BasicStruct.meta(omittable: true) do
       attribute :value, Types::String
       attribute :currency, Types::String
     end

data/lib/yaka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yaka
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaka
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Pavlov