holidays 9.0.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c970bf0b9b26a077f9902bc3729390c606b9354149ee024910689dfedcf4831
-  data.tar.gz: f21f303f0d7bcf522620f64fb1c35c36d84ba70a4de2aecc3c048b24a2be0e65
+  metadata.gz: 48de71e88e1ad86816570c37ed6758acb2cbfa7cdd7572c6d7f887db8ab1e97c
+  data.tar.gz: fd1ad6a19f5dded4fc5b9bcee63d67049229f51047c20d1e629dddee2bf27810
 SHA512:
-  metadata.gz: cf01eea6da4b4847aa8760dddc281b9c7f661ca8bb2fe7e36d09f9737ba2bb4cd0a1785910dcc7df567565c6ad86f1eb695ded055991b7f890d49303b71dd3e3
-  data.tar.gz: be38f100fd9ff3ba4b8aa8621226574c9f699ed5c8e1340c595586e4ea538a415c3685ef94b8471fb1b15830d9b9ff7840f32f930a4ac40578460ec8c2563b30
+  metadata.gz: bf87b687e2927731071a1bae0e128a19cd484a5ce919a7e9d5de6041be63fe4b23e8c7089d94fae37132d322ca206dc32b5c3f3cba59242aac5190e1289550f4
+  data.tar.gz: 3f4a6fb07d8ee2e6546ab25d311bf7f0307c2c94e80da6ae24ba53d0dba1d009a1fdcd651d23c1b69fdbb7d285040f88c01fe0dcbee68d44a67974b94334a63e

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,14 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 9.1.1
+
+* Update to [v6.0.1 definitions](https://github.com/holidays/definitions/releases/tag/v6.0.1). Please see the changelog for the definition details.
+
+## 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/Makefile

@@ -27,7 +27,7 @@ update-defs: definitions/
 definitions: point-to-defs-master
 
 point-to-defs-branch:
-	git submodule add -b $(BRANCH) git@github.com:$(USER)/definitions.git definitions/
+	git submodule add -b $(BRANCH) https://github.com/$(USER)/definitions.git ./definitions/
 
 point-to-defs-master:
 	git submodule add https://github.com/holidays/definitions definitions/

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/doc/MAINTAINERS.md

@@ -55,15 +55,13 @@ sections below.
   * If all of the tests pass, update the `lib/holidays/version.rb` file to the new version. Reference the above [semver](http://semver.org/) rules for how to update versions.
   * Make a branch on your fork and update the [CHANGELOG](../CHANGELOG.md) to reflect the latest changes. You do not need to put in all of the definition changes in this update, you can simply reference the other repository. See other entries in the CHANGELOG for examples.
   * Open a PR against the new branch and merge it (another maintainer will need to review before you can merge)
-  * Once the branch is merged, pull down the latest master from Github and run `make build`. This will generate a new `gem` file with the new version. The new version number is pulled from the above `version.rb` update.
-  * If the build was successful then you can run the following to push up to rubygems.org: `GEM=<gem> make push`. Example: `GEM=holidays-6.2.0.gem make push`
+  * Once the branch is merged, the release GitHub Actions workflow will automatically build the gem and push it to rubygems.org. No local steps are required.
 * Does this update require functionality additions or bug fixes? If YES, then:
   * Run `make test` and ensure that all of the tests pass. If any tests fail then do *not* merge and contact a [core member](https://github.com/orgs/holidays/teams/core/members) for assistance.
   * If all of the tests pass, make a branch on your fork and update the [CHANGELOG](../CHANGELOG.md) to reflect the latest changes.
   * Update the `lib/holidays/version.rb` file to the new version. Reference the above [semver](http://semver.org/) rules for how to update versions.
   * Open a PR against the new branch and merge it (another maintainer will need to review before you can merge)
-  * Once the branch is merged, pull down the latest master from Github and run `make build`. This will generate a new `gem` file with the new version. The new version number is pulled from the above `version.rb` update.
-  * If the build was successful then you can run the following to push up to rubygems.org: `GEM=<gem> make push`. Example: `GEM=holidays-6.2.0.gem make push`
+  * Once the branch is merged, the release GitHub Actions workflow will automatically build the gem and push it to rubygems.org. No local steps are required.
 
 You are done! The latest version should be uploaded to rubygems.org. You can go to view the [holidays page](https://rubygems.org/gems/holidays) to verify that the latest version is available.
 

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/generated_definitions/bg.rb

@@ -17,8 +17,9 @@ module Holidays
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Holy Saturday", :regions => [:bg_en]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Велика събота", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:bg_en]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg, :bg_bg]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]}],
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Великденски понеделник", :regions => [:bg_bg]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:bg_en]},
             {:mday => 1, :name => "Нова година", :regions => [:bg_bg]}],
       3 => [{:mday => 3, :name => "Liberation Day", :regions => [:bg_en]},

data/lib/generated_definitions/cy.rb

@@ -25,7 +25,8 @@ module Holidays
       4 => [{:mday => 1, :name => "Εθνική Ημέρα Κύπρου", :regions => [:cy]}],
       5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:cy]}],
       8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:cy]}],
-      10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:cy]}],
+      10 => [{:mday => 1, :name => "Ημέρα Ανεξαρτησίας της Κύπρου", :regions => [:cy]},
+            {:mday => 28, :name => "Επέτειος του Όχι", :regions => [:cy]}],
       12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:cy]},
             {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:cy]}]
       }

data/lib/generated_definitions/europe.rb

@@ -154,8 +154,9 @@ module Holidays
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Holy Saturday", :regions => [:bg_en]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Велика събота", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:bg_en]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg, :bg_bg]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Великденски понеделник", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Великдень", :regions => [:ua]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 49, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Трійця", :regions => [:ua]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]},

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '9.0.0'
+  VERSION = '9.1.1'
 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.1
 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.6
 specification_version: 4
 summary: A collection of Ruby methods to deal with statutory and other holidays.
 test_files: