ruby_ufebs 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9c43fce310f15885d39152aa8ce0c3e91292614
-  data.tar.gz: e186ae603f4efda7dc82154398ea5bb154a7b0ad
+  metadata.gz: 4abccd29721f5438cd5d51c4947a7c052b8ba48a
+  data.tar.gz: ac9cbdfed2bacc8a169f97a03a7870e00b3ef763
 SHA512:
-  metadata.gz: a25c6fd865729f9ccbe097bfabd81805a62ab57faf4912b87d05252af052c0e8a3a5007a267ae4fb33b9e866be358cc87a2a02575ef28baa79804787edcc166c
-  data.tar.gz: e6e32811995b947fe47706d60e240c61b1f900f8f3aa8442f166d7075e511bcaefb71841ccfd88218d2bfbb46519968520fcf86df89a8eeccb0f6feb907b07d5
+  metadata.gz: 364ec92dccd2c910998cbe20db9a03140d633f1bf8dc1a83be76178c091fe88ac5ff9e61901aee1712b846483d1ff866d584a61b1927a1cf64c6d7f7445be8eb
+  data.tar.gz: 5d4fb64b8da0eb95b7b89d43ea6a1fe87a40624cfaf6b3d85558a9d1d1385eb15fcf4d22d030b236299b0c904e4862d93e529a6e9fc03656b92e208059eded5d

data/Guardfile

@@ -1,5 +1,9 @@
 guard :minitest do
-  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-  watch(%r{^lib/ufebs/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r{^test\/(.*)\/?(.*)_test\.rb$}) { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^lib\/(ufebs)\.rb|ufebs\/(.+)\.rb$})  do |m|
+    pattern = "test/ufebs_test.rb" if m[1]
+    pattern = "test/#{m[2]}_test.rb" if m[2]
+    pattern
+  end
   watch(%r{^test/test_helper\.rb$})      { 'test' }
 end

data/lib/ufebs/documents/package.rb

@@ -17,14 +17,15 @@ module Ufebs
 
       has_many :payment_orders, Ufebs::Documents::PaymentOrder
 
-      def initialize(payment_orders, params = {})
+      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]
         @number    = params[:number]
         @quantity  = params[:quantity] || payment_orders.size
-        @sum       = params[:sum] || payment_orders.sum(&:sum)
+        @sum       = params[:sum]
         @system_code   = '01'
+        super()
       end
 
       def to_xml(encoding: 'UTF-8')

data/lib/ufebs/documents/payment_order.rb

@@ -34,17 +34,21 @@ module Ufebs
 
       has_one :departmental_info, Ufebs::Entities::DepartmentalInfo, tag: 'DepartmentalInfo', state_when_nil: false
 
+      def validate
+        Ufebs.validate(to_xml)
+      end
+
       def initialize(
         ed_date: Time.now,
-        number:,
-        sum:,
+        number: nil,
+        sum: nil,
         charge_off_date: Time.now,
         priority: 0,
         receipt_date: Time.now,
-        ed_author:,
-        acc_doc: Ufebs::Entities::AccDoc.new,
-        payer: Ufebs::Entities::Participant.new,
-        payee: Ufebs::Entities::Participant.new,
+        ed_author: '',
+        acc_doc: nil,
+        payer: nil,
+        payee: nil,
         purpose: '',
         uin: nil,
         payt_kind: nil,
@@ -72,6 +76,8 @@ module Ufebs
         @system_code = system_code || SYSTEM_CODE
 
         yield self if block_given?
+
+        super()
       end
     end
   end

data/lib/ufebs/entities/acc_doc.rb

@@ -2,12 +2,15 @@ module Ufebs
   module Entities
     class AccDoc
       include HappyMapper
+      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      namespace 'ed'
+
       attribute :number, String, tag: 'AccDocNo'
       attribute :date, String, tag: 'AccDocDate'
 
       def initialize(number:'', date: Time.now)
-        @number, @date = number.to_s.rjust(3,'0'), Date.parse(date.to_s).strftime('%Y-%m-%d')
+        @number, @date = number.to_s.rjust(6,'0'), Date.parse(date.to_s).strftime('%Y-%m-%d')
       end
     end
   end
-end
+end

data/lib/ufebs/entities/bank.rb

@@ -3,6 +3,9 @@ module Ufebs
     class Bank
       include HappyMapper
 
+      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      namespace 'ed'
+
       attribute :bic, String, tag: 'BIC'
       attribute :account, String, tag: 'CorrespAcc'
 

data/lib/ufebs/entities/departmental_info.rb

@@ -2,6 +2,9 @@ module Ufebs
   module Entities
     class DepartmentalInfo
       include HappyMapper
+      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'

data/lib/ufebs/entities/participant.rb

@@ -5,6 +5,9 @@ module Ufebs
     class Participant
       include HappyMapper
 
+      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      namespace 'ed'
+
       attribute :inn, String, tag: 'INN'
       attribute :account, String, tag: 'PersonalAcc'
       attribute :kpp, String, tag: 'KPP'

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/ufebs.rb

@@ -52,7 +52,7 @@ module Ufebs
 
 
   # Создание XML по формату ED101(Платежное поручение)
-  # @param params [Hash] Hash значений документа
+  # @param params [Hash, String] Hash значений документа или его строковое представление в виде XML
   # @option params [Integer] :number номер документа аттрибут EDNo
   # @option params [Integer] :sum Сумма документа аттрибут Sum
   # @option params [DateTime] :receipt_date ReceiptDate дата обработки
@@ -110,7 +110,7 @@ module Ufebs
   #      <ed:DepartmentalInfo CBC="18210301000010000110" OKATO="45263591000" TaxPeriod="МС.03.2017" DrawerStatus="01" PaytReason="ТП" DocNo="111" TaxPaytKind="НС" DocDate="2017-12-11"/>
   #    </ed:ED101>'
   def ED101(params)
-    Ufebs::Documents::PaymentOrder.new(params)
+    params.is_a?(Hash) ? Ufebs::Documents::PaymentOrder.new(params) : Ufebs::Documents::PaymentOrder.parse(params)
   end
 
   def PackedEPD(payment_eds, params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Evgeniy Burdaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler