store_model 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c6db50613221bc69d952fdaed0cb2f1ae07a8c3730748e1166fb93d9538386
-  data.tar.gz: f40dae854bd0900ed4f79096fa721da565c6d472b9b187a367cb03f7b3cd2da8
+  metadata.gz: e69ab65c67b3cd46e0285be5860d8cd5b1d501b38e126f9833fbe01b3dda3ee8
+  data.tar.gz: 04b8d780feaaa6bfcb578465582b845d66960ba5f9df6e5d7aaa8d99f3d568bb
 SHA512:
-  metadata.gz: 50a646560709d22bbb3a6c828cf7834e84dcc9998e1bebc619fcee0953a4b1962728573e18169444c28ef0fa49fcbfc88c3f3bb0de0a1828293a1397b4f13110
-  data.tar.gz: 684aa3e90eb4886709ad0960d1ff5092b6223d3393e9dc72276ef149262e82c549ac2de1727385655598e5c953e2f346a160daf15ce4df4f27e163af3a1a5c08
+  metadata.gz: f8176e449148b7b7aa04596bf75b4932a156f737bac32395e79ae4ca5af9d6e186addb5c1de47b503f754b491f3a98a2ae081ce44fb8f3608c077f81fbcbe8d7
+  data.tar.gz: 9a771879567e9bbe266fa3825327469ac5b2e2008e7f90a7b608b72d28bbbb9704bd7f28e1498e4d65879c6014321a368557f54ec04fe23af0c7d4f8074d0613

data/README.md

