holidays 4.2.0 → 8.4.1

data/Rakefile

@@ -41,7 +41,7 @@ end
 
 desc 'Launch IRB session'
 task :console do
-  sh "irb -rubygems -I lib -r holidays.rb"
+  sh "irb -r rubygems -I lib -r holidays.rb"
 end
 
 desc 'Generate definitions and tests used in main holiday logic based on raw YAML definitions'
@@ -54,14 +54,17 @@ namespace :generate do
     # create a dir for the generated tests
     FileUtils.mkdir_p(DEFINITION_TESTS_PATH)
 
-    all_regions = []
+    #TODO This entire section should be moved into '/lib/holidays/definition'. I don't think such an
+    # important part of the gem should be left in the Rakefile and without unit tests. There's no
+    # reason we can't move it.
+    all_regions = {}
 
     def_index['defs'].each do |region, files|
       puts "Building #{region} definition module:"
       files = files.collect { |f| "#{DEFINITION_PATH}/#{f}" }.uniq
 
-      regions, rules_by_month, custom_methods, tests = Holidays::DefinitionFactory.file_parser.parse_definition_files(files)
-      module_src, test_src = Holidays::DefinitionFactory.source_generator.generate_definition_source(region, files, regions, rules_by_month, custom_methods, tests)
+      regions, rules_by_month, custom_methods, tests = Holidays::Factory::Definition.file_parser.parse_definition_files(files)
+      module_src, test_src = Holidays::Factory::Definition.source_generator.generate_definition_source(region, files, regions, rules_by_month, custom_methods, tests)
 
       File.open("lib/#{Holidays::DEFINITIONS_PATH}/#{region.downcase.to_s}.rb","w") do |file|
         file.puts module_src
@@ -72,7 +75,7 @@ namespace :generate do
         end
       end
 
-      all_regions << regions
+      all_regions[region.downcase.to_sym] = regions
 
       puts "Done.\n\n"
     end
@@ -80,12 +83,7 @@ namespace :generate do
     puts "Building regions master file for later validation:"
 
     File.open("lib/#{Holidays::DEFINITIONS_PATH}/REGIONS.rb","w") do |file|
