ruby_ufebs 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa2afcf273f39833e0be0ae613b6245a6ed8d31
-  data.tar.gz: 0c0b7a1de0bde3e5a67c7127d3f1aa6031c62ee7
+  metadata.gz: 338092735b9e42d95d68346153723ac9eb739ead
+  data.tar.gz: 04a24c41e65b2ce3670015bb53d54a1344b55fbb
 SHA512:
-  metadata.gz: cfcfe12a0bc95394fe990a9721982bb06aaf9a35501e4fd3365b5a4414e78ef73a83869920b5f10879a4fe74c03b1f55d1650f988c26a0160579972d30f977b1
-  data.tar.gz: 19dc7ca2861e682f2aa54f72fedcfa5f53b40e29773ac1ff425fccb0a9e8adbe905711609f77bf5331bf0599893b15b7b2d8e41792ae9f776e0098e3d9528cc7
+  metadata.gz: 5ba73cdf20ad87a15bf8a4b852ea0cd049832858f14d13fd0976722d385408d111014f9e4629b349689423203b03586ba3f6fbb0312f22b603322729220765fb
+  data.tar.gz: b0fa5ab4ba787b8c958f4faac6c201e17bf0b7731e09045dda7063f64120790ea1af5ce713bfdd73704991f9777a81c2eb3e66e587b8e66bb46ff31d242b8945

data/lib/ufebs/entities/ed_define_answer_info.rb

@@ -1,10 +1,12 @@
 require_relative 'ed_field_list'
 require_relative 'ed_reestr_info'
+require_relative '../../ufebs/modules/common'
 
 module Ufebs
   module Entities
     class EdDefineAnswerInfo
       include HappyMapper
+      include Ufebs::Common
 
       register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
       namespace 'ed'
@@ -46,12 +48,12 @@ module Ufebs
 
       def set_ed_field_lists(value)
         @ed_field_lists =
-          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+          value.map { |params| Ufebs::Entities::EdFieldList.new(array_to_hash(params)) }
       end
 
       def set_ed_define_reestr_infos(value)
         @ed_define_reestr_infos =
-          value.map { |params| Ufebs::Entities::EdReestrInfo.new(params) }
+          value.map { |params| Ufebs::Entities::EdReestrInfo.new(array_to_hash(params)) }
       end
     end
   end

data/lib/ufebs/entities/ed_define_request_info.rb

@@ -1,10 +1,12 @@
 require_relative 'ed_field_list'
 require_relative 'ed_reestr_info'
+require_relative '../../ufebs/modules/common'
 
 module Ufebs
   module Entities
     class EdDefineRequestInfo
       include HappyMapper
+      include Ufebs::Common
 
       register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
       namespace 'ed'
@@ -39,12 +41,12 @@ module Ufebs
 
       def set_ed_field_lists(value)
         @ed_field_lists =
-          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+          value.map { |params| Ufebs::Entities::EdFieldList.new(array_to_hash(params)) }
       end
 
       def set_ed_define_reestr_infos(value)
         @ed_define_reestr_infos =
-          value.map { |params| Ufebs::Entities::EdReestrInfo.new(params) }
+          value.map { |params| Ufebs::Entities::EdReestrInfo.new(array_to_hash(params)) }
       end
     end
   end

data/lib/ufebs/entities/ed_field_list.rb

@@ -5,8 +5,8 @@ module Ufebs
       register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
       namespace 'ed'
 
-      element :field_no,    String, tag: 'FieldNo'
-      element :field_value, String, tag: 'FieldValue'
+      has_many :field_no,    String, tag: 'FieldNo'
+      element  :field_value, String, tag: 'FieldValue'
 
       def initialize(params = {})
         params.each do |key, value|

data/lib/ufebs/entities/ed_reestr_info.rb

@@ -1,9 +1,12 @@
 require_relative 'ed_field_list'
+require_relative '../../ufebs/modules/common'
 
 module Ufebs
   module Entities
     class EdReestrInfo
       include HappyMapper
+      include Ufebs::Common
+
       register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
       namespace 'ed'
 
@@ -24,7 +27,7 @@ module Ufebs
 
       def set_ed_reestr_field_lists(value)
         @ed_reestr_field_lists =
-          value.map { |params| Ufebs::Entities::EdFieldList.new(params) }
+          value.map { |params| Ufebs::Entities::EdFieldList.new(array_to_hash(params)) }
       end
     end
   end

data/lib/ufebs/modules/common.rb

@@ -0,0 +1,8 @@
+module Ufebs
+  module Common
+    def array_to_hash(params)
+      return Hash[*params] if params.is_a?(Array)
+      params
+    end
+  end
+end

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Evgeniy Burdaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -441,6 +441,7 @@ files:
 - lib/ufebs/entities/session.rb
 - lib/ufebs/entities/trans_info.rb
 - lib/ufebs/fields/header.rb
+- lib/ufebs/modules/common.rb
 - lib/ufebs/requests/define_answer.rb
 - lib/ufebs/requests/define_request.rb
 - lib/ufebs/requests/group_request.rb