store_model 0.13.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02467ba044729f1a4196b520ae35b90157cd09b8de8a41db53673f74bd24481
-  data.tar.gz: f893737770e749558b124154c81d3400b2f7a6defcfccee7164ad7fc667ba797
+  metadata.gz: 6139e784c55ab957dc9de25a43b4727c91333dde4b7c92f4f22ea2634c204bf5
+  data.tar.gz: 04ae362612c4032445da8b05320e0d95f29a4b825bba751fa72811aabae263bd
 SHA512:
-  metadata.gz: 8b3357e13f694420ebc0e58018fe247ed28cf7cab32345b24208c49751e119561a4413f11bb39cf80bab99f54cbfbd818dbcd54a4f6e801c16dd9cf22f7c5392
-  data.tar.gz: 9679bf7228ac2156f6704a4ac457db2d39f8837d428a04607bbb9a09e07dfeaa843ff91d929e04690ef6c1b65e1d2b318b4a98cc4beaba125f48e16659b82c16
+  metadata.gz: fc7e96d96c1d4e8b7074b7d4000755137b3199b55769ff5e57ad59235e79cde8441e80d59133a54981788a94202df8b698484a896d4ea2d22dd90fdb3633736f
+  data.tar.gz: '001499ba6ff97ee59dc16fca855fbd9128fe9f6f85d4fe37438f4ea13bdea5ae81bf6da9281b8436b816573be6c79a15f68c6fdb0c3b610e7d23a897ba762b6b'

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
 
@@ -22,6 +23,8 @@ module StoreModel
 
     attr_accessor :parent
 
+    delegate :each_value, :fetch, to: :attributes
+
     # Returns a hash representing the model. Some configuration can be
     # passed through +options+.
     #
@@ -29,7 +32,15 @@ module StoreModel
     #
     # @return [Hash]
     def as_json(options = {})
-      attributes.with_indifferent_access.merge(unknown_attributes).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 +53,24 @@ module StoreModel
 
       attributes.all? { |name, value| value == other.attributes[name] }
     end
+    alias eql? ==
+
+    # Accessing attribute using brackets
+    #
+    # @return [Object]
+    def [](attr_name)
+      @attributes.fetch_value(attr_name.to_s)
+    end
+
+    # Setting attribute using brackets
+    #
+    # @param name [String, Symbol]
+    # @param value [Object]
+    #
+    # @return [Object]
+    def []=(attr_name, value)
+      @attributes.write_from_user(attr_name.to_s, value)
+    end
 
     # 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.13.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.2.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Gem for working with JSON-backed attributes as ActiveRecord models