ruby_ufebs 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec810416c2556466033b7b703dde1236d4525e40
-  data.tar.gz: 58e0578544a9ac21c5fd46f35c809bec48d29da7
+  metadata.gz: 2fde77327f89a47d9093cf6348a1166f21646a87
+  data.tar.gz: ac8b9f64f3fede7f12a31e2ed0c74bd8a3130c58
 SHA512:
-  metadata.gz: 323f0353f7dc2452ad1e72cc97d038d71d08e328f0004175cd100f8903500cff0b6dcf4e4db69621a515724b8751d674db140715dfef27f1f6918a156405ffe2
-  data.tar.gz: e0730eee134186b52d8101070801eea1646b09119b7b359a9d6d61d866146c71eeaa61f7a9227b04ca045644ba2a1d9e503bf680c81ec089ef38a7b9dead4baf
+  metadata.gz: b91e5fed70f42e635255acdf20a61ff3975a3d6962232161ba0ed87fc08299abc5f8e54798984e152d93e41c80b430a066f90f8512ca1788fdd06290abde1fcb
+  data.tar.gz: dd597a549024422c3c692894b18d1ffa06c070f642c9f075fa52f9a42296735cec527609bd291123f063b7b1f621b0559fe519f0c19ab4987f79e73b5f2cc5ae

data/lib/ufebs/entities/departmental_info.rb

@@ -5,14 +5,14 @@ module Ufebs
       register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
       namespace 'ed'
 
-      attribute :kbk, String, tag: 'CBC'
-      attribute :okato, String, tag: 'OKATO'
-      attribute :tax_period, String, tag: 'TaxPeriod'
+      attribute :kbk,           String, tag: 'CBC'
+      attribute :okato,         String, tag: 'OKATO'
+      attribute :tax_period,    String, tag: 'TaxPeriod'
       attribute :drawer_status, String, tag: 'DrawerStatus'
-      attribute :payt_reason, String, tag: 'PaytReason'
-      attribute :doc_no, String, tag: 'DocNo'
+      attribute :payt_reason,   String, tag: 'PaytReason'
+      attribute :doc_no,        String, tag: 'DocNo'
       attribute :tax_payt_kind, String, tag: 'TaxPaytKind'
