holidays 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c970bf0b9b26a077f9902bc3729390c606b9354149ee024910689dfedcf4831
-  data.tar.gz: f21f303f0d7bcf522620f64fb1c35c36d84ba70a4de2aecc3c048b24a2be0e65
+  metadata.gz: c423e457490bf307e7fabdfc2744e0e8621eb6f0a783e593023f562dccd8ad68
+  data.tar.gz: a6ce029fecfb730da6d6b6a0a75f4c7b718937d5a95d0d03fc407df58083ecb7
 SHA512:
-  metadata.gz: cf01eea6da4b4847aa8760dddc281b9c7f661ca8bb2fe7e36d09f9737ba2bb4cd0a1785910dcc7df567565c6ad86f1eb695ded055991b7f890d49303b71dd3e3
-  data.tar.gz: be38f100fd9ff3ba4b8aa8621226574c9f699ed5c8e1340c595586e4ea538a415c3685ef94b8471fb1b15830d9b9ff7840f32f930a4ac40578460ec8c2563b30
+  metadata.gz: 9f2885529f2b22865d406bd38bafa8f169c94df37c4f7c6b51eef95d5aa2085cd29c0d4f9b9c8f3d2d2cb2ac887f984ba5521ecf279c548ec755b8a44ccb007a
+  data.tar.gz: 9c1aeaf7d210fe849d1977f931e625b895e8bced4924a26643a47e3edaca75451743ca036e864e8772901df92738fb612251195bfdf62b494ad01a3935c5eb91

data/.github/workflows/changelog-check.yml

@@ -0,0 +1,47 @@
+name: Changelog Check
+on:
+  pull_request:
+    branches: ["master"]
+    paths:
+      - 'lib/holidays/version.rb'
+      - 'CHANGELOG.md'
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Extract version from version.rb
+        id: version
+        run: |
+          VERSION=$(grep -oP "VERSION = '\K[^']+" lib/holidays/version.rb)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "version.rb declares: $VERSION"
+      - name: Extract latest version from CHANGELOG
+        id: changelog
+        run: |
+          CHANGELOG_VERSION=$(grep -oP "^## \K[0-9]+\.[0-9]+\.[0-9]+" CHANGELOG.md | head -1)
+          echo "changelog_version=$CHANGELOG_VERSION" >> $GITHUB_OUTPUT
+          echo "CHANGELOG latest entry: $CHANGELOG_VERSION"
+      - name: Verify version.rb and CHANGELOG agree
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          CHANGELOG_VERSION="${{ steps.changelog.outputs.changelog_version }}"
+          FAILED=false
+
+          if ! grep -q "^## ${VERSION}$" CHANGELOG.md; then
+            echo "ERROR: version.rb declares ${VERSION} but no matching '## ${VERSION}' section found in CHANGELOG.md"
+            FAILED=true
+          fi
+
+          if [ "${CHANGELOG_VERSION}" != "${VERSION}" ]; then
+            echo "ERROR: CHANGELOG.md latest entry is ${CHANGELOG_VERSION} but version.rb declares ${VERSION}"
+            FAILED=true
+          fi
+
+          if [ "$FAILED" = "true" ]; then
+            echo ""
+            echo "Both version.rb and CHANGELOG.md must be updated together and must agree on the version."
+            exit 1
+          fi
+
+          echo "OK: version.rb and CHANGELOG.md both declare ${VERSION}"

