fat_core 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6915be154abea741bce220665d425858a13c22aacdcff27952fda89627d0349c
-  data.tar.gz: 82fbae6f418d862154ba909c1f6097d2b82f020eddb740fa207285ee9bb8db3a
+  metadata.gz: 76bee6cef8acc3f947d63674a3010b4dd98ec22e84761fd4413380ac7223957a
+  data.tar.gz: a3c464aee07bfbeadde7ed71080f6e050821d7f1cf643918d500625f41d629c0
 SHA512:
-  metadata.gz: 71698e9642833bd200638b30b879b86eaf21f44ee690048299597982ee0abfb4ddbd2302f3b87d649dcd4963f35de8e04f79cda705fda72cb0bcfb8efb3ae158
-  data.tar.gz: 03407fbd6b3340c9742df04dff407ddd695ebd2ecb7f47ff7304e095be8b27aac933a48573d35279e20b6f3df922908f2d4d3f9043fcac29296dbc3d9ca84228
+  metadata.gz: ce57c6eb8ddc922e9508d82e92b6dc3b3123d1221cac98dae6f031c5835927c8f77154c6cd90e0e3e65c76c78b4ca215da43a45cccaced0c690b799b6886db21
+  data.tar.gz: 7c318d70e0891931511946e5752998de1363f15ef6a3277837aa913e6e4d003c8ec0fbfa0ff0896ec1e7a99f92e6b023335b195b6b91f2128a6bbb98fc4eb664

data/bin/easter

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "debug"
+require 'fat_core/date'
+
+usage = <<~HELP
+  USAGE:
+     easter             -- print the date of Easter for the current year
+     easter year        -- print the date of Easter for the given year
+     easter year1 year2 -- print the dates of Easter from year1 to year2
+
+  Note: if the date of Easter is the earliest possible, it is marked with a '<';
+        if it is the latest date possible, it is marked with a '>'
+HELP
+first, last = *ARGV
+first ||= Date.today.year
+last ||= Date.today.year
+
+if first.to_s.match?(/--help|-h/)
+  puts usage
+  exit(1)
+end
+
+begin
+  first = Integer(first)
+  last = Integer(last)
+rescue ArgumentError
+  warn "!!Error: invalid year number given\n\n"
+  puts usage
+  exit(2)
+end
+
+(first..last).each do |yr|
+  easter = Date.easter(yr)
+  sig =
+    if easter.month == 4 && easter.day >= 25
+      ' >'
+    elsif easter.month == 3 && easter.day <= 22
+      ' <'
+    else
+      ''
+    end
+  puts "Easter #{yr}: #{easter.iso}#{sig}"
+end

data/fat_core.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'damerau-levenshtein'
+  spec.add_dependency 'ostruct'
+  spec.add_dependency 'stringio', '>=3.1.2'
 end

data/lib/fat_core/date.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'date'
-require 'active_support'
 require 'active_support/core_ext/date'
 require 'active_support/core_ext/time'
 require 'active_support/core_ext/numeric/time'
@@ -58,7 +56,7 @@ module FatCore
     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)
+    DAYSYMS = ::Date::DAYNAMES.map { |name| name.downcase.to_sym }
 
     # :category: Formatting
     # @group Formatting
@@ -532,7 +530,7 @@ module FatCore
       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
+        ::Date.new(year - 1, 12, 31).week_number
       end
     end
 
@@ -1834,6 +1832,7 @@ module FatCore
       # @param year [Integer] the year of interest
       # @return [::Date] the date of Easter for year
       def easter(year)
+        year = year.to_i
         y = year
         a = y % 19
         b, c = y.divmod(100)

data/lib/fat_core/version.rb

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

data/lib/fat_core.rb

@@ -1,5 +1,7 @@
-require 'fat_core/version'
-require 'fat_core/patches'
+require 'date'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/deep_dup'
+
+require 'fat_core/version'
+require 'fat_core/patches'

data/spec/lib/date_spec.rb

@@ -1069,6 +1069,7 @@ describe Date do
     describe 'holidays' do
       it 'knows Easter in its year' do
         expect(described_class.today.easter_this_year).to eq(described_class.parse('2012-04-08'))
+        expect(Date.easter(2012)).to eq(Date.parse('2012-04-08'))
         expect(described_class.parse('2014-04-20').easter?).to be true
         expect(described_class.parse('2014-03-20').easter?).to be false
       end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'pry'
 require 'debug'
 
 require 'active_support/testing/time_helpers'
+require 'fat_core'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stringio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 description: |
   Useful extensions to Date, String, Range and other classes
   including useful Date extensions for dealing with US Federal
@@ -47,7 +75,7 @@ description: |
 email:
 - ded@ddoherty.net
 executables:
-- easters
+- easter
 extensions: []
 extra_rdoc_files: []
 files:
@@ -64,7 +92,7 @@ files:
 - Rakefile
 - TODO.org
 - bin/console
-- bin/easters
+- bin/easter
 - fat_core.gemspec
 - lib/fat_core.rb
 - lib/fat_core/ChangeLog

data/bin/easters

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'easters' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("fat_core", "easters")