-      attribute :doc_date, String, tag: 'DocDate'
+      attribute :doc_date,      String, tag: 'DocDate'
 
       def initialize(
         tax_payt_kind: 'HC',

data/lib/ufebs/entities/ed_define_answer_info.rb

@@ -0,0 +1,58 @@
+require_relative 'ed_field_list'
+require_relative 'ed_reestr_info'
+
+module Ufebs
+  module Entities
+    class EdDefineAnswerInfo
+      include HappyMapper
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+
+      attribute :acc_doc_date,   String, tag: 'AccDocDate'
+      attribute :acc_doc_no,     String, tag: 'AccDocNo'
+      attribute :payer_acc,      String, tag: 'PayerAcc'
+      attribute :payee_acc,      String, tag: 'PayeeAcc'
+      attribute :payer_inn,      String, tag: 'PayerINN'
+      attribute :payee_inn,      String, tag: 'PayeeINN'
+      attribute :sum,            String, tag: 'Sum'
+      attribute :enter_date,     String, tag: 'EnterDate'
+      attribute :payee_corr_acc, String, tag: 'PayeeCorrAcc'
+      attribute :payee_bic,      String, tag: 'PayeeBIC'
+
+      element :payer_long_name,       String, tag: 'PayerLongName'
+      element :payee_long_name,       String, tag: 'PayeeLongName'
+      element :purpose,               String, tag: 'Purpose'
+      element :address,               String, tag: 'Address'
+      element :ed_define_answer_text, String, tag: 'EDDefineAnswerText'
+
+      has_many :ed_filed_lists,
+               Ufebs::Entities::EdFieldList,
+               tag: 'EDFieldList'
+
+      has_many :ed_define_reestr_infos,
+               Ufebs::Entities::EdReestrInfo,
+               tag: 'EDReestrInfo'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_filed_lists         then set_ed_filed_lists(value)
+          when :ed_define_reestr_infos then set_ed_define_reestr_infos(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_filed_lists(value)
+        @ed_filed_lists =
+          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+      end
+
+      def set_ed_define_reestr_infos(value)
+        @ed_define_reestr_infos =
+          value.map { |params| Ufebs::Entities::EdReestrInfo.new(params) }
+      end
+    end
+  end
+end

data/lib/ufebs/entities/ed_define_request_info.rb

@@ -0,0 +1,51 @@
+require_relative 'ed_field_list'
+require_relative 'ed_reestr_info'
+
+module Ufebs
+  module Entities
+    class EdDefineRequestInfo
+      include HappyMapper
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+
+      attribute :acc_doc_date, String, tag: 'AccDocDate'
+      attribute :acc_doc_no,   String, tag: 'AccDocNo'
+      attribute :payer_acc,    String, tag: 'PayerAcc'
+      attribute :payee_acc,    String, tag: 'PayeeAcc'
+      attribute :sum,          String, tag: 'Sum'
+
+      element :payer_name,             String, tag: 'PayerName'
+      element :payee_name,             String, tag: 'PayeeName'
+      element :ed_define_request_text, String, tag: 'EDDefineRequestText'
+
+      has_many :ed_filed_lists,
+               Ufebs::Entities::EdFieldList,
+               tag: 'EDFieldList'
+
+      has_many :ed_define_reestr_infos,
+               Ufebs::Entities::EdReestrInfo,
+               tag: 'EDReestrInfo'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_filed_lists         then set_ed_filed_lists(value)
+          when :ed_define_reestr_infos then set_ed_define_reestr_infos(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_filed_lists(value)
+        @ed_filed_lists =
+          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+      end
+
+      def set_ed_define_reestr_infos(value)
+        @ed_define_reestr_infos =
+          value.map { |params| Ufebs::Entities::EdReestrInfo.new(params) }
+      end
+    end
+  end
+end

data/lib/ufebs/entities/ed_field_list.rb

@@ -0,0 +1,18 @@
+module Ufebs
+  module Entities
+    class EdFieldList
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+
+      element :field_no,    String, tag: 'FieldNo'
+      element :field_value, String, tag: 'FieldValue'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          instance_variable_set("@#{key}".to_sym, value)
+        end
+      end
+    end
+  end
+end

data/lib/ufebs/entities/ed_reestr_info.rb

@@ -0,0 +1,29 @@
+module Ufebs
+  module Entities
+    class EdReestrInfo
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+
+      attribute :transaction_id, String, tag: 'TransactionID'
+
+      has_many :ed_reestr_filed_lists,
+               Ufebs::Entities::EdFieldList,
+               tag: 'EDReestrFieldList'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_reestr_filed_lists then set_ed_reestr_filed_lists(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_reestr_filed_lists(value)
+        @ed_reestr_filed_lists =
+          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+      end
+    end
+  end
+end

data/lib/ufebs/requests/define_answer.rb

@@ -0,0 +1,114 @@
+module Ufebs
+  module Requests
+    class DefineAnswer
+      include HappyMapper
+      include Ufebs::Fields::Header
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      tag 'ED244'
+      namespace 'ed'
+
+      attribute :ed_define_request_code, String, tag: 'EDDefineRequestCode'
+      attribute :ed_define_answer_code,  String, tag: 'EDDefineAnswerCode'
+
+      has_one :original_epd, Ufebs::Entities::EdRefId,
+              tag: 'OriginalEPD'
+
+      has_one :ed_define_answer_info, Ufebs::Entities::EdDefineAnswerInfo,
+              tag: 'EDDefineAnswerInfo'
+
+      has_one :initial_ed, Ufebs::Entities::EdRefId,
+              tag: 'InitialED'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_define_answer_info then set_ed_define_answer_info(value)
+          when :original_epd          then set_original_epd(value)
+          when :initial_ed            then set_initial_ed(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_define_answer_info(value)
+        @ed_define_answer_info = Ufebs::Entities::EdDefineAnswerInfo.new(value)
+      end
+
+      def set_original_epd(value)
+        @original_epd = Ufebs::Entities::EdRefId.new(value)
+      end
+
+      def set_initial_ed(value)
+        @initial_ed = Ufebs::Entities::EdRefId.new(value)
+      end
+    end
+  end
+end
+
+# <?xml version="1.0" encoding="utf-8"?>
+#   <ED244 EDDefineRequestCode="EDDefineRequestCode1" EDDefineAnswerCode="EDDefineAnswerCode1" EDReceiver="EDReceiver1" EDNo="1" EDDate="1900-01-01" EDAuthor="EDAuthor1" xmlns="urn:cbr-ru:ed:v2.0">
+# <OriginalEPD EDNo="1" EDDate="1900-01-01" EDAuthor="EDAuthor1" />
+# <EDDefineAnswerInfo AccDocDate="1900-01-01" AccDocNo="AccDo1" PayerAcc="PayerAcc1" PayeeAcc="PayeeAcc1" PayerINN="PayerINN1" PayeeINN="PayeeINN1" Sum="1" EnterDate="1900-01-01" PayeeCorrAcc="PayeeCorrAcc1" PayeeBIC="PayeeBIC1">
+# <PayerLongName>PayerLongName1</PayerLongName>
+#     <PayeeLongName>PayeeLongName1</PayeeLongName>
+# <Purpose>Purpose1</Purpose>
+#     <Address>Address1</Address>
+# <EDDefineAnswerText>EDDefineAnswerText1</EDDefineAnswerText>
+#     <EDFieldList>
+#       <FieldNo>FieldNo1</FieldNo>
+# <FieldValue>FieldValue1</FieldValue>
+#     </EDFieldList>
+# <EDFieldList>
+# <FieldNo>FieldNo2</FieldNo>
+#       <FieldValue>FieldValue2</FieldValue>
+# </EDFieldList>
+#     <EDFieldList>
+#       <FieldNo>FieldNo3</FieldNo>
+# <FieldValue>FieldValue3</FieldValue>
+#     </EDFieldList>
+# <EDReestrInfo TransactionID="1">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo1</FieldNo>
+#         <FieldValue>FieldValue1</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo2</FieldNo>
+# <FieldValue>FieldValue2</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo3</FieldNo>
+#         <FieldValue>FieldValue3</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# <EDReestrInfo TransactionID="-99999">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo4</FieldNo>
+#         <FieldValue>FieldValue4</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo5</FieldNo>
+# <FieldValue>FieldValue5</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo6</FieldNo>
+#         <FieldValue>FieldValue6</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# <EDReestrInfo TransactionID="99999">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo7</FieldNo>
+#         <FieldValue>FieldValue7</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo8</FieldNo>
+# <FieldValue>FieldValue8</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo9</FieldNo>
+#         <FieldValue>FieldValue9</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# </EDDefineAnswerInfo>
+#   <InitialED EDNo="1" EDDate="1900-01-01" EDAuthor="EDAuthor1" />
+# </ED244>

data/lib/ufebs/requests/define_request.rb

@@ -0,0 +1,101 @@
+module Ufebs
+  module Requests
+    class DefineRequest
+      include HappyMapper
+      include Ufebs::Fields::Header
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      tag 'ED243'
+      namespace 'ed'
+
+      attribute :ed_define_request_code, String, tag: 'EDDefineRequestCode'
+
+      has_one :original_epd, Ufebs::Entities::EdRefId,
+              tag: 'OriginalEPD'
+
+      has_one :ed_define_request_info, Ufebs::Entities::EdDefineRequestInfo,
+              tag: 'EDDefineRequestInfo'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :original_epd           then set_original_epd(value)
+          when :ed_define_request_info then set_ed_define_request_info(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_define_request_info(value)
+        @ed_define_request_info = Ufebs::Entities::EdDefineRequestInfo.new(value)
+      end
+
+      def set_original_epd(value)
+        @original_epd = Ufebs::Entities::EdRefId.new(value)
+      end
+    end
+  end
+end
+
+# <?xml version="1.0" encoding="utf-8"?>
+#   <ED243 EDDefineRequestCode="EDDefineRequestCode1" EDReceiver="EDReceiver1" EDNo="1" EDDate="1900-01-01" EDAuthor="EDAuthor1" xmlns="urn:cbr-ru:ed:v2.0">
+
+# <PayerName>PayerName1</PayerName>
+#     <PayeeName>PayeeName1</PayeeName>
+# <EDDefineRequestText>EDDefineRequestText1</EDDefineRequestText>
+#     <EDFieldList>
+#       <FieldNo>FieldNo1</FieldNo>
+# <FieldValue>FieldValue1</FieldValue>
+#     </EDFieldList>
+# <EDFieldList>
+# <FieldNo>FieldNo2</FieldNo>
+#       <FieldValue>FieldValue2</FieldValue>
+# </EDFieldList>
+#     <EDFieldList>
+#       <FieldNo>FieldNo3</FieldNo>
+# <FieldValue>FieldValue3</FieldValue>
+#     </EDFieldList>
+# <EDReestrInfo TransactionID="1">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo1</FieldNo>
+#         <FieldValue>FieldValue1</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo2</FieldNo>
+# <FieldValue>FieldValue2</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo3</FieldNo>
+#         <FieldValue>FieldValue3</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# <EDReestrInfo TransactionID="-99999">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo4</FieldNo>
+#         <FieldValue>FieldValue4</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo5</FieldNo>
+# <FieldValue>FieldValue5</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo6</FieldNo>
+#         <FieldValue>FieldValue6</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# <EDReestrInfo TransactionID="99999">
+# <EDReestrFieldList>
+# <FieldNo>FieldNo7</FieldNo>
+#         <FieldValue>FieldValue7</FieldValue>
+# </EDReestrFieldList>
+#       <EDReestrFieldList>
+#         <FieldNo>FieldNo8</FieldNo>
+# <FieldValue>FieldValue8</FieldValue>
+#       </EDReestrFieldList>
+# <EDReestrFieldList>
+# <FieldNo>FieldNo9</FieldNo>
+#         <FieldValue>FieldValue9</FieldValue>
+# </EDReestrFieldList>
+#     </EDReestrInfo>
+# </EDDefineRequestInfo>
+# </ED243>

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/ufebs.rb

@@ -73,15 +73,24 @@ module Ufebs
   end
 
   def ED243(params)
+    if params.is_a?(Hash)
+      Ufebs::Requests::DefineRequest.new(params)
+    else
+      Ufebs::Requests::DefineRequest.parse(params)
+    end
   end
 
   def ED218(params)
   end
 
-  def ED244
+  def ED244(params)
+    if params.is_a?(Hash)
+      Ufebs::Requests::DefineAnswer.new(params)
+    else
+      Ufebs::Requests::DefineAnswer.parse(params)
+    end
   end
 
-
   # Создание XML по формату ED101(Платежное поручение)
   # @param params [Hash, String] Hash значений документа или его строковое представление в виде XML
   # @option params [Integer] :number номер документа аттрибут EDNo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Evgeniy Burdaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -428,12 +428,18 @@ files:
 - lib/ufebs/entities/acc_doc.rb
 - lib/ufebs/entities/bank.rb
 - lib/ufebs/entities/departmental_info.rb
+- lib/ufebs/entities/ed_define_answer_info.rb
+- lib/ufebs/entities/ed_define_request_info.rb
+- lib/ufebs/entities/ed_field_list.rb
+- lib/ufebs/entities/ed_reestr_info.rb
 - lib/ufebs/entities/ed_ref_id.rb
 - lib/ufebs/entities/participant.rb
 - lib/ufebs/entities/processing_details.rb
 - lib/ufebs/entities/session.rb
 - lib/ufebs/entities/trans_info.rb
 - lib/ufebs/fields/header.rb
+- lib/ufebs/requests/define_answer.rb
+- lib/ufebs/requests/define_request.rb
 - lib/ufebs/requests/group_request.rb
 - lib/ufebs/requests/package_request.rb
 - lib/ufebs/requests/receipt.rb