@@ -22,7 +22,10 @@ class Product < ApplicationRecord
 end
 ```
 
-You can support my open–source work [here](https://boosty.to/dmitry_tsepelev).
+## Professional Support
+
+Working on a complex Rails application and need an experienced eye?
+I'm available for consulting — [get in touch](https://dmitrytsepelev.dev/consulting).
 
 ## Why should I wrap my JSON columns?
 

data/lib/store_model/configuration.rb

@@ -39,12 +39,19 @@ module StoreModel
     # @return [Boolean]
     attr_accessor :active_admin_compatibility
 
+    # Controls whether nested attributes updates preserve existing model instances by default.
+    # When true, acts like `update_only: true` for all singular nested attributes unless overridden.
+    # Default: false
+    # @return [Boolean]
+    attr_accessor :nested_attributes_update_only
+
     def initialize
       @serialize_unknown_attributes = true
       @enable_parent_assignment = true
       @serialize_enums_using_as_json = true
       @serialize_empty_attributes = true
       @active_admin_compatibility = false
+      @nested_attributes_update_only = false
     end
   end
 end

data/lib/store_model/ext/active_record/base.rb

@@ -8,14 +8,25 @@ module StoreModel
     include ParentAssignment
 
     def _read_attribute(*)
-      super.tap do |attribute|
-        assign_parent_to_store_model_relation(attribute)
-      end
+      value = super
+      assign_parent_to_store_model_relation(value) if store_model_attribute?(value)
+      value
     end
 
     def _write_attribute(*)
-      super.tap do |attribute|
-        assign_parent_to_store_model_relation(attribute)
+      value = super
+      assign_parent_to_store_model_relation(value) if store_model_attribute?(value)
+      value
+    end
+
+    private
+
+    def store_model_attribute?(value)
+      case value
+      when StoreModel::Model then true
+      when Array then value.first.is_a?(StoreModel::Model)
+      when Hash then value.each_value.any? { |v| v.is_a?(StoreModel::Model) }
+      else false
       end
     end
   end

data/lib/store_model/ext/parent_assignment.rb

@@ -13,7 +13,10 @@ module StoreModel
     end
 
     def assign_parent_to_singular_store_model(item)
-      item.parent = self if item.is_a?(StoreModel::Model)
+      return unless item.is_a?(StoreModel::Model)
+      return if item.frozen?
+
+      item.parent = self
     end
   end
 end

data/lib/store_model/model.rb

@@ -216,7 +216,10 @@ module StoreModel
     #
     # @return [Hash]
     def unknown_attributes
-      @unknown_attributes ||= {}
+      return @unknown_attributes if defined?(@unknown_attributes)
+      return {}.freeze if frozen?
+
+      @unknown_attributes = {}
     end
 
     # Returns the value of the `@serialize_unknown_attributes` instance
@@ -314,6 +317,10 @@ module StoreModel
       return unless Array(attr.value).all? { |value| value.is_a?(StoreModel::Model) }
 
       Array(attr.value).each do |value|
+        # Skip frozen objects - they cannot have instance variables modified
+        # but will still serialize correctly with their existing settings
+        next if value.frozen?
+
         value.serialize_unknown_attributes = serialize_unknown_attributes
         value.serialize_enums_using_as_json = serialize_enums_using_as_json
         value.serialize_empty_attributes = serialize_empty_attributes

data/lib/store_model/nested_attributes.rb

@@ -50,7 +50,7 @@ module StoreModel
 
         attributes.each do |attribute|
           if nested_attribute_type(attribute).is_a?(Types::Base)
-            options.reverse_merge!(allow_destroy: false, update_only: false)
+            options.reverse_merge!(allow_destroy: false, update_only: StoreModel.config.nested_attributes_update_only)
             define_store_model_attr_accessors(attribute, options)
           else
             super(*attribute, options)

data/lib/store_model/types/one_of.rb

@@ -7,12 +7,13 @@ module StoreModel
     # Implements ActiveModel::Type::Value type for handling an array of
     # StoreModel::Model
     class OneOf
-      def initialize(&block)
+      def initialize(union: false, &block)
         @block = block
+        @union = union
       end
 
       def to_type
-        Types::OnePolymorphic.new(@block)
+        Types::OnePolymorphic.new(@block, union: @union)
       end
 
       def to_array_type

data/lib/store_model/types/one_polymorphic.rb

@@ -13,8 +13,9 @@ module StoreModel
       # @param model_wrapper [Proc] class to handle
       #
       # @return [StoreModel::Types::OnePolymorphic ]
-      def initialize(model_wrapper)
+      def initialize(model_wrapper, union: false)
         @model_wrapper = model_wrapper
+        @union = union
         super()
       end
 
@@ -30,8 +31,9 @@ module StoreModel
       # @param value [Object] a value to cast
       #
       # @return StoreModel::Model
-      def cast_value(value) # rubocop:disable Metrics/MethodLength
+      def cast_value(value) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         return nil if value.nil?
+        return nil if @union && value.respond_to?(:empty?) && value.empty?
 
         if value.is_a?(String)
           decode_and_initialize(value)
@@ -87,6 +89,18 @@ module StoreModel
               "Hash or instances which implement StoreModel::Model are allowed"
       end
 
+      # rubocop:disable Style/RescueModifier
+      def decode_and_initialize(value)
+        decoded = ActiveSupport::JSON.decode(value) rescue nil
+        return nil if decoded.nil?
+        return nil if @union && decoded.respond_to?(:empty?) && decoded.empty?
+
+        model_instance(decoded)
+      rescue ActiveModel::UnknownAttributeError => e
+        handle_unknown_attribute(decoded, e)
+      end
+      # rubocop:enable Style/RescueModifier
+
       def model_instance(value)
         extract_model_klass(value).new(value)
       end

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel # :nodoc:
-  VERSION = "4.5.0"
+  VERSION = "4.6.0"
 end

data/lib/store_model.rb

@@ -58,7 +58,7 @@ module StoreModel # :nodoc:
     end
 
     def union_one_of(discriminator, class_map)
-      Types::OneOf.new do |attributes|
+      Types::OneOf.new(union: true) do |attributes|
         next nil unless attributes
 
         discriminator_value = attributes.with_indifferent_access[discriminator]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - DmitryTsepelev