xsd 2.7.2 → 2.7.4

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ac666b4ba9690ed163376b0232dec21ba29c7098f2362b6ba9b1d5751fa60ca2
4
- data.tar.gz: 8eedebb55d21670bf6620a892073b8c4af9a269e39be1f20e66a1873749c1c76
3
+ metadata.gz: d9095472b3d2f3c563c0418c8b9bc1effdd8a94d7e35e36196f750b37be868e5
4
+ data.tar.gz: a404b786ce073a8e3f24603fccaf16a22e8cbf7dd478973a58d20c4fc0fc6547
5
5
  SHA512:
6
- metadata.gz: def1638cb816c68f2539611eb5ff2fd5328d729dab3ea530546f54e362f08fb39c06c325f2d734f934231404242adb85f560458c2a1ca8570f482a10fe4e0144
7
- data.tar.gz: f62492a9cec4f219cb2b966d033b66c7d7a5f1cfdb7c27ac0bef5a5d7fdc3a3aa3265e5ea8c41fba8069433041fc210ceb7521f60304e3a0704a721bf1b0f567
6
+ metadata.gz: 9f8d71e7ca6571d89f19232b729fb2dacddb78f31ef6900bbf47eede632cc9c2f3f195b015c601c524bb30a3dd6b8ec1dc0d6a944260d2fafd953e27a69646a4
7
+ data.tar.gz: '08231dcf39f93087cf3c151345cba2f2c4d7f60db6074f1eaf452c8ffb2b316fef4cecc8fdf253943d48c8d9226537ec194fdbc0711653aebcad5b392f01d6d9'
data/CHANGELOG.md CHANGED
@@ -1,4 +1,4 @@
1
- ## [2.7.2] - 2024-04-17
1
+ ## [2.7.4] - 2024-04-21
2
2
 
3
3
  - Return <xs:any> and <xs:anyAttribute> from collect_elements/collect_attributes
4
4
  - Make multiple_allowed? available on all definitions with max occurs
@@ -120,7 +120,13 @@ module XSD
120
120
  restriction = simple_content.restriction
121
121
  if restriction
122
122
  if restriction.base
123
- restriction.base_simple_type&.data_type || strip_prefix(restriction.base)
123
+ if restriction.base_simple_type
124
+ restriction.base_simple_type.data_type
125
+ elsif restriction.base_complex_type
126
+ restriction.base_complex_type.data_type
127
+ else
128
+ strip_prefix(restriction.base)
129
+ end
124
130
  else
125
131
  restriction.simple_type&.data_type
126
132
  end
@@ -73,7 +73,7 @@ module XSD
73
73
  def collect_attributes(include_base = true)
74
74
  result = super(include_base)
75
75
  # Filter restricted attributes to avoid duplicates from restricting and restricted type
76
- result.inject({}) { |hash, item| hash[item.name] = item; hash }.values if include_base
76
+ include_base ? result.inject({}) { |hash, item| hash[item.name] = item; hash }.values : result
77
77
  end
78
78
  end
79
79
  end
data/lib/xsd/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module XSD
4
- VERSION = '2.7.2'
4
+ VERSION = '2.7.4'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xsd
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.2
4
+ version: 2.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - d.arkhipov
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-04-17 00:00:00.000000000 Z
11
+ date: 2024-04-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: builder