coaster 1.4.11 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672b2d8abf215219eb2fd1b925d3ed0ab658cef0ab54f449daeb8d99260d4fcb
-  data.tar.gz: 6b9fc26bcaaad1a9df56e8ee15e917c960ce463d642c5e0047420738cbffade4
+  metadata.gz: 3fc17d468961bab6b4f93a732e8731d0b25eb3b25205f15e6ddbe464978fe744
+  data.tar.gz: 87bbf294791a39fde0d45ee3872f4566ca42bfa8c05af3860c9d9f136848d944
 SHA512:
-  metadata.gz: b2f83e5b8274e241f85102da046bb559aa6888e4f87eec0a0153322c85ef48977c734e5deccf8ff013d7cdd718c49ce65198aa0f7e9ef3e24962daa821402b32
-  data.tar.gz: f473793222297836169f893954e09ab93b80b0e367d86cb62a48a48fe7e76728b4950076a992d4eb5eaa3cf4a21e64ffb2ffe8be4648bce5d8c7c35ffdf07584
+  metadata.gz: '049c160b3d86b2ca1072d7b6b6fbefc44b03209c5a68411126cfc72c13b480d3d3b808ac9e02056d4582a6c7d642f50cccadc33f504a900fcfdf33012c67852d'
+  data.tar.gz: 4b392aa4f2dc03a25b02a18ed1ed76b7f94d271e2d37198983a3f7dbd08f3e2c8e195eab7b8f33f588af9ac948c2b43668a23cf57da7e625e815c2009b44407e

data/lib/coaster/safe_yaml_serializer.rb

@@ -1,19 +1,6 @@
 # frozen_string_literal: true
 
 module Coaster
-  # +ActiveRecord::AttributeMethods::Serialization#serialize+ 적용시 YAML
-  # 시리얼라이저로 지정한다. 다음과 같은 특징이 있다.
-  #   * 안전한 YAML(+Psych.safe_load+ 가능한 YAML)로 시리얼라이즈한다.
-  #   * +Hash+ 만 지원한다.
-  #   * YAML 데이터가 nil 인 경우 +load+ 하면 빈 해시를 반환한다.
-  #   * +load+ 는 +ActiveSupport::HashWithIndifferentAccess+ 를 반환한다.
-  # ==== 주의
-  #   * 해시 값에 지정된 객체는 기본 타입(String으로 변환된다
-  #
-  # ==== Example
-  #   class User < ApplicationRecord
-  #     serialize :data, SafeYamlSerializer
-  #   end
   class SafeYamlSerializer
     class << self
       def dump(obj)
@@ -25,14 +12,12 @@ module Coaster
         return {} if yaml.nil?
         return yaml unless yaml.is_a?(String) && yaml.start_with?("---")
 
-        if Rails.env.production?
-          YAML.load(yaml)
-        else
-          begin
-            YAML.safe_load(yaml, [], [], true) || {}
-          rescue Psych::DisallowedClass => e
-            # Rails.logger.warn e.inspect
-            # Rails.logger.warn e.backtrace.join("\n")
+        begin
+          YAML.safe_load(yaml, permitted_classes: [Date, Time], aliases: true) || {}
+        rescue Psych::DisallowedClass => e
+          if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(yaml) || {}
+          else
             YAML.load(yaml) || {}
           end
         end
@@ -40,7 +25,9 @@ module Coaster
 
       # @return [HashWithIndifferentAccess]
       def load(yaml)
-        (_load_hash(yaml) || {}).with_indifferent_access
+        obj = _load_hash(yaml)
+        obj = obj.with_indifferent_access if obj.is_a?(Hash)
+        obj
       end
     end
   end

data/lib/coaster/serialized_properties.rb

@@ -106,7 +106,7 @@ module Coaster
             _define_serialized_property(serialize_column, key, default: default || [])
           elsif type.respond_to?(:serialized_property_serializer) && (serializer = type.serialized_property_serializer)
             _define_serialized_property(serialize_column, key, getter: serializer[:getter], setter: serializer[:setter], setter_callback: serializer[:setter_callback], default: default)
-          elsif type.is_a?(Class) && type < ActiveRecord::Base
+          elsif (type.is_a?(Symbol) && (t = type.to_s.constantize rescue nil)) || (type.is_a?(Class) && type < ActiveRecord::Base && (t = type))
             _define_serialized_property serialize_column, "#{key}_id", default: default
 
             define_method key.to_sym do
@@ -116,10 +116,10 @@ module Coaster
               if key_id.nil?
                 instance_val = nil
               else
-                instance_val = type.find(key_id) rescue nil
-                instance_variable_set("@#{key}".to_sym, instance_val)
+                instance_val = t.find(key_id) rescue nil
               end
               instance_val = getter.call(instance_val) if getter
+              instance_variable_set("@#{key}".to_sym, instance_val)
               instance_val
             end
 
@@ -130,8 +130,8 @@ module Coaster
                 instance_variable_set("@#{key}".to_sym, nil)
                 send("#{key}_id=".to_sym, nil)
               else
-                unless val.is_a?(type)
-                  raise ActiveRecord::AssociationTypeMismatch, "#{type}(##{type.object_id}) expected, got #{val.class.name}(#{val.class.object_id})"
+                unless val.is_a?(t)
+                  raise ActiveRecord::AssociationTypeMismatch, "#{t}(##{t.object_id}) expected, got #{val.class.name}(#{val.class.object_id})"
                 end
                 instance_variable_set("@#{key}".to_sym, val)
                 send("#{key}_id=".to_sym, (Integer(val.id) rescue val.id))

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.4.11'
+  VERSION = '1.4.12'
 end

data/test/support/models.rb

@@ -6,6 +6,8 @@ class User < ActiveRecord::Base
   extend Coaster::SerializedProperties
   serialized_column :data
   serialized_property :data, :appendix, default: {}
+  serialized_property :data, :father, type: :User
+  serialized_property :data, :mother, type: self
 
   def init_appendix
     appendix['test_key1'] ||= 0

data/test/test_serialized_property.rb

@@ -14,6 +14,20 @@ module Coaster
       user.init_appendix
       assert_equal 0, user.appendix['test_key1']
       assert_equal 0, user.appendix['test_key2']
+      father = User.create(name: 'father')
+      user.father = father
+      assert_equal father, user.father
+      assert_equal father.id, user.father_id
+      mother = User.create(name: 'mother')
+      user.mother = mother
+      assert_equal mother, user.mother
+      assert_equal mother.id, user.mother_id
+      assert_equal({"appendix"=>{"test_key1"=>0, "test_key2"=>0}, "father_id"=>father.id, "mother_id"=>mother.id}, user.data)
+      user.save!
+      user = User.find(user.id)
+      assert_equal({"appendix"=>{"test_key1"=>0, "test_key2"=>0}, "father_id"=>father.id, "mother_id"=>mother.id}, user.data)
+      assert_equal mother, user.mother
+      assert_equal father, user.father
     end
   end
 end

metadata

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