lib/scim/kit/v2/attribute.rb in scim-kit-0.2.15 vs lib/scim/kit/v2/attribute.rb in scim-kit-0.2.16

@@ -12,20 +12,25 @@
         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
+        validate :validate_type, unless: proc { |x| x.complex? }
+        validate :validate_complex, if: proc { |x| x.complex? }
+        validate :multiple, if: proc { |x| x.multi_valued && !x.complex? }
 
+        delegate :complex?, :multi_valued, to: :_type
+
         def initialize(resource:, type:, value: nil)
           @_type = type
           @_value = value || type.multi_valued ? [] : nil
           @_resource = resource
+
           define_attributes_for(resource, type.attributes)
         end
 
-        def _assign(new_value, coerce: true)
+        def _assign(new_value, coerce: false)
           @_value = coerce ? _type.coerce(new_value) : new_value
         end
 
         def _value=(new_value)
           _assign(new_value, coerce: true)
@@ -37,10 +42,14 @@
           return false if restricted?
 
           true
         end
 
+        def each_value(&block)
+          Array(_value).each(&block)
+        end
+
         private
 
         def server_only?
           read_only? && _resource.mode?(:client)
         end
@@ -64,12 +73,29 @@
 
           errors.add(_type.name, I18n.t('errors.messages.inclusion'))
         end
 
         def validate_type
+          return if _value.nil?
           return if _type.valid?(_value)
 
           errors.add(_type.name, I18n.t('errors.messages.invalid'))
+        end
+
+        def validate_complex
+          validates_with ComplexAttributeValidator
+        end
+
+        def multiple
+          return unless _value.respond_to?(:to_a)
+
+          duped_type = _type.dup
+          duped_type.multi_valued = false
+          _value.to_a.each do |x|
+            unless duped_type.valid?(x)
+              errors.add(duped_type.name, I18n.t('errors.messages.invalid'))
+            end
+          end
         end
 
         def read_only?
           _type.mutability == Mutability::READ_ONLY
         end