coaster 1.4.28 → 1.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53b6e577599120b7264569f9164e783b61563cd90255c55fc4608554c78d001
-  data.tar.gz: f7f410d4712a9ebfc57a44ebd1bd239471ec04222e25e79964b180a35ab14178
+  metadata.gz: d39beeaee29be2896e13ec86ba9e0a9c581a424d8886757e3478fe7283350276
+  data.tar.gz: dec06f3400a4e5be9f95987fddca45d04ed41cdc991070455361bb2463d91cb0
 SHA512:
-  metadata.gz: 2a16047f7c323c9baca6b71b13b410d3fb26639951457d6ab71c756e9dc3bac613fb0bc19afb352ce9613924b6283cc9f4d6da206355a76791af7a354b411c1b
-  data.tar.gz: 3a5806e48fdc46c314d60cb4e2926561e7ef2e31a642c2e0eb52cf34fbb6507bc012b6b4b0949232d9b7c1fcf72abf60dc6fc29dbfc5befe954c8ba832488c9d
+  metadata.gz: 384a1e5564c587f06901aecceb71de37b70fb51353f205067b966cd525dfda3b16c81a7bbd3830740da68c448a3b0c756f117e372d0343bc8f871e5b8192c204
+  data.tar.gz: ac1b741ff50422d42335e96ba32e6c2362571452c5c425d27b27bb72822c9f99932540eacb37f19e908b51c3f160cf3fe9d8b2300ad3deb651a6b8c100cdb881

data/lib/coaster/core_ext/array.rb

@@ -8,15 +8,4 @@ class Array
       true
     end
   end
-
-  def deep_key_count(**options)
-    sum do |v|
-      case v
-      when Hash, Array
-        v.deep_key_count
-      else
-        1
-      end
-    end
-  end
 end

data/lib/coaster/core_ext/css_hash_string.rb

@@ -0,0 +1,43 @@
+module Coaster
+  module CssHashString
+    module HashToStyle
+      def to_css_style(**defaults)
+        to_css_hash(**defaults).map do |k, v|
+          k = k.gsub(/_/, '-')
+          v.present? ? "#{k}:#{v}" : nil
+        end.compact.join(';')
+      end
+
+      def to_css_hash(**defaults)
+        defaults = defaults.map do |k, v|
+          k = k.to_s.gsub(/_/, '-')
+          v.present? ? [k, v] : nil
+        end.compact.to_h
+        h = self.map do |k, v|
+          k = k.to_s.gsub(/_/, '-')
+          v.present? ? [k, v] : nil
+        end.compact.to_h
+        defaults.merge(h)
+      end
+    end
+    ::Hash.send(:include, HashToStyle)
+    ::ActiveSupport::HashWithIndifferentAccess.send(:include, HashToStyle)
+
+    module StringToStyle
+      def to_css_style(**defaults)
+        return self unless defaults.present?
+        to_css_hash(**defaults).to_css_style
+      end
+
+      def to_css_hash(**defaults)
+        defaults.with_indifferent_access.merge(
+          self.split(';').map do |pair|
+            k, v = pair.split(':')
+            [k.strip, v.strip]
+          end.to_h
+        )
+      end
+    end
+    ::String.send(:include, StringToStyle)
+  end
+end

data/lib/coaster/core_ext/deep_key_count.rb

@@ -0,0 +1,44 @@
+module Coaster
+  module DeepKeyCount
+    module HashCnt
+      def deep_key_count(**options)
+        keys.size + values.sum do |v|
+          case v
+          when Hash
+            v.deep_key_count(**options)
+          when Array
+            if options[:array_is_element]
+              0
+            else
+              v.deep_key_count(**options)
+            end
+          else
+            0
+          end
+        end
+      end
+    end
+    ::Hash.send(:include, HashCnt)
+    ::ActiveSupport::HashWithIndifferentAccess.send(:include, HashCnt)
+
+    module ArrayCnt
+      def deep_key_count(**options)
+        sum do |v|
+          case v
+          when Hash
+            v.deep_key_count(**options)
+          when Array
+            if options[:array_is_element]
+              1
+            else
+              v.deep_key_count(**options)
+            end
+          else
+            1
+          end
+        end
+      end
+    end
+    ::Array.send(:include, ArrayCnt)
+  end
+end

data/lib/coaster/core_ext/hash.rb

@@ -1,18 +1,2 @@
 class Hash
-  def deep_key_count(**options)
-    keys.size + values.sum do |v|
-      case v
-      when Hash
-        v.deep_key_count(**options)
-      when Array
-        if options[:array_is_element]
-          0
-        else
-          v.deep_key_count(**options)
-        end
-      else
-        0
-      end
-    end
-  end
 end

data/lib/coaster/core_ext/memory_size.rb

@@ -0,0 +1,85 @@
+require 'objspace'
+
+class Object
+  def memory_size(depth: 2, object_ids: [])
+    res = {nil => ObjectSpace.memsize_of(self)}
+    instance_variables.each do |var|
+      iv = instance_variable_get(var)
+      if object_ids.include?(iv.object_id)
+        res[var] = nil
+      else
+        object_ids << iv.object_id
+        if depth > 0
+          res[var] = iv.memory_size(depth: depth - 1, object_ids:)
+        else
+          res[var] = iv.memory_size_total(object_ids:)
+        end
+      end
+    end
+    res
+  end
+
+  def memory_size_total(object_ids: [])
+    sum = 0
+    memory_size(depth: 0, object_ids:).each do |k, v|
+      case v
+      when Hash, Array then sum += v._memory_size_total
+      when nil then next
+      else sum += v
+      end
+    end
+    sum
+  end
+end
+
+class Array
+  def memory_size(depth: 2, object_ids: [])
+    res = {nil => super}
+    each_with_index do |item, x|
+      if depth > 0
+        res[x] = item.memory_size(depth: depth - 1, object_ids:)
+      else
+        res[x] = item.memory_size_total(object_ids:)
+      end
+    end
+    res
+  end
+
+  def _memory_size_total
+    sum = 0
+    each do |item|
+      case item
+      when Hash, Array then sum += item._memory_size_total
+      when nil then next
+      else sum += item
+      end
+    end
+    sum
+  end
+end
+
+class Hash
+  def memory_size(depth: 2, object_ids: [])
+    res = {nil => super}
+    each do |k, v|
+      if depth > 0
+        res[k] = [k.memory_size(depth: depth - 1, object_ids:), v.memory_size(depth: depth - 1, object_ids:)]
+      else
+        res[k] = k.memory_size_total(object_ids:) + v.memory_size_total(object_ids:)
+      end
+    end
+    res
+  end
+
+  def _memory_size_total
+    sum = 0
+    each do |k, v|
+      case v
+      when Hash, Array then sum += v._memory_size_total
+      when nil then next
+      else sum += v
+      end
+    end
+    sum
+  end
+end

data/lib/coaster/serialized_properties.rb

@@ -3,6 +3,33 @@ module Coaster
     class DuplicatedProperty < StandardError; end
     class InvalidProperty < StandardError; end
 
+    def self.extended(base)
+      base.class_eval do
+        def sprop_changes = self.class.serialized_property_changes(changes)
+        def sprop_change(key) = sprop_changes[key.to_s]
+        def sprop_changed?(key) = sprop_change(key).present?
+        def sprop_was(key) = (ch = sprop_change(key)).present? ? ch[0] : nil
+        
+        def sprop_saved_changes = self.class.serialized_property_changes(saved_changes)
+        def sprop_saved_change(key) = sprop_saved_changes[key.to_s]
+
+        def sprop_previous_changes = self.class.serialized_property_changes(previous_changes)
+        def sprop_previous_change(key) = sprop_previous_changes[key.to_s] 
+        def sprop_previously_changed?(key) = sprop_previous_change(key).present?
+        def sprop_previously_was(key) = (ch = sprop_previous_change(key)).present? ? ch[0] : nil
+      end
+    end
+
+    def serialized_property_changes(changes)
+      serialized_property_settings.each_with_object({}) do |(key, prop), result|
+        prop_ch = changes[prop[:column].to_s]
+        next if prop_ch.blank?
+        before = prop_ch[0] && prop_ch[0][key.to_s]
+        after = prop_ch[1] && prop_ch[1][key.to_s]
+        result[key.to_s] = [before, after] if before != after
+      end
+    end
+
     def serialized_property_settings
       @serialized_property_settings ||= {}
     end
@@ -27,7 +54,7 @@ module Coaster
 
     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, rescuer: rescuer}
+      serialized_property_settings[key.to_sym] = {column: serialize_column.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
 
@@ -118,6 +145,7 @@ module Coaster
           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?(Symbol) && (t = type.to_s.constantize rescue nil)) || (type.is_a?(Class) && type < ActiveRecord::Base && (t = type))
+            serialized_property_settings["#{key}_id".to_sym] = serialized_property_settings.delete(key.to_sym) # rename key from setting
             _define_serialized_property serialize_column, "#{key}_id", default: default
 
             define_method key.to_sym do
@@ -218,6 +246,25 @@ module Coaster
           send("#{key}_without_callback=".to_sym, val)
         end
       end
+
+      define_method "#{key}_change".to_sym do
+        send("sprop_change", key)
+      end
+      define_method "#{key}_changed?".to_sym do
+        send("sprop_changed?", key)
+      end
+      define_method "#{key}_was".to_sym do
+        send("sprop_was", key)
+      end
+      define_method "#{key}_previous_change".to_sym do
+        send("sprop_previous_change", key)
+      end
+      define_method "#{key}_previously_changed?".to_sym do
+        send("sprop_previously_changed?", key)
+      end
+      define_method "#{key}_previously_was".to_sym do
+        send("sprop_previously_was", key)
+      end
     end
   end
 end

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.4.28'
+  VERSION = '1.4.30'
 end

data/test/test_css_hash_string.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'minitest/autorun'
+require 'coaster/core_ext/css_hash_string'
+
+module Coaster
+  class TestCssHashString < Minitest::Test
+    def setup
+    end
+
+    def teardown
+    end
+
+    def test_hash_to_style
+      assert_equal "font-size:12px;color:red", {"font-size" => '12px', color: 'red'}.to_css_style
+      assert_equal "font-size:12px;color:red", {font_size: '12px', color: 'red'}.to_css_style
+      assert_equal "font-size:12px;color:red", {font_size: '12px', color: 'red'}.with_indifferent_access.to_css_style
+    end
+
+    def test_string_to_css_hash
+      assert_equal({"font-size" => '12px', "color" => 'red'}, "font-size: 12px; color: red".to_css_hash)
+      assert_equal({"font-size" => '12px', "color" => 'red'}, "font-size: 12px".to_css_hash(color: 'red'))
+      assert_equal({"font-size" => '12px', "color" => 'blue'}, "font-size: 12px; color: blue".to_css_hash(color: 'red'))
+    end
+  end
+end

data/test/test_deep_key_count.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'minitest/autorun'
+require 'coaster/core_ext/deep_key_count'
 
 module Coaster
   class TestDeepKeyCount < Minitest::Test
@@ -25,9 +26,10 @@ module Coaster
 
       assert_equal 2, [1, 2].deep_key_count(array_is_element: true)
       assert_equal 2, [1, {b: 2}].deep_key_count(array_is_element: true)
-      assert_equal 3, [1, {b: 2, c: [1, 2]}].deep_key_count(array_is_element: true)
 
       assert_equal 3, [1, {b: 2}, 3].deep_key_count(array_is_element: true)
+      
+      assert_equal 3, [1, {b: 2, c: [1, 2]}].deep_key_count(array_is_element: true)
       assert_equal 3, [1, {b: 2}, [3, 4]].deep_key_count(array_is_element: true)
     end
   end

data/test/test_memory_size.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'minitest/autorun'
+require 'coaster/core_ext/memory_size'
+
+module Coaster
+  class TestMemorySize < Minitest::Test
+    class Some
+      attr_accessor :aa, :bb, :cc
+    end
+
+    def setup
+    end
+
+    def teardown
+    end
+
+    def test_memory_size
+      h = {"aa" => 1, "bb" => [2, 3], "cc" => {"dd" => 4}}
+      # assert_equal 10, {"aa" => 1, "bb" => [2, 3], "cc" => {"dd" => 4}}.memory_size
+      assert_equal({nil => {nil => 160}, "aa" => 40, "bb" => 80, "cc" => 240}, h.memory_size(depth: 0))
+      assert_equal 520, h.memory_size_total
+      some = Some.new
+      some.aa = h
+      some.bb = [1, 2, 3]
+      some.cc = {"dd" => 4, "ee" => [5, 6]}
+      depth_0 = some.memory_size(depth: 0)
+      depth_1 = some.memory_size(depth: 1)
+      assert_equal({nil => 40, "@aa": 520, "@bb": 40, "@cc": 280}, depth_0)
+      assert_equal({nil => 40, 
+        "@aa": {nil => {nil => 160}, "aa" => 40, "bb" => 80, "cc" => 240}, 
+        "@bb": {nil => {nil => 40}, 0 => 0, 1 => 0, 2 => 0}, 
+        "@cc": {nil => {nil => 160}, "dd" => 40, "ee" => 80}}, depth_1)
+      assert_equal 880, some.memory_size_total
+    end
+  end
+end

data/test/test_serialized_property.rb

@@ -11,6 +11,7 @@ module Coaster
 
     def test_serialized
       user = User.create(name: 'abc')
+      assert_equal([:appendix, :father_id, :mother_id], User.serialized_property_settings.keys)
       user.init_appendix
       assert_equal 0, user.appendix['test_key1']
       assert_equal 0, user.appendix['test_key2']
@@ -23,7 +24,13 @@ module Coaster
       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)
+      assert_equal({"appendix" => [nil, {"test_key1" => 0, "test_key2" => 0}], "father_id" => [nil, 2], "mother_id" => [nil, 3]}, user.sprop_changes)
+      assert_equal(true, user.mother_id_changed?)
+      assert_equal(nil, user.mother_id_was)
       user.save!
