fat_core 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2376c4bac5a7a1702ae4361cca280a07b1bfde4304f42fad41e0f37754d41c8
-  data.tar.gz: e87c81524e1901bf80443b421d62ad8ebffe7212916f0bd18817625e79795985
+  metadata.gz: 6915be154abea741bce220665d425858a13c22aacdcff27952fda89627d0349c
+  data.tar.gz: 82fbae6f418d862154ba909c1f6097d2b82f020eddb740fa207285ee9bb8db3a
 SHA512:
-  metadata.gz: c0b95bc966b857fae1bcfbf2b38dcb8e4275dee5b269091944f2dcd08830162ebf22b98072a49b9b40e1599b7c0f940beeffa4e08f9f6b9f05dc003ba81a3e8c
-  data.tar.gz: 6cf190c0656ba641ccfe10a27e832d9bbe2bb71dde2491c97179ae4acc677af884679a4c635aefe40379e5a022dda71549c705cc6c05e71a5e4d7037639c193b
+  metadata.gz: 71698e9642833bd200638b30b879b86eaf21f44ee690048299597982ee0abfb4ddbd2302f3b87d649dcd4963f35de8e04f79cda705fda72cb0bcfb8efb3ae158
+  data.tar.gz: 03407fbd6b3340c9742df04dff407ddd695ebd2ecb7f47ff7304e095be8b27aac933a48573d35279e20b6f3df922908f2d4d3f9043fcac29296dbc3d9ca84228

data/lib/fat_core/date.rb

@@ -57,6 +57,9 @@ module FatCore
     # to find in commercial situations.
     EOT = ::Date.parse('3000-12-31')
 
+    # Symbols for each of the days of the week, e.g., :sunday, :monday, etc.
+    DAYSYMS = ::Date::DAYNAMES.map(&:downcase).map(&:to_sym)
+
     # :category: Formatting
     # @group Formatting
 
@@ -515,12 +518,56 @@ module FatCore
 
     # :category: Relative ::Dates
 
+    # In order to accomodate biweeks, we adopt the convention that weeks are
+    # numbered so that whatever week contains the year's first
+    # Date.beginning_of_week (usually Sunday or Monday) is week number 1.
+    # Biweeks are then pairs of weeks: an odd numbered week first, followed by
+    # an even numbered week last.
+    def week_number
+      start_of_weeks = ::Date.new(year, 1, 1)
+      bow_wday = DAYSYMS.index(::Date.beginning_of_week)
+      start_of_weeks += 1 until start_of_weeks.wday == bow_wday
+      if yday >= start_of_weeks.yday
+        ((yday - start_of_weeks.yday) / 7) + 1
+      else
+        # One of the days before the start of the year's first week, so it
+        # belongs to the last week of the prior year.
+        Date.new(year - 1, 12, 31).week_number
+      end
+    end
+
+    # Return the date that is the first day of the biweek in which self
+    # falls, or the first day of the year, whichever is later.
+    # @return [::Date]
+    def beginning_of_biweek
+      if week_number.odd?
+        beginning_of_week
+      else
+        (self - 1.week).beginning_of_week
+      end
+    end
+
+    # :category: Relative ::Dates
+
+    # Return the date that is the last day of the biweek in which
+    # self falls, or the last day of the year, whichever if earlier.
+    # @return [::Date]
+    def end_of_biweek
+      if week_number.even?
+        end_of_week
+      else
+        (self + 1.week).end_of_week
+      end
+    end
+
+    # NOTE: Date#end_of_week and Date#beginning_of_week is defined in ActiveSupport
+
     # Return the date that is the first day of the commercial biweek in which
     # self falls. A biweek is a period of two commercial weeks starting with an
     # odd-numbered week and with each week starting in Monday and ending on
     # Sunday.
     # @return [::Date]
-    def beginning_of_biweek
+    def beginning_of_bicweek
       if cweek.odd?
         beginning_of_week(::Date.beginning_of_week)
       else
@@ -537,7 +584,7 @@ module FatCore
     # In the last week of the year (if it is not part of next year's first
     # week) the end of the biweek will not extend beyond self's week, so that
     # week 1 of the following year will start a new biweek.  @return [::Date]
-    def end_of_biweek
+    def end_of_bicweek
       if cweek >= 52 && end_of_week(::Date.beginning_of_week).year > year
         end_of_week(::Date.beginning_of_week)
       elsif cweek.odd?

data/lib/fat_core/version.rb

@@ -2,7 +2,7 @@
 
 module FatCore
   MAJOR = 5
-  MINOR = 3
+  MINOR = 4
   PATCH = 0
 
   # FatCore version number

data/spec/lib/date_spec.rb

@@ -379,7 +379,7 @@ describe Date do
         expect(described_class.parse_spec('10', :to)).to eq described_class.parse('2012-10-31')
         expect { described_class.parse_spec('99') }.to raise_error(ArgumentError)
         # This is a valid day-of-year spec
-        expect { described_class.parse_spec('011') }.not_to raise_error(ArgumentError)
+        expect { described_class.parse_spec('011') }.not_to raise_error
       end
 
       it 'parses month-day specs such as MM-DD' do
@@ -408,6 +408,8 @@ describe Date do
         expect(described_class.parse_spec('2010-09-I', :to)).to eq described_class.parse('2010-09-15')
         expect(described_class.parse_spec('2010-09-II', :from)).to eq described_class.parse('2010-09-16')
         expect(described_class.parse_spec('2010-09-II', :to)).to eq described_class.parse('2010-09-30')
+        expect(described_class.parse_spec('2010-05-I', :from)).to eq described_class.parse('2010-05-01')
+        expect(described_class.parse_spec('2010-05-I', :to)).to eq described_class.parse('2010-05-15')
       end
 
       it 'parses intra-month week specs such as YYYY-MM-i and YYYY-MM-v begin Sunday' do
@@ -753,15 +755,17 @@ describe Date do
 
       it 'knows about biweeks' do
         expect(described_class.parse('2013-11-07').beginning_of_biweek)
-          .to eq described_class.parse('2013-11-04')
+          .to eq described_class.parse('2013-10-28')
         expect(described_class.parse('2013-11-07').end_of_biweek)
-          .to eq described_class.parse('2013-11-17')
-        expect(described_class.parse('2013-03-11')).to be_beginning_of_biweek
-        expect(described_class.parse('2013-03-24')).to be_end_of_biweek
+          .to eq described_class.parse('2013-11-10')
+        expect(described_class.parse('2013-03-04')).to be_beginning_of_biweek
+        expect(described_class.parse('2013-03-17')).to be_end_of_biweek
         expect(described_class.parse('2013-12-30').end_of_biweek)
-          .to eq described_class.parse('2014-01-12')
+          .to eq described_class.parse('2014-01-05')
         expect(described_class.parse('2009-12-30').end_of_biweek)
           .to eq described_class.parse('2010-01-03')
+        expect(described_class.parse('2010-01-03').biweek)
+          .to eq described_class.parse('2009-12-31').biweek
       end
 
       it 'knows that a Monday is the beginning of the week' do
@@ -800,10 +804,10 @@ describe Date do
       it 'knows the beginning and end of bi-week-based chunks' do
         # First Friday to prior Monday
         expect(described_class.parse('2013-11-08').beginning_of_chunk(:biweek))
-          .to eq described_class.parse('2013-11-04')
+          .to eq described_class.parse('2013-10-28')
         # Second Wednesday to 2 prior Monday
         expect(described_class.parse('2013-11-13').beginning_of_chunk(:biweek))
-          .to eq described_class.parse('2013-11-04')
+          .to eq described_class.parse('2013-11-11')
       end
 
       it 'knows the beginning and end of week-based chunks' do
@@ -980,7 +984,7 @@ describe Date do
         expect(described_class.parse('2013-11-24').end_of_chunk(:semimonth))
           .to eq described_class.parse('2013-11-30')
         expect(described_class.parse('2013-11-08').end_of_chunk(:biweek))
-          .to eq described_class.parse('2013-11-17')
+          .to eq described_class.parse('2013-11-10')
         expect(described_class.parse('2013-07-04').end_of_chunk(:week))
           .to eq described_class.parse('2013-07-07')
         expect {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: some useful core extensions