coaster 1.4.15 → 1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05148ce7220929cde94487a2b368436630b00d84acd3f3d7dbecd8615834f5ce'
-  data.tar.gz: bb01490b06fd771896beca2e0f3db3c9cf44286e60b733b29598ed3186660cc2
+  metadata.gz: 54a4cd4285f5c47fe270fbff49fb6b639a69c05bcff645a40508f6a720469148
+  data.tar.gz: f5514b63f55b49a84e95a439f9c1baacec5798e080cf8f06ab5b9744d2b10b53
 SHA512:
-  metadata.gz: 14739671089cd45b658bc3268e88b73135199b0ba08e2f0d411bc059d2686c0539a13ec4891894fac65edaa7bef3baa9aac902d6119587dc0e128e5b70037777
-  data.tar.gz: 80dad5a88e45bc18f83b50baf856d47260b75d2aa1efe1cde0f40d289c49d9df53649030053b0a753ccd10a75eae19fab3640ef5d7bdb93728e5f12341bd8c3a
+  metadata.gz: 60c173a2b09beeb1af679dc2b15f33a0df489f8da04a656ee4f2decf80366b0907e52a598d4a39ac605171a2d54cb3d84fad7dac7585340f4bf7de60646e6e1d
+  data.tar.gz: 4a25b83caa173276193da30ba43b4e2f9e68e3bee74b640e8185aea78c1a396b45ac6d1180fc52ebeca4c17a9e617f9c24ba25fb18c1092d5be60d45bb5e4627

data/lib/coaster/core_ext/date.rb

@@ -1,12 +1,16 @@
 class Date
-  def to_time_range(timezone = nil)
-    if timezone
-      timezone = ActiveSupport::TimeZone[timezone] if timezone.is_a?(String)
-      b_day = in_time_zone(timezone)
-      b_day...(b_day + 1.day)
-    else
-      beginning_of_day...(self + 1.day).beginning_of_day
-    end
+  def to_time_range(timezone = ::Time.zone)
+    timezone = ActiveSupport::TimeZone[timezone] if timezone.is_a?(String)
+    b_day = in_time_zone(timezone)
+    b_day...(b_day + 1.day)
+  end
+
+  def beginning_of_range(timezone = ::Time.zone)
+    to_time_range(timezone).begin
+  end
+
+  def end_of_range(timezone = ::Time.zone)
+    to_time_range(timezone).end
   end
 
   def prev_specific_date(day_num)

data/lib/coaster/core_ext/month.rb

@@ -82,20 +82,37 @@ class Month
     last_date.day
   end
 
-  def beginning_of_month
-    first_date.in_time_zone(timezone)
+  def _timezone(timezone)
+    tz = timezone || self.timezone
+    tz = ActiveSupport::TimeZone[tz] if tz.is_a?(String)
+    tz
+  end
+
+  def beginning_of_month(timezone = nil)
+    tz = _timezone(timezone)
+    first_date.in_time_zone(tz)
   end
 
   def end_of_month
-    last_date.in_time_zone(timezone).end_of_day
+    tz = _timezone(timezone)
+    last_date.in_time_zone(tz).end_of_day
   end
 
   def date_for_day(number)
     Date.new(year, month, number)
   end
 
-  def to_time_range
-    beginning_of_month...(later.beginning_of_month)
+  def to_time_range(timezone = nil)
+    tz = _timezone(timezone)
+    beginning_of_month(tz)...(later.beginning_of_month(tz))
+  end
+
+  def beginning_of_range(timezone = nil)
+    to_time_range(timezone).begin
+  end
+
+  def end_of_range(timezone = nil)
+    to_time_range(timezone).end
   end
 
   def to_date_range

data/lib/coaster/core_ext/standard_error/sentry.rb

@@ -1,5 +1,6 @@
 class StandardError
   attr_writer :raven
+  attr_reader :sentry_event
 
   alias_method :initialize_original, :initialize
   def initialize(message = nil, cause = $!)
