holidays 4.7.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871b08553ee038ed6f91d776fd6f88aca3794f2e
-  data.tar.gz: e72de1dec225bd96944fc8bf9999215de0b6a17d
+  metadata.gz: b7ac864cf9a702e79f70f0781f4a9f0739a7909c
+  data.tar.gz: b2f694914ebcf0cd36a7e5b531fd3cc3a9aec3b3
 SHA512:
-  metadata.gz: 87c05e189fcea4445530190bcdbd32126bbb1af3b4dc7e52de3e71c289ccb5ac014cb1dd1e8d14022634a1a02ac5ba3d32acde7a7df8f5ec700a9217d5f87b9e
-  data.tar.gz: 325bb3ec66f2b48c774564aba19bc41c9b3b46ee143cb8f0d5789b30778fa0b34dc04f6af4b97d0c87514a8e1b4ab4426250bb52897637e8f347ec3aa339b4e4
+  metadata.gz: 2478e61ae75f0d08de0b50c1d7f7a8ec214efc2a919fae11f86866a1fa8c9834b322cef0728fa754fffa32470282ebec807fbe97844e6cb3f911bbb50db3792a
+  data.tar.gz: 01d5ff2c9345147b92c6f13fa7c009f52dfb7939f9c133da9ba36878c6164c957e1ddea81a56a9b31eeaf4cf0bf4cbb0b4199274a9b6027fcade5551a6b941e0

data/.gitmodules

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

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 5.0.0
+
+* Remove support for jruby 1.7 (this is the main reason for the major semver bump)
+* Remove support for ruby 2.0 (since it is no longer being supported by the core ruby team)
+* Add back the lazy loading of regions (this was removed in the 4.0.0 bump) instead of loading upon require (this should have 
+  no outward repercussions for users)
+* Move definitions into their own repository and add as submodule. This will allow for more flexibility for tools written
+  in other languages.
+
 ## 4.7.0
 
 * Fix issue-225 (`LocalJumpError` for certain `jp` definition combinations) (https://github.com/ttwo32)

data/CONTRIBUTING.md

@@ -6,25 +6,34 @@ There are multiple ways to help! We rely on users around the world to help keep
 
 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. You can find a complete guide to our format in the [definitions README](definitions/README.md). We take the YAML definitions and generate final ruby classes that are loaded at runtime for fast calculations.
+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/SYNTAX.md).
+
+In this ruby project we take the YAML definitions and generate final ruby classes that are loaded at runtime for fast
+calculations.
 
-Here are the steps to take once you have a good idea on what you want to change:
+Once you have a good idea on what you want to change, please see the [contributing guide](https://github.com/holidays/definitions/CONTRIBUTING.md) in the `definitions` repository.
 
-* Fork the repository
-* Edit desired definition YAML file(s) located under `definitions/`. If you are adding a new region be sure to update `definitions/index.yaml` as well
-* Run `make generate` to generate updated final definitions (they will be located under `lib/generated_definitions/` and `test/defs/`)
-* Run `make test` to ensure your changes did not introduce errors
-* Open a PR with *all* of these changes. You *MUST* include the generated definition files and tests in your PR. There is no automatic process to generate definitions at this time
+*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. :)
 
-Including documentation with your updates is very much appreciated. A simple Wikipedia entry or government link in the comments alongside your changes would be perfect.
+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!
 
-Lastly, note that there are many 'meta' regions. For example, there are regions for Europe, Scandinavia, and North America. If your new region(s) falls into these areas consider adding them. You can find these 'meta' regions in `definitions/index.yaml`.
+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 the repository
+* Fork this repository
 * Make your changes
 * Create a PR pointing back to `master`
 
@@ -37,5 +46,6 @@ Don't worry about versioning, we'll handle it on our end.
 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 sure to run `make generate` after updating your YAML before running this!
+* `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

data/Makefile

@@ -1,25 +1,28 @@
 default: test
 
-setup:
+setup: update_defs
 	bundle install
 
+generate: update_defs
+	bundle exec rake generate
+
 test:
 	bundle exec rake test
 
-generate:
-	bundle exec rake generate
-
 console:
 	bundle exec rake console
 
 test_region:
 	bundle exec rake test_region $(REGION)
 
-build:
+build: clean
 	bundle exec gem build holidays.gemspec
 
 push:
-	bundle exec gem push holidays.gemspec
+	bundle exec gem push $(GEM)
+
+update_defs:
+	git submodule update --init --remote --recursive
 
 clean:
 	rm -rf holidays-*.gem

data/holidays.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^test/)
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
-  gem.required_ruby_version = '~> 2.0'
+  gem.required_ruby_version = '~> 2.1'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'coveralls'

data/lib/generated_definitions/MANIFEST

@@ -26,6 +26,7 @@ The following definition files are included in this installation:
 * generated_definitions/fi
 * generated_definitions/fr
 * generated_definitions/gb
+* generated_definitions/hk
 * generated_definitions/hr
 * generated_definitions/hu
 * generated_definitions/ie

data/lib/generated_definitions/REGIONS.rb

@@ -1,4 +1,4 @@
 # 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, :kr, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :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, :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, :my]
+  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, :hk, :hu, :ie, :is, :it, :kr, :li, :lt, :ma, :mx, :mx_pue, :us, :ca, :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, :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, :my]
 end

data/lib/generated_definitions/hk.rb

@@ -0,0 +1,112 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: definitions/hk.yaml
+  #
+  # To use the definitions in this file, load it right after you load the
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'generated_definitions/hk'
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module HK # :nodoc:
+    def self.defined_regions
+      [:hk]
+    end
+
+    def self.holidays_by_month
+      {
+              0 => [{:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Lunar New Year's Day", :regions => [:hk]},
+            {:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :function_modifier => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "The second day of Lunar New Year", :regions => [:hk]},
+            {:function => "cn_new_lunar_day(year)", :function_arguments => [:year], :function_modifier => 2, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "The third day of Lunar New Year", :regions => [:hk]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:hk]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "The day following Good Friday", :regions => [:hk]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:hk]}],
+      1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:hk]}],
+      5 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Labour Day", :regions => [:hk]}],
+      7 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Hong Kong Special Administrative Region Establishment Day", :regions => [:hk]}],
+      10 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "National Day", :regions => [:hk]}],
+      12 => [{:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:hk]},
+            {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:hk]}]
+      }
+    end
+
+    def self.custom_methods
+      {
+        "cn_new_lunar_day(year)" => Proc.new { |year|
+month_day = case year
+  when 1930, 1949, 1987, 2025, 2063, 2082, 2101, 2112, 2131, 2150, 2207, 2245, 2253, 2283, 2321
+    [1, 29]
+  when 1931, 1950, 1969, 1988, 2007, 2026, 2045, 2083, 2091, 2102, 2121, 2159, 2197, 2208, 2216, 2227, 2246, 2265, 2303, 2322, 2341, 2379
+    [2, 17]
+  when 1932, 1951, 1970, 1989, 2027, 2046, 2114, 2179, 2198, 2209, 2247, 2266, 2304, 2323, 2342, 2361, 2399
+    [2, 6]
+  when 1933, 2009, 2028, 2047, 2066, 2085, 2115, 2161, 2199, 2210, 2229, 2267, 2305, 2316, 2324, 2335, 2381
+    [1, 26]
+  when 1934, 1953, 2037, 2048, 2067, 2086, 2105, 2116, 2181, 2189, 2211, 2257, 2268, 2306, 2325, 2336
+    [2, 14]
+  when 1935, 1943, 1992, 2038, 2106, 2144, 2201, 2212, 2258, 2296, 2307, 2326, 2364
+    [2, 4]
+  when 1936, 1955, 2001, 2039, 2058, 2088, 2107, 2164, 2183, 2221, 2259, 2278, 2308, 2327, 2373
+    [1, 24]
+  when 1937, 1975, 2032, 2040, 2051, 2070, 2108, 2127, 2146, 2165, 2252, 2260, 2271, 2290, 2309, 2328, 2347, 2366
+    [2, 11]
+  when 1938, 1957, 1976, 1995, 2014, 2033, 2071, 2109, 2128, 2185, 2272, 2291, 2329, 2348, 2367, 2386
+    [1, 31]
+  when 1939, 1996, 2015, 2053, 2072, 2110, 2129, 2292, 2330, 2368, 2387
+    [2, 19]
+  when 1940, 1959, 2016, 2035, 2081, 2130, 2149, 2187, 2206, 2225, 2236, 2255, 2312, 2350, 2358, 2369
+    [2, 8]
+  when 1941, 1952, 1971, 1990, 2074, 2093, 2123, 2142, 2180, 2248, 2294, 2343, 2351, 2362
+    [1, 27]
+  when 1942, 1961, 1972, 1991, 2056, 2075, 2094, 2124, 2143, 2200, 2276, 2295, 2344, 2363
+    [2, 15]
+  when 1944, 1963, 1982, 2020, 2096, 2134, 2153, 2172, 2191, 2202, 2240, 2286, 2354, 2392
+    [1, 25]
+  when 1945, 1964, 1983, 2010, 2029, 2162, 2192, 2230, 2249, 2317, 2382
+    [2, 13]
+  when 1946, 2003, 2022, 2041, 2052, 2098, 2147, 2155, 2166, 2223, 2242, 2261, 2299, 2310, 2375, 2394
+    [2, 1]
+  when 1947, 2004, 2042, 2050, 2080, 2118, 2137, 2194, 2270, 2289, 2300, 2338, 2376
+    [1, 22]
+  when 1948, 1994, 2013, 2024, 2043, 2089, 2119, 2138, 2157, 2176, 2195, 2214, 2320, 2396
+    [2, 10]
+  when 1954, 1973, 2011, 2057, 2068, 2087, 2125, 2163, 2231, 2277, 2288, 2345, 2383
+    [2, 3]
+  when 1956, 2002, 2021, 2059, 2078, 2097, 2135, 2154, 2173, 2184, 2203, 2222, 2241, 2279, 2287, 2298, 2355, 2374, 2393
+    [2, 12]
+  when 1958, 1977, 2034, 2140, 2178, 2235, 2254, 2273, 2311, 2349, 2360, 2398
+    [2, 18]
+  when 1960, 1979, 1998, 2006, 2017, 2036, 2055, 2104, 2169, 2188, 2218, 2226, 2237, 2256, 2275, 2313, 2332, 2370, 2389
+    [1, 28]
+  when 1962, 1981, 2000, 2019, 2065, 2076, 2084, 2095, 2133, 2152, 2171, 2190, 2220, 2239, 2285, 2315, 2334, 2353, 2372, 2391
+    [2, 5]
+  when 1965, 1984, 2030, 2049, 2060, 2079, 2117, 2136, 2174, 2182, 2193, 2204, 2250, 2269, 2280, 2318, 2337, 2356
+    [2, 2]
+  when 1966, 2023, 2061, 2099, 2186, 2262, 2281, 2357, 2395
+    [1, 21]
+  when 1967, 1986, 2005, 2062, 2100, 2168, 2233, 2244, 2263, 2282, 2301, 2339, 2377, 2385, 2388
+    [2, 9]
+  when 1968, 2044, 2090, 2120, 2139, 2158, 2177, 2196, 2215, 2234, 2264, 2302, 2340, 2359, 2378, 2397
+    [1, 30]
+  when 1974, 1993, 2012, 2031, 2069, 2077, 2126, 2145, 2156, 2175, 2213, 2232, 2251, 2297, 2346, 2365, 2384
+    [1, 23]
+  when 1978, 1997, 2008, 2054, 2073, 2092, 2103, 2111, 2122, 2141, 2160, 2217, 2228, 2274, 2293, 2331, 2380
+    [2, 7]
+  when 1980, 1999, 2018, 2064, 2113, 2132, 2151, 2170, 2219, 2238, 2284, 2314, 2333, 2352, 2371, 2390
+    [2, 16]
+  when 1985, 2148, 2167, 2205, 2224, 2243
+    [2, 20]
+  when 2319
+    [2, 21]
+  end
+Date.civil(year, month_day[0], month_day[1])
+},
+
+
+      }
+    end
+  end
+end

data/lib/generated_definitions/kr.rb

@@ -101,7 +101,7 @@ month_day = case year
     [2, 19]
   when 1920, 1985
     [2, 20]
-end 
+end
 Date.civil(year, month_day[0], month_day[1])
 },
 
@@ -149,7 +149,7 @@ month_day = case year
     [5, 19]
   when 1934, 1953, 1972, 1983, 2029, 2046, 2048
     [5, 20]
-  when 1915, 1980, 1991, 2010 
+  when 1915, 1980, 1991, 2010
     [5, 21]
   when 1904, 1942, 1961, 1999, 2018, 2037
     [5, 22]
@@ -169,7 +169,7 @@ month_day = case year
     [5, 29]
   when 1906, 2001, 2020
     [5, 30]
-end 
+end
 Date.civil(year, month_day[0], month_day[1])
 },
 
@@ -237,7 +237,7 @@ month_day = case year
     [10, 8]
   when 2011
     [10, 9]
-end 
+end
 Date.civil(year, month_day[0], month_day[1])
 },
 

data/lib/holidays/errors.rb

@@ -4,4 +4,5 @@ module Holidays
   class FunctionNotFound < Error; end
   class InvalidFunctionResponse < Error; end
   class UnknownRegionError < Error ; end
+  class InvalidRegion < Error; end
 end

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

@@ -54,7 +54,7 @@ module Holidays
             unless region == :any || @regions_repo.exists?(region)
               begin
                 load_definition_data(region.to_s)
-              rescue NameError => e
+              rescue NameError, LoadError => e
                 # This could be a sub region that does not have any holiday
                 # definitions of its own; try to load the containing region instead.
                 if region.to_s =~ /_/
@@ -71,7 +71,7 @@ module Holidays
 
         def validate!(regions)
           regions.each do |r|
-            raise UnknownRegionError unless @region_validator.valid?(r)
+            raise InvalidRegion unless @region_validator.valid?(r)
           end
         end
 
@@ -84,12 +84,17 @@ module Holidays
 
           begin
             load_definition_data(prefix)
-          rescue NameError => e
+          rescue NameError, LoadError => e
             raise UnknownRegionError.new(e), "Could not load region prefix: #{prefix.to_s}, original subregion: #{sub_reg.to_s}"
           end
         end
 
         def load_definition_data(region)
+          # Lazy loading of definition files. We verify the region doesn't
+          # contain malicious stuff in the initial validation.
+          region_definition_file = "#{DEFINITIONS_PATH}/#{region}"
+          require region_definition_file
+
           target_region_module = Module.const_get("Holidays").const_get(region.upcase)
 
           @definition_merger.call(

data/lib/holidays/load_all_definitions.rb

@@ -2,17 +2,6 @@ module Holidays
   class LoadAllDefinitions
     class << self
       def call
-        path = File.expand_path(File.dirname(__FILE__)) + "/../#{Holidays::DEFINITIONS_PATH}/"
-
-        Dir.foreach(path) do |item|
-          next if item == '.' or item == '..'
-
-          target = path+item
-          next if File.extname(target) != '.rb'
-
-          require target
-        end
-
         #FIXME I need a better way to do this. I'm thinking of putting these 'common' methods
         # into some kind of definition file so it can be loaded automatically but I'm afraid
         # of making that big of a breaking API change since these are public. For the time

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '4.7.0'
+  VERSION = '5.0.0'
 end

data/test/defs/test_defs_hk.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: definitions/hk.yaml
+class HkDefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_hk
+{Date.civil(2016,1,1) => 'New Year\'s Day',
+ Date.civil(2016,2,8) => 'Lunar New Year\'s Day',
+ Date.civil(2016,2,9) => 'The second day of Lunar New Year',
+ Date.civil(2016,2,10) => 'The third day of Lunar New Year',
+ Date.civil(2016,3,25) => 'Good Friday',
+ Date.civil(2016,3,26) => 'The day following Good Friday',
+ Date.civil(2016,3,28) => 'Easter Monday',
+ Date.civil(2016,5,2) => 'Labour Day',
+ Date.civil(2016,7,1) => 'Hong Kong Special Administrative Region Establishment Day',
+ Date.civil(2016,10,1) => 'National Day',
+ Date.civil(2016,12,26) => 'Christmas Day',
+ Date.civil(2016,12,27) => 'Boxing Day',
+ Date.civil(2017,1,2) => 'New Year\'s Day',
+ Date.civil(2017,1,28) => 'Lunar New Year\'s Day',
+ Date.civil(2017,1,30) => 'The second day of Lunar New Year',
+ Date.civil(2017,1,31) => 'The third day of Lunar New Year',
+ Date.civil(2017,4,14) => 'Good Friday',
+ Date.civil(2017,4,15) => 'The day following Good Friday',
+ Date.civil(2017,4,17) => 'Easter Monday',
+ Date.civil(2017,5,1) => 'Labour Day',
+ Date.civil(2017,7,1) => 'Hong Kong Special Administrative Region Establishment Day',
+ Date.civil(2017,10,2) => 'National Day',
+ Date.civil(2017,12,25) => 'Christmas Day',
+ Date.civil(2017,12,26) => 'Boxing Day'}.each do |date, name|
+  assert_equal name, (Holidays.on(date, :hk, :observed)[0] || {})[:name]
+end
+
+  end
+end

data/test/defs/test_defs_jp.rb

@@ -73,5 +73,6 @@ assert_nil Holidays.on(Date.civil(2015,8,11), :jp)[0]
 # [note] citizens holiday requires that jp_national_culture_day is wednesday.
 #        Before 2003, the closest past year that mathches above condition is 1998.
 assert_nil Holidays.on(Date.civil(1998,9,22), :jp)[0]
+
   end
 end

data/test/defs/test_defs_kr.rb

@@ -10,7 +10,7 @@ class KrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 {Date.civil(2016,2,8) => "Korean New Year",
  Date.civil(2016,5,14) => "Buddah\'s Birthday",
  Date.civil(2016,9,12) => "Korean Thanksgiving",
- Date.civil(2016,1,1) => "New Year\'s Day", 
+ Date.civil(2016,1,1) => "New Year\'s Day",
  Date.civil(2016,3,1) => "Independence Movement Day",
  Date.civil(2016,5,5) => "Children\'s Day",
  Date.civil(2016,6,6) => "Memorial Day",

data/test/holidays/definition/validator/test_region.rb

@@ -47,4 +47,8 @@ class RegionValidatorTests < Test::Unit::TestCase
   def test_returns_false_if_wildcard_region_is_invalid
     assert_equal(false, @subject.valid?(:somethingweird_))
   end
+
+  def test_returns_false_if_malicious_region_is_given
+    assert_equal(false, @subject.valid?(:"../../../test"))
+  end
 end

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

@@ -67,8 +67,16 @@ class ParseOptionsTests < Test::Unit::TestCase
   def test_raises_error_if_regions_are_invalid
     @region_validator.stubs(:valid?).returns(false)
 
-    assert_raise Holidays::UnknownRegionError do
+    assert_raise Holidays::InvalidRegion do
       @subject.call([:unknown_region])
     end
   end
+
+  def test_raises_error_if_regions_contain_malicious_directory_changes
+    @region_validator.stubs(:valid?).returns(false)
+
+    assert_raise Holidays::InvalidRegion do
+      @subject.call(["../../test"])
+    end
+  end
 end