store_model 0.11.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066a53b97ac50d61d82c10376abe79d3dac452ff2ff33f3a5d650e7e119e356f
-  data.tar.gz: '0892deb0ac4827ad431ea76c0d1a121bacfbb0fe66204164fba1c6baec685cad'
+  metadata.gz: 4da1ca43da439ca2634d69307669020e77ac7349c3ab8fc61ac0386a6e980715
+  data.tar.gz: 2f88d2308bfb76be228eebdb7e6ecd1df5f63a4c8b751f0d41a289e5a30cfb1a
 SHA512:
-  metadata.gz: 0333e12118a8a445a22ed591e1e887dfc3912f6e02f41e0cc63d87d8dde76a001abd30e5860afba0bde49a4f6163b7092e4fc9c931865586344959c52ddf2cdc
-  data.tar.gz: 9eaffc2c1660ea778b5360410e1498ff3dd4add451cbcdc1cf6ee32a83fb65bd4286b76929c9cddf7d4c693811bee83cc5669391fa0ea84dcdd0254e5fc44a25
+  metadata.gz: 4dd14031ebb8949192d31cfcbcc48609a7670c023d3968e12ee32a7db686081bdc67390cb6538519eb79d1ba3f4cc4ee1ef9f5496d4f06991fae1ee24eb9bb8f
+  data.tar.gz: 32e2ae5a3c1a5286cb299039de8b435a919e0618d9251904b3c0c32b439601da7847d9d33e2f039d56831621df4692013d345b8ac946f2c7c59a99d927f53f85

data/README.md

@@ -79,6 +79,11 @@ end
 product.save
 ```
 
+_Usage note: Rails and assigning Arrays/Hashes to records_
+
+- Assigned attributes must be a String, Hash, Array of Hashes, or StoreModel. For example, if the attributes are coming from a controller, be sure to convert any ActionController::Parameters as needed.
+- Any changes made to a StoreModel instance requires the attribute be re-assigned; Rails doesn't track mutations of objects. For example: `self.my_stored_models = my_stored_models.map(&:as_json)`
+
 ## Documentation
 
 1. [Installation](./docs/installation.md)

data/lib/store_model/enum.rb

@@ -10,14 +10,15 @@ module StoreModel
     # @param kwargs [Object]
     def enum(name, values = nil, **kwargs)
       values ||= kwargs[:in] || kwargs
+      options = kwargs.slice(:_prefix, :_suffix, :default)
 
       ensure_hash(values).tap do |mapping|
-        define_attribute(name, mapping, kwargs[:default])
+        define_attribute(name, mapping, options[:default])
         define_reader(name, mapping)
         define_writer(name, mapping)
         define_method("#{name}_value") { attributes[name.to_s] }
         define_method("#{name}_values") { mapping }
-        define_predicate_methods(name, mapping)
+        define_predicate_methods(name, mapping, options)
       end
     end
 
@@ -36,8 +37,9 @@ module StoreModel
       define_method("#{name}=") { |value| super type.cast_value(value) }
     end
 
-    def define_predicate_methods(name, mapping)
+    def define_predicate_methods(name, mapping, options)
       mapping.each do |label, value|
+        label = affixed_label(label, name, options[:_prefix], options[:_suffix])
         define_method("#{label}?") { send(name) == mapping.key(value).to_s }
       end
     end
@@ -51,5 +53,12 @@ module StoreModel
 
       values.zip(0...values.size).to_h
     end
+
+    def affixed_label(label, name, prefix = nil, suffix = nil)
+      prefix = prefix == true ? "#{name}_" : "#{prefix}_" if prefix
+      suffix = suffix == true ? "_#{name}" : "_#{suffix}" if suffix
+
+      "#{prefix}#{label}#{suffix}"
+    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,7 @@ module StoreModel
     #
     # @return [Hash]
     def as_json(options = {})
-      attributes.with_indifferent_access.as_json(options)
+      attributes.with_indifferent_access.merge(unknown_attributes).as_json(options)
     end
 
     # Compares two StoreModel::Model instances

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 1.0.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-06-27 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