proformaxml 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +21 -10
  3. data/lib/proformaxml/helpers/export_helpers.rb +1 -1
  4. data/lib/proformaxml/helpers/import_helpers.rb +1 -1
  5. data/lib/proformaxml/version.rb +1 -1
  6. data/proformaxml.gemspec +1 -1
  7. metadata +5 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 81e1724c3c9498d52025b18b5f3e2830fa10c499bcc9a064470f265d6ed9ba34
4
- data.tar.gz: 4b7499f6e605ba8dae8ad23e149a06e7e78fa08f91a14f3e8803e70140b02cdc
3
+ metadata.gz: 606acc3bf478e597146722128fa681af0e50985af661a74d302de9c3ab2b5b37
4
+ data.tar.gz: 474a73f7e5a09f850d9c8b9e5a4fb90b93953d2ceece434750f91f5a8581b633
5
5
  SHA512:
6
- metadata.gz: c47047c96d5fb1c23233c67bd165a6b088e643bc9b6032c8107afd1e32d8d3cb9c4d2342661bd0b5b2b9da38fee368a058dc2fdfa2aabd34889f49c3e9817c21
7
- data.tar.gz: 18e38170e845ad6e148ce0de1f621e57c3b360a19c7e3a875d8be90e1dfaf94fc085aacdd18ab16d6a587116261426e1f6de6939a351d5fdb0a683e218c7ed1d
6
+ metadata.gz: d482b1a2a9ad647fe971577eeb6e5d19210e08b51bcdab7cc2daecea68cd1cc1389b80ff9da2d75cf628dd36999241655549a29ad41c9c666a9db4c698a7216d
7
+ data.tar.gz: d5b0f74efc13fda6dbf91d55799321d694db0961b9d80d07bed395e6f202a0dc8ba935a2437fac82f51d455623af7b208df0b2e3f9e3fc264f1763488ec42031
data/Gemfile.lock CHANGED
@@ -1,32 +1,41 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- proformaxml (1.1.0)
4
+ proformaxml (1.2.0)
5
5
  activemodel (>= 5.2.3, < 8.0.0)
6
6
  activesupport (>= 5.2.3, < 8.0.0)
7
- dachsfisch (>= 0.2.0, < 1.0.0)
7
+ dachsfisch (~> 1.0.0)
8
8
  nokogiri (>= 1.10.2, < 2.0.0)
9
9
  rubyzip (>= 1.2.2, < 3.0.0)
10
10
 
11
11
  GEM
12
12
  remote: https://rubygems.org/
13
13
  specs:
14
- activemodel (7.0.8)
15
- activesupport (= 7.0.8)
16
- activesupport (7.0.8)
14
+ activemodel (7.1.1)
15
+ activesupport (= 7.1.1)
16
+ activesupport (7.1.1)
17
+ base64
18
+ bigdecimal
17
19
  concurrent-ruby (~> 1.0, >= 1.0.2)
20
+ connection_pool (>= 2.2.5)
21
+ drb
18
22
  i18n (>= 1.6, < 2)
19
23
  minitest (>= 5.1)
24
+ mutex_m
20
25
  tzinfo (~> 2.0)
21
26
  ast (2.4.2)
22
27
  base64 (0.1.1)
28
+ bigdecimal (3.1.4)
23
29
  byebug (11.1.3)
24
30
  coderay (1.1.3)
25
31
  concurrent-ruby (1.2.2)
26
- dachsfisch (0.2.0)
32
+ connection_pool (2.4.1)
33
+ dachsfisch (1.0.0)
27
34
  nokogiri (>= 1.14.1, < 2.0.0)
28
35
  diff-lcs (1.5.0)
29
36
  docile (1.4.0)
37
+ drb (2.1.1)
38
+ ruby2_keywords
30
39
  factory_bot (6.3.0)
31
40
  activesupport (>= 5.0.0)
32
41
  ffi (1.16.1)
@@ -56,6 +65,7 @@ GEM
56
65
  method_source (1.0.0)
57
66
  mini_portile2 (2.8.4)
58
67
  minitest (5.20.0)
68
+ mutex_m (0.1.2)
59
69
  nenv (0.3.0)
60
70
  nokogiri (1.15.4)
61
71
  mini_portile2 (~> 2.8.2)
@@ -64,7 +74,7 @@ GEM
64
74
  nenv (~> 0.1)
65
75
  shellany (~> 0.0)
66
76
  parallel (1.23.0)
67
- parser (3.2.2.3)
77
+ parser (3.2.2.4)
68
78
  ast (~> 2.4.1)
69
79
  racc
70
80
  pry (0.14.2)
@@ -80,7 +90,7 @@ GEM
80
90
  rb-fsevent (0.11.2)