-      file.puts <<-EOR
-# encoding: utf-8
-module Holidays
-  REGIONS = [:#{all_regions.join(', :')}]
-end
-  EOR
+      file.puts Holidays::Factory::Definition.regions_generator.call(all_regions)
     end
 
     puts "Done.\n\n"
@@ -94,6 +92,7 @@ end
   desc 'Build the definition manifest'
   task :manifest do
     File.open("lib/#{Holidays::DEFINITIONS_PATH}/MANIFEST","w") do |file|
+      #TODO Generating the file source should be done interally, in the /lib dir, not in the Rakefile
       file.puts <<-EOH
 ==== Regional definitions
 The following definition files are included in this installation:

data/bin/setup

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 IFS=$'\n\t'
+set -vx
 
 bundle install

data/doc/CONTRIBUTING.md

@@ -0,0 +1,72 @@
+# How to contribute
+
+There are multiple ways to help! We rely on users around the world to help keep our definitions accurate and up to date. In addition, pull requests to address bugs or implement new features are always welcome.
+
+## Code of Conduct
+
+Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing. Everyone interacting with this project (or associated projects) is expected to abide by its terms.
+
+## General note
+
+The definitions for this project are housed in a submodule. When pulling this repo please make sure to run `git clone --recursive git@github.com/holidays/holidays`
+or, if you forgot to do so, run `make update-defs` so that all of the submodule data is pulled correctly.
+
+## For definition updates
+
+Our definitions are written in YAML. They are housed in a [separate repository](https://github.com/holidays/definitions) so that they can be used by tools written in other languages. You can find a complete guide to our format in the [definitions SYNTAX guide](https://github.com/holidays/definitions/blob/master/doc/SYNTAX.md).
+
+In this ruby project we take the YAML definitions and generate final ruby classes that are loaded at runtime for fast calculations.
+
+Once you have a good idea on what you want to change, please see the [CONTRIBUTING guide](https://github.com/holidays/definitions/blob/master/doc/CONTRIBUTING.md) in the `definitions` repository.
+
+The idea is that if the validation passes on the other repo then you shouldn't have to worry about generating and testing here. We'll see how that goes!
+
+Once that PR is accepted the maintainers of this project will be responsible for generating the updated definitions here and releasing a new gem. Don't worry about versioning, we'll take care of it!
+
+#### Testing out your definitions locally
+
+As mentioned above we use a git submodule for the definitions. Sometimes you might want to manually test out how this ruby project will behave with your changes. To facilitate that we provide some commands for pointing the definitions submodule to your fork/branch.
+
+To point at your fork/branch:
+
+```sh
+make clean-defs
+BRANCH=<branch-name> USER=<user> make point-to-defs-branch
+```
+
+Example:
+
+```sh
+make clean-defs
+BRANCH=issue-24 USER=ppeble make point-to-defs-branch
+```
+
+This will pull everything down for the latest commit on that fork/branch. When you are done testing and want to point back at the master definitions:
+
+```sh
+make clean-defs
+make point-to-defs-master
+```
+
+## For non-definition functionality
+
+* Fork this repository
+* Make your changes. Don't forget to run `make test` to execute the test suite!
+* Create a PR pointing back to `master`
+
+Don't worry about versioning, we'll handle it on our end.
+
+*Tests are required*. If your PR results in lower test coverage then it will not be accepted.
+
+## Local development helpers
+
+We have included a few handy tasks to help you troubleshoot and test:
+
+* `make test` - runs the entire suite
+* `bundle exec ruby <test-file-to-run>` - runs just the tests in the specified file
+* `REGION=<region> make test-region` - runs the tests for just that region
+* `make console` - launches an IRB session with the 'holidays' gem loaded for quick testing
+* `make update-defs` - runs the appropriate git submodule commands to pull the latest definitions
+* `make clean-defs` - removes the definitions submodule, useful for switching between a fork and the main definitions repository
+* `BRANCH=<branch> USER=<user> make point-to-defs-branch` - updates your definitions submodule to point at a fork/branch
+* `make point-to-defs-master` - updates your definitions submodule to point back at the `holidays/definitions` repo and master branch

data/doc/MAINTAINERS.md

@@ -0,0 +1,81 @@
+# Maintainers guide
+
+This document outlines the process of releasing an update to the `holidays` gem. This update could
+include any (or a combination of) the following:
+
+* definition updates from the [definitions](https://github.com/holidays/definitions) repository
+* bug fixes
+* additional functionality
+
+### semver
+
+This gem operates under the rules of [semver](http://semver.org/). The decisions on what constitutes a major,
+minor, or patch version update fall on the maintainer. If in doubt, follow these rules:
+
+* Will this change mean that users will be REQUIRED to make a code change? If so then it is a major version bump. This includes dropping supported versions of ruby!
+* Will this change mean that users might see a definition/behavior change but won't need to modify their own code? If so then it is as minor version bump
+* Will this change mean that a bug, either in code or definitions, will be fixed? If so then it is a patch version bump
+
+*@ppeble editor note*: I am pretty aggressive when it comes to version bumps! If the slightest functionality has changed then
+I consider it a minor version bump, if ANY consumer code has to change then I consider it a major version bump. I don't care
+if we get up to version 250, the version number doesn't matter. Communicating the effort required in updating is what matters!
+
+### Who this document is for
+
+This document is for maintainers that have merge access to this repository. These maintainers may or may not have access to the upstream
+[definitions](https://github.com/holidays/definitions) repository.
+
+Please note that a core contributor must provide the relevant Github access so that you can perform merges. If you have any issues
+please contact the [core members](https://github.com/orgs/holidays/teams/core/members) for assistance.
+
+### Setup
+
+This guide assumes that you have forked the repository in Github. If you require assistance in this please contact the core members listed above.
+
+You will need upload access to rubygems.org in order to publish gems. Contact a [core member](https://github.com/orgs/holidays/teams/core/members) for assistance.
+
+### Release Overview
+
+A release could contain one or more of the following:
+
+* definition updates - these are rule updates pulled from https://github.com/holidays/definitions. These changes are not
+language specific and will most likely require local regeneration of compiled rules.
+* functionality additions - this is new functionality in this repository that uses the existing definitions
+* bug fixes - these are bug fixes in this repository
+
+It is up to the maintainer to determine what needs to be updated. We will attempt to outline the various scenarios in the
+sections below.
+
+### Release flow
+
+* Does this update require definition updates? If YES, then:
+  * Pull the latest `master` version of this ruby repository and run `make update-defs`. This will grab the latest version from the [definitions](https://github.com/holidays/definitions) repository. Run `git diff` to verify that the version of the submodule for the definitions matches the latest commit in the [definitions](https://github.com/holidays/definitions) repo.
+  * Run the `make generate` command. This will 'recompile' the ruby sources with the latest definitions.
+  * 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, 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`
+* 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`
+
+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.
+
+It is totally acceptable to do both functionality AND definition updates in a single release. Simply combine both sets of rules into a single branch for your update.
+
+### Troubleshooting
+
+The biggest hurdle in this repository is that [upstream definition](https://github.com/holidays/definitions) changes will
+result in failures in existing tests and it will not be because of ruby issues but rather upstream issues. If you notice any test failures
+that seem to be specific to certain regions then look at recent changes in that other repository. If there were changes there then the odds
+are that there are issues in the definition-specific tests. This is most likely not a language (i.e. ruby) specific issue.
+
+It is a known issue that the definitions do not have a good set of self-tests to ensure that they are internally consistent. This means that a failure in this
+repository could NOT be related to ruby specifically. It could be that the 'tests' specified in in the YAML files are incorrect! If you encounter errors here
+make sure that you don't assume that it is just a ruby error that is causing the issues!

data/holidays.gemspec

@@ -7,20 +7,20 @@ require 'holidays/version'
 Gem::Specification.new do |gem|
   gem.name          = 'holidays'
   gem.version       = Holidays::VERSION
-  gem.authors       = ['Alex Dunae', 'Phil Trimble']
+  gem.authors       = ['Alex Dunae', 'Phil Peble']
   gem.email         = ['holidaysgem@gmail.com']
   gem.homepage      = 'https://github.com/holidays/holidays'
   gem.description   = %q(A collection of Ruby methods to deal with statutory and other holidays. You deserve a holiday!)
   gem.summary       = %q(A collection of Ruby methods to deal with statutory and other holidays.)
-  gem.files         = `git ls-files`.split("\n") - ['.gitignore', '.travis.yml', '.coveralls.yml']
+  gem.files         = `git ls-files`.split("\n") - ['.gitignore', '.travis.yml']
   gem.test_files    = gem.files.grep(/^test/)
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
-  gem.required_ruby_version = '~> 2.0'
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'test-unit'
-  gem.add_development_dependency 'mocha', '~>1.0'
-  gem.add_development_dependency 'pry', '~>0.10'
+  gem.required_ruby_version = '>= 2.4'
+  gem.add_development_dependency 'bundler', '~> 2'
+  gem.add_development_dependency 'rake', '~> 12'
+  gem.add_development_dependency 'simplecov', '~> 0.16'
+  gem.add_development_dependency 'test-unit', '~> 3'
+  gem.add_development_dependency 'mocha', '~> 1'
+  gem.add_development_dependency 'pry', '~> 0.12'
 end

data/lib/generated_definitions/MANIFEST

@@ -13,45 +13,67 @@ The following definition files are included in this installation:
 * generated_definitions/ca
 * generated_definitions/ch
 * generated_definitions/cl
+* generated_definitions/co
 * generated_definitions/cr
 * generated_definitions/cz
 * generated_definitions/de
 * generated_definitions/dk
-* generated_definitions/ecb_target
+* generated_definitions/ecbtarget
+* generated_definitions/ee
 * generated_definitions/el
 * generated_definitions/es
 * generated_definitions/europe
-* generated_definitions/federal_reserve
+* generated_definitions/federalreserve
+* generated_definitions/federalreservebanks
 * generated_definitions/fedex
 * generated_definitions/fi
 * generated_definitions/fr
 * generated_definitions/gb
+* generated_definitions/ge
+* generated_definitions/hk
 * generated_definitions/hr
 * generated_definitions/hu
 * generated_definitions/ie
 * generated_definitions/is
 * generated_definitions/it
 * generated_definitions/jp
+* generated_definitions/kr
+* generated_definitions/kz
 * generated_definitions/li
 * generated_definitions/lt
+* generated_definitions/lu
+* generated_definitions/lv
 * generated_definitions/ma
+* generated_definitions/mt_en
+* generated_definitions/mt_mt
 * generated_definitions/mx
+* generated_definitions/my
 * generated_definitions/nerc
+* generated_definitions/ng
 * generated_definitions/nl
 * generated_definitions/no
-* generated_definitions/north_america
+* generated_definitions/northamerica
 * generated_definitions/nyse
 * generated_definitions/nz
+* generated_definitions/pe
 * generated_definitions/ph
 * generated_definitions/pl
 * generated_definitions/pt
 * generated_definitions/ro
+* generated_definitions/rs_cyrl
+* generated_definitions/rs_la
+* generated_definitions/ru
 * generated_definitions/scandinavia
 * generated_definitions/se
 * generated_definitions/sg
 * generated_definitions/si
 * generated_definitions/sk
-* generated_definitions/united_nations
+* generated_definitions/southamerica
+* generated_definitions/th
+* generated_definitions/tn
+* generated_definitions/tr
+* generated_definitions/ua
+* generated_definitions/unitednations
 * generated_definitions/ups
 * generated_definitions/us
 * generated_definitions/ve

data/lib/generated_definitions/REGIONS.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
 module Holidays
-  REGIONS = [:ar, :at, :au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas_south, :au_wa, :au_tas, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne, :be_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :us, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cl, :cr, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :de_th, :ecb_target, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :federal_reserve, :fedex, :fi, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :nerc, :nl, :no, :nyse, :nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ne, :nz_ot, :nz_ta, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl, :ph, :pl, :pt, :ro, :se, :us, :us_dc, :us_ca, :ca, :united_nations, :ups, :za, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_mb, :ca_ns, :ca_pe, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :mx, :mx_pue, :us, :us_dc, :us_ca, :dk, :is, :no, :se, :fi, :at, :be_fr, :be_nl, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux, :de_sn, :de_st, :de_by_aux, :de_bb, :de_mv, :de_th, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :ie, :is, :it, :li, :lt, :nl, :no, :pl, :pt, :ro, :sk, :si, :bg_en, :bg_bg, :jp, :ve, :vi, :sk, :si, :sg]
+  REGIONS = [:ar, :at, :au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_wa, :au_tas, :au_tas_south, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne, :be_fr, :be_nl, :br, :bg_en, :bg_bg, :ca, :ca_qc, :ca_ab, :ca_sk, :ca_on, :ca_bc, :ca_nb, :ca_mb, :ca_ns, :ca_pe, :ca_nl, :ca_nt, :ca_nu, :ca_yt, :us, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_ne, :ch_ge, :ch_ju, :ch_vs, :ch, :cl, :co, :cr, :cz, :dk, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_sorbian, :de_th_cath, :de_sn, :de_st, :de_be, :de_by_cath, :de_by_augsburg, :de_bb, :de_mv, :de_th, :de_hb, :de_hh, :de_ni, :de_sh, :ecbtarget, :ee, :el, :es_pv, :es_na, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :es, :es_ct, :es_v, :es_vc, :federalreserve, :federalreservebanks, :fedex, :fi, :fr_a, :fr_m, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :je, :gb_jsy, :gg, :gb_gsy, :gb_sct, :gb_con, :im, :gb_iom, :ge, :hr, :hk, :hu, :ie, :is, :it, :it_ve, :it_tv, :it_vr, :it_pd, :it_fi, :it_ge, :it_to, :it_rm, :it_vi, :it_bl, :it_ro, :kr, :kz, :li, :lt, :lv, :ma, :mt_mt, :mt_en, :mx, :mx_pue, :nerc, :nl, :lu, :no, :nyse, :nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ne, :nz_ot, :nz_ta, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl, :pe, :ph, :pl, :pt, :pt_li, :pt_po, :ro, :rs_cyrl, :rs_la, :ru, :se, :tn, :tr, :ua, :us_fl, :us_la, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_al, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_pa, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :unitednations, :ups, :za, :ve, :sk, :si, :jp, :vi, :sg, :my, :th, :ng]
+
+  PARENT_REGION_LOOKUP = {:ar=>:ar, :at=>:at, :au=>:au, :au_nsw=>:au, :au_vic=>:au, :au_qld=>:au, :au_nt=>:au, :au_act=>:au, :au_sa=>:au, :au_wa=>:au, :au_tas=>:au, :au_tas_south=>:au, :au_qld_cairns=>:au, :au_qld_brisbane=>:au, :au_tas_north=>:au, :au_vic_melbourne=>:au, :be_fr=>:be_fr, :be_nl=>:be_nl, :br=>:br, :bg_en=>:bg, :bg_bg=>:bg, :ca=>:ca, :ca_qc=>:ca, :ca_ab=>:ca, :ca_sk=>:ca, :ca_on=>:ca, :ca_bc=>:ca, :ca_nb=>:ca, :ca_mb=>:ca, :ca_ns=>:ca, :ca_pe=>:ca, :ca_nl=>:ca, :ca_nt=>:ca, :ca_nu=>:ca, :ca_yt=>:ca, :us=>:us, :ch_zh=>:ch, :ch_be=>:ch, :ch_lu=>:ch, :ch_ur=>:ch, :ch_sz=>:ch, :ch_ow=>:ch, :ch_nw=>:ch, :ch_gl=>:ch, :ch_zg=>:ch, :ch_fr=>:ch, :ch_so=>:ch, :ch_bs=>:ch, :ch_bl=>:ch, :ch_sh=>:ch, :ch_ar=>:ch, :ch_ai=>:ch, :ch_sg=>:ch, :ch_gr=>:ch, :ch_ag=>:ch, :ch_tg=>:ch, :ch_ti=>:ch, :ch_vd=>:ch, :ch_ne=>:ch, :ch_ge=>:ch, :ch_ju=>:ch, :ch_vs=>:ch, :ch=>:ch, :cl=>:cl, :co=>:co, :cr=>:cr, :cz=>:cz, :dk=>:dk, :de=>:de, :de_bw=>:de, :de_by=>:de, :de_he=>:de, :de_nw=>:de, :de_rp=>:de, :de_sl=>:de, :de_sn_sorbian=>:de, :de_th_cath=>:de, :de_sn=>:de, :de_st=>:de, :de_be=>:de, :de_by_cath=>:de, :de_by_augsburg=>:de, :de_bb=>:de, :de_mv=>:de, :de_th=>:de, :de_hb=>:de, :de_hh=>:de, :de_ni=>:de, :de_sh=>:de, :ecbtarget=>:ecbtarget, :ee=>:ee, :el=>:el, :es_pv=>:es, :es_na=>:es, :es_an=>:es, :es_ib=>:es, :es_cm=>:es, :es_mu=>:es, :es_m=>:es, :es_ar=>:es, :es_cl=>:es, :es_cn=>:es, :es_lo=>:es, :es_ga=>:es, :es_ce=>:es, :es_o=>:es, :es_ex=>:es, :es=>:es, :es_ct=>:es, :es_v=>:es, :es_vc=>:es, :federalreserve=>:federalreserve, :federalreservebanks=>:federalreservebanks, :fedex=>:fedex, :fi=>:fi, :fr_a=>:fr, :fr_m=>:fr, :fr=>:fr, :gb=>:gb, :gb_eng=>:gb, :gb_wls=>:gb, :gb_eaw=>:gb, :gb_nir=>:gb, :je=>:gb, :gb_jsy=>:gb, :gg=>:gb, :gb_gsy=>:gb, :gb_sct=>:gb, :gb_con=>:gb, :im=>:gb, :gb_iom=>:gb, :ge=>:ge, :hr=>:hr, :hk=>:hk, :hu=>:hu, :ie=>:ie, :is=>:is, :it=>:it, :it_ve=>:it, :it_tv=>:it, :it_vr=>:it, :it_pd=>:it, :it_fi=>:it, :it_ge=>:it, :it_to=>:it, :it_rm=>:it, :it_vi=>:it, :it_bl=>:it, :it_ro=>:it, :kr=>:kr, :kz=>:kz, :li=>:li, :lt=>:lt, :lv=>:lv, :ma=>:ma, :mt_mt=>:mt_mt, :mt_en=>:mt_en, :mx=>:mx, :mx_pue=>:mx, :nerc=>:nerc, :nl=>:nl, :lu=>:lu, :no=>:no, :nyse=>:nyse, :nz=>:nz, :nz_sl=>:nz, :nz_we=>:nz, :nz_ak=>:nz, :nz_nl=>:nz, :nz_ne=>:nz, :nz_ot=>:nz, :nz_ta=>:nz, :nz_sc=>:nz, :nz_hb=>:nz, :nz_mb=>:nz, :nz_ca=>:nz, :nz_ch=>:nz, :nz_wl=>:nz, :pe=>:pe, :ph=>:ph, :pl=>:pl, :pt=>:pt, :pt_li=>:pt, :pt_po=>:pt, :ro=>:ro, :rs_cyrl=>:rs_cyrl, :rs_la=>:rs_la, :ru=>:ru, :se=>:se, :tn=>:tn, :tr=>:tr, :ua=>:ua, :us_fl=>:us, :us_la=>:us, :us_ct=>:us, :us_de=>:us, :us_gu=>:us, :us_hi=>:us, :us_in=>:us, :us_ky=>:us, :us_nj=>:us, :us_nc=>:us, :us_nd=>:us, :us_pr=>:us, :us_tn=>:us, :us_ms=>:us, :us_id=>:us, :us_ar=>:us, :us_tx=>:us, :us_dc=>:us, :us_md=>:us, :us_va=>:us, :us_vt=>:us, :us_ak=>:us, :us_ca=>:us, :us_me=>:us, :us_ma=>:us, :us_al=>:us, :us_ga=>:us, :us_ne=>:us, :us_mo=>:us, :us_sc=>:us, :us_wv=>:us, :us_vi=>:us, :us_ut=>:us, :us_ri=>:us, :us_az=>:us, :us_co=>:us, :us_il=>:us, :us_mt=>:us, :us_nm=>:us, :us_ny=>:us, :us_oh=>:us, :us_pa=>:us, :us_mi=>:us, :us_mn=>:us, :us_nv=>:us, :us_or=>:us, :us_sd=>:us, :us_wa=>:us, :us_wi=>:us, :us_wy=>:us, :us_ia=>:us, :us_ks=>:us, :us_nh=>:us, :us_ok=>:us, :unitednations=>:unitednations, :ups=>:ups, :za=>:za, :ve=>:southamerica, :sk=>:europe, :si=>:europe, :jp=>:jp, :vi=>:vi, :sg=>:sg, :my=>:my, :th=>:th, :ng=>:ng}
 end

data/lib/generated_definitions/ar.rb

@@ -4,12 +4,6 @@ module Holidays
   #
   # Definitions loaded: definitions/ar.yaml
   #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/ar'
-  #
   # All the definitions are available at https://github.com/holidays/holidays
   module AR # :nodoc:
     def self.defined_regions
@@ -18,10 +12,10 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ar]}],
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ar]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Carnaval Lunes", :regions => [:ar]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Carnaval Martes", :regions => [:ar]}],
       1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:ar]}],
-      2 => [{:mday => 8, :name => "Carnaval", :regions => [:ar]},
-            {:mday => 9, :name => "Carnaval", :regions => [:ar]}],
       3 => [{:mday => 24, :name => "Día Nacional de la Memoria por la Verdad y la Justicia", :regions => [:ar]}],
       4 => [{:mday => 2, :name => "Día del Veterano y de los Caídos en la Guerra de Malvinas", :regions => [:ar]}],
       5 => [{:mday => 1, :name => "Día del Trabajador", :regions => [:ar]},
@@ -40,7 +34,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/at.rb

@@ -4,12 +4,6 @@ module Holidays
   #
   # Definitions loaded: definitions/at.yaml
   #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/at'
-  #
   # All the definitions are available at https://github.com/holidays/holidays
   module AT # :nodoc:
     def self.defined_regions
@@ -18,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:at]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:at]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:at]}],
@@ -28,7 +22,7 @@ module Holidays
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]}],
       10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}],
       11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}],
