store_attribute 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2134f240621f2f546e5521fe4db4b66e3b6ec0a4a76ebb832fbcae8654c0904e
-  data.tar.gz: 862ce5201d0c1ad548035161b0f51b50a9a540a85ae8be0a9c550976f918701c
+  metadata.gz: 601846a5ef07068e0777b17cfb7896a6bcd1fe32ef93ac107f957c568a6598de
+  data.tar.gz: 7ebee7679babde4188b07aa0504310001edbe31758070112b6f5c0e48eadc83d
 SHA512:
-  metadata.gz: efe4992702c419f392f4fcbfd16c0ab32c862acf4679e841a7a8c28d40e0fb2eb66c2b72b2ac0156517a49bce4ee7308ec75ffa64604d4b879c735da0201d7f3
-  data.tar.gz: a9b8d3683abcd37f99a7c0ef68431e80e32a79537c5dab426e150a85b7d15c4b8ce1cb92e0a6c1c24031418286223e854fb2e2c73083c801781553f6559cd2c1
+  metadata.gz: 64d0e3b562bd62b6e8b65b993f049b3af805d0a38f075218eaa05993f7229befbf10f21e59dd1709ddd1faa5397e20ca4f02c8800a703cee7f3db79b12a28a98
+  data.tar.gz: 29623e721a38b1bf646f3a45c00c605c4162236716624e3cb8a0dceee69641d254145baa84b58008e3fe61084b1eb76249a34775f186bbe86861eca827ba2856

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master
 
+## 1.2.0 (2023-11-29)
+
+- Support Rails >7.1. ([@palkan][])
+
+- Fix handling of store attributes for not-yet-defined columns. ([@palkan][])
+
+## 1.1.1 (2023-06-27)
+
+- Lookup store attribute types only after schema load.
+
 ## 1.1.0 (2023-03-08) 🌷
 
 - Add configuration option to return default values when attribute key is not present in the serialized value ([@markedmondson][], [@palkan][]).

data/lib/store_attribute/active_record/store.rb

@@ -124,7 +124,7 @@ module ActiveRecord
         _define_predicate_method(name, prefix: prefix, suffix: suffix) if type == :boolean
 
         _define_store_attribute(store_name) if !_local_typed_stored_attributes? || _local_typed_stored_attributes[store_name].empty?
-        _store_local_stored_attribute(store_name, name, type, **options)
+        _local_typed_stored_attributes[store_name][name] = [type, options]
       end
 
       def store_attribute_unset_values_fallback_to_default
@@ -138,11 +138,6 @@ module ActiveRecord
           end
       end
 
-      def _store_local_stored_attribute(store_name, key, cast_type, default: Type::TypedStore::UNDEFINED, **options) # :nodoc:
-        cast_type = ActiveRecord::Type.lookup(cast_type, **options) if cast_type.is_a?(Symbol)
-        _local_typed_stored_attributes[store_name][key] = [cast_type, default]
-      end
-
       def _local_typed_stored_attributes?
         instance_variable_defined?(:@local_typed_stored_attributes)
       end
@@ -162,28 +157,45 @@ module ActiveRecord
 
       def _define_store_attribute(store_name)
         attr_name = store_name.to_s
-        was_type = attributes_to_define_after_schema_loads[attr_name]&.first
-
-        # For Rails <6.1
-        use_decorator = respond_to?(:decorate_attribute_type) && method(:decorate_attribute_type).parameters.count { |type, _| type == :req } == 2
 
         defaultik = Type::TypedStore::Defaultik.new
 
         owner = self
 
-        if use_decorator
+        # For Rails <6.1
+        if respond_to?(:decorate_attribute_type) && method(:decorate_attribute_type).parameters.count { |type, _| type == :req } == 2
           decorate_attribute_type(attr_name, "typed_accessor_for_#{attr_name}") do |subtype|
             subtypes = _local_typed_stored_attributes[attr_name]
             type = Type::TypedStore.create_from_type(subtype)
             type.owner = owner
             defaultik.type = type
-            subtypes.each { |name, (cast_type, default)| type.add_typed_key(name, cast_type, default: default) }
+            subtypes.each do |name, (cast_type, options)|
+              type.add_typed_key(name, cast_type, **options.symbolize_keys)
+            end
 
             define_default_attribute(attr_name, defaultik.proc, type, from_user: true)
 
             type
           end
+        # Rails >7.1
+        elsif respond_to?(:decorate_attributes)
+          decorate_attributes([attr_name]) do |_, subtype|
+            subtypes = _local_typed_stored_attributes[attr_name]
+            type = Type::TypedStore.create_from_type(subtype)
+            type.owner = owner
+            defaultik.type = type
+            subtypes.each do |name, (cast_type, options)|
+              type.add_typed_key(name, cast_type, **options.symbolize_keys)
+            end
+
+            type
+          end
+
+          attribute(attr_name, default: defaultik.proc)
+        # Rails >=6.1, <=7.1
         else
+          was_type = attributes_to_define_after_schema_loads[attr_name]&.first
+
           attribute(attr_name, default: defaultik.proc) do |subtype|
             subtypes = _local_typed_stored_attributes[attr_name]
             subtype = _lookup_cast_type(attr_name, was_type, {}) if defined?(_lookup_cast_type)
@@ -191,7 +203,9 @@ module ActiveRecord
             type = Type::TypedStore.create_from_type(subtype)
             type.owner = owner
             defaultik.type = type
-            subtypes.each { |name, (cast_type, default)| type.add_typed_key(name, cast_type, default: default) }
+            subtypes.each do |name, (cast_type, options)|
+              type.add_typed_key(name, cast_type, **options.symbolize_keys)
+            end
 
             type
           end

data/lib/store_attribute/active_record/type/typed_store.rb

@@ -30,7 +30,7 @@ module ActiveRecord
       def initialize(subtype)
         @accessor_types = {}
         @defaults = {}
-        @store_accessor = subtype.accessor
+        @subtype = subtype
         super(subtype)
       end
 
@@ -118,7 +118,7 @@ module ActiveRecord
       def key_to_cast(val, key)
         return key if val.key?(key)
         return key.to_sym if val.key?(key.to_sym)
-        return key if defaults.key?(key)
+        key if defaults.key?(key)
       end
 
       def typed?(key)
@@ -133,7 +133,11 @@ module ActiveRecord
         owner&.store_attribute_unset_values_fallback_to_default && defaults.key?(key)
       end
 
-      attr_reader :accessor_types, :defaults, :store_accessor, :owner
+      def store_accessor
+        subtype.accessor
+      end
+
+      attr_reader :accessor_types, :defaults, :subtype, :owner
     end
   end
 end

data/lib/store_attribute/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors