coaster 1.4.14 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1900122e65b530f6f0fa5a326066a732f5f4a9fb8b50321456d25648acceae
-  data.tar.gz: 21cd9c962eadc7e375fd8c39fc03259f8aeee6efa525efd4c770ca3d5c8ece2b
+  metadata.gz: d9b06a2cf428c68aaa8d8a990cd3c7a38d33bb2ff6e032d12ee7aeb3e3816cd9
+  data.tar.gz: 638bf5a8d7a944c671b0b7e10f5308abff516d0b2ed98ac16279201131f394bf
 SHA512:
-  metadata.gz: 0d1ab771e687cf80aae1c22cf1d4b37787354966d3465d0bd33f5a2dab498d4ef63cb4214ab6d331556d172ab889773dc9e584fd29d61837c05beec17f495b32
-  data.tar.gz: 7e720f7287a730114f978a2a469ccb64099d809eec9c415d851efb9df5bcbc74f2d06b287e555f04c7bf0dc50566ad263538da6a79471d6a67bd721dac45c576
+  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/util.rb

@@ -52,7 +52,8 @@ module Coaster
         end
 
         array_keys = (array_start...(step2.keys.size+array_start)).to_a
-        if array_keys == step2.keys.map(&:to_i).sort
+        step2_keys = step2.keys.map {|k| Integer(k)} rescue nil
+        if array_keys == step2_keys
           step3 = []
           array_keys.map(&:to_s).each do |k|
             step3 << step2[k]

data/lib/coaster/version.rb

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

data/test/test_util.rb

@@ -38,5 +38,12 @@ module Coaster
       b = Util.roughen_hashify(res, array_start: 1, delimiter: '/')
       assert_equal(a, b)
     end
+
+    def test_roughen_hashify
+      assert_equal({'a'=> [2, 3]}, Util.roughen_hashify({'a.0' => 2, 'a.1' => 3}))
+      assert_equal({'a'=> [2, 3]}, Util.roughen_hashify({'a.1' => 2, 'a.2' => 3}, array_start: 1))
+      res = Util.roughen_hashify({"1.a"=>1, "2"=>22, "3.1"=>33, "3.2"=>44, "4.b.c.1"=>33, "4.b.c.2.d"=>4}, array_start: 1)
+      assert_equal([{"a"=>1}, 22, [33, 44], {"b"=>{"c"=>[33, {"d"=>4}]}}], res)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.16
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: A little convenient feature for standard library