store_model 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11081c035b30aac60161c2efaa4c629faf80aee154135d71cd9d1723ac0f96ea
-  data.tar.gz: 7ccd368264fd10a0731b81d30f708d1187f5b4571dc0e27cc374e650ab8c5d91
+  metadata.gz: f4731608dcbfcf457b9e0cce52d04766ccbc7ea38fc061a6af61ef3b6edc2a3c
+  data.tar.gz: d5a84b08a03420aece94ea78a0c620d3e486ac4046173d6b6091974f94f4c507
 SHA512:
-  metadata.gz: 9842ac11b144fe8bde05bb50e0d91b6301450a8bd3f67cfdb3beca09c7d806568dc40994db42eebe929c01eca83ce8762a622eeea512bdfa0e04b92458ed33ba
-  data.tar.gz: 88044a2f28e0edf8a6babfd7935d1e89af2df45e6b9c831227cfabc9346e89421d53ce19e8dfcdf44c96efe93d3bf6faf28ccdf3251fb167391ccba38eef81e5
+  metadata.gz: 9e78d0f1f95f9982ed599f5701e06d48936f2be349189764b5fa7df6fc7a0c9ee71a17d1ae50a74c1a70bcbb037feb8e33db43131de1e880efb74c9a2c0e9c9d
+  data.tar.gz: 7d5d82c70fe870f3abc767faae918a2a8f11bc6a9d645a8d36d12800da19951b9a8f018cdc336e5c35979a5e21847a034d1d9b76196a87c6bd1a1d0389062a80

data/lib/active_model/validations/store_model_validator.rb

@@ -22,20 +22,21 @@ module ActiveModel
 
         case record.type_for_attribute(attribute).type
         when :json, :polymorphic
-          call_json_strategy(attribute, record.errors, value)
+          call_json_strategy(record, attribute, value)
         when :array, :polymorphic_array
-          call_array_strategy(attribute, record.errors, value)
+          call_array_strategy(record, attribute, value)
         end
       end
 
       private
 
-      def call_json_strategy(attribute, record_errors, value)
-        strategy.call(attribute, record_errors, value.errors) if value.invalid?
+      def call_json_strategy(record, attribute, value)
+        strategy.call(attribute, record.errors, value.errors) if value.invalid?(record.validation_context)
       end
 
-      def call_array_strategy(attribute, record_errors, value)
-        array_strategy.call(attribute, record_errors, value) if value.select(&:invalid?).present?
+      def call_array_strategy(record, attribute, value)
+        any_invalid = value.select { |v| v.invalid?(record.validation_context) }.present?
+        array_strategy.call(attribute, record.errors, value) if any_invalid
       end
 
       def strategy

data/lib/store_model/enum.rb

@@ -17,7 +17,7 @@ module StoreModel
         define_reader(name, mapping)
         define_writer(name, mapping)
         define_method("#{name}_value") { attributes[name.to_s] }
-        define_method("#{name}_values") { mapping }
+        define_map_readers(name, mapping)
         define_predicate_methods(name, mapping, options)
       end
     end
@@ -44,6 +44,12 @@ module StoreModel
       end
     end
 
+    def define_map_readers(name, mapping)
+      define_method("#{name}_values") { mapping }
+      singleton_class.define_method("#{name}_values") { mapping }
+      singleton_class.alias_method(ActiveSupport::Inflector.pluralize(name), "#{name}_values")
+    end
+
     def cast_type(mapping)
       StoreModel::Types::EnumType.new(mapping)
     end

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord