holidays 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b334c3ebec3562f4855ca608d4cd685dc223bad374bb4e15dcd64a61b3abe0d
-  data.tar.gz: bd53c8ff4bc93522c6ac997080a5315e38b3e10cd66654cfeade2674bb1e8249
+  metadata.gz: 10ac53801a7e5df310c955e2d14eff378b5486e7f6b8e6e55c2f2f680c3bc68f
+  data.tar.gz: 249638ac1590932582342b2f6d39eaffca6d408f275420711916d94dce1eadbc
 SHA512:
-  metadata.gz: 124f5e256062ec52db46603b8854bd3eafcdabb699b77e26766c9bd3d7aba51bc821b9438051956f451b8aec47b83e0f6fccf2855b38cf5862c0262799c8c51b
-  data.tar.gz: 8412d3f181987241a802e64d5a6b562e6ef89f9336f05c4d281df4b84eb6c03e6728d403b3666323a9ebaa8bed703db8d0e40eae4d48cc1412be004a36182954
+  metadata.gz: 6a53bd90098905e561558ccc5c1adc42a40bbf19647ff70bb5cf846ffa7350cf6ef7958d251e8d6644d0e0ba5d3ef48a5c3fd008fb6c159b82df948a33fb72c5
+  data.tar.gz: dc023803f7dea3acb449e58c4756b3408586f92b9f83620af72f9c84f712cbec50383198ff455ad97dfc151d1bf7f6e97d40a542dfab014000acace307bd0551

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "definitions"]
 	path = definitions
-	url =  https://github.com/holidays/definitions
+	url = https://github.com/holidays/definitions

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 6.6.0
+
+* Update to [v3.0.0 definitions](https://github.com/holidays/definitions/releases/tag/v3.0.0). This required updates to the custom method parser but no behavior changes.
+* Remove unused `simplecov-rcov` from gemspec dev dependencies
+* Fix parent region loading bug [PR](https://github.com/holidays/holidays/pull/320) (thanks to chadrschroeder)
+* Fix `ruby-head` build caused by new 'endless range' feature in ruby 2.6.0 [PR](https://github.com/holidays/holidays/pull/321)
+* Refactor definition search logic for improved readability [PR](https://github.com/holidays/holidays/pull/318) (thanks to https://github.com/guizma)
+* Reorganize most documentation into the `docs/` directory
+* Fix list of covered rubies in README
+
 ## 6.5.0
 
 * Update to [v2.5.2 definitions](https://github.com/holidays/definitions/releases/tag/v2.5.2). Please see the changelog for the definition details.

data/Makefile

@@ -1,6 +1,6 @@
 default: test
 
-setup: update_defs
+setup: update-defs
 	bundle install
 
 generate:
@@ -12,7 +12,7 @@ test:
 console:
 	bundle exec rake console
 
-test_region:
+test-region:
 	bundle exec rake test_region $(REGION)
 
 build: clean
@@ -21,12 +21,25 @@ build: clean
 push:
 	bundle exec gem push $(GEM)
 
-update_defs:
+update-defs: definitions/
 	git submodule update --init --remote --recursive
 
+definitions: point-to-defs-master
+
+point-to-defs-branch:
+	git submodule add -b $(BRANCH) git@github.com:$(USER)/definitions.git definitions/
+
+point-to-defs-master:
+	git submodule add https://github.com/holidays/definitions definitions/
+
+clean-defs:
+	git rm -f definitions
+	rm -rf .git/modules/definitions
+	git config -f .git/config --remove-section submodule.definitions 2> /dev/null
+
 clean:
 	rm -rf holidays-*.gem
 	rm -rf reports
 	rm -rf coverage
 
-.PHONY: setup test generate
+.PHONY: setup test generate console build push update-defs test-region clean-defs point-to-defs-master point-to-defs-branch clean definitions

data/README.md

@@ -4,22 +4,20 @@ A set of functions to deal with holidays in Ruby.
 
 Extends Ruby's built-in Date class and supports custom holiday definition lists.
 
-Full documentation can be found [here](http://www.rubydoc.info/github/alexdunae/holidays/master/frames).
-
 ## Installation
 
 To install the gem from RubyGems:
 
     gem install holidays
 
-The Holidays gem is tested on Ruby 2.2.0, 2.3.0, 2.4.0 and JRuby.
+This gem is tested with the following ruby versions: 2.2.0, 2.3.0, 2.4.0, 2.5.0, JRuby
+
+This gem follows [semantic versioning](http://semver.org/). The guarantee specifically covers:
 
-This gem follows [semantic versioning](http://semver.org/). The only methods covered by this guarantee are under the
-`Holidays` namespace specifically. Anything that is not a method off of `Holidays` or the core extension is not covered by
-semver. Please take this into account when relying on this gem as a dependency.
+ * methods in the topmost `Holidays` namespace e.g. `Holidays.<method>`
+ * the [core extension](#extending-rubys-date-and-time-classes)
 
-Also note that we consider definition changes as 'minor' bumps, meaning they are backwards compatible with your code
-but might give different holiday results!
+Please note that we consider definition changes to be 'minor' bumps, meaning they are backwards compatible with your code but might give different holiday results!
 
 ## Time zones
 
@@ -175,7 +173,7 @@ Holidays for the regions specified within the dates specified will be pre-calcul
 
 ### How to contribute
 
-See our [contribution guidelines](CONTRIBUTING.md) for information on how to help out!
+See our [contribution guidelines](doc/CONTRIBUTING.md) for information on how to help out!
 
 ### Credits and code
 

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'

data/doc/CONTRIBUTING.md

@@ -0,0 +1,71 @@
+# 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
+* 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
+* `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/{MAINTAINERS.md → doc/MAINTAINERS.md}

@@ -49,19 +49,19 @@ 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 correct commit in the [definitions](https://github.com/holidays/definitions) repo.
+  * 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](https://github.com/holidays/holidays/blob/master/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 (this may require another maintainer for safety)
+  * 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](https://github.com/holidays/holidays/blob/master/CHANGELOG.md) to reflect the latest changes.
+  * 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 (this may require another maintainer for safety)
+  * 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`
 
@@ -79,4 +79,3 @@ are that there are issues in the definition-specific tests. This is most likely
 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,7 +7,7 @@ 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!)
@@ -19,9 +19,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '~> 2.2'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake', '~> 12.0'
-  gem.add_development_dependency 'simplecov', '~> 0.15'
-  gem.add_development_dependency 'simplecov-rcov', '~> 0.2'
+  gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'test-unit', '~> 3.2'
-  gem.add_development_dependency 'mocha', '~> 1.0'
-  gem.add_development_dependency 'pry', '~> 0.10'
+  gem.add_development_dependency 'mocha', '~> 1.7'
+  gem.add_development_dependency 'pry', '~> 0.11'
 end

data/lib/generated_definitions/REGIONS.rb

@@ -2,5 +2,5 @@
 module Holidays
   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_by_cath, :de_by_augsburg, :de_bb, :de_mv, :de_th, :de_hb, :de_hh, :de_ni, :de_sh, :ecb_target, :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, :federal_reserve, :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, :kr, :li, :lt, :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, :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_il, :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_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, :united_nations, :ups, :za, :ve, :sk, :si, :jp, :vi, :sg, :my]
 
-  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=>:ca, :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_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, :ecb_target=>:ecb_target, :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, :federal_reserve=>:federal_reserve, :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, :kr=>:kr, :li=>:li, :lt=>:lt, :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, :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_il=>: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_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, :united_nations=>:united_nations, :ups=>:ups, :za=>:za, :ve=>:south_america, :sk=>:europe, :si=>:europe, :jp=>:jp, :vi=>:vi, :sg=>:sg, :my=>:my}
+  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_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, :ecb_target=>:ecb_target, :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, :federal_reserve=>:federal_reserve, :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, :kr=>:kr, :li=>:li, :lt=>:lt, :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, :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_il=>: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_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, :united_nations=>:united_nations, :ups=>:ups, :za=>:za, :ve=>:south_america, :sk=>:europe, :si=>:europe, :jp=>:jp, :vi=>:vi, :sg=>:sg, :my=>:my}
 end

data/lib/generated_definitions/cl.rb

@@ -41,7 +41,6 @@ if [2,3,4].include?(date.wday)
 elsif date.wday == 5
   date += 3
 end
-
 date
 },
 
@@ -52,7 +51,6 @@ if [2,3,4].include?(date.wday)
 elsif date.wday == 5
   date += 3
 end
-
 date
 },
 
@@ -63,7 +61,6 @@ if date.wday == 2
 elsif date.wday == 3
   date += 2
 end
-
 date
 },
 

data/lib/generated_definitions/europe.rb

@@ -410,7 +410,7 @@ module Holidays
             {:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Día de las Islas Baleares", :regions => [:es_ib]},
             {:mday => 19, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]},
             {:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
-            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]},
+            {:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:gb_nir]},
             {:mday => 15, :name => "1848/49-es forradalom és szabadságharc ünnepe", :regions => [:hu]},
             {:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:ie]},
             {:mday => 19, :name => "St. Josef", :regions => [:li]},

data/lib/generated_definitions/gb.rb

@@ -18,7 +18,7 @@ module Holidays
       1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:gb]},
             {:mday => 2, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "2nd January", :regions => [:gb_sct]}],
       3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
-            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]}],
+            {:mday => 17, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Patrick's Day", :regions => [:gb_nir]}],
       5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]},
             {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
             {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}],

data/lib/generated_definitions/jp.rb

@@ -136,6 +136,8 @@ date.wday == 0 ? (Holidays::Factory::Definition.custom_methods_repository.find("
 },
 
 "jp_next_weekday(date)" => Proc.new { |date|
+# This suuuucks. I have no idea how to make this not reach into our interal ruby API to do this.
+# I'm punting, I'll come back to this.
 is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
   holiday[:mday] == date.day
 end

data/lib/generated_definitions/south_america.rb

@@ -119,7 +119,6 @@ if [2,3,4].include?(date.wday)
 elsif date.wday == 5
   date += 3
 end
-
 date
 },
 
@@ -130,7 +129,6 @@ if [2,3,4].include?(date.wday)
 elsif date.wday == 5
   date += 3
 end
-
 date
 },
 
@@ -141,7 +139,6 @@ if date.wday == 2
 elsif date.wday == 3
   date += 2
 end
-
 date
 },
 

data/lib/holidays/definition/context/load.rb

@@ -14,7 +14,7 @@ module Holidays
           target_region_module = Module.const_get("Holidays").const_get(region.upcase)
 
           @definition_merger.call(
-            target_region_module.defined_regions,
+            region,
             target_region_module.holidays_by_month,
             target_region_module.custom_methods,
           )

data/lib/holidays/definition/generator/regions.rb

@@ -2,6 +2,10 @@ module Holidays
   module Definition
     module Generator
       class Regions
+        # The "ca", "mx", and "us" holiday definitions include the "north_america_informal"
+        # holiday definitions, but that does not make these countries subregions of one another.
+        NORTH_AMERICA_REGIONS = %i[ca mx us].freeze
+
         def call(regions)
           validate!(regions)
 
@@ -37,8 +41,9 @@ EOF
           lookup = {}
 
           regions.each do |region, subregions|
-            subregions.each do |s|
-              lookup[s] = region unless lookup.has_key?(s)
+            subregions.each do |subregion|
+              parent_region = NORTH_AMERICA_REGIONS.include?(subregion) ? subregion : region
+              lookup[subregion] = parent_region unless lookup.has_key?(subregion)
             end
           end
 

data/lib/holidays/definition/parser/custom_method.rb

@@ -21,7 +21,7 @@ module Holidays
             custom_methods[method_key(name, arguments)] = Entity::CustomMethod.new({
               name: name,
               arguments: arguments,
-              source: pieces["source"],
+              source: pieces["ruby"],
             })
           end
 
@@ -36,7 +36,7 @@ module Holidays
               {
                 :name => name,
                 :arguments => pieces["arguments"],
-                :source => pieces["source"]
+                :source => pieces["ruby"]
               }
             )
           end

data/lib/holidays/definition/repository/cache.rb

@@ -8,6 +8,7 @@ module Holidays
 
         def cache_between(start_date, end_date, cache_data, options)
           raise ArgumentError unless cache_data
+          raise ArgumentError unless start_date && end_date
 
           @cache_range[options] = start_date..end_date
           @cache[options] = cache_data.group_by { |holiday| holiday[:date] }
@@ -15,7 +16,7 @@ module Holidays
 
         def find(start_date, end_date, options)
           return nil unless in_cache_range?(start_date, end_date, options)
-          
+
           if start_date == end_date
             @cache[options].fetch(start_date, [])
           else

data/lib/holidays/finder/context/dates_driver_builder.rb

@@ -11,20 +11,14 @@ module Holidays
         def call(start_date, end_date)
           dates_driver = {}
 
-          (start_date..end_date).map{|current_date|build(dates_driver, current_date)}
+          (start_date..end_date).each do |date|
+            dates_driver[date.year] = [] unless dates_driver[date.year]
+            dates_driver[date.year] << date.month
+            dates_driver = add_border_months(date, dates_driver)
+          end
           clean(dates_driver)
         end
 
-        #FIXME Why is the date_driver set to optional as the first param? That's
-        # just plain wrong...
-        def build(dates_driver = {}, date)
-          raise ArgumentError unless dates_driver
-          raise ArgumentError unless date
-          dates_driver[date.year] = [] unless dates_driver[date.year]
-          dates_driver[date.year] << date.month
-          dates_driver = add_border_months(date, dates_driver)
-        end
-
         private
 
         # As part of https://github.com/holidays/holidays/issues/146 I am returning

data/lib/holidays/finder/context/parse_options.rb

@@ -42,12 +42,6 @@ module Holidays
 
           loaded_regions = []
 
-          #FIXME I don't know what this means or why we have it! I'm reluctant to remove it
-          # at this time without understanding more. -PP 2017/3/29
-          #
-          # special case for north_america/US cross-linking
-          load_region!(:north_america) if regions.include?(:us)
-
           if regions.include?(:any)
             @regions_repo.all_generated.each do |r|
               if @regions_repo.loaded?(r)

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '6.5.0'
+  VERSION = '6.6.0'
 end

data/test/coverage_report.rb

@@ -1,8 +1,6 @@
 require 'simplecov'
-require 'simplecov-rcov'
 
 SimpleCov.minimum_coverage 99
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 SimpleCov.coverage_dir 'reports/coverage'
 SimpleCov.start do
   add_filter 'lib/generated_definitions/'

data/test/defs/test_defs_at.rb

@@ -9,11 +9,11 @@ class AtDefinitionTests < Test::Unit::TestCase  # :nodoc:
   def test_at
     assert_equal "Neujahrstag", (Holidays.on(Date.civil(2009, 1, 1), [:at], [:informal])[0] || {})[:name]
 