-      12 => [{:mday => 8, :name => "Mariä Empfägnis", :regions => [:at]},
+      12 => [{:mday => 8, :name => "Mariä Empfängnis", :regions => [:at]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at]},
             {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}]
       }
@@ -36,7 +30,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/au.rb

@@ -4,38 +4,35 @@ module Holidays
   #
   # Definitions loaded: definitions/au.yaml
   #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/au'
-  #
   # All the definitions are available at https://github.com/holidays/holidays
   module AU # :nodoc:
     def self.defined_regions
-      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas_south, :au_wa, :au_tas, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne]
+      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_wa, :au_tas, :au_tas_south, :au_qld_cairns, :au_qld_brisbane, :au_tas_north, :au_vic_melbourne]
     end
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:au]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:au]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Easter Saturday", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:au_nsw, :au_vic]},
+            {:function => "easter(year)", :function_arguments => [:year], :year_ranges => { :from => 2017 },:name => "Easter Sunday", :regions => [:au_qld, :au_act]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:au]}],
-      1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:au]},
+      1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:au, :au_nsw, :au_vic, :au_act, :au_sa, :au_wa, :au_nt, :au_qld]},
+            {:mday => 1, :function => "to_monday_if_weekend(date)", :function_arguments => [:date], :name => "New Year's Day", :regions => [:au_tas]},
             {:mday => 26, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Australia Day", :regions => [:au]}],
       2 => [{:wday => 1, :week => 2, :name => "Royal Hobart Regatta", :regions => [:au_tas_south]}],
       3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
             {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]},
