yandex_kassa 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ead6d73a29db100d1dcb21f849e984327edf08
-  data.tar.gz: e666e5f320faafeb15b350717a7fcab5724da7e7
+  metadata.gz: 135a9122a4c0e13b17202498e6c921962c47f98e
+  data.tar.gz: 67228caba0b668c66f48d87bb9b49c3563465be7
 SHA512:
-  metadata.gz: b779d6b8722f05bc9889f13b1cd62acdc769e9c2885532a91b2bfc62c590ffbfd51160b758e03d3c3800b6560988ca8a03fa444625c27a81ca5632f6d3b236ca
-  data.tar.gz: 7eaf5e08f16b9b9e22335f4bcfe15bdfd061b19f2b273141fbcb615aaf8e849223f23b74db0ddb188a08f958963e96b50c2a6c7a386193d90966c7b8d878e304
+  metadata.gz: b00004f6b268ffed239070eb61760897ba8a09b8407e6af61b08facf4e53ba9a5377a164ec85691b8496818823544b0c59ebf217b146a6a8abade9bae651e647
+  data.tar.gz: 06571c6b01a5063011ca96c90e2dd0c6d8e7bc4d3fcc4df9cfdd4f120fa2be5fcea882c6f8f1ac41f6530a867c1ca58dcf7e535dab607ca04bd86a4953198ac1

data/lib/yandex_kassa.rb

@@ -3,15 +3,18 @@ require "yandex_kassa/configuration"
 require "yandex_kassa/requests"
 require "yandex_kassa/api"
 require "yandex_kassa/signed_response_parser"
+require "yandex_kassa/request_signer"
 require "openssl"
 require "rest-client"
 
 module YandexKassa
   class << self
-
     def create
-      Api.new(url: configuration.url, cert_file: cert_file,
-                key_file: key_file, response_parser: pkcs7_response_parser)
+      Api.new(url: configuration.url,
+              cert_file: configuration.cert_file,
+              key_file: configuration.key_file,
+              response_parser: pkcs7_response_parser,
+              request_signer: request_signer)
     end
 
     def configure(&block)
@@ -19,24 +22,17 @@ module YandexKassa
     end
 
     def pkcs7_response_parser
-      @pkcs7_response_parser ||= SignedResponseParser.new(deposit_cert_file: deposit_cert_file,
-                                                                           cert_file: cert_file)
+      @pkcs7_response_parser ||= SignedResponseParser.new(
+        deposit_cert_file: configuration.deposit_cert_file,
+        cert_file: configuration.cert_file)
     end
 
     def configuration
       @configuration ||= Configuration.new
     end
 
-    def cert_file
-      @cert_file ||= OpenSSL::X509::Certificate.new(File.read(configuration.cert))
-    end
-
-    def key_file
-      @key_file ||= OpenSSL::PKey::RSA.new(File.read(configuration.key), configuration.passphrase)
-    end
-
-    def deposit_cert_file
-      @depostit_cert_file ||= OpenSSL::X509::Certificate.new(File.read(configuration.deposit))
+    def request_signer
+      @request_signer ||= RequestSigner.new(cert_file: cert_file, key_file: key)
     end
   end
 end

data/lib/yandex_kassa/api.rb

@@ -7,11 +7,18 @@ module YandexKassa
       @url = params.fetch(:url)
       @cert_file = params.fetch(:cert_file)
       @key_file = params.fetch(:key_file)
+      @request_signer = params.fetch(:request_signer)
     end
 
     private
 
-    attr_reader :cert_file, :key_file, :url, :response_parser
+    attr_reader :cert_file, :key_file, :url, :response_parseri, :request_signer
+
+    def post_signed_xml_request(yandex_kassa_request)
+      signed_data = request_signer.sign(yandex_kassa_request.xml_request_body)
+      response = client[yandex_kassa_request.request_path].post(signed_data)
+      response_parser.parse(response)
+    end
 
     def client
       @client ||= RestClient::Resource.new(
@@ -19,7 +26,7 @@ module YandexKassa
         ssl_client_cert: cert_file,
         ssl_client_key: key_file,
         verify_ssl: OpenSSL::SSL::VERIFY_NONE,
-        headers: { content_type: 'application/pkcs7-mime'})
+        headers: { content_type: 'application/pkcs7-mime'} )
     end
   end
 end

data/lib/yandex_kassa/configuration.rb

@@ -1,5 +1,17 @@
 module YandexKassa
   class Configuration
     attr_accessor :url, :deposit, :cert, :key, :passphrase
+
+    def cert_file
+      @cert_file ||= OpenSSL::X509::Certificate.new(File.read(cert))
+    end
+
+    def key_file
+      @key_file ||= OpenSSL::PKey::RSA.new(File.read(key), passphrase)
+    end
+
+    def deposit_cert_file
+      @depostit_cert_file ||= OpenSSL::X509::Certificate.new(File.read(deposit))
+    end
   end
 end

data/lib/yandex_kassa/request_signer.rb

@@ -0,0 +1,16 @@
+module YandexKassa
+  class RequestSigner
+    def initialize(params = {})
+      @cert_file = params.fetch(:cert_file)
+      @key_file = params.fetch(:key_file)
+    end
+
+    def sign(raw_xml_body)
+      OpenSSL::PKCS7.sign(cert_file, key_file, raw_xml_body, [], PKCS7::NOCERTS).to_pem
+    end
+
+    private
+
+    attr_reader :cert_file, :key_file
+  end
+end

data/lib/yandex_kassa/requests.rb

@@ -2,17 +2,12 @@ module YandexKassa
   module Requests
     def test_deposition(params = {}, &block)
       test_deposition_request = Requests::TestDeposition.new(params, &block)
-      post_request(test_deposition_request)
+      post_signed_xml_request(test_deposition_request)
     end
 
     def make_deposition(params = {}, &block)
       make_deposition_request = Requests::MakeDeposition.new(params, &block)
-      post_request(make_deposition_request)
-    end
-
-    def post_request(xml_request)
-      response = client[xml_request.request_path].post(xml_request.xml_request_body)
-      response_parser.parse(response)
+      post_signed_xml_request(make_deposition_request)
     end
 
     class Deposition

data/lib/yandex_kassa/version.rb

@@ -1,3 +1,3 @@
 module YandexKassa
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_kassa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Evgeniy Burdaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - lib/yandex_kassa.rb
 - lib/yandex_kassa/api.rb
 - lib/yandex_kassa/configuration.rb
+- lib/yandex_kassa/request_signer.rb
 - lib/yandex_kassa/requests.rb
 - lib/yandex_kassa/signed_response_parser.rb
 - lib/yandex_kassa/version.rb