81
91
  rb-inotify (0.10.1)
82
92
  ffi (~> 1.0)
83
- regexp_parser (2.8.1)
93
+ regexp_parser (2.8.2)
84
94
  rexml (3.2.6)
85
95
  rspec (3.12.0)
86
96
  rspec-core (~> 3.12.0)
@@ -99,12 +109,12 @@ GEM
99
109
  diff-lcs (>= 1.2.0, < 2.0)
100
110
  rspec-support (~> 3.12.0)
101
111
  rspec-support (3.12.1)
102
- rubocop (1.56.4)
112
+ rubocop (1.57.1)
103
113
  base64 (~> 0.1.1)
104
114
  json (~> 2.3)
105
115
  language_server-protocol (>= 3.17.0)
106
116
  parallel (~> 1.10)
107
- parser (>= 3.2.2.3)
117
+ parser (>= 3.2.2.4)
108
118
  rainbow (>= 2.2.2, < 4.0)
109
119
  regexp_parser (>= 1.8, < 3.0)
110
120
  rexml (>= 3.2.5, < 4.0)
@@ -129,6 +139,7 @@ GEM
129
139
  rubocop-capybara (~> 2.17)
130
140
  rubocop-factory_bot (~> 2.22)
131
141
  ruby-progressbar (1.13.0)
142
+ ruby2_keywords (0.0.5)
132
143
  rubyzip (2.3.2)
133
144
  shellany (0.0.1)
134
145
  simplecov (0.22.0)
data/lib/proformaxml/helpers/export_helpers.rb CHANGED
@@ -48,7 +48,7 @@ module ProformaXML
48
48
  end
49
49
 
50
50
  def add_namespaces_for_dachsfisch_node(dachsfisch_node, xml)
51
- dachsfisch_node.flat_map {|_, val| val['@xmlns'].to_a }.uniq.each do |namespace|
51
+ dachsfisch_node.reject {|k| k == '@@order' }.flat_map {|_, val| val['@xmlns'].to_a }.uniq.each do |namespace|
52
52
  xml.doc.root.add_namespace(namespace[0], namespace[1]) unless namespace[0] == '$'
53
53
  end
54
54
  end
data/lib/proformaxml/helpers/import_helpers.rb CHANGED
@@ -69,7 +69,7 @@ module ProformaXML
69
69
 
70
70
  {}.tap do |config_hash|
71
71
  configuration_any_nodes.each do |config_node|
72
- config_hash.merge! convert_xml_node_to_json(config_node)
72
+ config_hash.merge!(convert_xml_node_to_json(config_node)) {|key, oldval, newval| key == '@@order' ? oldval + newval : newval }
73
73
  end
74
74
  end
75
75
  end
data/lib/proformaxml/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ProformaXML
4
- VERSION = '1.1.0'
4
+ VERSION = '1.2.0'
5
5
  end
data/proformaxml.gemspec CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
29
29
 
30
30
  spec.add_dependency 'activemodel', '>= 5.2.3', '< 8.0.0'
31
31
  spec.add_dependency 'activesupport', '>= 5.2.3', '< 8.0.0'
32
- spec.add_dependency 'dachsfisch', '>= 0.2.0', '< 1.0.0'
32
+ spec.add_dependency 'dachsfisch', '~> 1.0.0'
33
33
  spec.add_dependency 'nokogiri', '>= 1.10.2', '< 2.0.0'
34
34
  spec.add_dependency 'rubyzip', '>= 1.2.2', '< 3.0.0'
35
35
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: proformaxml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karol
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-10-03 00:00:00.000000000 Z
11
+ date: 2023-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel
@@ -54,20 +54,14 @@ dependencies:
54
54
  name: dachsfisch
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
- - - ">="
58
- - !ruby/object:Gem::Version
59
- version: 0.2.0
60
- - - "<"
57
+ - - "~>"
61
58
  - !ruby/object:Gem::Version
62
59
  version: 1.0.0
63
60
  type: :runtime
64
61
  prerelease: false
65
62
  version_requirements: !ruby/object:Gem::Requirement
66
63
  requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- version: 0.2.0
70
- - - "<"
64
+ - - "~>"
71
65
  - !ruby/object:Gem::Version
72
66
  version: 1.0.0
73
67
  - !ruby/object:Gem::Dependency
@@ -173,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
173
167
  - !ruby/object:Gem::Version
174
168
  version: '0'
175
169
  requirements: []
176
- rubygems_version: 3.4.6
170
+ rubygems_version: 3.4.1
177
171
  signing_key:
178
172
  specification_version: 4
179
173
  summary: Implements parts of ProFormA-XML specification