coaster 1.4.5 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08822e51820887cf495240d0c1b53e44f30102f88b608c99eec3b3f455ba0f9d'
-  data.tar.gz: 64f436a0a84ca84eb43029cbb49337c642d088650bdc7ffe438dc66d3a6f2894
+  metadata.gz: 5e8ae6d7e690ce70628c0687e935bd182eb3257e1b6253790a00cbd3c9ed6fc9
+  data.tar.gz: a9d9708ee72f4872184c9c2969b2b414015d48eedd99ee5bfe5881630f93bf25
 SHA512:
-  metadata.gz: ba54e6173b8d509a4de9b814e319874fdb873a218befa685a8ea786e2ca6e01fed90a411bd54960459223f590bdb5e9ec6af6b22f26d820d06cc4e943e37f963
-  data.tar.gz: 369a9b5b66b1141b5ee51ed8ab5707d7ca61331b650545af498390a465d34f2d95d72145457db051e5aa628027ba127485e611bad5378d2ad12332513d6fb336
+  metadata.gz: c17c5fe51f8dc29c2961d74918b949a7f0907df3e0fbbc273f75cb60aaf15fc561f51dbc8b17cf53bdc113df173acf7439b47a58a1d2d33ae8310783422328c6
+  data.tar.gz: cb22eedcdb827462e4b66beec6426a6b71561230e1fae62d873bd4244910ff1c1baeb176753e11734a7ec8db202d0e38472c1deef075a25fdabec2ea529a1fc0

data/lib/coaster/core_ext/date.rb

@@ -2,4 +2,54 @@ class Date
   def to_time_range
     beginning_of_day...(self + 1.day).beginning_of_day
   end
+
+  def prev_specific_date(day_num)
+    raise Date::Error, 'invalid date' if day_num < 1 || day_num > 31
+
+    m = Month.from(self)
+    if day_num < day
+      begin
+        m.date_for_day(day_num)
+      rescue Date::Error
+        m.last_date
+      end
+    else
+      begin
+        m.previous.date_for_day(day_num)
+      rescue Date::Error
+        m.previous.last_date
+      end
+    end
+  end
+
+  def next_specific_date(day_num)
+    raise Date::Error, 'invalid date' if day_num < 1 || day_num > 31
+
+    m = Month.from(self)
+    if day < day_num
+      if m.last_date.day < day_num
+        if day < m.last_date.day
+          m.last_date
+        else
+          begin
+            m.later.date_for_day(day_num)
+          rescue Date::Error
+            m.later.last_date
+          end
+        end
+      else
+        begin
+          m.date_for_day(day_num)
+        rescue Date::Error
+          m.last_date
+        end
+      end
+    else
+      begin
+        m.later.date_for_day(day_num)
+      rescue Date::Error
+        m.later.last_date
+      end
+    end
+  end
 end

data/lib/coaster/core_ext/month.rb

@@ -1,23 +1,26 @@
 require 'attr_extras'  # gem
 
 class Month
-  vattr_initialize :_year, :_month
+  attr_reader :_year, :_month
+  attr_reader :timezone
 
   class << self
-    def from(object)
+    def from(object, timezone: nil)
       case object
-        when Month then object
-        when String then Month.parse(object)
-        when Array then Month.new(object[0], object[1])
-        else new(object.year, object.month)
+        when Month 
+          object.timezone = timezone
+          object
+        when String then Month.parse(object, timezone: timezone)
+        when Array then Month.new(object[0], object[1], timezone: timezone)
+        else new(object.year, object.month, timezone: timezone)
       end
     end
 
     # Month.parse('201601')
     # Month.parse('2016-01')
-    def parse(str)
+    def parse(str, timezone: nil)
       date = Date.parse(str)
-      from(date)
+      from(date, timezone: timezone)
     rescue ArgumentError => e
       if str.instance_variable_defined?(:@_gsub_) && str.instance_variable_get(:@_gsub_)
         raise e, str: str.instance_variable_get(:@_gsub_)
