coaster 1.3.17 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2eb8291386db2096f9972b5094c8377337cf1ba33741222dc748959e9eb6c8
-  data.tar.gz: 599d8e3771f71618d5cd93b111bc04b68b61cd632bedb212e8070d61758462ae
+  metadata.gz: 027776edeff41584c83bf80bc821af255f2315c3b0710cd1e4f86feae9489de6
+  data.tar.gz: 369e0b1ca5e3def035a66a9ba163954fb5541718af7be9164616c04d1588f131
 SHA512:
-  metadata.gz: 6700f6a695c28ca3d4eda360ccf651a5a35aa30568ad38f41e0e0992aeb3edd9cee94d23beab7e1f79e03f378553a7b09efbc278ce7090511dee9c046394e916
-  data.tar.gz: da224933981d1593c1ddf6318829ca63a6610dcf75535bd49a3c043a32ef604a074292c50da53e8ff5790e690ddc851bf6a9ea3e251ee2afcb6e0b3308b52be4
+  metadata.gz: b1bbc8f1f40e6da9ed89c7b71150d7beab5c8296e6209a57bb029a8c5fa1ac43d19a40f407cb6f0287ff722d965a345ed21ce7c5b32a7a1a98b07fd916a0ad8d
+  data.tar.gz: 9dc7568d12aef21c1afee7c469d26313cded69c90c36c81d9e905fd72cf0a765f89b7410527e8525647fad95cc919bd1026e1d2f26936e6f2520d710b510e56a

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

@@ -143,6 +143,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

@@ -1,18 +1,22 @@
 module Coaster
   module Util
     FLATTEN_HASH_DELIMITER = '.'.freeze
+    ARRAY_START = 0
 
     class << self
-      def flatten_hashify(object, delimiter: FLATTEN_HASH_DELIMITER, breadcrumbs: [], include_array: nil)
+      # 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
           object.each_with_object({}) do |(key, value), memo|
-            memo.merge!(flatten_hashify(value, delimiter: delimiter, breadcrumbs: breadcrumbs + [key], include_array: include_array))
+            memo.merge!(flatten_hashify(value, delimiter: delimiter, breadcrumbs: breadcrumbs + [key], array_start: array_start))
           end
         when Array
-          if include_array
-            object.each.with_index(1).with_object({}) do |(element, ix), memo|
-              memo.merge!(flatten_hashify(element, delimiter: delimiter, breadcrumbs: breadcrumbs + [ix], include_array: include_array))
+          if array_start
+            object.each.with_index(array_start).with_object({}) do |(element, ix), memo|
+              memo.merge!(flatten_hashify(element, delimiter: delimiter, breadcrumbs: breadcrumbs + [ix], array_start: array_start))
             end
           else
             {breadcrumbs.join(delimiter) => object}
@@ -21,6 +25,43 @@ module Coaster
           {breadcrumbs.join(delimiter) => object}
         end
       end
+
+      # 숫자로 된 키는 무조건 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
+          if sp_keys.present?
+            memo[k] ||= {}
+            memo[k][sp_keys.join(delimiter)] = value
+          else
+            memo[k] = value
+          end
+        end
+
+        step2 = step1.each_with_object({}) do |(key, value), memo|
+          case value
+          when Hash
+            memo[key] = roughen_hashify(value, delimiter: delimiter, array_start: array_start)
+          else
+            memo[key] = value
+          end
+        end
+
+        array_keys = (array_start...(step2.keys.size+array_start)).to_a
+        if array_keys == step2.keys.map(&:to_i).sort
+          step3 = []
+          array_keys.map(&:to_s).each do |k|
+            step3 << step2[k]
+          end
+          step3
+        else
+          step2
+        end
+      end
     end
   end
 end

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.17'
+  VERSION = '1.3.19'
 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

@@ -11,19 +11,32 @@ module Coaster
     end
 
     def test_flatten_hashify
-      res = Util.flatten_hashify({a: [1], b: {aa: 1, bb: [2, 1]}})
+      a = {'a'=>[1], 'b'=>{'aa'=>1, 'bb'=>[2, 1]}}
+      res = Util.flatten_hashify(a)
       assert_equal({"a"=>[1], "b.aa"=>1, "b.bb"=>[2, 1]}, res)
-      res = Util.flatten_hashify({a: [1], b: {aa: 1, bb: [2, 1]}}, include_array: true)
+      b = Util.roughen_hashify(res)
+      assert_equal(a, b)
+      res = Util.flatten_hashify(a, array_start: 1)
       assert_equal({"a.1"=>1, "b.aa"=>1, "b.bb.1"=>2, "b.bb.2"=>1}, res)
+      b = Util.roughen_hashify(res, array_start: 1)
+      assert_equal(a, b)
+      res = Util.flatten_hashify(a, array_start: 0)
+      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}]}}], include_array: true)
+      res = Util.flatten_hashify([{a: 1}, 22, [33, 44], {b: {c: [33, {d: 4}]}}], array_start: 1)
       assert_equal({"1.a"=>1, "2"=>22, "3.1"=>33, "3.2"=>44, "4.b.c.1"=>33, "4.b.c.2.d"=>4}, res)
     end
 
     def test_flatten_hashify_delimiter
-      res = Util.flatten_hashify([{a: 1}, 22, [33, 44], {b: {c: [33, {d: 4}]}}], include_array: true, delimiter: '/')
+      a = [{'a'=>1}, 22, [33, 44], {'b'=>{'c'=>[33, {'d'=>4}]}}]
+      res = Util.flatten_hashify(a, array_start: 1, delimiter: '/')
       assert_equal({"1/a"=>1, "2"=>22, "3/1"=>33, "3/2"=>44, "4/b/c/1"=>33, "4/b/c/2/d"=>4}, res)
+      b = Util.roughen_hashify(res, array_start: 1, delimiter: '/')
+      assert_equal(a, b)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.19
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-10-17 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