+      assert_equal(false, user.mother_id_changed?)
+      assert_equal(true, user.mother_id_previously_changed?)
+      assert_equal(nil, user.mother_id_previously_was)
       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

data/test/test_standard_error.rb

@@ -211,25 +211,24 @@ module Coaster
       detail_front = <<-LOG
 [Coaster::TestStandardError::ExampleError] status:20
   MESSAGE: Test example error (Coaster::TestStandardError::ExampleError) cause{Test sample error (Coaster::TestStandardError::SampleError)}
-  @attributes: {\"frog\"=>\"rams\", \"wat\"=>\"cha\"}
+  @attributes: {\"frog\" => \"rams\", \"wat\" => \"cha\"}
   @coaster: true
   @digest_backtrace: #{e.digest_backtrace}
   @digest_message: a8c7c1
   @fingerprint: ["a8c7c1"]
-  @ins_var: [\"Coaster::TestStandardError::SampleError\", {\"h\"=>1}]
-  @ins_varr: {\"dd\"=>true}
+  @ins_var: [\"Coaster::TestStandardError::SampleError\", {\"h\" => 1}]
+  @ins_varr: {\"dd\" => true}
   @level: \"error\"
   @raven: {}
   @tags: {}
   @tkey: nil
   BACKTRACE:
-    #{__FILE__}:193:in `rescue in test_to_detail'
-    #{__FILE__}:187:in `test_to_detail'
+    #{__FILE__}:193:in 'Coaster::TestStandardError#test_to_detail'
 LOG
       detail_cause_front = <<-LOG
 CAUSE: [Coaster::TestStandardError::SampleError] status:10
     MESSAGE: Test sample error (Coaster::TestStandardError::SampleError)
-    @attributes: {"frog"=>"rams"}
+    @attributes: {"frog" => "rams"}
     @coaster: true
     @digest_backtrace: #{e.cause.digest_backtrace}
     @digest_message: cbe233
@@ -239,7 +238,7 @@ CAUSE: [Coaster::TestStandardError::SampleError] status:10
     @tags: {}
     @tkey: nil
     BACKTRACE:
-      #{__FILE__}:188:in `test_to_detail'
+      #{__FILE__}:188:in 'Coaster::TestStandardError#test_to_detail'
 LOG
       assert detail.start_with?(detail_front)
       cause_ix = (detail =~ /CAUSE/)
@@ -331,7 +330,7 @@ LOG
       assert_equal 999999, e.to_hash['status']
       assert_equal 500, e.to_hash['http_status']
       assert_equal "standard error translation (#{e.digest_message} #{bt})", e.user_message
-      assert_match(/undefined local variable or method `aa'/, e.to_hash['message'])
+      assert_match(/undefined local variable or method 'aa'/, e.to_hash['message'])
     end
 
     def test_descriptions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.4.28
+  version: 1.4.30
 platform: ruby
 authors:
 - buzz jung
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-27 00:00:00.000000000 Z
+date: 2025-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -194,8 +194,11 @@ files:
 - lib/coaster/cmd_options.rb
 - lib/coaster/core_ext.rb
 - lib/coaster/core_ext/array.rb
+- lib/coaster/core_ext/css_hash_string.rb
 - lib/coaster/core_ext/date.rb
+- lib/coaster/core_ext/deep_key_count.rb
 - lib/coaster/core_ext/hash.rb
+- lib/coaster/core_ext/memory_size.rb
 - lib/coaster/core_ext/month.rb
 - lib/coaster/core_ext/object_translation.rb
 - lib/coaster/core_ext/require_more.rb
@@ -221,12 +224,14 @@ files:
 - test/support/schema.rb
 - test/test_action_view.rb
 - test/test_backtrace.rb
+- test/test_css_hash_string.rb
 - test/test_date.rb
 - test/test_deep_key_count.rb
 - test/test_git.rb
 - test/test_git_options.rb
 - test/test_git_repository.rb
 - test/test_helper.rb
+- test/test_memory_size.rb
 - test/test_month.rb
 - test/test_object_translation.rb
 - test/test_serialized_property.rb
@@ -264,12 +269,14 @@ test_files:
 - test/support/schema.rb
 - test/test_action_view.rb
 - test/test_backtrace.rb
+- test/test_css_hash_string.rb
 - test/test_date.rb
 - test/test_deep_key_count.rb
 - test/test_git.rb
 - test/test_git_options.rb
 - test/test_git_repository.rb
 - test/test_helper.rb
+- test/test_memory_size.rb
 - test/test_month.rb
 - test/test_object_translation.rb
 - test/test_serialized_property.rb