-            {:function => "march_pub_hol_sa(year)", :function_arguments => [:year], :name => "March Public Holiday", :regions => [:au_sa]}],
+            {:function => "march_pub_hol_sa(year)", :function_arguments => [:year], :name => "March Public Holiday", :regions => [:au_sa]},
+            {:wday => 1, :week => 2, :name => "Canberra Day", :regions => [:au_act]}],
       4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]},
             {:mday => 25, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "ANZAC Day", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas]},
             {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "ANZAC Day", :regions => [:au_wa]}],
       5 => [{:function => "qld_labour_day_may(year)", :function_arguments => [:year], :name => "Labour Day", :regions => [:au_qld]},
             {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]},
             {:function => "may_pub_hol_sa(year)", :function_arguments => [:year], :name => "May Public Holiday", :regions => [:au_sa]}],
-      6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
+      6 => [{:wday => 1, :week => 1, :name => "Western Australia Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_vic]},
             {:function => "qld_queens_birthday_june(year)", :function_arguments => [:year], :name => "Queen's Birthday", :regions => [:au_qld]},
             {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
@@ -51,26 +48,36 @@ module Holidays
       11 => [{:function => "g20_day_2014_only(year)", :function_arguments => [:year], :name => "G20 Day", :regions => [:au_qld_brisbane]},
             {:wday => 1, :week => 1, :name => "Recreation Day", :regions => [:au_tas_north]},
             {:wday => 2, :week => 1, :name => "Melbourne Cup Day", :regions => [:au_vic_melbourne]}],
-      12 => [{:mday => 25, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_qld, :au_nsw, :au_act, :au_tas, :au_wa]},
-            {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_sa]},
-            {:function => "xmas_to_weekday_if_weekend(year)", :function_arguments => [:year], :name => "Christmas Day", :regions => [:au_vic, :au_nt]},
+      12 => [{:mday => 25, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_qld, :au_nsw, :au_act, :au_tas, :au_wa, :au_vic, :au_nt]},
             {:mday => 26, :observed => "to_tuesday_if_sunday_or_monday_if_saturday(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:au_nsw, :au_vic, :au_qld, :au_act, :au_wa]},
-            {:function => "to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_sa]},
-            {:function => "to_weekday_if_boxing_weekend_from_year(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_tas, :au_nt]}]
+            {:function => "to_weekday_if_boxing_weekend_from_year(year)", :function_arguments => [:year], :name => "Boxing Day", :regions => [:au_tas, :au_nt]},
+            {:function => "to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)", :function_arguments => [:year], :name => "Proclamation Day", :regions => [:au_sa]},
+            {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:au_sa]}]
       }
     end
 
     def self.custom_methods
       {
-        "afl_grand_final(year)" => Proc.new { |year|
-if year == 2015
+          "afl_grand_final(year)" => Proc.new { |year|
+case year
+when 2015
   Date.civil(2015, 10, 2)
+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)
 end
 },
 
 "qld_queens_bday_october(year)" => Proc.new { |year|
 if year >= 2016
-  DateCalculatorFactory.day_of_month_calculator.call(year, 10, 1, 1)
+  Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 1, 1)
 elsif year == 2012
   1
 else
@@ -80,19 +87,19 @@ end
 
 "qld_queens_birthday_june(year)" => Proc.new { |year|
 if year <= 2015
-  DateCalculatorFactory.day_of_month_calculator.call(year, 6, 2, 1)
+  Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 6, 2, 1)
 end
 },
 
 "qld_labour_day_may(year)" => Proc.new { |year|
 if year < 2013 || year >= 2016
-  DateCalculatorFactory.day_of_month_calculator.call(year, 5, 1, 1)
+  Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, 1, 1)
 end
 },
 
 "qld_labour_day_october(year)" => Proc.new { |year|
 if year >= 2013 && year < 2016
-  DateCalculatorFactory.day_of_month_calculator.call(year, 10, 1, 1)
+  Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 1, 1)
 end
 },
 