data/.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: Release
+on:
+  push:
+    branches: ["master"]
+permissions:
+  contents: read
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLER_NO_OLD_RUBYGEMS_WARNING: true
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 #v1.299.0
+        with:
+          ruby-version: 'ruby'
+          bundler-cache: true
+      - name: Extract version from version.rb
+        id: version
+        run: |
+          VERSION=$(grep -oP "VERSION = '\K[^']+" lib/holidays/version.rb)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Detected version: $VERSION"
+      - name: Check if version already exists on RubyGems
+        id: rubygems
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
+            "https://rubygems.org/api/v2/rubygems/holidays/versions/${VERSION}.json")
+          if [ "$HTTP_STATUS" = "200" ]; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            echo "Version ${VERSION} already exists on RubyGems, skipping publish"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+            echo "Version ${VERSION} not found on RubyGems (HTTP ${HTTP_STATUS})"
+          fi
+      - name: Build and publish gem
+        if: steps.rubygems.outputs.exists == 'false'
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          gem build holidays.gemspec
+          gem push "holidays-${VERSION}.gem"
+          echo "Successfully published holidays ${VERSION} to RubyGems"

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 9.1.0
+
+* Update to [v6.0.0 definitions](https://github.com/holidays/definitions/releases/tag/v6.0.0). Please see the changelog for the definition details.
+* Update mocha from 1.x to 2.x for Ruby 4.0 compatibility. Fixes warning about removed CGI library.
+
 ## 9.0.0
 
 * Drop support for Ruby < 3.2. Supported versions are now 3.2, 3.3, 3.4, and ruby-head.

data/README.md

@@ -14,14 +14,10 @@ gem install holidays
 
 This gem is tested with the following ruby versions:
 
-  * 2.4.5
-  * 2.5.3
-  * 2.6.1
-  * 2.7.7
-  * 3.0.6
-  * 3.1.4
-  * 3.2.2
-  * 3.3.0
+  * 3.2
+  * 3.3
+  * 3.4
+  * 4.0
   * JRuby 9.2.21.0
   * JRuby 9.4.2.0
 

data/holidays.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 13'
   gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'test-unit', '~> 3'
-  gem.add_development_dependency 'mocha', '~> 1'
+  gem.add_development_dependency 'mocha', '~> 2'
   gem.add_development_dependency 'pry', '~> 0.12'
 end

data/lib/generated_definitions/au.rb

@@ -71,20 +71,16 @@ when 2016
   Date.civil(2016, 9, 30)
 when 2017
   Date.civil(2017, 9, 29)
-when 2018
-  Date.civil(2018, 9, 28)
-when 2019
-  Date.civil(2019, 9, 27)
 when 2020
   Date.civil(2020, 10, 23)
-when 2021
-  Date.civil(2021, 9, 24)
 when 2022
   Date.civil(2022, 9, 23)
-when 2023
-  Date.civil(2023, 9, 29)
-when 2024
-  Date.civil(2024, 9, 27)
+else
+  # Friday before AFL Grand Final typically falls on the last Friday in September
+  # Override when falls on a different date
+  last_day = Date.civil(year, 9, -1)
+  last_friday = last_day - ((last_day.wday - 5) % 7)
+  last_friday
 end
 },
 

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '9.0.0'
+  VERSION = '9.1.0'
 end

data/test/holidays/definition/context/test_generator.rb

@@ -189,7 +189,7 @@ class GeneratorTests < Test::Unit::TestCase
   def test_generate_definition_source_correctly_generate_module_src_with_custom_methods
     files = ['test/data/test_single_custom_holiday_with_custom_procs.yaml']
 
-    @custom_method_parser.expects(:call).with('custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}).returns({"custom_method(year, month)" => @parsed_custom_method})
+    @custom_method_parser.expects(:call).with(equals({'custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}})).returns({"custom_method(year, month)" => @parsed_custom_method})
     @custom_methods_repository.expects(:find).twice.with('custom_method(year, month)').returns(nil)
     @custom_method_source_decorator.expects(:call).once.with(@parsed_custom_method).returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
 
@@ -209,7 +209,7 @@ class GeneratorTests < Test::Unit::TestCase
   def test_generate_definition_source_correctly_generate_test_src_with_custom_methods
     files = ['test/data/test_single_custom_holiday_with_custom_procs.yaml']
 
-    @custom_method_parser.expects(:call).with('custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}).returns({"custom_method(year, month)" => @parsed_custom_method})
+    @custom_method_parser.expects(:call).with(equals({'custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}})).returns({"custom_method(year, month)" => @parsed_custom_method})
     @custom_methods_repository.expects(:find).twice.with('custom_method(year, month)').returns(nil)
     @custom_method_source_decorator.expects(:call).once.with(@parsed_custom_method).returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/changelog-check.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitmodules"
 - CHANGELOG.md
@@ -405,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.9
 specification_version: 4
 summary: A collection of Ruby methods to deal with statutory and other holidays.
 test_files: