store_model 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b12509ebafeb20d7a2bcb2ae1094dcd756f1b86f31dd8066b0abd61d8f998a
-  data.tar.gz: d3a06944b46ebf4094de55736e892f15ae27514e0604047260e74a033bbc7cda
+  metadata.gz: 02f882325fbae00f97a61603cdab0578ccfd1723a54b8b6e4cfd61aeaabe8a6f
+  data.tar.gz: bfd3a7c92a01debecb1fea0d36f73306486612ec7cba22095f9673907ae6b9e4
 SHA512:
-  metadata.gz: 7d8ec95caf59aea39e3cedc20a471db9289f4c1eda9d083a1b2fd321f732e7d056b67ac58a7f4f437cb04e932c1f14f18e56dfb9b04c884e5d64025cc7d7989b
-  data.tar.gz: e526dbc89d1c4186b1fe94581acb2b1d80e207bcf08d69809dffc393d43e3d8d2cd08c905d3d3d4f842c9bf7db9ad1581611368fabe8206eb0445c16a2c615eb
+  metadata.gz: d8a703611d38eedfa8d66e5db71084df8a89676e8f6401207451160278ec4df9c7274acab73027d6eba9c6bcb884c77ebd06c420fc08dd592ea423b7e45f9821
+  data.tar.gz: c2a876abb12ccd218c40f0e0d9d89613ea03f0d318f7dcffb83c85ea6f6cee3bebc52caf8ae2cf21bc0bc37969d271d04d61a6199d08865ab54ce40277f36a91

data/README.md

@@ -1,4 +1,4 @@
-# StoreModel [![Gem Version](https://badge.fury.io/rb/store_model.svg)](https://rubygems.org/gems/store_model) [![Coverage Status](https://coveralls.io/repos/github/DmitryTsepelev/store_model/badge.svg?branch=master)](https://coveralls.io/github/DmitryTsepelev/store_model?branch=master) ![](https://ruby-gem-downloads-badge.herokuapp.com/store_model?type=total)
+# StoreModel [![Gem Version](https://badge.fury.io/rb/store_model.svg)](https://rubygems.org/gems/store_model) ![](https://ruby-gem-downloads-badge.herokuapp.com/store_model?type=total)
 
 **StoreModel** gem allows you to wrap JSON-backed DB columns with ActiveModel-like classes.
 

data/lib/store_model/model.rb

@@ -118,7 +118,7 @@ module StoreModel
     #
     # @return [String]
     def inspect
-      attribute_string = attributes.map { |name, value| "#{name}: #{value.nil? ? 'nil' : value}" }
+      attribute_string = attributes.map { |name, value| "#{name}: #{value.inspect}" }
                                    .join(", ")
       "#<#{self.class.name} #{attribute_string}>"
     end

data/lib/store_model/nested_attributes.rb

@@ -35,25 +35,45 @@ module StoreModel
       #
       #   See https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html#method-i-accepts_nested_attributes_for
       def accepts_nested_attributes_for(*attributes)
-        global_options = attributes.extract_options!
+        options = attributes.extract_options!
 
-        attributes.each do |attribute, options|
-          case attribute_types[attribute.to_s]
+        attributes.each do |attribute|
+          case nested_attribute_type(attribute)
           when Types::OneBase, Types::ManyBase
-            define_store_model_attr_accessors(attribute, options || global_options)
+            options.reverse_merge!(allow_destroy: false, update_only: false)
+            define_store_model_attr_accessors(attribute, options)
           else
-            super(attribute, options || global_options)
+            super(*attribute, options)
           end
         end
       end
 
       private
 
+      # If attribute defined in ActiveRecord model but you dont yet have database created
+      # you cannot access attribute types.
+      # To handle this case, we can use ActiveRecord::Attributes 'attributes_to_define_after_schema_loads'
+      # which stores information about custom defined attributes.
+      # See ActiveRecord::Attributes#atribute
+      # If #accepts_nested_attributes_for is used inside active model instance
+      # schema is not required to determine attribute type so we can still use attribute_types
+      # If schema loaded the attribute_types already populated and we can safely use it
+      # See ActiveRecord::ModelSchema#load_schema!
+      def nested_attribute_type(attribute)
+        if self < ActiveRecord::Base && !schema_loaded?
+          attributes_to_define_after_schema_loads[attribute.to_s]&.first
+        else
+          attribute_types[attribute.to_s]
+        end
+      end
+
       def define_store_model_attr_accessors(attribute, options)
-        case attribute_types[attribute.to_s]
+        case nested_attribute_type(attribute)
         when Types::OneBase
           define_association_setter_for_single(attribute, options)
-          alias_method "#{attribute}_attributes=", "#{attribute}="
+          define_method "#{attribute}_attributes=" do |*args, **kwargs|
+            send("#{attribute}=", *args, **kwargs)
+          end
         when Types::ManyBase
           define_association_setter_for_many(attribute, options)
         end
@@ -64,7 +84,7 @@ module StoreModel
       def define_attr_accessor_for_destroy(association, options)
         return unless options&.dig(:allow_destroy)
 
-        attribute_types[association.to_s].model_klass.class_eval do
+        nested_attribute_type(association).model_klass.class_eval do
           attr_accessor :_destroy
         end
       end
@@ -88,7 +108,10 @@ module StoreModel
       end
     end
 
-    def assign_nested_attributes_for_collection_association(association, attributes, options)
+    # Base
+    def assign_nested_attributes_for_collection_association(association, attributes, options = nil)
+      return super(association, attributes) unless options
+
       attributes = attributes.values if attributes.is_a?(Hash)
 
       if options&.dig(:allow_destroy)

data/lib/store_model/types/one.rb

@@ -63,7 +63,7 @@ module StoreModel
       def deserialize(value)
         case value
         when String
-          payload = ActiveSupport::JSON.decode(value) rescue nil
+          payload = ActiveSupport::JSON.decode(value) rescue {}
           model_instance(deserialize_by_types(payload))
         when Hash
           model_instance(deserialize_by_types(value))

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,20 +66,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.64.0
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Gem for working with JSON-backed attributes as ActiveRecord models
 email:
 - dmitry.a.tsepelev@gmail.com