@@ -101,7 +108,7 @@ year == 2014 ? 14 : nil
 },
 
 "hobart_show_day(year)" => Proc.new { |year|
-fourth_sat_in_oct = Date.civil(year, 10, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 10, 4, :saturday))
+fourth_sat_in_oct = Date.civil(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 4, :saturday))
 fourth_sat_in_oct - 2 # the thursday before
 },
 
@@ -109,7 +116,7 @@ fourth_sat_in_oct - 2 # the thursday before
 if year < 2006
   nil
 else
-  Date.civil(year, 3, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 3, :second, :monday))
+  Date.civil(year, 3, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 3, :second, :monday))
 end
 },
 
@@ -117,7 +124,7 @@ end
 if year >= 2006
   nil
 else
-  Date.civil(year, 5, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 5, :third, :monday))
+  Date.civil(year, 5, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, :third, :monday))
 end
 },
 

data/lib/generated_definitions/be_fr.rb

@@ -4,12 +4,6 @@ module Holidays
   #
   # Definitions loaded: definitions/be_fr.yaml
   #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/be_fr'
-  #
   # All the definitions are available at https://github.com/holidays/holidays
   module BE_FR # :nodoc:
     def self.defined_regions
@@ -18,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pâques", :regions => [:be_fr]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pâques", :regions => [:be_fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lundi de Pâques", :regions => [:be_fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Ascension", :regions => [:be_fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pentecôte", :regions => [:be_fr]},
@@ -35,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/be_nl.rb

@@ -4,12 +4,6 @@ module Holidays
   #
   # Definitions loaded: definitions/be_nl.yaml
   #
-  # To use the definitions in this file, load it right after you load the
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'generated_definitions/be_nl'
-  #
   # All the definitions are available at https://github.com/holidays/holidays
   module BE_NL # :nodoc:
     def self.defined_regions
@@ -18,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasen", :regions => [:be_nl]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasen", :regions => [:be_nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Paasmaandag", :regions => [:be_nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "O.H. Hemelvaart", :regions => [:be_nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pinksteren", :regions => [:be_nl]},
@@ -35,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end