@@ -42,7 +43,7 @@ class StandardError
     return if options.key?(:report) && !options[:report]
     return unless report?
     nt = notes(options)
-    Sentry.capture_exception(self, level: nt[:level]) do |scope|
+    @sentry_event = Sentry.capture_exception(self, level: nt[:level]) do |scope|
       scope.user.merge!(nt[:user] || {})
       scope.tags.merge!(nt[:tags])
       scope.extra.merge!(nt[:extra])
@@ -54,6 +55,10 @@ class StandardError
     Sentry.logger.error(msg)
   end
 
+  def sentry_event_id
+    @sentry_event&.event_id
+  end
+
   # options
   #   :logger
   #   :cleaner

data/lib/coaster/core_ext/time.rb

@@ -0,0 +1,15 @@
+class Time
+  def to_time_range(timezone = ::Time.zone)
+    timezone = ActiveSupport::TimeZone[timezone] if timezone.is_a?(String)
+    s = self.in_time_zone(timezone).change(usec: 0)
+    s...(s + 1.second)
+  end
+
+  def beginning_of_range(timezone = ::Time.zone)
+    to_time_range(timezone).begin
+  end
+
+  def end_of_range(timezone = ::Time.zone)
+    to_time_range(timezone).end
+  end
+end

data/lib/coaster/core_ext.rb

@@ -1,5 +1,6 @@
 require_relative 'core_ext/require_more'
 require_relative 'core_ext/array'
+require_relative 'core_ext/time'
 require_relative 'core_ext/date'
 require_relative 'core_ext/month'
 require_relative 'core_ext/object_translation'

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/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.4.15'
+  VERSION = '1.4.17'
 end

data/test/test_month.rb

@@ -73,5 +73,20 @@ module Coaster
       h = {Month.now => 1}
       assert_equal h[Month.now], 1
     end
+
+    def test_range_timezone
+      m = Month.parse('202001', timezone: 'Asia/Seoul')
+      assert_equal m.beginning_of_range('Asia/Seoul'), Date.parse('20200101').in_time_zone('Asia/Seoul')
+      assert_equal m.end_of_range('Asia/Seoul'), Date.parse('20200201').in_time_zone('Asia/Seoul')
+      assert m.to_time_range.exclude_end?
+      d = Date.parse('20200101')
+      assert_equal d.beginning_of_range('Asia/Seoul'), Date.parse('20200101').in_time_zone('Asia/Seoul')
+      assert_equal d.end_of_range('Asia/Seoul'), Date.parse('20200102').in_time_zone('Asia/Seoul')
+      assert d.to_time_range.exclude_end?
+      t = Time.parse('20200101 12:12:12.123456')
+      assert_equal t.beginning_of_range('Asia/Seoul'), Time.parse('20200101 12:12:12').in_time_zone('Asia/Seoul')
+      assert_equal t.end_of_range('Asia/Seoul'), Time.parse('20200101 12:12:13').in_time_zone('Asia/Seoul')
+      assert t.to_time_range.exclude_end?
+    end
   end
 end

data/test/test_standard_error.rb

@@ -316,7 +316,7 @@ LOG
       assert_equal 'NameError', e.to_hash['type']
       assert_equal 999999, e.to_hash['status']
       assert_equal 500, e.to_hash['http_status']
-      assert_equal "standard error translation (3dd84e #{bt})", e.user_message
+      assert_equal "standard error translation (bc1746 #{bt})", e.user_message
       assert_match(/undefined local variable or method `aa'/, e.to_hash['message'])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.4.15
+  version: 1.4.17
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -201,6 +201,7 @@ files:
 - lib/coaster/core_ext/standard_error/raven.rb
 - lib/coaster/core_ext/standard_error/sentry.rb
 - lib/coaster/core_ext/string.rb
+- lib/coaster/core_ext/time.rb
 - lib/coaster/git.rb
 - lib/coaster/git/options.rb
 - lib/coaster/git/repository.rb