ruby_ufebs 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f30732a0da06a8bad33e326d405eb468331971
-  data.tar.gz: 4ee7038d9e92074ddcdf108e1ae11fc90b8a170e
+  metadata.gz: cfda05f80c87fccdeb6bb3ef58fb6373d0fec16f
+  data.tar.gz: e4036b13cd0851a7e1cb6d2af85f75e3ce70b7b5
 SHA512:
-  metadata.gz: f0481fd69b73f32bfd7b09c118a18a3dae7d49e3bfe8d1fe1ebee9a0a503acb475c40fc904147e0d284a0f71488b9608413c5ca20493dd42002225f05b22ea19
-  data.tar.gz: ce5c5806ade72b46dea1ff6130af374847691213d99b1f4041a252ed9df5007ee8e2192a6959218295352532c73ef1a2c6b9055dca37894bad8a6bde50877d35
+  metadata.gz: 920239aaf564f57ca1e678fa6b2737718ce4cbd12ab8bd2e9766c1bd7f193027c48f90c580d799edf88e9191a78fa27b6da9ad8ede6d0ed99dd490203de9bc06
+  data.tar.gz: 0866099ff25bf804d0b16ce11d69ff2d56ad1b190d52c61f919c84fe5947775ed3b1812f0c2731282c302408dc8ea92e946cbccb4681fcb084bc70f19c5bf5bc

data/lib/ufebs/documents/package_response.rb

@@ -3,57 +3,21 @@ require_relative '../entities/session'
 
 module Ufebs
   module Documents
-    class Package
+    class PackageResponse
       include HappyMapper
       register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
-      tag 'PacketEPD'
+      tag 'PacketESID'
       namespace 'ed'
 
-      attribute :ed_date, String, tag: 'EDDate'
       attribute :ed_author, String, tag: 'EDAuthor'
+      attribute :ed_creation_time, String, tag: 'EDCreationTime'
+      attribute :ed_date, String, tag: 'EDDate'
+      attribute :ed_no, String, tag: 'EDNo'
       attribute :ed_receiver, String, tag: 'EDReceiver'
-      attribute :number, String, tag: 'EDNo'
-      attribute :quantity, String, tag: 'EDQuantity'
-      attribute :sum, String, tag: 'Sum'
-      attribute :system_code, String, tag: 'SystemCode'
 
-      has_many :payment_orders, Ufebs::Documents::PaymentOrder
+      has_many :payment_responses, Ufebs::Documents::PaymentResponse
       has_one :session, ::Ufebs::Entities::Session, tag: 'Session', state_when_nil: false
-
-      def initialize(payment_orders=[], params = {})
-        @payment_orders = payment_orders
-        @ed_date   = Date.parse(params.fetch(:ed_date){Time.now}.to_s).strftime('%Y-%m-%d')
-        @ed_author = params[:ed_author]
-        @ed_receiver = params[:ed_receiver]
-        @number    = params[:number]
-        @quantity  = params[:quantity] || payment_orders.size
-        @sum       = params[:sum]
-        @system_code   = '01'
-        super()
-      end
-
-      def to_xml(encoding: 'UTF-8')
-        super(Nokogiri::XML::Builder.new(:encoding => encoding)).to_xml
-      end
+      has_one :initial_packet, ::Ufebs::Entities::InitialPacket, tag: 'InitialPacketED', state_when_nil: false
     end
   end
 end
-
-# <?xml version="1.0" encoding="WINDOWS-1251"?>
-# <PacketESID xmlns="urn:cbr-ru:ed:v2.0" EDAuthor="4583001999" EDCreationTime="13:33:08" EDDate="2018-02-23" EDNo="1070230" EDReceiver="4525420000">
-#   <dsig:SigValue xmlns:dsig="urn:cbr-ru:dsig:v1.1">MIIBaQYJKoZIhvcNAQcCoIIBWjCCAVYCAQExDjAMBggqhQMHAQECAgUAMAsGCSqGSIb3DQEHATGCATIwggEuAgEBMGAwTDELMAkGA1UEBhMCUlUxCzAJBgNVBAgTAjAwMQ8wDQYDVQQHEwZSVEdTQlIxDTALBgNVBAoTBEdDS0kxEDAOBgNVBAMTB0FETUlOQ0ECEEBQFMCd4KlDNKW6RlhblsQwDAYIKoUDBwEBAgIFAKBpMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MDIyNzEzMzIzMlowLwYJKoZIhvcNAQkEMSIEIPretuTeA+Uosyhj6ROUT66yYTuZF+aaXclhxXXKmPxdMAwGCCqFAwcBAQEBBQAEQD/Ah3zv5DZv13fsX1Pcqd3Z7YFls14j+4rnYkrRuU31oR1clc4YUG1Lg71Hrp7q/uErXapd33FrjKyxO7Dvfxo=</dsig:SigValue>
-#   <InitialPacketED EDAuthor="4525420000" EDDate="2018-02-23" EDNo="5"/>
-#   <Session>
-#     <SessionID>6</SessionID>
-#   </Session>
-#   <ED206 Acc="30101810945250000420" BICCorr="044525000" CorrAcc="40101810845250010102" DC="1" EDAuthor="4583001999" EDDate="2018-02-23" EDNo="1070231" EDReceiver="4525420000" Sum="381" SystemCode="01" TransDate="2018-02-23" TransTime="13:33:08">
-#     <AccDoc AccDocDate="2018-02-23" AccDocNo="441"/>
-#     <EDRefID EDAuthor="4525420000" EDDate="2018-02-23" EDNo="6"/>
-#     <ProcessingDetails CreditDate="2018-02-23" DebitDate="2018-02-23"/>
-#   </ED206>
-#   <ED206 Acc="30101810945250000420" BICCorr="044525000" CorrAcc="40101810045250010041" DC="1" EDAuthor="4583001999" EDDate="2018-02-23" EDNo="1070232" EDReceiver="4525420000" Sum="680700" SystemCode="01" TransDate="2018-02-23" TransTime="13:33:08">
-#     <AccDoc AccDocDate="2018-02-23" AccDocNo="459"/>
-#     <EDRefID EDAuthor="4525420000" EDDate="2018-02-23" EDNo="7"/>
-#     <ProcessingDetails CreditDate="2018-02-23" DebitDate="2018-02-23"/>
-#   </ED206>
-# </PacketESID>

data/lib/ufebs/entities/initial_packet.rb

@@ -0,0 +1,20 @@
+module Ufebs
+  module Entities
+    class InitialPacket
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+      tag 'InitialPacketED'
+
+      attribute :ed_no,     String, tag: 'EDNo'
+      attribute :ed_date,   String, tag: 'EDDate'
+      attribute :ed_author, String, tag: 'EDAuthor'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          instance_variable_set("@#{key}".to_sym, value)
+        end
+      end
+    end
+  end
+end

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/ufebs.rb

@@ -167,7 +167,8 @@ module Ufebs
   def ED205(params)
   end
 
-  def packetESID
+  def packetESID(params)
+    Ufebs::Documents::PackageResponse.parse(params)
   end
 
   def validate(doc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Evgeniy Burdaev
@@ -435,6 +435,7 @@ files:
 - lib/ufebs/entities/ed_field_list.rb
 - lib/ufebs/entities/ed_reestr_info.rb
 - lib/ufebs/entities/ed_ref_id.rb
+- lib/ufebs/entities/initial_packet.rb
 - lib/ufebs/entities/participant.rb
 - lib/ufebs/entities/processing_details.rb
 - lib/ufebs/entities/session.rb