@@ -28,7 +31,7 @@ class Month
       str_gsub.insert(4, '0') if str_gsub.length == 5
       str_gsub += '01'
       str_gsub.instance_variable_set(:@_gsub_, str_gsub)
-      parse(str_gsub)
+      parse(str_gsub, timezone: timezone)
     end
 
     def current
@@ -40,6 +43,17 @@ class Month
     end
   end
 
+  def initialize(year, month, timezone: nil)
+    @_year = year
+    @_month = month
+    self.timezone = timezone
+  end
+
+  def timezone=(tz)
+    tz = ActiveSupport::TimeZone[tz] if tz.is_a?(String)
+    @timezone = tz || Time.zone
+  end
+
   def year
     Integer(@_year)
   end
@@ -49,11 +63,11 @@ class Month
   end
 
   def first_date
-    Date.new(year, month, 1)
+    @first_date ||= Date.new(year, month, 1)
   end
 
   def last_date
-    Date.new(year, month, -1)
+    @last_date ||= Date.new(year, month, -1)
   end
 
   def each_date(&block)
@@ -69,11 +83,11 @@ class Month
   end
 
   def beginning_of_month
-    first_date.beginning_of_day
+    first_date.in_time_zone(timezone)
   end
 
   def end_of_month
-    last_date.end_of_day
+    last_date.in_time_zone(timezone).end_of_day
   end
 
   def date_for_day(number)
@@ -93,16 +107,24 @@ class Month
   end
 
   def to_s
-    "#{year}-#{month}"
+    first_date.strftime('%Y-%m')
   end
   alias_method :inspect, :to_s
 
   def -(time)
-    first_date - time
+    case time
+    when ActiveSupport::Duration then first_date.in_time_zone(timezone) - time
+    else
+      first_date - time
+    end
   end
 
   def +(time)
-    first_date + time
+    case time
+    when ActiveSupport::Duration then first_date.in_time_zone(timezone) + time
+    else
+      first_date + time
+    end
   end
 
   include Comparable

data/lib/coaster/git/repository.rb

@@ -117,10 +117,10 @@ module Coaster
         puts "[DEEP_MERGE] #{path} #{pointer}"
         submodules.values.each do |submodule|
           sm_sha = submodule_sha(submodule.path, pointer: pointer)
-          submodule.merge(sm_sha)
+          submodule.merge(sm_sha) if sm_sha.present?
         end
         merge_without_submodules do
-          merge(pointer)
+          merge(pointer) if pointer.present?
         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 && type < ActiveRecord::Base
+          elsif type.is_a?(Class) && type < ActiveRecord::Base
             _define_serialized_property serialize_column, "#{key}_id", default: default
 
             define_method key.to_sym do

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.4.5'
+  VERSION = '1.4.7'
 end

data/test/test_helper.rb

@@ -2,6 +2,8 @@ ENV['DEBUG'] = 'true'
 
 require 'minitest'
 require 'pry'
+require 'pry-byebug'
+require 'pry-stack_explorer'
 
 require 'rubygems'
 require 'bundler/setup'

data/test/test_month.rb

@@ -9,6 +9,54 @@ module Coaster
       assert_equal m.last_date, Date.parse('20200131')
       assert_equal m.end_of_month, Date.parse('20200131').end_of_day
       assert_equal m.to_time_range, Date.parse('20200101').beginning_of_day...Date.parse('20200201').beginning_of_day
+      assert_equal m.to_s, '2020-01'
+    end
+
+    def test_timezone
+      m = Month.parse('202001', timezone: 'Pacific/Midway')
+      assert_equal m.timezone, ActiveSupport::TimeZone['Pacific/Midway']
+      assert_equal m.beginning_of_month, Date.parse('20200101').in_time_zone('Pacific/Midway')
+    end
+
+    def test_next_specific_date
+      d = Date.parse('20200101')
+      assert_equal d.next_specific_date(1), Date.parse('20200201')
+      assert_equal d.next_specific_date(2), Date.parse('20200102')
+      assert_equal d.next_specific_date(31), Date.parse('20200131')
+      d = Date.parse('20200131')
+      assert_equal d.next_specific_date(31), Date.parse('20200229')
+      d = Date.parse('20200130')
+      assert_equal d.next_specific_date(31), Date.parse('20200131')
+      d = Date.parse('20200129')
+      assert_equal d.next_specific_date(29), Date.parse('20200229')
+      d = Date.parse('20200210')
+      assert_equal d.next_specific_date(29), Date.parse('20200229')
+      assert_equal d.next_specific_date(30), Date.parse('20200229')
+      assert_equal d.next_specific_date(31), Date.parse('20200229')
+      d = Date.parse('20210210')
+      assert_equal d.next_specific_date(9), Date.parse('20210309')
+      assert_equal d.next_specific_date(10), Date.parse('20210310')
+      assert_equal d.next_specific_date(29), Date.parse('20210228')
+      assert_equal d.next_specific_date(30), Date.parse('20210228')
+      assert_equal d.next_specific_date(31), Date.parse('20210228')
+      d = Date.parse('20210228')
+      assert_equal d.next_specific_date(31), Date.parse('20210331')
+    end
+
+    def test_prev_specific_date
+      d = Date.parse('20200101')
+      assert_equal d.prev_specific_date(1), Date.parse('20191201')
+      assert_equal d.prev_specific_date(2), Date.parse('20191202')
+      assert_equal d.prev_specific_date(31), Date.parse('20191231')
+      d = Date.parse('20200331')
+      assert_equal d.prev_specific_date(31), Date.parse('20200229')
+      assert_equal d.prev_specific_date(30), Date.parse('20200330')
+      d = Date.parse('20200330')
+      assert_equal d.prev_specific_date(30), Date.parse('20200229')
+      d = Date.parse('20200229')
+      assert_equal d.prev_specific_date(29), Date.parse('20200129')
+      assert_equal d.prev_specific_date(30), Date.parse('20200130')
+      assert_equal d.prev_specific_date(31), Date.parse('20200131')
     end
   end
 end

data/test/test_string.rb

@@ -64,22 +64,16 @@ module Coaster
       not_target_full_seq = ((33..255).map { |c| (c + 0xfee0).chr('UTF-8') }.join.chars - full_seq.chars).join + '일이삼いちにさんイチニサン一二三'
       mixed_str = full_seq + not_target_full_seq
       # full -> half 1:1 잘 변환되는가?
-      expect(full_seq.to_half_characters(symbol: true)).to eq half_seq
       assert_equal full_seq.to_half_characters(symbol: true), half_seq
       # full -> half -> full 변환 시, 원래 string 유지되는가?
-      expect(full_seq.to_half_characters(symbol: true).to_full_characters(symbol: true)).to eq full_seq
       assert_equal full_seq.to_half_characters(symbol: true).to_full_characters(symbol: true), full_seq
       # not_target string은 to half 변환 시도시 원본이 유지되는가?
-      expect(not_target_full_seq.to_half_characters(symbol: true)).to eq not_target_full_seq
       assert_equal not_target_full_seq.to_half_characters(symbol: true), not_target_full_seq
       # target / not_target이 섞여있는 문장에서, target'만' half로 변환되는가?
-      expect(mixed_str.to_half_characters(symbol: true)).to eq half_seq + not_target_full_seq
       assert_equal mixed_str.to_half_characters(symbol: true), half_seq + not_target_full_seq
       # target / not_target이 섞여있는 문장에서, full -> half -> full 변환시, 원래 string 유지되는가?
-      expect(mixed_str.to_half_characters(symbol: true).to_full_characters(symbol: true)).to eq mixed_str
       assert_equal mixed_str.to_half_characters(symbol: true).to_full_characters(symbol: true), mixed_str
       # 공백문자열에 다른게 추가되지는 않는가?
-      expect(''.to_half_characters(symbol: true)).to eq ''
       assert_equal ''.to_half_characters(symbol: true), ''
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.7
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj