coaster 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc563bd833f85761a0dd634b98527069c0c61331a354a9c62e48bbe9dbbf9173
-  data.tar.gz: 011c8922be26c2e8c5a6c192baf1d1e1d673ebae2e64c3518f1c5d1078d8b130
+  metadata.gz: 5e8ae6d7e690ce70628c0687e935bd182eb3257e1b6253790a00cbd3c9ed6fc9
+  data.tar.gz: a9d9708ee72f4872184c9c2969b2b414015d48eedd99ee5bfe5881630f93bf25
 SHA512:
-  metadata.gz: e32aa85da5169a73b3bb85cfd7757aa14b3a03269700364e9747432b5e1e8b2338ab9607977c575a94bd6239919c158495fa42375df0447b2a8ba429db3b4499
-  data.tar.gz: d146502d6f5c06d33949822e348a596b77a1fe712e9ae0f5e24493bff450bdc513b478faebbdf06505b737b668d54693377576ab85f0b58cf55457b5ed1e2a04
+  metadata.gz: c17c5fe51f8dc29c2961d74918b949a7f0907df3e0fbbc273f75cb60aaf15fc561f51dbc8b17cf53bdc113df173acf7439b47a58a1d2d33ae8310783422328c6
+  data.tar.gz: cb22eedcdb827462e4b66beec6426a6b71561230e1fae62d873bd4244910ff1c1baeb176753e11734a7ec8db202d0e38472c1deef075a25fdabec2ea529a1fc0

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/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.6'
+  VERSION = '1.4.7'
 end

data/test/test_month.rb

@@ -9,6 +9,13 @@ 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
@@ -24,11 +31,13 @@ module Coaster
       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')

metadata

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