coaster 1.3.18 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e15c20364ddf5904a27bacf4444b398fc3c1546358d1dea7bc528b3b3d8984
-  data.tar.gz: f404e8e526232d2d1989cf34599b448fab05f85b01be2d71a841fd75510c1369
+  metadata.gz: 9a7dffaea9663d2126ec52401350b70af96285a7476e2540ab9a6ba5b55ae6f8
+  data.tar.gz: c2bb68ce9c7e15c385229579a6ca77e74e75c13b39be31d65affd17f2f690495
 SHA512:
-  metadata.gz: 6c5a2801171bb3e725a28763efdeb9585f4200d9ae651c167efe3efca7b1840417853d7ac684ac7f52f28f537ddf53b6309798715aed42da106e542b4f715800
-  data.tar.gz: 464be9d5a8c7af75fc8f005645203c4b7c19ffd236ecb27431bf8ae9653df2de3ad58650c93087139baf8a91322e5d14d7e386f06fd1d7507cc12527e565e663
+  metadata.gz: 1e28d5fe2efe1af4387b8134f594ee9ab136434bf09c08079e004525ee075c0d3605ca29333c669ebe60363ca0040441badeffc2f41495c06fe45a9ce5ddb00a
+  data.tar.gz: e6b2fe88e60f8f7e2eba5d3cdeedff765919a120d9f3aff01a4a244ac6b2bee32e44a64ca48535bb684491e1e5073af0de124d923a7123839813ae710d837944

data/lib/coaster/safe_yaml_serializer.rb

@@ -0,0 +1,47 @@
+# 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)
+        return if obj.nil?
+        YAML.dump(JSON.load(obj.to_json))
+      end
+
+      def _load_hash(yaml)
+        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")
+            YAML.load(yaml) || {}
+          end
+        end
+      end
+
+      # @return [HashWithIndifferentAccess]
+      def load(yaml)
+        (_load_hash(yaml) || {}).with_indifferent_access
+      end
+    end
+  end
+end

data/lib/coaster/serialized_properties.rb

@@ -78,7 +78,11 @@ module Coaster
           if type == Time
             _define_serialized_property serialize_column, key,
               getter: Proc.new { |val| val.nil? ? nil : Time.zone.parse(val) },
-              setter: Proc.new { |val| val.is_a?(Time) ? val.to_s(:default_tz) : nil}
+              setter: Proc.new { |val|
+                if val.is_a?(Time)
+                  val.respond_to?(:to_fs) ? val.to_fs(:default_tz) : val.to_s(:default_tz)
+                end
+              }
           elsif type == Integer
             _define_serialized_property serialize_column, key,
               setter: proc { |val|
@@ -143,6 +147,7 @@ module Coaster
           define_method key.to_sym do
             hsh = send(serialize_column.to_sym)
             hsh[key.to_s] ||= default.dup
+            hsh[key.to_s]
           end
         end
       else

data/lib/coaster/util.rb

@@ -4,6 +4,9 @@ module Coaster
     ARRAY_START = 0
 
     class << self
+      # array_start가 0이면 array를 {'0'=>'blah', '1'=>'vlah'}
+      # array_start가 1이면 array를 {'1'=>'blah', '2'=>'vlah'}
+      # array_start가 nil이면 그대로 ['blah', 'vlah'] 로 처리
       def flatten_hashify(object, delimiter: FLATTEN_HASH_DELIMITER, breadcrumbs: [], array_start: nil)
         case object
         when Hash
@@ -23,7 +26,11 @@ module Coaster
         end
       end
 
-      def roughen_hashify(object, delimiter: FLATTEN_HASH_DELIMITER, array_start: ARRAY_START)
+      # 숫자로 된 키는 무조건 array로 처리함
+      # array_start는 nil일 경우 기본값은 Util::ARRAY_START = 0
+      def roughen_hashify(object, delimiter: FLATTEN_HASH_DELIMITER, array_start: nil)
+        array_start ||= ARRAY_START
+
         step1 = object.each_with_object({}) do |(key, value), memo|
           sp_keys = key.split(delimiter)
           k = sp_keys.shift

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.18'
+  VERSION = '1.3.20'
 end

data/test/support/models.rb

@@ -0,0 +1,14 @@
+require 'coaster/serialized_properties'
+require 'coaster/safe_yaml_serializer'
+
+class User < ActiveRecord::Base
+  serialize :data, Coaster::SafeYamlSerializer
+  extend Coaster::SerializedProperties
+  serialized_column :data
+  serialized_property :data, :appendix, default: {}
+
+  def init_appendix
+    appendix['test_key1'] ||= 0
+    appendix['test_key2'] ||= 0
+  end
+end

data/test/support/schema.rb

@@ -0,0 +1,11 @@
+ActiveRecord::Schema.define do
+  create_table :users do |t|
+    t.string :key
+    t.string :name
+    t.integer :age
+    t.datetime :last_login
+    t.text :data
+    t.timestamps
+  end
+
+end

data/test/test_helper.rb

@@ -8,6 +8,12 @@ require 'bundler/setup'
 require 'coaster'
 require 'logger'
 
+require 'active_record'
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ":memory:"
+load File.expand_path('../support/schema.rb', __FILE__)
+load File.expand_path('../support/models.rb', __FILE__)
+require 'rails'
+
 class Raven
   def self.capture_exception(*args)
   end

data/test/test_serialized_property.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'minitest/autorun'
+
+module Coaster
+  class TestSerializedProperty < Minitest::Test
+    def setup
+    end
+
+    def teardown
+    end
+
+    def test_serialized
+      user = User.create(name: 'abc')
+      user.init_appendix
+      assert_equal 0, user.appendix['test_key1']
+      assert_equal 0, user.appendix['test_key2']
+    end
+  end
+end

data/test/test_util.rb

@@ -24,6 +24,7 @@ module Coaster
       assert_equal({"a.0"=>1, "b.aa"=>1, "b.bb.0"=>2, "b.bb.1"=>1}, res)
       b = Util.roughen_hashify(res)
       assert_equal(a, b)
+
       res = Util.flatten_hashify([{a: 1}, 22, [33, 44], {b: {c: [33, {d: 4}]}}])
       assert_equal({""=>[{:a=>1}, 22, [33, 44], {:b=>{:c=>[33, {:d=>4}]}}]}, res) # no meaning result
       res = Util.flatten_hashify([{a: 1}, 22, [33, 44], {b: {c: [33, {d: 4}]}}], array_start: 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.18
+  version: 1.3.20
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Core Extensions
 email: buzz@frograms.com
 executables: []
@@ -157,14 +185,18 @@ files:
 - lib/coaster/core_ext/standard_error/sentry.rb
 - lib/coaster/rails_ext.rb
 - lib/coaster/rails_ext/backtrace_cleaner.rb
+- lib/coaster/safe_yaml_serializer.rb
 - lib/coaster/serialized_properties.rb
 - lib/coaster/util.rb
 - lib/coaster/version.rb
 - test/locales/en.yml
+- test/support/models.rb
+- test/support/schema.rb
 - test/test_backtrace.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb
+- test/test_serialized_property.rb
 - test/test_standard_error.rb
 - test/test_util.rb
 homepage: http://github.com/frograms/coaster
@@ -192,9 +224,12 @@ specification_version: 4
 summary: A little convenient feature for standard library
 test_files:
 - test/locales/en.yml
+- test/support/models.rb
+- test/support/schema.rb
 - test/test_backtrace.rb
 - test/test_helper.rb
 - test/test_month.rb
 - test/test_object_translation.rb
+- test/test_serialized_property.rb
 - test/test_standard_error.rb
 - test/test_util.rb