store_model 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02f882325fbae00f97a61603cdab0578ccfd1723a54b8b6e4cfd61aeaabe8a6f
-  data.tar.gz: bfd3a7c92a01debecb1fea0d36f73306486612ec7cba22095f9673907ae6b9e4
+  metadata.gz: 7cd3190d949fc4fd854928abccfafa5b74658bb973e1efe1567aa7b0ab0546d8
+  data.tar.gz: 22945765f627eca2a7278b46b3f462ee620e5721957d401a5f06b13b7daafffe
 SHA512:
-  metadata.gz: d8a703611d38eedfa8d66e5db71084df8a89676e8f6401207451160278ec4df9c7274acab73027d6eba9c6bcb884c77ebd06c420fc08dd592ea423b7e45f9821
-  data.tar.gz: c2a876abb12ccd218c40f0e0d9d89613ea03f0d318f7dcffb83c85ea6f6cee3bebc52caf8ae2cf21bc0bc37969d271d04d61a6199d08865ab54ce40277f36a91
+  metadata.gz: 1a740f2c00feb62259cae03b72f992dfc7ae15538010a3d62a88cf3cdcb3ab5986e20ae56d2f9133adf294ab4d25232b56216ff3f940ad8732bbef8de1dc0e56
+  data.tar.gz: e6ad43a005026d5275fd29573ab9dbddd3d8fb966c329eb9a44f7fc2b0406cc9350725cc143daea17953e8d084d9a76b5a13d87d50b213fe0a565e3b9a2c289a

data/lib/store_model/enum.rb

@@ -10,12 +10,12 @@ module StoreModel
     # @param kwargs [Object]
     def enum(name, values = nil, **kwargs)
       values ||= kwargs[:in] || kwargs
-      options = kwargs.slice(:_prefix, :_suffix, :default)
+      options = retrieve_options(kwargs)
 
       ensure_hash(values).tap do |mapping|
-        define_attribute(name, mapping, options[:default])
+        define_attribute(name, mapping, options)
         define_reader(name, mapping)
-        define_writer(name, mapping)
+        define_writer(name, mapping, options[:raise_on_invalid_values])
         define_method("#{name}_value") { attributes[name.to_s] }
         define_map_readers(name, mapping)
         define_predicate_methods(name, mapping, options)
@@ -24,16 +24,25 @@ module StoreModel
 
     private
 
-    def define_attribute(name, mapping, default)
-      attribute name, cast_type(mapping), default: default
+    def retrieve_options(options)
+      default_options = { raise_on_invalid_values: true }
+      options.slice(:_prefix, :_suffix, :default, :raise_on_invalid_values)
+             .reverse_merge(default_options)
+    end
+
+    def define_attribute(name, mapping, options)
+      attribute name, cast_type(mapping, options[:raise_on_invalid_values]), default: options[:default]
     end
 
     def define_reader(name, mapping)
-      define_method(name) { mapping.key(send("#{name}_value")).to_s }
+      define_method(name) do
+        raw_value = send("#{name}_value")
+        (mapping.key(raw_value) || raw_value).to_s
+      end
     end
 
-    def define_writer(name, mapping)
-      type = cast_type(mapping)
+    def define_writer(name, mapping, raise_on_invalid_values)
+      type = cast_type(mapping, raise_on_invalid_values)
       define_method("#{name}=") { |value| super type.cast_value(value) }
     end
 
@@ -50,8 +59,8 @@ module StoreModel
       singleton_class.alias_method(ActiveSupport::Inflector.pluralize(name), "#{name}_values")
     end
 
-    def cast_type(mapping)
-      StoreModel::Types::EnumType.new(mapping)
+    def cast_type(mapping, raise_on_invalid_values)
+      StoreModel::Types::EnumType.new(mapping, raise_on_invalid_values)
     end
 
     def ensure_hash(values)

data/lib/store_model/types/enum_type.rb

@@ -11,8 +11,9 @@ module StoreModel
       # @param mapping [Hash] mapping for enum values
       #
       # @return [StoreModel::Types::EnumType]
-      def initialize(mapping)
+      def initialize(mapping, raise_on_invalid_values)
         @mapping = mapping
+        @raise_on_invalid_values = raise_on_invalid_values
       end
 
       # Returns type
@@ -31,7 +32,7 @@ module StoreModel
         return if value.blank?
 
         case value
-        when String, Symbol then cast_symbol_value(value.to_sym)
+        when String, Symbol then cast_symbol_value(value)
         when Integer then cast_integer_value(value)
         else
           raise StoreModel::Types::CastError,
@@ -43,12 +44,12 @@ module StoreModel
       private
 
       def cast_symbol_value(value)
-        raise_invalid_value!(value) unless @mapping.key?(value.to_sym)
-        @mapping[value.to_sym]
+        raise_invalid_value!(value) if @raise_on_invalid_values && !@mapping.key?(value.to_sym)
+        @mapping[value.to_sym] || value
       end
 
       def cast_integer_value(value)
-        raise_invalid_value!(value) unless @mapping.value?(value)
+        raise_invalid_value!(value) if @raise_on_invalid_values && !@mapping.value?(value)
         value
       end
 

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord