scimitar 1.11.0 → 2.0.0

data/app/models/scimitar/resources/base.rb

@@ -35,45 +35,14 @@ module Scimitar
         @errors = ActiveModel::Errors.new(self)
       end
 
-      # Scimitar has at present a general limitation in handling schema IDs,
-      # which just involves stripping them and requiring attributes across all
-      # extension schemas to be overall unique.
-      #
-      # This method takes an options payload for the initializer and strips out
-      # *recognised* schema IDs, so that the resulting attribute data matches
-      # the resource attribute map.
-      #
-      # +attributes+:: Attributes to assign via initializer; typically a POST
-      #                payload of attributes that has been run through Rails
-      #                strong parameters for safety.
-      #
-      # Returns a new object of the same class as +options+ with recognised
-      # schema IDs removed.
-      #
       def flatten_extension_attributes(options)
-        flattened             = options.class.new
-        lower_case_schema_ids = self.class.extended_schemas.map do | schema |
-          schema.id.downcase()
-        end
-
-        options.each do | key, value |
-          path = Scimitar::Support::Utilities::path_str_to_array(
-            self.class.extended_schemas,
-            key
-          )
-
-          if path.first.include?(':') && lower_case_schema_ids.include?(path.first.downcase)
-            path.shift()
-          end
-
-          if path.empty?
-            flattened.merge!(value)
-          else
-            flattened[path.join('.')] = value
+        flattened = options.dup
+        self.class.extended_schemas.each do |extended_schema|
+          if extension_attrs = flattened.delete(extended_schema.id)
+            flattened.merge!(extension_attrs)
           end
         end
-
-        return flattened
+        flattened
       end
 
       # Can be used to extend an existing resource type's schema. For example:
@@ -143,7 +112,7 @@ module Scimitar
       end
 
       def self.complex_scim_attributes
-        schemas.flat_map(&:scim_attributes).select(&:complexType).group_by(&:name)
+        schema.scim_attributes.select(&:complexType).group_by(&:name)
       end
 
       def complex_type_from_hash(scim_attribute, attr_value)
@@ -160,7 +129,7 @@ module Scimitar
 
           if scim_attribute && scim_attribute.complexType
             if scim_attribute.multiValued
-              self.send("#{attr_name}=", attr_value&.map {|attr_for_each_item| complex_type_from_hash(scim_attribute, attr_for_each_item)})
+              self.send("#{attr_name}=", attr_value.map {|attr_for_each_item| complex_type_from_hash(scim_attribute, attr_for_each_item)})
             else
               self.send("#{attr_name}=", complex_type_from_hash(scim_attribute, attr_value))
             end
@@ -168,28 +137,15 @@ module Scimitar
         end
       end
 
-      # Renders *in full* as JSON; typically used for write-based operations...
-      #
-      #     record = self.storage_class().new
-      #     record.from_scim!(scim_hash: scim_resource.as_json())
-      #     self.save!(record)
-      #
-      # ...so all fields, even those marked "returned: false", are included.
-      # Use Scimitar::Resources::Mixin::to_scim to obtain a SCIM object with
-      # non-returnable fields omitted, rendering *that* as JSON via #to_json.
-      #
       def as_json(options = {})
-        self.meta = Meta.new unless self.meta && self.meta.is_a?(Meta)
-        self.meta.resourceType = self.class.resource_type_id
-
+        self.meta = Meta.new unless self.meta
+        meta.resourceType = self.class.resource_type_id
         original_hash = super(options).except('errors')
         original_hash.merge!('schemas' => self.class.schemas.map(&:id))
-
         self.class.extended_schemas.each do |extension_schema|
           extension_attributes = extension_schema.scim_attributes.map(&:name)
           original_hash.merge!(extension_schema.id => original_hash.extract!(*extension_attributes))
         end
-
         original_hash
       end