-    assert_equal "Ostermontag", (Holidays.on(Date.civil(2009, 4, 13), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Ostermontag", (Holidays.on(Date.civil(2009, 4, 13), [:at])[0] || {})[:name]
 
-    assert_equal "Christi Himmelfahrt", (Holidays.on(Date.civil(2009, 5, 21), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Christi Himmelfahrt", (Holidays.on(Date.civil(2009, 5, 21), [:at])[0] || {})[:name]
 
-    assert_equal "Pfingstmontag", (Holidays.on(Date.civil(2009, 6, 1), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Pfingstmontag", (Holidays.on(Date.civil(2009, 6, 1), [:at])[0] || {})[:name]
 
     assert_equal "Nationalfeiertag", (Holidays.on(Date.civil(2009, 10, 26), [:at], [:informal])[0] || {})[:name]
 
@@ -25,5 +25,7 @@ class AtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_nil (Holidays.on(Date.civil(2010, 5, 8), [:at])[0] || {})[:name]
 
+    assert_equal "Fronleichnam", (Holidays.on(Date.civil(2017, 6, 15), [:at])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_au.rb

@@ -7,6 +7,13 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class AuDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_au
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2017, 4, 14), [:au])[0] || {})[:name]
+
+    assert_equal "Easter Saturday", (Holidays.on(Date.civil(2017, 4, 15), [:au_nsw])[0] || {})[:name]
+
+    assert_equal "Easter Sunday", (Holidays.on(Date.civil(2010, 4, 4), [:au_nsw])[0] || {})[:name]
+assert_equal "Easter Sunday", (Holidays.on(Date.civil(2017, 4, 16), [:au_nsw])[0] || {})[:name]
+
     assert_equal "Labour Day", (Holidays.on(Date.civil(2013, 10, 7), [:au_qld])[0] || {})[:name]
 
     assert_equal "Labour Day", (Holidays.on(Date.civil(2012, 5, 7), [:au_qld])[0] || {})[:name]
@@ -183,7 +190,11 @@ assert_equal "Queen's Birthday", (Holidays.on(Date.civil(2016, 9, 26), [:au_wa])
 
     assert_equal "New Year's Day", (Holidays.on(Date.civil(2017, 1, 2), [:au_tas])[0] || {})[:name]
 
+    assert_nil (Holidays.on(Date.civil(2016, 3, 27), [:au_qld])[0] || {})[:name]
+
     assert_equal "Easter Sunday", (Holidays.on(Date.civil(2017, 4, 16), [:au_qld])[0] || {})[:name]
 
+    assert_equal "G20 Day", (Holidays.on(Date.civil(2014, 11, 14), [:au_qld_brisbane])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_be_fr.rb

@@ -31,5 +31,15 @@ class Be_frDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Noël", (Holidays.on(Date.civil(2007, 12, 25), [:be_fr], [:informal])[0] || {})[:name]
 
+    assert_equal "Pâques", (Holidays.on(Date.civil(2017, 4, 16), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Lundi de Pâques", (Holidays.on(Date.civil(2017, 4, 17), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Ascension", (Holidays.on(Date.civil(2017, 5, 25), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Pentecôte", (Holidays.on(Date.civil(2017, 6, 4), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Lundi de Pentecôte", (Holidays.on(Date.civil(2017, 6, 5), [:be_fr])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_be_nl.rb

@@ -31,5 +31,15 @@ class Be_nlDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Kerstmis", (Holidays.on(Date.civil(2007, 12, 25), [:be_nl], [:informal])[0] || {})[:name]
 
+    assert_equal "Pasen", (Holidays.on(Date.civil(2017, 4, 16), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Paasmaandag", (Holidays.on(Date.civil(2017, 4, 17), [:be_nl])[0] || {})[:name]
+
+    assert_equal "O.H. Hemelvaart", (Holidays.on(Date.civil(2017, 5, 25), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Pinksteren", (Holidays.on(Date.civil(2017, 6, 4), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Pinkstermaandag", (Holidays.on(Date.civil(2017, 6, 5), [:be_nl])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_europe.rb

@@ -9,11 +9,11 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
   def test_europe
     assert_equal "Neujahrstag", (Holidays.on(Date.civil(2009, 1, 1), [:at], [:informal])[0] || {})[:name]
 
-    assert_equal "Ostermontag", (Holidays.on(Date.civil(2009, 4, 13), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Ostermontag", (Holidays.on(Date.civil(2009, 4, 13), [:at])[0] || {})[:name]
 
-    assert_equal "Christi Himmelfahrt", (Holidays.on(Date.civil(2009, 5, 21), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Christi Himmelfahrt", (Holidays.on(Date.civil(2009, 5, 21), [:at])[0] || {})[:name]
 
-    assert_equal "Pfingstmontag", (Holidays.on(Date.civil(2009, 6, 1), [:at], [:informal])[0] || {})[:name]
+    assert_equal "Pfingstmontag", (Holidays.on(Date.civil(2009, 6, 1), [:at])[0] || {})[:name]
 
     assert_equal "Nationalfeiertag", (Holidays.on(Date.civil(2009, 10, 26), [:at], [:informal])[0] || {})[:name]
 
@@ -25,6 +25,8 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_nil (Holidays.on(Date.civil(2010, 5, 8), [:at])[0] || {})[:name]
 
+    assert_equal "Fronleichnam", (Holidays.on(Date.civil(2017, 6, 15), [:at])[0] || {})[:name]
+
     assert_equal "Jour de l'an", (Holidays.on(Date.civil(2007, 1, 1), [:be_fr], [:informal])[0] || {})[:name]
 
     assert_equal "Pâques", (Holidays.on(Date.civil(2007, 4, 8), [:be_fr], [:informal])[0] || {})[:name]
@@ -49,6 +51,16 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Noël", (Holidays.on(Date.civil(2007, 12, 25), [:be_fr], [:informal])[0] || {})[:name]
 
+    assert_equal "Pâques", (Holidays.on(Date.civil(2017, 4, 16), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Lundi de Pâques", (Holidays.on(Date.civil(2017, 4, 17), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Ascension", (Holidays.on(Date.civil(2017, 5, 25), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Pentecôte", (Holidays.on(Date.civil(2017, 6, 4), [:be_fr])[0] || {})[:name]
+
+    assert_equal "Lundi de Pentecôte", (Holidays.on(Date.civil(2017, 6, 5), [:be_fr])[0] || {})[:name]
+
     assert_equal "Nieuwjaar", (Holidays.on(Date.civil(2007, 1, 1), [:be_nl], [:informal])[0] || {})[:name]
 
     assert_equal "Pasen", (Holidays.on(Date.civil(2007, 4, 8), [:be_nl], [:informal])[0] || {})[:name]
@@ -73,6 +85,16 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Kerstmis", (Holidays.on(Date.civil(2007, 12, 25), [:be_nl], [:informal])[0] || {})[:name]
 
+    assert_equal "Pasen", (Holidays.on(Date.civil(2017, 4, 16), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Paasmaandag", (Holidays.on(Date.civil(2017, 4, 17), [:be_nl])[0] || {})[:name]
+
+    assert_equal "O.H. Hemelvaart", (Holidays.on(Date.civil(2017, 5, 25), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Pinksteren", (Holidays.on(Date.civil(2017, 6, 4), [:be_nl])[0] || {})[:name]
+
+    assert_equal "Pinkstermaandag", (Holidays.on(Date.civil(2017, 6, 5), [:be_nl])[0] || {})[:name]
+
     assert_equal "Bundesfeiertag", (Holidays.on(Date.civil(2012, 8, 1), [:ch])[0] || {})[:name]
 
     assert_equal "Weihnachten", (Holidays.on(Date.civil(2012, 12, 25), [:ch])[0] || {})[:name]
@@ -435,6 +457,14 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2008, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
 
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2018, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2018, 3, 19), [:gb_nir], [:observed, :informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2019, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2019, 3, 18), [:gb_nir], [:observed, :informal])[0] || {})[:name]
+
     assert_equal "St. Andrew's Day", (Holidays.on(Date.civil(2006, 11, 30), [:gb_sct], [:informal])[0] || {})[:name]
 
     assert_equal "St. Andrew's Day", (Holidays.on(Date.civil(2006, 11, 30), [:gb_sct], [:informal, :observed])[0] || {})[:name]

data/test/defs/test_defs_gb.rb

@@ -23,6 +23,14 @@ class GbDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2008, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
 
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2018, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2018, 3, 19), [:gb_nir], [:observed, :informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2019, 3, 17), [:gb_nir], [:informal])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2019, 3, 18), [:gb_nir], [:observed, :informal])[0] || {})[:name]
+
     assert_equal "St. Andrew's Day", (Holidays.on(Date.civil(2006, 11, 30), [:gb_sct], [:informal])[0] || {})[:name]
 
     assert_equal "St. Andrew's Day", (Holidays.on(Date.civil(2006, 11, 30), [:gb_sct], [:informal, :observed])[0] || {})[:name]

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

@@ -14,7 +14,7 @@ class LoadTests < Test::Unit::TestCase
   end
 
   def test_region_is_found_and_loaded_and_merged
-    @definition_merger.expects(:call).with([:test_region, :test_region2], {}, {})
+    @definition_merger.expects(:call).with(:test_region, {}, {})
     @subject.call(:test_region)
   end
 
@@ -31,7 +31,7 @@ class LoadTests < Test::Unit::TestCase
   end
 
   def test_returns_list_of_loaded_regions
-    @definition_merger.expects(:call).with([:test_region, :test_region2], {}, {})
-    assert_equal([:test_region, :test_region2], @subject.call(:test_region))
+    @definition_merger.expects(:call).with(:test_region, {}, {})
+    assert_equal([:test_region, :test_region2], @subject.call(:test_region), "Should cache subregions under the parent region's name")
   end
 end

data/test/holidays/definition/parser/test_custom_method.rb

@@ -11,7 +11,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_parse_happy_single_method
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
 
     result = @parser.call(input)
@@ -28,7 +28,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_call_happy_with_multiple_methods
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","source"=>"source"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","ruby"=>"source"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
     @validator.expects(:valid?).with({:name => "second_method", :arguments => "month", :source => "source"}).returns(true)
 
@@ -59,7 +59,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_call_raises_error_if_validator_returns_false_for_single_method
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(false)
 
     assert_raises ArgumentError do
@@ -68,7 +68,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_call_raises_error_if_validator_returns_false_for_one_of_multiple_methods
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","source"=>"source"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","ruby"=>"source"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
     @validator.expects(:valid?).with({:name => "second_method", :arguments => "month", :source => "source"}).returns(false)
 

data/test/holidays/finder/context/test_parse_options.rb

@@ -138,14 +138,4 @@ class ParseOptionsTests < Test::Unit::TestCase
     regions = @subject.call(:any).first
     assert_equal([:region1, :region2], regions)
   end
-
-  # This is a legacy thing...we currently have this in the code and...I don't fully
-  # understand why. I don't want to remove it as part of this refactor.
-  def test_load_north_america_if_regions_include_us
-    @regions_repo.expects(:parent_region_lookup).with(:us).returns(nil)
-    @definition_loader.expects(:call).with(:north_america)
-
-    regions = @subject.call([:us]).first
-    assert_equal([:us], regions)
-  end
 end

data/test/integration/test_multiple_regions.rb

@@ -3,21 +3,69 @@ require "#{Holidays::DEFINITIONS_PATH}/gb"
 require "#{Holidays::DEFINITIONS_PATH}/ie"
 
 class MultipleRegionsTests < Test::Unit::TestCase
-  def setup
-    @date = Date.civil(2008,1,1)
+  # Simulate load of new environment where the repositories begin empty
+  def reset_cache
+    Holidays::Factory::Definition.instance_variable_set(:@regions_repo, nil)
+    Holidays::Factory::Definition.instance_variable_set(:@holidays_repo, nil)
   end
 
   def test_defining_holidays
-    h = Holidays.on(Date.civil(2008,12,26), :ie)
+    h = Holidays.on(Date.new(2008, 12, 26), :ie)
     assert_equal 'St. Stephen\'s Day', h[0][:name]
 
-    h = Holidays.on(Date.civil(2008,5,9), :gb_)
+    h = Holidays.on(Date.new(2008, 5, 9), :gb_)
     assert_equal 'Liberation Day', (h[0] || {})[:name]
 
-    h = Holidays.on(Date.civil(2008,5,9), :je)
+    h = Holidays.on(Date.new(2008, 5, 9), :je)
     assert_equal 'Liberation Day', h[0][:name]
 
-    h = Holidays.on(Date.civil(2008,5,9), :gb)
+    h = Holidays.on(Date.new(2008, 5, 9), :gb)
     assert h.empty?
   end
+
+  def test_north_american_parent_region_lookup
+    assert_equal :ca, Holidays::PARENT_REGION_LOOKUP[:ca]
+    assert_equal :ca, Holidays::PARENT_REGION_LOOKUP[:ca_qc]
+    assert_equal :mx, Holidays::PARENT_REGION_LOOKUP[:mx]
+    assert_equal :mx, Holidays::PARENT_REGION_LOOKUP[:mx_pue]
+    assert_equal :us, Holidays::PARENT_REGION_LOOKUP[:us]
+    assert_equal :us, Holidays::PARENT_REGION_LOOKUP[:us_fl]
+  end
+
+  def test_north_american_subregion_caching
+    { ca: :ca_qc, mx: :mx_pue, us: :us_fl }.each do |region, subregion|
+      module_name = region.upcase
+
+      reset_cache
+      Holidays.on(Date.new(2018, 1, 1), region)  # Test check on regional holidays
+      assert_equal [region], Holidays::Factory::Definition.regions_repository.all_loaded, "Only Holidays::#{module_name} should be loaded"
+      holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+      assert_includes holiday_regions, region, 'Region holidays should be loaded'
+      assert_includes holiday_regions, subregion, 'Subregion holidays should be loaded'
+
+      reset_cache
+      Holidays.on(Date.new(2018, 1, 1), subregion)  # Test check on subregional holidays
+      assert_equal [region], Holidays::Factory::Definition.regions_repository.all_loaded, "Only Holidays::#{module_name} should be loaded"
+      holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+      assert_includes holiday_regions, region, 'Region holidays should be loaded'
+      assert_includes holiday_regions, subregion, 'Subregion holidays should be loaded'
+    end
+  end
+
+  def test_north_american_cross_region_caching
+    reset_cache
+    Holidays.on(Date.new(2018, 1, 1), :us)
+    assert_equal [:us], Holidays::Factory::Definition.regions_repository.all_loaded, 'Only Holidays::US should be loaded'
+    holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+    assert_includes holiday_regions, :us, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :us_fl, 'Subregion holidays should be loaded'
+
+    Holidays.on(Date.new(2018, 1, 1), :ca)
+    assert_equal [:us, :ca], Holidays::Factory::Definition.regions_repository.all_loaded, 'Only Holidays::US and Holidays::CA should be loaded'
+    holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+    assert_includes holiday_regions, :us, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :ca, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :us_fl, 'Subregion holidays should be loaded'
+    assert_includes holiday_regions, :ca_qc, 'Subregion holidays should be loaded'
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Alex Dunae
-- Phil Trimble
+- Phil Peble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,28 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -87,28 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 description: A collection of Ruby methods to deal with statutory and other holidays.
   You deserve a holiday!
 email:
@@ -120,16 +106,16 @@ files:
 - ".gitmodules"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- MAINTAINERS.md
 - Makefile
 - README.md
-- REFERENCES
 - Rakefile
 - bin/console
 - bin/setup
+- doc/CONTRIBUTING.md
+- doc/MAINTAINERS.md
+- doc/REFERENCES
 - holidays.gemspec
 - lib/generated_definitions/MANIFEST
 - lib/generated_definitions/REGIONS.rb

data/CONTRIBUTING.md

@@ -1,51 +0,0 @@
-# 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. 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 down.
-
-## 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/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/CONTRIBUTING.md) in the `definitions` repository.
-
-*NOTICE* - this whole submodule-definitions-thing is brand-new. If you are confused or run into issues please open an issue.
-The maintainers will respond immediately to help you out. :)
-
-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 and
-releasing a new gem. Don't worry about versioning, we'll take care of it!
-
-## For non-definition functionality
-
-* Fork this repository
-* Make your changes
-* 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
-* `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` - this will run the appropriate git submodule commands to pull the latest definitions