scim-kit 0.7.0 → 0.7.2

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 (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +3 -3
  3. data/.rubocop.yml +12 -1
  4. data/CHANGELOG.md +12 -3
  5. data/Gemfile.lock +116 -74
  6. data/lib/scim/kit/v2/attributable.rb +9 -10
  7. data/lib/scim/kit/v2/attribute_type.rb +4 -5
  8. data/lib/scim/kit/v2/messages.rb +6 -6
  9. data/lib/scim/kit/v2/schema.rb +1 -1
  10. data/lib/scim/kit/v2/schemas.rb +8 -8
  11. data/lib/scim/kit/v2/templates/resource.json.jbuilder +2 -1
  12. data/lib/scim/kit/v2.rb +2 -2
  13. data/lib/scim/kit/version.rb +1 -1
  14. data/lib/scim/kit.rb +1 -1
  15. data/scim-kit.gemspec +3 -3
  16. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d4927e495e03c22db7cfe706323d710cc3679fa7f3f69c9e81c95eebc14c5fb2
4
- data.tar.gz: 4a465b912bc234e23eddbaa6066550b12b7a8f1a54a018ede1ceb59b0da98834
3
+ metadata.gz: df09439529d961feaa4d6cc393a8ca4f14eea998b527394cb11f4601c23273e1
4
+ data.tar.gz: 12ad84eaf6851b6f2e0ba5a88377b2784c621465cebefdc0e9c1a66804575e19
5
5
  SHA512:
6
- metadata.gz: 1cfc455af11f819193eece084026a7d5dd18ae244365a543269b1027388ad1ff0ba291eb1a2a70758e2dfc6ec15a867f4339c383e996935d93df5876c00bec49
7
- data.tar.gz: 93510335e4ab9d219ef18786b5f04a086f45e6464a9c6403b2a24c9fdeec581e6c7a54b563195d5a2613708dec424d994061059acfe89bda624cf68213a12cdb
6
+ metadata.gz: 200c7de9210c394343eb2de469beccbaa0ce2b5d8ba1616a8e06d5b2f532bf6865953f85390be158f1eae8c811c4efc770a9b50b16762ec3a8b8371ae7882e86
7
+ data.tar.gz: 37f4514aa538bdb0501e26734c98cefa0a440825abdc4d407865a4a6c71325b3bcd6a7ad07076a7f64c8d62f3680ee843e19199433ff712a2e11dc7299ad77e0
data/.github/workflows/ci.yml CHANGED
@@ -9,7 +9,7 @@ jobs:
9
9
  runs-on: ubuntu-latest
10
10
  strategy:
11
11
  matrix:
12
- ruby-version: ['2.7', '3.0', '3.1']
12
+ ruby-version: ['3.1', '3.2', '3.3', '3.4']
13
13
  steps:
14
14
  - uses: actions/checkout@v2
15
15
  - name: Set up Ruby
@@ -25,7 +25,7 @@ jobs:
25
25
  - uses: actions/checkout@v2
26
26
  - uses: ruby/setup-ruby@v1
27
27
  with:
28
- ruby-version: '3.0'
28
+ ruby-version: '3.1'
29
29
  bundler-cache: true
30
30
  - name: Running style checks…
31
31
  run: sh bin/style
@@ -35,7 +35,7 @@ jobs:
35
35
  - uses: actions/checkout@v2
36
36
  - uses: ruby/setup-ruby@v1
37
37
  with:
38
- ruby-version: '3.0'
38
+ ruby-version: '3.1'
39
39
  bundler-cache: true
40
40
  - name: Running audit…
41
41
  run: sh bin/audit
data/.rubocop.yml CHANGED
@@ -7,7 +7,7 @@ AllCops:
7
7
  - 'pkg/**/*'
8
8
  - 'tmp/**/*'
9
9
  - 'vendor/**/*'
10
- TargetRubyVersion: 2.7
10
+ TargetRubyVersion: 3.1
11
11
 
12
12
  Layout/ArgumentAlignment:
13
13
  EnforcedStyle: with_fixed_indentation
@@ -23,6 +23,7 @@ Layout/LineLength:
23
23
  - 'spec/**/*.rb'
24
24
  IgnoredPatterns:
25
25
  - '^#*'
26
+ Max: 80
26
27
 
27
28
  Layout/MultilineMethodCallIndentation:
28
29
  Enabled: true
@@ -37,6 +38,10 @@ Lint/AmbiguousBlockAssociation:
37
38
  Exclude:
38
39
  - 'spec/**/*.rb'
39
40
 
41
+ Lint/EmptyFile:
42
+ Exclude:
43
+ - 'lib/scim/kit/v2/templates/nil_class.json.jbuilder'
44
+
40
45
  Lint/RaiseException:
41
46
  Enabled: true
42
47
 
@@ -64,6 +69,9 @@ Naming/FileName:
64
69
  Naming/RescuedExceptionsVariableName:
65
70
  PreferredName: error
66
71
 
72
+ Style/AccessorGrouping:
73
+ Enabled: false
74
+
67
75
  Style/Documentation:
68
76
  Enabled: false
69
77
 
@@ -83,6 +91,9 @@ Style/IfUnlessModifier:
83
91
  Style/StringLiterals:
84
92
  EnforcedStyle: 'single_quotes'
85
93
 
94
+ Style/SymbolProc:
95
+ Enabled: false
96
+
86
97
  Style/TrailingCommaInArrayLiteral:
87
98
  Enabled: false
88
99
 
data/CHANGELOG.md CHANGED
@@ -1,4 +1,4 @@
1
- Version 0.7.0
1
+ Version 0.7.2
2
2
 
3
3
  # Changelog
4
4
  All notable changes to this project will be documented in this file.
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8
8
 
9
9
  ## [Unreleased]
10
10
 
11
+ ## [0.7.2] - 2024-12-05
12
+ ### Fixed
13
+ - Change references to string during validation
14
+
15
+ ## [0.7.1] - 2022-12-12
16
+ ### Fixed
17
+ - Add support for duplicate attribute names
18
+
11
19
  ## [0.7.0] - 2022-09-28
12
20
  ### Added
13
21
  - Add constant for 'urn:ietf:params:scim:api:messages:2.0:BulkRequest' [RFC-7644](https://www.rfc-editor.org/rfc/rfc7644.html#section-3.7)
@@ -15,7 +23,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
15
23
  - Add constant for 'urn:ietf:params:scim:api:messages:2.0:PatchOp' [RFC-7644](https://www.rfc-editor.org/rfc/rfc7644.html#section-3.5.2)
16
24
  - Add constant for 'urn:ietf:params:scim:schemas:core:2.0:Schema' [RFC-7643](https://www.rfc-editor.org/rfc/rfc7643.html#section-7)
17
25
 
18
-
19
26
  ## [0.6.0] - 2022-05-23
20
27
  ### Added
21
28
  - Add support for Ruby 3.1
@@ -82,7 +89,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
82
89
  - \_assign does not coerce values by default.
83
90
  - errors are merged together instead of overwritten during attribute validation.
84
91
 
85
- [Unreleased]: https://github.com/xlgmokha/scim-kit/compare/v0.7.0...HEAD
92
+ [Unreleased]: https://github.com/xlgmokha/scim-kit/compare/v0.7.2...HEAD
93
+ [0.7.2]: https://github.com/xlgmokha/scim-kit/compare/v0.7.1...v0.7.2
94
+ [0.7.1]: https://github.com/xlgmokha/scim-kit/compare/v0.7.0...v0.7.1
86
95
  [0.7.0]: https://github.com/xlgmokha/scim-kit/compare/v0.6.0...v0.7.0
87
96
  [0.6.0]: https://github.com/xlgmokha/scim-kit/compare/v0.5.3...v0.6.0
88
97
  [0.5.3]: https://github.com/xlgmokha/scim-kit/compare/v0.5.2...v0.5.3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- scim-kit (0.7.0)
4
+ scim-kit (0.7.2)
5
5
  activemodel (>= 6.1, < 8.0)
6
6
  net-hippie (~> 1.0)
7
7
  parslet (~> 2.0)
@@ -11,108 +11,150 @@ PATH
11
11
  GEM
12
12
  remote: https://rubygems.org/
13
13
  specs:
14
- actionview (7.0.4)
15
- activesupport (= 7.0.4)
14
+ actionview (7.2.2)
15
+ activesupport (= 7.2.2)
16
16
  builder (~> 3.1)
17
- erubi (~> 1.4)
18
- rails-dom-testing (~> 2.0)
19
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
20
- activemodel (7.0.4)
21
- activesupport (= 7.0.4)
22
- activesupport (7.0.4)
23
- concurrent-ruby (~> 1.0, >= 1.0.2)
17
+ erubi (~> 1.11)
18
+ rails-dom-testing (~> 2.2)
19
+ rails-html-sanitizer (~> 1.6)
20
+ activemodel (7.2.2)
21
+ activesupport (= 7.2.2)
22
+ activesupport (7.2.2)
23
+ base64
24
+ benchmark (>= 0.3)
25
+ bigdecimal
26
+ concurrent-ruby (~> 1.0, >= 1.3.1)
27
+ connection_pool (>= 2.2.5)
28
+ drb
24
29
  i18n (>= 1.6, < 2)
30
+ logger (>= 1.4.2)
25
31
  minitest (>= 5.1)
26
- tzinfo (~> 2.0)
27
- addressable (2.8.1)
28
- public_suffix (>= 2.0.2, < 6.0)
32
+ securerandom (>= 0.3)
33
+ tzinfo (~> 2.0, >= 2.0.5)
34
+ addressable (2.8.7)
35
+ public_suffix (>= 2.0.2, < 7.0)
29
36
  ast (2.4.2)
30
- builder (3.2.4)
31
- bundler-audit (0.9.1)
37
+ base64 (0.2.0)
38
+ benchmark (0.4.0)
39
+ bigdecimal (3.1.8)
40
+ builder (3.3.0)
41
+ bundler-audit (0.9.2)
32
42
  bundler (>= 1.2.0, < 3)
33
43
  thor (~> 1.0)
34
- concurrent-ruby (1.1.10)
35
- crack (0.4.5)
44
+ concurrent-ruby (1.3.4)
45
+ connection_pool (2.4.1)
46
+ crack (1.0.0)
47
+ bigdecimal
36
48
  rexml
37
49
  crass (1.0.6)
38
- diff-lcs (1.5.0)
39
- erubi (1.11.0)
40
- ffaker (2.21.0)
41
- hashdiff (1.0.1)
42
- i18n (1.12.0)
50
+ diff-lcs (1.5.1)
51
+ drb (2.2.1)
52
+ erubi (1.13.0)
53
+ ffaker (2.23.0)
54
+ hashdiff (1.1.2)
55
+ i18n (1.14.6)
43
56
  concurrent-ruby (~> 1.0)
44
- jbuilder (2.11.5)
57
+ jbuilder (2.13.0)
45
58
  actionview (>= 5.0.0)
46
59
  activesupport (>= 5.0.0)
47
- loofah (2.18.0)
60
+ json (2.9.0)
61
+ language_server-protocol (3.17.0.3)
62
+ logger (1.6.2)
63
+ loofah (2.23.1)
48
64
  crass (~> 1.0.2)
49
- nokogiri (>= 1.5.9)
50
- mini_portile2 (2.8.0)
51
- minitest (5.16.3)
52
- net-hippie (1.1.1)
53
- nokogiri (1.13.8)
54
- mini_portile2 (~> 2.8.0)
65
+ nokogiri (>= 1.12.0)
66
+ minitest (5.25.4)
67
+ net-hippie (1.2.0)
68
+ logger (~> 1.0)
69
+ nokogiri (1.16.8-aarch64-linux)
55
70
  racc (~> 1.4)
56
- nokogiri (1.13.8-x86_64-linux)
71
+ nokogiri (1.16.8-arm-linux)
57
72
  racc (~> 1.4)
58
- parallel (1.21.0)
59
- parser (3.1.0.0)
73
+ nokogiri (1.16.8-arm64-darwin)
74
+ racc (~> 1.4)
75
+ nokogiri (1.16.8-x86-linux)
76
+ racc (~> 1.4)
77
+ nokogiri (1.16.8-x86_64-darwin)
78
+ racc (~> 1.4)
79
+ nokogiri (1.16.8-x86_64-linux)
80
+ racc (~> 1.4)
81
+ parallel (1.26.3)
82
+ parser (3.3.6.0)
60
83
  ast (~> 2.4.1)
84
+ racc
61
85
  parslet (2.0.0)
62
- public_suffix (5.0.0)
63
- racc (1.6.0)
64
- rails-dom-testing (2.0.3)
65
- activesupport (>= 4.2.0)
86
+ public_suffix (6.0.1)
87
+ racc (1.8.1)
88
+ rails-dom-testing (2.2.0)
89
+ activesupport (>= 5.0.0)
90
+ minitest
66
91
  nokogiri (>= 1.6)
67
- rails-html-sanitizer (1.4.3)
68
- loofah (~> 2.3)
92
+ rails-html-sanitizer (1.6.1)
93
+ loofah (~> 2.21)
94
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
69
95
  rainbow (3.1.1)
70
- rake (13.0.6)
71
- regexp_parser (2.2.0)
72
- rexml (3.2.5)
73
- rspec (3.11.0)
74
- rspec-core (~> 3.11.0)
75
- rspec-expectations (~> 3.11.0)
76
- rspec-mocks (~> 3.11.0)
77
- rspec-core (3.11.0)
78
- rspec-support (~> 3.11.0)
79
- rspec-expectations (3.11.0)
96
+ rake (13.2.1)
97
+ regexp_parser (2.9.3)
98
+ rexml (3.3.9)
99
+ rspec (3.13.0)
100
+ rspec-core (~> 3.13.0)
101
+ rspec-expectations (~> 3.13.0)
102
+ rspec-mocks (~> 3.13.0)
103
+ rspec-core (3.13.2)
104
+ rspec-support (~> 3.13.0)
105
+ rspec-expectations (3.13.3)
80
106
  diff-lcs (>= 1.2.0, < 2.0)
81
- rspec-support (~> 3.11.0)
82
- rspec-mocks (3.11.0)
107
+ rspec-support (~> 3.13.0)
108
+ rspec-mocks (3.13.2)
83
109
  diff-lcs (>= 1.2.0, < 2.0)
84
- rspec-support (~> 3.11.0)
85
- rspec-support (3.11.0)
86
- rubocop (0.93.1)
110
+ rspec-support (~> 3.13.0)
111
+ rspec-support (3.13.2)
112
+ rubocop (1.69.1)
113
+ json (~> 2.3)
114
+ language_server-protocol (>= 3.17.0)
87
115
  parallel (~> 1.10)
88
- parser (>= 2.7.1.5)
116
+ parser (>= 3.3.0.2)
89
117
  rainbow (>= 2.2.2, < 4.0)
90
- regexp_parser (>= 1.8)
91
- rexml
92
- rubocop-ast (>= 0.6.0)
118
+ regexp_parser (>= 2.9.3, < 3.0)
119
+ rubocop-ast (>= 1.36.2, < 2.0)
93
120
  ruby-progressbar (~> 1.7)
94
- unicode-display_width (>= 1.4.0, < 2.0)
95
- rubocop-ast (1.15.1)
96
- parser (>= 3.0.1.1)
97
- rubocop-rspec (1.44.1)
98
- rubocop (~> 0.87)
99
- rubocop-ast (>= 0.7.1)
100
- ruby-progressbar (1.11.0)
101
- thor (1.2.1)
102
- tilt (2.0.11)
121
+ unicode-display_width (>= 2.4.0, < 4.0)
122
+ rubocop-ast (1.36.2)
123
+ parser (>= 3.3.1.0)
124
+ rubocop-capybara (2.21.0)
125
+ rubocop (~> 1.41)
126
+ rubocop-factory_bot (2.26.1)
127
+ rubocop (~> 1.61)
128
+ rubocop-rspec (2.31.0)
129
+ rubocop (~> 1.40)
130
+ rubocop-capybara (~> 2.17)
131
+ rubocop-factory_bot (~> 2.22)
132
+ rubocop-rspec_rails (~> 2.28)
133
+ rubocop-rspec_rails (2.29.1)
134
+ rubocop (~> 1.61)
135
+ ruby-progressbar (1.13.0)
136
+ securerandom (0.4.0)
137
+ thor (1.3.2)
138
+ tilt (2.4.0)
103
139
  tilt-jbuilder (0.7.1)
104
140
  jbuilder
105
141
  tilt (>= 1.3.0, < 3)
106
- tzinfo (2.0.5)
142
+ tzinfo (2.0.6)
107
143
  concurrent-ruby (~> 1.0)
108
- unicode-display_width (1.8.0)
109
- webmock (3.18.1)
144
+ unicode-display_width (3.1.2)
145
+ unicode-emoji (~> 4.0, >= 4.0.4)
146
+ unicode-emoji (4.0.4)
147
+ webmock (3.24.0)
110
148
  addressable (>= 2.8.0)
111
149
  crack (>= 0.3.2)
112
150
  hashdiff (>= 0.4.0, < 2.0.0)
113
151
 
114
152
  PLATFORMS
115
- ruby
153
+ aarch64-linux
154
+ arm-linux
155
+ arm64-darwin
156
+ x86-linux
157
+ x86_64-darwin
116
158
  x86_64-linux
117
159
 
118
160
  DEPENDENCIES
@@ -120,10 +162,10 @@ DEPENDENCIES
120
162
  ffaker (~> 2.7)
121
163
  rake (~> 13.0)
122
164
  rspec (~> 3.0)
123
- rubocop (~> 0.52)
124
- rubocop-rspec (~> 1.22)
165
+ rubocop (~> 1.0)
166
+ rubocop-rspec (~> 2.0)
125
167
  scim-kit!
126
168
  webmock (~> 3.5)
127
169
 
128
170
  BUNDLED WITH
129
- 2.3.6
171
+ 2.5.23
data/lib/scim/kit/v2/attributable.rb CHANGED
@@ -38,7 +38,9 @@ module Scim
38
38
  # @param name [String] the name of the attribute to return
39
39
  # @return [Scim::Kit::V2::Attribute] the attribute or {Scim::Kit::V2::UnknownAttribute}
40
40
  def attribute_for(name)
41
- dynamic_attributes[name.to_s.underscore] || UnknownAttribute.new(name)
41
+ dynamic_attributes[name.to_s.underscore] ||
42
+ dynamic_attributes[name] ||
43
+ UnknownAttribute.new(name)
42
44
  end
43
45
 
44
46
  # Returns the value associated with the attribute name
@@ -64,10 +66,8 @@ module Scim
64
66
 
65
67
  # yields each attribute to the provided block
66
68
  # @param [Block] the block to yield each attribute to.
67
- def each
68
- dynamic_attributes.each do |_name, attribute|
69
- yield attribute
70
- end
69
+ def each(&block)
70
+ dynamic_attributes.each_value(&block)
71
71
  end
72
72
 
73
73
  private
@@ -86,11 +86,10 @@ module Scim
86
86
  end
87
87
 
88
88
  def attribute(type, resource)
89
- dynamic_attributes[type.name] = Attribute.new(
90
- type: type,
91
- resource: resource
92
- )
93
- extend(create_module_for(type))
89
+ previously_defined = dynamic_attributes.key?(type.name)
90
+ dynamic_attributes[previously_defined ? type.fully_qualified_name : type.name] =
91
+ Attribute.new(type: type, resource: resource)
92
+ extend(create_module_for(type)) unless previously_defined
94
93
  end
95
94
  end
96
95
  end
data/lib/scim/kit/v2/attribute_type.rb CHANGED
@@ -8,16 +8,15 @@ module Scim
8
8
  include Templatable
9
9
  attr_accessor :canonical_values, :case_exact, :description
10
10
  attr_accessor :multi_valued, :required
11
- attr_reader :mutability, :name, :type, :attributes
11
+ attr_reader :mutability, :name, :fully_qualified_name, :type, :attributes
12
12
  attr_reader :reference_types, :returned, :uniqueness
13
13
 
14
- def initialize(name:, type: :string)
14
+ def initialize(name:, type: :string, schema: nil)
15
15
  @name = name.to_s.underscore
16
+ @fully_qualified_name = [schema&.id, @name].compact.join('#')
16
17
  @type = DATATYPES[type.to_sym] ? type.to_sym : (raise TYPE_ERROR)
17
18
  @description = name.to_s.camelize(:lower)
18
- @multi_valued = false
19
- @required = false
20
- @case_exact = false
19
+ @multi_valued = @required = @case_exact = false
21
20
  @mutability = Mutability::READ_WRITE
22
21
  @returned = Returned::DEFAULT
23
22
  @uniqueness = Uniqueness::NONE
data/lib/scim/kit/v2/messages.rb CHANGED
@@ -5,12 +5,12 @@ module Scim
5
5
  module V2
6
6
  module Messages
7
7
  CORE = 'urn:ietf:params:scim:api:messages:2.0'
8
- BULK_REQUEST = "#{CORE}:BulkRequest"
9
- BULK_RESPONSE = "#{CORE}:BulkResponse"
10
- ERROR = "#{CORE}:Error"
11
- LIST_RESPONSE = "#{CORE}:ListResponse"
12
- PATCH_OP = "#{CORE}:PatchOp"
13
- SEARCH_REQUEST = "#{CORE}:SearchRequest"
8
+ BULK_REQUEST = "#{CORE}:BulkRequest".freeze
9
+ BULK_RESPONSE = "#{CORE}:BulkResponse".freeze
10
+ ERROR = "#{CORE}:Error".freeze
11
+ LIST_RESPONSE = "#{CORE}:ListResponse".freeze
12
+ PATCH_OP = "#{CORE}:PatchOp".freeze
13
+ SEARCH_REQUEST = "#{CORE}:SearchRequest".freeze
14
14
  end
15
15
  end
16
16
  end
data/lib/scim/kit/v2/schema.rb CHANGED
@@ -21,7 +21,7 @@ module Scim
21
21
  end
22
22
 
23
23
  def add_attribute(name:, type: :string)
24
- attribute = AttributeType.new(name: name, type: type)
24
+ attribute = AttributeType.new(name: name, type: type, schema: self)
25
25
  yield attribute if block_given?
26
26
  attributes << attribute
27
27
  end
data/lib/scim/kit/v2/schemas.rb CHANGED
@@ -6,14 +6,14 @@ module Scim
6
6
  module Schemas
7
7
  ROOT = 'urn:ietf:params:scim:schemas'
8
8
 
9
- CORE = "#{ROOT}:core:2.0"
10
- EXTENSION = "#{ROOT}:extension"
11
- ENTERPRISE_USER = "#{EXTENSION}:enterprise:2.0:User"
12
- GROUP = "#{CORE}:Group"
13
- RESOURCE_TYPE = "#{CORE}:ResourceType"
14
- SCHEMA = "#{CORE}:Schema"
15
- SERVICE_PROVIDER_CONFIGURATION = "#{CORE}:ServiceProviderConfig"
16
- USER = "#{CORE}:User"
9
+ CORE = "#{ROOT}:core:2.0".freeze
10
+ EXTENSION = "#{ROOT}:extension".freeze
11
+ ENTERPRISE_USER = "#{EXTENSION}:enterprise:2.0:User".freeze
12
+ GROUP = "#{CORE}:Group".freeze
13
+ RESOURCE_TYPE = "#{CORE}:ResourceType".freeze
14
+ SCHEMA = "#{CORE}:Schema".freeze
15
+ SERVICE_PROVIDER_CONFIGURATION = "#{CORE}:ServiceProviderConfig".freeze
16
+ USER = "#{CORE}:User".freeze
17
17
  end
18
18
  end
19
19
  end
data/lib/scim/kit/v2/templates/resource.json.jbuilder CHANGED
@@ -18,7 +18,8 @@ schemas.each do |schema|
18
18
  else
19
19
  json.set! schema.id do
20
20
  schema.attributes.each do |type|
21
- attribute = dynamic_attributes[type.name]
21
+ attribute = dynamic_attributes[type.fully_qualified_name] ||
22
+ dynamic_attributes[type.name]
22
23
  render attribute, json: json
23
24
  end
24
25
  end
data/lib/scim/kit/v2.rb CHANGED
@@ -29,7 +29,7 @@ module Scim
29
29
  module V2
30
30
  BASE64 = %r(
31
31
  \A([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?\Z
32
- )x.freeze
32
+ )x
33
33
  BOOLEAN_VALUES = [true, false].freeze
34
34
  DATATYPES = {
35
35
  string: 'string',
@@ -68,7 +68,7 @@ module Scim
68
68
  false
69
69
  end
70
70
  },
71
- reference: ->(x) { x =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/ },
71
+ reference: ->(x) { x&.to_s =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/ },
72
72
  string: ->(x) { x.is_a?(String) }
73
73
  }.freeze
74
74
 
data/lib/scim/kit/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Scim
4
4
  module Kit
5
- VERSION = '0.7.0'
5
+ VERSION = '0.7.2'
6
6
  end
7
7
  end
data/lib/scim/kit.rb CHANGED
@@ -25,7 +25,7 @@ module Scim
25
25
  TYPE_ERROR = ArgumentError.new(:type)
26
26
 
27
27
  def self.logger
28
- @logger ||= Logger.new(STDOUT)
28
+ @logger ||= Logger.new($stdout)
29
29
  end
30
30
 
31
31
  def self.logger=(logger)
data/scim-kit.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  File.basename(file)
28
28
  end
29
29
  spec.require_paths = ['lib']
30
- spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
30
+ spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
31
31
  spec.metadata['yard.run'] = 'yri'
32
32
 
33
33
  spec.add_dependency 'activemodel', '>= 6.1', '< 8.0'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
39
39
  spec.add_development_dependency 'ffaker', '~> 2.7'
40
40
  spec.add_development_dependency 'rake', '~> 13.0'
41
41
  spec.add_development_dependency 'rspec', '~> 3.0'
42
- spec.add_development_dependency 'rubocop', '~> 0.52'
43
- spec.add_development_dependency 'rubocop-rspec', '~> 1.22'
42
+ spec.add_development_dependency 'rubocop', '~> 1.0'
43
+ spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
44
44
  spec.add_development_dependency 'webmock', '~> 3.5'
45
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scim-kit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - mo
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-09-29 00:00:00.000000000 Z
11
+ date: 2024-12-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel
@@ -148,28 +148,28 @@ dependencies:
148
148
  requirements:
149
149
  - - "~>"
150
150
  - !ruby/object:Gem::Version
151
- version: '0.52'
151
+ version: '1.0'
152
152
  type: :development
153
153
  prerelease: false
154
154
  version_requirements: !ruby/object:Gem::Requirement
155
155
  requirements:
156
156
  - - "~>"
157
157
  - !ruby/object:Gem::Version
158
- version: '0.52'
158
+ version: '1.0'
159
159
  - !ruby/object:Gem::Dependency
160
160
  name: rubocop-rspec
161
161
  requirement: !ruby/object:Gem::Requirement
162
162
  requirements:
163
163
  - - "~>"
164
164
  - !ruby/object:Gem::Version
165
- version: '1.22'
165
+ version: '2.0'
166
166
  type: :development
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
169
169
  requirements:
170
170
  - - "~>"
171
171
  - !ruby/object:Gem::Version
172
- version: '1.22'
172
+ version: '2.0'
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: webmock
175
175
  requirement: !ruby/object:Gem::Requirement
@@ -264,14 +264,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
264
264
  requirements:
265
265
  - - ">="
266
266
  - !ruby/object:Gem::Version
267
- version: 2.7.0
267
+ version: 3.1.0
268
268
  required_rubygems_version: !ruby/object:Gem::Requirement
269
269
  requirements:
270
270
  - - ">="
271
271
  - !ruby/object:Gem::Version
272
272
  version: '0'
273
273
  requirements: []
274
- rubygems_version: 3.3.22
274
+ rubygems_version: 3.3.27
275
275
  signing_key:
276
276
  specification_version: 4
277
277
  summary: A simple toolkit for working with SCIM 2.0