scim-kit 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4927e495e03c22db7cfe706323d710cc3679fa7f3f69c9e81c95eebc14c5fb2
-  data.tar.gz: 4a465b912bc234e23eddbaa6066550b12b7a8f1a54a018ede1ceb59b0da98834
+  metadata.gz: 6c3387262115568567b66e8b8841b1ee4cc2b5b6ae9907a0fbe6ba8d6b370527
+  data.tar.gz: 7d68e2ee54e4ea77afbbd6917ff88465d1f1159a4c9875d3cfc646ded9b59fcb
 SHA512:
-  metadata.gz: 1cfc455af11f819193eece084026a7d5dd18ae244365a543269b1027388ad1ff0ba291eb1a2a70758e2dfc6ec15a867f4339c383e996935d93df5876c00bec49
-  data.tar.gz: 93510335e4ab9d219ef18786b5f04a086f45e6464a9c6403b2a24c9fdeec581e6c7a54b563195d5a2613708dec424d994061059acfe89bda624cf68213a12cdb
+  metadata.gz: 04652d7191799e43a400626471672c39fd29939bd7c7b6b84bc756a77262de54e74d624064e2ada5afd8edb0ef4e1bc4eb1137b065d3f64c2f1db7669303d359
+  data.tar.gz: cfb017b66a7fb18a3f97bde84043efb158015e8d3bd0b266146e203e5335e4f6aba6bc3d6abb082d124aacf83cd3707e97125b831f39ed7f1c88b60f511c15db

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.7.0
+Version 0.7.1
 
 # Changelog
 All notable changes to this project will be documented in this file.
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.1] - 2022-12-12
+### Fixed
+- Add support for duplicate attribute names
+
 ## [0.7.0] - 2022-09-28
 ### Added
 - 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 +19,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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)
 - Add constant for 'urn:ietf:params:scim:schemas:core:2.0:Schema' [RFC-7643](https://www.rfc-editor.org/rfc/rfc7643.html#section-7)
 
-
 ## [0.6.0] - 2022-05-23
 ### Added
 - Add support for Ruby 3.1
@@ -82,7 +85,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - \_assign does not coerce values by default.
 - errors are merged together instead of overwritten during attribute validation.
 
-[Unreleased]: https://github.com/xlgmokha/scim-kit/compare/v0.7.0...HEAD
+[Unreleased]: https://github.com/xlgmokha/scim-kit/compare/v0.7.1...HEAD
+[0.7.1]: https://github.com/xlgmokha/scim-kit/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/xlgmokha/scim-kit/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/xlgmokha/scim-kit/compare/v0.5.3...v0.6.0
 [0.5.3]: https://github.com/xlgmokha/scim-kit/compare/v0.5.2...v0.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scim-kit (0.7.0)
+    scim-kit (0.7.1)
       activemodel (>= 6.1, < 8.0)
       net-hippie (~> 1.0)
       parslet (~> 2.0)
@@ -50,10 +50,10 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     net-hippie (1.1.1)
-    nokogiri (1.13.8)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.1.0.0)
@@ -70,19 +70,19 @@ GEM
     rake (13.0.6)
     regexp_parser (2.2.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)

data/lib/scim/kit/v2/attributable.rb

@@ -38,7 +38,9 @@ module Scim
         # @param name [String] the name of the attribute to return
         # @return [Scim::Kit::V2::Attribute] the attribute or {Scim::Kit::V2::UnknownAttribute}
         def attribute_for(name)
-          dynamic_attributes[name.to_s.underscore] || UnknownAttribute.new(name)
+          dynamic_attributes[name.to_s.underscore] ||
+            dynamic_attributes[name] ||
+            UnknownAttribute.new(name)
         end
 
         # Returns the value associated with the attribute name
@@ -86,11 +88,10 @@ module Scim
         end
 
         def attribute(type, resource)
-          dynamic_attributes[type.name] = Attribute.new(
-            type: type,
-            resource: resource
-          )
-          extend(create_module_for(type))
+          previously_defined = dynamic_attributes.key?(type.name)
+          dynamic_attributes[previously_defined ? type.fully_qualified_name : type.name] =
+            Attribute.new(type: type, resource: resource)
+          extend(create_module_for(type)) unless previously_defined
         end
       end
     end

data/lib/scim/kit/v2/attribute_type.rb

@@ -8,16 +8,15 @@ module Scim
         include Templatable
         attr_accessor :canonical_values, :case_exact, :description
         attr_accessor :multi_valued, :required
-        attr_reader :mutability, :name, :type, :attributes
+        attr_reader :mutability, :name, :fully_qualified_name, :type, :attributes
         attr_reader :reference_types, :returned, :uniqueness
 
-        def initialize(name:, type: :string)
+        def initialize(name:, type: :string, schema: nil)
           @name = name.to_s.underscore
+          @fully_qualified_name = [schema&.id, @name].compact.join('#')
           @type = DATATYPES[type.to_sym] ? type.to_sym : (raise TYPE_ERROR)
           @description = name.to_s.camelize(:lower)
-          @multi_valued = false
-          @required = false
-          @case_exact = false
+          @multi_valued = @required = @case_exact = false
           @mutability = Mutability::READ_WRITE
           @returned = Returned::DEFAULT
           @uniqueness = Uniqueness::NONE

data/lib/scim/kit/v2/schema.rb

@@ -21,7 +21,7 @@ module Scim
         end
 
         def add_attribute(name:, type: :string)
-          attribute = AttributeType.new(name: name, type: type)
+          attribute = AttributeType.new(name: name, type: type, schema: self)
           yield attribute if block_given?
           attributes << attribute
         end

data/lib/scim/kit/v2/templates/resource.json.jbuilder

@@ -18,7 +18,8 @@ schemas.each do |schema|
   else
     json.set! schema.id do
       schema.attributes.each do |type|
-        attribute = dynamic_attributes[type.name]
+        attribute = dynamic_attributes[type.fully_qualified_name] ||
+                    dynamic_attributes[type.name]
         render attribute, json: json
       end
     end

data/lib/scim/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Scim
   module Kit
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scim-kit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - mo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel