tinkoff 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a4e41a7cb90dde1c23ea9e3b479421a0d0fc1770
-  data.tar.gz: e7b4a8cf46bd057ba0ced657bdc0ee96bad5c0c4
+SHA256:
+  metadata.gz: 50bc66809e4128c77a72bf33185bdeb9f90c5edeca762d91a8566b266ae8122c
+  data.tar.gz: 893e4b19b3b75bb1ba6fef012f82b3ca36ffe90c8f6e6ac00ce76c1c75686f0d
 SHA512:
-  metadata.gz: 9815634ecca48290a6490bf03d1b21d73e982a9d0072509ad5004dcc173d5979cdb1a1e52b4755b6363e88763e52870574060c4f44dc5647c368472d9c0d9b12
-  data.tar.gz: 04267e91dcdb309e04a1a05e1d02f1c04752723a17afad8eb62e49fcb6986d7225dc2de97c07b2ecd06ea32171a1d52b325956a3f31db9de4b6268c5107c1aa4
+  metadata.gz: 593b6e3def9f1b881cd77e850a627031b29379f75d7e36340a50a25dda855854ff6cf967246438ed29732c20e6bd398e2ac187d683c38f1a502cc6878ad36683
+  data.tar.gz: f7a062af88d0cf1e952af7e63e4b7e8041f03a7e7fbeedae2223b8cf26170806fc42a772b464ba3aea11d0eb57c2ccc9b2450a914a6ff330bee0bf0258d4a8be

data/README.md

@@ -1,7 +1,7 @@
 # Tinkoff
 
-[![Build Status](http://img.shields.io/travis/dankimio/tinkoff.svg?style=flat)](https://travis-ci.org/dankimio/tinkoff)
-[![Gem Version](http://img.shields.io/gem/v/tinkoff.svg?style=flat&color=brightgreen)](https://rubygems.org/gems/tinkoff)
+[![Build Status](https://img.shields.io/travis/dankimio/tinkoff.svg?style=flat)](https://travis-ci.org/dankimio/tinkoff)
+[![Gem Version](https://img.shields.io/gem/v/tinkoff.svg?style=flat&color=brightgreen)](https://rubygems.org/gems/tinkoff)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://raw.githubusercontent.com/dankimio/tinkoff/master/LICENSE.txt)
 
 
@@ -40,7 +40,7 @@ Use the client to work with payments.
 ```ruby
 # Parameters: amount (in kopecks), order_id, data, options (hash, optional)
 # data — a hash of arbitrary data (up to 20 pairs), "Email" key is required
-# More info: https://oplata.tinkoff.ru/documentation/?section=Init
+# More info: https://www.tinkoff.ru/kassa/develop/api/payments/init-description/
 Tinkoff::Client.init(100, 1, { Email: 'foo@bar.com' })
 
 # Parameters: payment_id, options (hash, optional)
@@ -56,7 +56,15 @@ Tinkoff::Client.cancel(1)
 Tinkoff::Client.state(1)
 ```
 
-You can view all available options in the [official documentation](https://oplata.tinkoff.ru/documentation/?section=aboutMet).
+You can view all available options in the [official documentation](https://www.tinkoff.ru/kassa/develop/api/payments/).
+
+A notification will be sent to if you provided the URL. You should use it to update the status of your payment / order.
+
+```ruby
+notification = Tinkoff::Notification.new(params)
+order = Order.find(notification.order_id)
+order.update_attribute(:paid, true)
+```
 
 ## Development
 

data/lib/tinkoff/notification.rb

@@ -0,0 +1,28 @@
+module Tinkoff
+  class Notification
+    attr_reader :terminal_key, :order_id, :success, :status, :payment_id,
+                :error_code, :amount, :rebill_id, :card_id, :pan, :token
+
+    def initialize(params)
+      @terminal_key = params['TerminalKey']
+      @order_id = params['OrderId']
+      @success = params['Success'] == 'true'
+      @status = params['Status']
+      @payment_id = params['PaymentId'].to_i
+      @error_code = params['ErrorCode']
+      @amount = params['Amount'].to_i
+      @rebill_id = params['RebillId'].to_i
+      @card_id = params['CardId'].to_i
+      @pan = params['Pan']
+      @token = params['Token']
+    end
+
+    def success?
+      @success
+    end
+
+    def failure?
+      !@success
+    end
+  end
+end

data/lib/tinkoff/request.rb

@@ -1,6 +1,6 @@
 module Tinkoff
   class Request
-    BASE_URL = 'https://securepay.tinkoff.ru/rest/'
+    BASE_URL = 'https://securepay.tinkoff.ru/rest/'.freeze
 
     def initialize(path, params = {})
       @url = BASE_URL + path
@@ -41,7 +41,8 @@ module Tinkoff
 
     # Ключ=значение дополнительных параметров через “|”, например Email=a@test.ru|Phone=+71234567890
     def prepare_data
-      return unless @params[:DATA].present?
+      return unless @params[:DATA].to_s.empty?
+
       @params[:DATA] = @params[:DATA].to_query.tr('&', '|')
     end
   end

data/lib/tinkoff/version.rb

@@ -1,3 +1,3 @@
 module Tinkoff
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'.freeze
 end

data/lib/tinkoff.rb

@@ -1,9 +1,12 @@
 require 'httparty'
 require 'active_support'
 require 'active_support/core_ext/hash'
+
 require 'tinkoff/request'
 require 'tinkoff/client'
 require 'tinkoff/payment'
+require 'tinkoff/notification'
+
 require 'tinkoff/version'
 
 module Tinkoff

data/tinkoff.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tinkoff/version'
 
@@ -19,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
 
   spec.add_runtime_dependency 'httparty', '~> 0.14'
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinkoff
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dan Kim
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description: Ruby wrapper for Tinkoff Acquiring API.
 email:
 - itsdanya@gmail.com
@@ -98,16 +84,16 @@ files:
 - bin/setup
 - lib/tinkoff.rb
 - lib/tinkoff/client.rb
+- lib/tinkoff/notification.rb
 - lib/tinkoff/payment.rb
 - lib/tinkoff/request.rb
-- lib/tinkoff/response.rb
 - lib/tinkoff/version.rb
 - tinkoff.gemspec
 homepage: https://github.com/dankimio/tinkoff
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Tinkoff API wrapper.
 test_files: []

data/lib/tinkoff/response.rb

@@ -1,19 +0,0 @@
-module Tinkoff
-  class Response
-    attr_reader :success, :error_code, :message, :details, :amount,
-                :merchant_email, :merchant_name, :order_id, :payment_id, :tran_date
-
-    def initialize(params)
-      @success = params['Success']
-      @error_code = params['ErrorCode']
-      @message = params['Message']
-      @details = params['Details']
-      @amount = params['Amount']
-      @merchant_email = params['MerchantEmail']
-      @merchant_name = params['MerchantName']
-      @order_id = params['OrderId']
-      @payment_id = params['PaymentId']
-      @tran_date = params['TranDate']
-    end
-  end
-end