store_model 0.12.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ca0d09ab27d1e2fb7d83c2463d6467879fc915343bef013cc45759c2c1d508
-  data.tar.gz: 58cf03e6d692d62715ee0564f79913a8212e73b95defae7572ef88314c244265
+  metadata.gz: df54ca03d99d1173d2e94d32c6a8cc4fa4a503c8f6d7a26b77ff4275e9cf7420
+  data.tar.gz: 011b0d5f4fe3532998bca81043895f0882a5f709245c4d688a0226ba17eb2cbb
 SHA512:
-  metadata.gz: 22e05c3bf0438d9add8abfed9950b3a8fba77766b90e5105ef766bf8bc64e233758d85ec841aefa026d6dbe075334999e969c90fbdf5057bd45cd38355a240ac
-  data.tar.gz: 508b2bddff9deac36022342f8069adfe66857301436347d9d7fd01fdf594207c5e83670581f2fefc50567c80d927b3344cb5ff62e5b9ae5e7269f0f86db833df
+  metadata.gz: c4dad930177bc577c03a7f12959f57ac897dd1caa17c2817786e15e4e120dee2b1563778575c5eebcbaf9639abca7b8a8ea7bf9ba4f6ee93e2624267d4a06798
+  data.tar.gz: dc0a1200e73a465832e3abb9b6778991395a8c70b19b0e1480b19f15b723d64bc7e259fdbeaef6be837c286767675bf44f1828173a8004edfa0f058f7db1888f

data/lib/store_model/configuration.rb

@@ -10,5 +10,13 @@ module StoreModel
     # Controls usage of MergeArrayErrorStrategy
     # @return [Boolean]
     attr_accessor :merge_array_errors
+
+    # Controls if the result of `as_json` will contain the unknown attributes of the model
+    # @return [Boolean]
+    attr_accessor :serialize_unknown_attributes
+
+    def initialize
+      @serialize_unknown_attributes = true
+    end
   end
 end

data/lib/store_model/ext/active_model/attributes.rb

@@ -15,9 +15,17 @@ module StoreModel
       end
     end
 
-    def write_attribute(*)
-      super.tap do |value|
-        assign_parent_to_store_model_relation(value)
+    if Rails::VERSION::MAJOR >= 7
+      def _write_attribute(*)
+        super.tap do |value|
+          assign_parent_to_store_model_relation(value)
+        end
+      end
+    else
+      def write_attribute(*)
+        super.tap do |value|
+          assign_parent_to_store_model_relation(value)
+        end
       end
     end
   end

data/lib/store_model/model.rb

@@ -11,6 +11,7 @@ module StoreModel
     def self.included(base) # :nodoc:
       base.include ActiveModel::Model
       base.include ActiveModel::Attributes
+      base.include ActiveRecord::AttributeMethods::BeforeTypeCast
       base.include ActiveModel::AttributeMethods
       base.include StoreModel::NestedAttributes
 
@@ -29,7 +30,15 @@ module StoreModel
     #
     # @return [Hash]
     def as_json(options = {})
-      attributes.with_indifferent_access.as_json(options)
+      serialize_unknown_attributes = if options.key?(:serialize_unknown_attributes)
+                                       options[:serialize_unknown_attributes]
+                                     else
+                                       StoreModel.config.serialize_unknown_attributes
+                                     end
+
+      result = attributes.with_indifferent_access
+      result.merge!(unknown_attributes) if serialize_unknown_attributes
+      result.as_json(options)
     end
 
     # Compares two StoreModel::Model instances
@@ -42,6 +51,7 @@ module StoreModel
 
       attributes.all? { |name, value| value == other.attributes[name] }
     end
+    alias eql? ==
 
     # Returns hash for a StoreModel::Model instance based on attributes hash
     #

data/lib/store_model/types/many_base.rb

@@ -38,7 +38,7 @@ module StoreModel
       def serialize(value)
         case value
         when Array
-          ActiveSupport::JSON.encode(value)
+          ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
         else
           super
         end

data/lib/store_model/types/one.rb

@@ -47,7 +47,7 @@ module StoreModel
       def serialize(value)
         case value
         when Hash, @model_klass
-          ActiveSupport::JSON.encode(value)
+          ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
         else
           super
         end

data/lib/store_model/types/one_polymorphic.rb

@@ -52,9 +52,11 @@ module StoreModel
       def serialize(value)
         case value
         when Hash
-          ActiveSupport::JSON.encode(value)
+          ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
         else
-          return ActiveSupport::JSON.encode(value) if implements_model?(value.class)
+          if implements_model?(value.class)
+            return ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
+          end
 
           super
         end

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.1.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Gem for working with JSON-backed attributes as ActiveRecord models