coaster 1.4.15 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05148ce7220929cde94487a2b368436630b00d84acd3f3d7dbecd8615834f5ce'
-  data.tar.gz: bb01490b06fd771896beca2e0f3db3c9cf44286e60b733b29598ed3186660cc2
+  metadata.gz: d9b06a2cf428c68aaa8d8a990cd3c7a38d33bb2ff6e032d12ee7aeb3e3816cd9
+  data.tar.gz: 638bf5a8d7a944c671b0b7e10f5308abff516d0b2ed98ac16279201131f394bf
 SHA512:
-  metadata.gz: 14739671089cd45b658bc3268e88b73135199b0ba08e2f0d411bc059d2686c0539a13ec4891894fac65edaa7bef3baa9aac902d6119587dc0e128e5b70037777
-  data.tar.gz: 80dad5a88e45bc18f83b50baf856d47260b75d2aa1efe1cde0f40d289c49d9df53649030053b0a753ccd10a75eae19fab3640ef5d7bdb93728e5f12341bd8c3a
+  metadata.gz: a659d1d247a9294ee83e8a31bb7df3ab536bb043a5880dfebafe0dee3680ebc6edab51ea12c6c3894f2a6cc99af15a2e14a103a236326255d739f82f9ec2935c
+  data.tar.gz: c2fff3ed081673f46fbb7570f10ef7d080bf2fd35898676d536a373830c38cf8e909e92a73c818226344b6ea0ec8b359987e54f6953ce7444e1e5c692ddc0fe7

data/lib/coaster/serialized_properties.rb

@@ -25,16 +25,16 @@ module Coaster
       cm || key.to_s
     end
 
-    def serialized_property(serialize_column, key, type: nil, comment: nil, getter: nil, setter: nil, setter_callback: nil, default: nil)
+    def serialized_property(serialize_column, key, type: nil, comment: nil, getter: nil, setter: nil, setter_callback: nil, default: nil, rescuer: nil)
       raise DuplicatedProperty, "#{self.name}##{key} duplicated\n#{caller[0..5].join("\n")}" if serialized_property_settings[key.to_sym]
-      serialized_property_settings[key.to_sym] = {type: type, comment: comment, getter: getter, setter: setter, setter_callback: setter_callback, default: default}
-      _typed_serialized_property(serialize_column, key, type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default)
+      serialized_property_settings[key.to_sym] = {type: type, comment: comment, getter: getter, setter: setter, setter_callback: setter_callback, default: default, rescuer: rescuer}
+      _typed_serialized_property(serialize_column, key, type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default, rescuer: rescuer)
     end
 
-    def serialized_properties(serialize_column, *keys, type: nil, getter: nil, setter: nil, setter_callback: nil, default: nil)
+    def serialized_properties(serialize_column, *keys, type: nil, getter: nil, setter: nil, setter_callback: nil, default: nil, rescuer: nil)
       keys.flatten.each do |key|
         key_name = key
-        prop_hash = {type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default}
+        prop_hash = {type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default, rescuer: rescuer}
         if key.is_a? Hash
           key_name = key[:key]
           prop_hash = {type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default}.merge(key)
@@ -46,7 +46,7 @@ module Coaster
 
     private
 
-    def _typed_serialized_property(serialize_column, key, type: nil, getter: nil, setter: nil, setter_callback: nil, default: nil)
+    def _typed_serialized_property(serialize_column, key, type: nil, getter: nil, setter: nil, setter_callback: nil, default: nil, rescuer: nil)
       case type
         when String then
           # String은 나중에 eval해서 가져옴,
@@ -55,14 +55,25 @@ module Coaster
             if type.is_a?(String)
               begin
                 type = eval(type)
-                raise InvalidProperty, "#{self.name}##{key} type string is return string #{type}" if type.is_a?(String)
+                raise InvalidProperty, m: "#{self.name}##{key} type string is return string #{type}", type: type if type.is_a?(String)
               rescue InvalidProperty => e
-                raise
+                if rescuer
+                  type = rescuer.call(e)
+                else
+                  raise
+                end
               rescue => e
-                raise InvalidProperty, "#{self.name}##{key} eval failed: type:[#{type}] [#{e.class.name}] #{e.message}"
+                e.attributes[:type] = type
+                if rescuer
+                  type = rescuer.call(e)
+                else
+                  raise InvalidProperty, "#{self.name}##{key} eval failed: type:[#{type}] [#{e.class.name}] #{e.message}"
+                end
+              end
+              if type
+                serialized_property_setting(key.to_sym)[:type] = type
+                _typed_serialized_property serialize_column, key, type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default
               end
-              serialized_property_setting(key.to_sym)[:type] = type
-              _typed_serialized_property serialize_column, key, type: type, getter: getter, setter: setter, setter_callback: setter_callback, default: default
             end
           }
         when Array then

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.4.15'
+  VERSION = '1.4.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.4.15
+  version: 1.4.16
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj