isomorfeus-data 2.5.2 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683f95014508aca48f80ba7230ca3b7904886e8482852714ce6eed75bb418170
-  data.tar.gz: 6d3106fd68c818818022b8bff174a51fcaf7d1b9ce7606f208e0325b555823ed
+  metadata.gz: 73175d7dc425cc54e235ee9719bacaaebe93b60753794949506cb044d05a5599
+  data.tar.gz: 1af87ebf47618289399a3cdf7539e533577f09ae0757cae9e5f7b873e3f05b59
 SHA512:
-  metadata.gz: 30764ed57ee8a5b255ee02b596f9e3617c1e53d75300973c3494fe62e880977ed3c04eaf49b42cccf50b47ba4a4b8b4f0b9877f74761d121fddb03291bdb3442
-  data.tar.gz: 2dd0444993981ba0e9eafba0933496fd95b68f01d4e420443ec5591c87e1e08d764635614e0ba87a6a3c671687eacd94d9bb0ffa522b80f18ea6e8056eb51253
+  metadata.gz: 4fe59f656951f87f9382f4dfd2b86b00ba835644e69b729d51cc1eef6dbec9ca13a05e683d655cb085e536d1f13d0e738c42b15309e4ba681102e1d54bbca5ad
+  data.tar.gz: c2403b92cb3c88e1f38d05270afef98610694d8edd8cfca274735e4b456cfae2d2902db9512737dbd7316427dd7579d8f2275c691e64d6ac31e4c77affb725c4

data/lib/isomorfeus/data/field_support.rb

@@ -3,6 +3,16 @@ module Isomorfeus
     module FieldSupport
       def self.included(base)
         base.instance_exec do
+          @@object_validation_proc = proc do |v|
+            fail = false
+            if v.is_a?(Array)
+              v.each { |e| fail = true unless e.nil? || e.is_a?(LucidObject::Mixin) }
+            elsif !v.nil? && !v.is_a?(LucidObject::Mixin)
+              fail = true
+            end
+            raise "must be nil, a LucidObject::Mixin or a Array of LucidObject::Mixin" if fail
+          end
+
           def field_types
             # determines how the item is stored in the index
             @field_types ||= {}
@@ -14,6 +24,7 @@ module Isomorfeus
           end
 
           def field_conditions
+            # conditions for validating the field data
             @field_conditions ||= {}
           end
 
@@ -43,7 +54,7 @@ module Isomorfeus
           alias embed attribute
 
           def object(name, options = {})
-            default_options = { is_a: LucidObject::Mixin, allow_nil: true }
+            default_options = { validate_block: @@object_validation_proc }
             field(name, :object, default_options.merge(options))
           end
           alias reference object
@@ -64,9 +75,13 @@ module Isomorfeus
             field_types[obj_name] == :object
           end
 
+          def validate_field!(field_name, val)
+            raise "no such field" unless field?(field_name)
+            Isomorfeus::Props::Validator.new(self.name, field_name, val, field_conditions[field_name]).validate!
+          end
+
           def valid_field?(field_name, val)
-            return Isomorfeus::Props::Validator.new(self.name, field_name, val, field_conditions[field_name]).validate! if field?(field_name)
-            false
+            validate_field!(field_name, val)
           rescue
             false
           end
@@ -84,6 +99,7 @@ module Isomorfeus
           rescue
             false
           end
+          alias valid_embed? valid_attribute?
 
           def valid_object?(obj_name, val)
             return valid_field?(obj_name, val) if object?(obj_name)
@@ -91,6 +107,7 @@ module Isomorfeus
           rescue
             false
           end
+          alias valid_reference? valid_object?
 
           def validate
             Isomorfeus::Props::ValidateHashProxy.new
@@ -183,7 +200,14 @@ module Isomorfeus
             path = @_store_path + [name]
             sid_or_array = Redux.fetch_by_path(*path)
             return nil if `(sid_or_array === null)`
-            @_objects[name] = Isomorfeus.instance_from_sid(sid_or_array) if sid_or_array
+            if sid_or_array[0].is_a?(String)
+              @_objects[name] = Isomorfeus.instance_from_sid(sid_or_array)
+            elsif sid_or_array[0].is_a?(Array)
+              a = sid_or_array.map { |sid| Isomorfeus.instance_from_sid(sid) if sid }
+              a.compact!
+              @_objects[name] = a
+            end
+            @_objects[name]
           end
 
           def fields
@@ -196,7 +220,10 @@ module Isomorfeus
           def _get_selected_fields
             sel_fields = fields.dup
             self.class.field_types.each do |field, type|
-              sel_fields[field] = sel_fields[field]&.sid if type == :object
+              if type == :object
+                v = sel_fields[field]
+                sel_fields[field] = v.is_a?(Array) ? v.map(&:sid) : v&.sid
+              end
             end
             sel_fields
           end
@@ -229,7 +256,8 @@ module Isomorfeus
               if options[:server_only]
                 sel_fields.delete(field_s)
               elsif ft[field] == :object
-                sel_fields[field_s] = sel_fields[field_s]&.sid
+                v = sel_fields[field_s]
+                sel_fields[field_s] = v.is_a?(Array) ? v.map(&:sid) : v&.sid
               end
             end
             sel_fields

data/lib/isomorfeus/data/object_accelerator.rb

@@ -20,6 +20,7 @@ module Isomorfeus
       end
 
       def object_from_ref(ref, already_loaded)
+        return nil if !ref || ref.empty?
         _, iso, type_class_name, key = ref.split('---')
         raise "not a valid object reference '#{ref}'" unless iso == "iso-object-reference"
         raise "invalid data class #{type_class_name}" unless Isomorfeus.valid_data_class_name?(type_class_name)
@@ -99,15 +100,30 @@ module Isomorfeus
       def unserialize_or_load(v, t, already_loaded)
         return unserialize(v) if t == :attribute
         if t == :object && v
-          return nil if v.empty?
-          return object_from_ref(v, already_loaded)
+          if v.is_a?(Array)
+            v = v.map { |e| object_from_ref(e, already_loaded) }
+            v.compact!
+            return v
+          else
+            return nil if v.empty?
+            return object_from_ref(v, already_loaded)
+          end
         end
         v
       end
 
       def serialize_or_save(v, t, already_saved)
         return serialize(v) if t == :attribute
-        return create_or_save(v, already_saved) if t == :object && v
+        if t == :object && v
+          if v.is_a?(Array)
+            v = v.compact
+            v.map! { |e| create_or_save(e, already_saved) }
+            v.compact!
+            return v
+          else
+            return create_or_save(v, already_saved)
+          end
+        end
         v
       end
 

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.5.2'
+    VERSION = '2.5.5'
   end
 end

data/lib/isomorfeus_data/lucid_object/mixin.rb

@@ -39,9 +39,16 @@ module LucidObject
           if type == :object
             v = f[field]
             if v
-              data_hash.deep_merge!(v.to_transport)
-              if v.respond_to?(:included_items_to_transport)
-                data_hash.deep_merge!(v.included_items_to_transport)
+              if v.is_a?(LucidObject::Mixin)
+                data_hash.deep_merge!(v.to_transport)
+                data_hash.deep_merge!(v.included_items_to_transport) if v.respond_to?(:included_items_to_transport)
+              elsif v.is_a?(Array)
+                v.each do |e|
+                  if e
+                    data_hash.deep_merge!(e.to_transport)
+                    data_hash.deep_merge!(e.included_items_to_transport) if e.respond_to?(:included_items_to_transport)
+                  end
+                end
               end
             end
           end
@@ -99,6 +106,14 @@ module LucidObject
         Isomorfeus.add_valid_data_class(base) unless base == LucidObject::Base
 
         base.instance_exec do
+          def _instance_from_transport_sid(sid, included_items_data, _already_loaded)
+            o_class_name = sid[0]
+            raise "invalid data class #{o_class_name}" unless Isomorfeus.valid_data_class_name?(o_class_name)
+            o_class = Isomorfeus.cached_data_class(o_class_name)
+            o_data = { o_class_name => { sid[1] => included_items_data[o_class_name][sid[1]] }}
+            o_class.instance_from_transport(o_data, included_items_data, _already_loaded)
+          end
+
           def instance_from_transport(instance_data, included_items_data, _already_loaded = {})
             key = instance_data[self.name].keys.first
             ref_s = gen_ref_s(key)
@@ -110,16 +125,15 @@ module LucidObject
             if fields
               field_types.each do |field, type|
                 if type == :object
-                  sid = fields[field]
-                  if sid
-                    o_class_name = sid[0]
-                    raise "invalid data class #{type_class_name}" unless Isomorfeus.valid_data_class_name?(o_class_name)
-                    o_class = Isomorfeus.cached_data_class(o_class_name)
-                    o_data = { o_class_name => { sid[1] => included_items_data[o_class_name][sid[1]] }}
-                    if included_items_data && !included_items_data[self.name]&.key?(key)
-                      included_items_data.deep_merge!(instance_data)
+                  sid_or_array = fields[field]
+                  if sid_or_array&.any?
+                    if sid_or_array[0].is_a? String
+                      fields[field] = _instance_from_transport_sid(sid_or_array, included_items_data, _already_loaded)
+                    elsif sid_or_array[0].is_a? Array
+                      v = sid_or_array.map { |e_sid| _instance_from_transport_sid(e_sid, included_items_data, _already_loaded) }
+                      v.compact!
+                      fields[field] = v
                     end
-                    fields[field] = o_class.instance_from_transport(o_data, included_items_data, _already_loaded)
                   end
                 end
               end
@@ -141,10 +155,19 @@ module LucidObject
           end
 
           def each(&block)
-            self.object_accelerator.each do |fields|
-              block.call self.new(key: fields.delete(:key), fields: fields)
+            if block_given?
+              self.object_accelerator.each do |fields|
+                block.call self.new(key: fields.delete(:key), fields: fields)
+              end
+            else
+              Enumerator.new do |yielder|
+                self.object_accelerator.each do |fields|
+                  yielder << self.new(key: fields.delete(:key), fields: fields)
+                end
+              end
             end
           end
+          alias to_enum each
 
           def search(field = nil, val = nil, options = {}, query: nil)
             if field && !self.field_options[field]&.fetch(:index) == :yes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement