scim-kit 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f02299047002221e07cbb5b8329134fa92d510c1851bd06fd1653b55a9d72e
-  data.tar.gz: b4f80a7b6480db73b6227da7bfa1b2e06fe274d8536df9e0c48db40a1e34ff5e
+  metadata.gz: 33385c673e7d22f17ef8d63edc67fe1bbd6929804f911c9975a5b182bb7de303
+  data.tar.gz: 397e0416ac4feb3c286eed89556b2ddcea84978eaf6ffb31cd475ae4ca8f90b6
 SHA512:
-  metadata.gz: b7539e5af3e80ccd8ec44118cfdb66ede3740cd5544c91ff7085454e9c841e326a616390bddbd0c69a37867e931d7ebfb0e2f9560f8e07dcdc56c0c51a430b2c
-  data.tar.gz: 6a442adc9bdcc3c558441727a6f4648d3d1c235420860e36fcb2cad94938353eae27540ce55ac1dd7c5187ab181decfefa4954cbfbe5297cbde39351106fe2bc
+  metadata.gz: 94870076efae7bb2854afa211cc3670ae4a27f73a1cf330b3a6ef65bc8ae885bc68cb2258d73eb1d79d3638f9aaec75697486dbfd4ba4733515e192422e2ed2d
+  data.tar.gz: 3fc8ccfb002af55083f41490486cf79b7d8d443e1005f6252592b11cf23166e8ccdec491e37d807048aedca63411ddfab0abcbc634bbd76be29023a4837ff521

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

@@ -7,9 +7,9 @@ module Scim
       module Attributable
         attr_reader :dynamic_attributes
 
-        def define_attributes_for(types)
+        def define_attributes_for(resource, types)
           @dynamic_attributes = {}.with_indifferent_access
-          types.each { |x| attribute(x) }
+          types.each { |x| attribute(x, resource) }
         end
 
         private
@@ -42,8 +42,11 @@ module Scim
           end
         end
 
-        def attribute(type)
-          dynamic_attributes[type.name] = Attribute.new(type: type)
+        def attribute(type, resource)
+          dynamic_attributes[type.name] = Attribute.new(
+            type: type,
+            resource: resource
+          )
           extend(create_module_for(type))
         end
       end

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

@@ -9,16 +9,18 @@ module Scim
         include Attributable
         include Templatable
         attr_reader :type
+        attr_reader :_resource
         attr_reader :_value
 
         validate :presence_of_value, if: proc { |x| x.type.required }
         validate :inclusion_of_value, if: proc { |x| x.type.canonical_values }
         validate :validate_type
 
-        def initialize(type:, value: nil)
+        def initialize(resource:, type:, value: nil)
           @type = type
-          @_value = value
-          define_attributes_for(type.attributes)
+          @_value = value || type.multi_valued ? [] : nil
+          @_resource = resource
+          define_attributes_for(resource, type.attributes)
         end
 
         def _assign(new_value, coerce: true)
@@ -29,6 +31,14 @@ module Scim
           _assign(new_value, coerce: true)
         end
 
+        def renderable?
+          return false if read_only? && _resource.mode?(:client)
+          return false if write_only? &&
+                          (_resource.mode?(:server) || _value.blank?)
+
+          true
+        end
+
         private
 
         def presence_of_value
@@ -48,6 +58,14 @@ module Scim
 
           errors.add(type.name, I18n.t('errors.messages.invalid'))
         end
+
+        def read_only?
+          type.mutability == Mutability::READ_ONLY
+        end
+
+        def write_only?
+          type.mutability == Mutability::WRITE_ONLY
+        end
       end
     end
   end

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

@@ -63,6 +63,7 @@ module Scim
         end
 
         def coerce(value)
+          return value if value.nil?
           return value if complex?
 
           if multi_valued

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

@@ -10,10 +10,13 @@ module Scim
         IMMUTABLE = 'immutable'
         WRITE_ONLY = 'writeOnly'
         VALID = {
+          immutable: IMMUTABLE,
           read_only: READ_ONLY,
           read_write: READ_WRITE,
-          immutable: IMMUTABLE,
-          write_only: WRITE_ONLY
+          readonly: READ_ONLY,
+          readwrite: READ_WRITE,
+          write_only: WRITE_ONLY,
+          writeonly: WRITE_ONLY
         }.freeze
 
         def self.find(value)

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

@@ -21,7 +21,17 @@ module Scim
           @meta.disable_timestamps
           @schemas = schemas
           schemas.each do |schema|
-            define_attributes_for(schema.attributes)
+            define_attributes_for(self, schema.attributes)
+          end
+          yield self if block_given?
+        end
+
+        def mode?(type)
+          case type.to_sym
+          when :server
+            meta&.location
+          else
+            meta&.location.nil?
           end
         end
 

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

@@ -7,6 +7,6 @@ if type.complex? && !type.multi_valued
       render attribute, json: json
     end
   end
-else
+elsif renderable?
   json.set! type.name, _value
 end

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

@@ -1,23 +1,25 @@
 # frozen_string_literal: true
 
 json.key_format! camelize: :lower
-if meta.location
+if mode?(:server)
   json.meta do
     render meta, json: json
   end
 end
 json.schemas schemas.map(&:id)
-json.id id if id
-json.external_id external_id if external_id
+json.id id if mode?(:server)
+json.external_id external_id if mode?(:client) && external_id
 schemas.each do |schema|
   if schema.core?
     schema.attributes.each do |type|
-      render dynamic_attributes[type.name], json: json
+      attribute = dynamic_attributes[type.name]
+      render attribute, json: json
     end
   else
     json.set! schema.id do
       schema.attributes.each do |type|
-        render dynamic_attributes[type.name], json: json
+        attribute = dynamic_attributes[type.name]
+        render attribute, json: json
       end
     end
   end

data/lib/scim/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Scim
   module Kit
-    VERSION = '0.2.9'
+    VERSION = '0.2.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scim-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - mo