holidays 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ae038d2ecc81231efdb1dfb62b8aa5f8a9a08b
-  data.tar.gz: 0ee05da812d8db5409bad033938d44d127c5a9a7
+  metadata.gz: daf9f996b85b5c11645266f2604847ceddf8d4a3
+  data.tar.gz: 1c37b24104b546431ba477bf22ed8ac35a622c5f
 SHA512:
-  metadata.gz: d89718606e9235afedb475611e069cc5cfeae83951f28881418df6299287cd947bff46df32ee6fbec68eb3794f42622c90ca8d69b4fc764bc9a0464542a1e36f
-  data.tar.gz: 1005849766e633f5fad96e4cdc37f8d5ab021c63b5a50c921bd066239eedd69d07d22f0b83474af958fc32db75cfee83ff7216f6d8a146b4788466e05702fc1b
+  metadata.gz: 4d782ce1901f6e8efab46412277d807d310e88881f87a283ef9a5e94108a2dcbc9d13f25f1c30927024cc0c24263fee77514ce8d73113c6130c0290cd978593a
+  data.tar.gz: 9e23cb50fdaa0889020463b8e104726922300f07d0536ca3d0ab39b1838756082fdfcc1e48552d6fba787424ef46383f6151e66b69da21a39eeec44ef1b4dbf2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 4.1.0
+
+* Issue-161: correctly report St Andrews Day as informal 2006 and earlier in `gb_sct`
+* Issue-169: set correct years of observance for Family Day in various `ca` provinces
+* Issue-163: Add `next_holidays` method. See README for usage (https://github.com/ttwo32)
+
 ## 4.0.0
 
 Major refactor with breaking changes! Sorry for the wall of text but there is a lot of info here.

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at holidaysgem@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -2,6 +2,10 @@
 
 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.
+
 ## 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.

data/README.md

@@ -1,4 +1,4 @@
-# Ruby Holidays Gem [![Build Status](https://travis-ci.org/holidays/holidays.svg?branch=master)](https://travis-ci.org/holidays/holidays) [![Coverage Status](https://coveralls.io/repos/holidays/holidays/badge.svg)](https://coveralls.io/r/holidays/holidays)
+# Ruby Holidays Gem [![Build Status](https://travis-ci.org/holidays/holidays.svg?branch=master)](https://travis-ci.org/holidays/holidays) [![Coverage Status](https://coveralls.io/repos/github/holidays/holidays/badge.svg?branch=master)](https://coveralls.io/github/holidays/holidays?branch=master)
 
 A set of functions to deal with holidays in Ruby.
 
@@ -65,6 +65,13 @@ To check if there are any holidays taking place during a specified work week:
     Holidays.any_holidays_during_work_week?(Date.civil(2016, 1, 1))
     => true
 
+To find and return the next holidays occurring from date, inclusively:
+
+    Holidays.next_holidays(3, [:us, :informal], Date.civil(2016, 2, 23))
+    => [{:name => "St. Patrick's Day",...}, {:name => "Good Friday",...}, {:name => "Easter Sunday",...}]
+
+Will default to `Date.today` if no date is provided.
+
 ### Loading Custom Definitions on the fly
 
 Load custom definitions file on the fly and use them immediately.

data/definitions/ca.yaml

@@ -1,5 +1,8 @@
 # Canadian holiday definitions for the Ruby Holiday gem.
-# Updated 2014-11-12.
+# Updated 2016-04-29.
+#
+# Notes:
+#  - 'Family Day' in various provinces are only celebrated after certain years: http://www.timeanddate.com/holidays/canada/family-day
 ---
 months:
   0:
@@ -24,25 +27,43 @@ months:
     mday: 2
   2:
   - name: Family Day
-    regions: [ca_ab, ca_on, ca_sk]
+    regions: [ca_ab]
+    wday: 1
+    week: 3
+    year_ranges:
+    - after: 1990
+  - name: Family Day
+    regions: [ca_sk]
+    wday: 1
+    week: 3
+    year_ranges:
+    - after: 2007
+  - name: Family Day
+    regions: [ca_on]
     wday: 1
     week: 3
+    year_ranges:
+    - after: 2008
+  - name: Family Day
+    regions: [ca_bc]
+    wday: 1
+    week: 2
+    year_ranges:
+    - after: 2013
   - name: Louis Riel Day
     regions: [ca_mb]
     wday: 1
     week: 3
-  - name: Nova Scotia Heritage Day # Ideally would be restricted to 2015 or later
+  - name: Nova Scotia Heritage Day
     regions: [ca_ns]
     wday: 1
     week: 3
+    year_ranges:
+    - after: 2015
   - name: Islander Day
     regions: [ca_pe]
     wday: 1
     week: 3
-  - name: BC Family Day # Ideally would be restricted to 2013 or later
-    regions: [ca_bc]
-    wday: 1
-    week: 2
   3:
   - name: St. Patrick's Day
     regions: [ca_nf]
@@ -156,16 +177,104 @@ tests: |
       assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
     end
 
-    # Family Day in BC
-    [ Date.civil(2013,2,11), Date.civil(2014,2,10) ].each do |date|
-      assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
+    # Family Day in Alberta - Should only be active on 1990 or later
+    [
+      Date.civil(1990,2,19),
+      Date.civil(2013,2,18),
+      Date.civil(2014,2,17),
+      Date.civil(2044,2,15),
+    ].each do |date|
+      assert_equal 'Family Day', Holidays.on(date, :ca_ab)[0][:name]
     end
 
-    # Nova Scotia Heritage Day
-    [ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+    # Family Day in Alberta - should not be active before 1990
+    [
+      Date.civil(1970,2,16),
+      Date.civil(1988,2,15),
+      Date.civil(1989,2,20),
+    ].each do |date|
+      assert_equal [], Holidays.on(date, :ca_ab)
+    end
+
+    # Family Day in Saskatchewan - Should only be active on 2007 or later
+    [
+      Date.civil(2007,2,19),
+      Date.civil(2013,2,18),
+      Date.civil(2014,2,17),
+      Date.civil(2044,2,15),
+    ].each do |date|
+      assert_equal 'Family Day', Holidays.on(date, :ca_sk)[0][:name]
+    end
+
+    # Family Day in Saskatchewan - should not be active before 2007
+    [
+      Date.civil(1970,2,16),
+      Date.civil(1988,2,15),
+      Date.civil(1989,2,20),
+      Date.civil(2006,2,20),
+    ].each do |date|
+      assert_equal [], Holidays.on(date, :ca_sk)
+    end
+
+    # Family Day in Ontario - Should only be active on 2008 or later
+    [
+      Date.civil(2008,2,18),
+      Date.civil(2013,2,18),
+      Date.civil(2014,2,17),
+      Date.civil(2044,2,15),
+    ].each do |date|
+      assert_equal 'Family Day', Holidays.on(date, :ca_on)[0][:name]
+    end
+
+    # Family Day in Ontario - should not be active before 2008
+    [
+      Date.civil(1970,2,16),
+      Date.civil(1988,2,15),
+      Date.civil(1989,2,20),
+      Date.civil(2006,2,20),
+      Date.civil(2007,2,19),
+    ].each do |date|
+      assert_equal [], Holidays.on(date, :ca_on)
+    end
+
+    # Family Day in BC - Should only be active on 2013 or later
+    [
+      Date.civil(2013,2,11),
+      Date.civil(2014,2,10),
+      Date.civil(2044,2,8),
+    ].each do |date|
+      assert_equal 'Family Day', Holidays.on(date, :ca_bc)[0][:name]
+    end
+
+    # Family Day in BC - should not be active before 2013
+    [
+      Date.civil(2000,2,14),
+      Date.civil(2011,2,14),
+      Date.civil(2012,2,13),
+    ].each do |date|
+      assert_equal [], Holidays.on(date, :ca_bc)
+    end
+
+    # Nova Scotia Heritage Day - should only be active on 2015 and later
+    [
+      Date.civil(2015,2,16),
+      Date.civil(2016,2,15),
+      Date.civil(2017,2,20),
+      Date.civil(2044,2,15),
+    ].each do |date|
       assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
     end
 
+    # Nova Scotia Heritage Day - should not be active before 2015
+    [
+      Date.civil(2000,2,21),
+      Date.civil(2012,2,20),
+      Date.civil(2013,2,18),
+      Date.civil(2014,2,17),
+    ].each do |date|
+      assert_equal [], Holidays.on(date, :ca_ns)
+    end
+
     # Islander Day in PE
     [ Date.civil(2013,2,18), Date.civil(2014,2,17) ].each do |date|
       assert_equal 'Islander Day', Holidays.on(date, :ca_pe)[0][:name]

data/definitions/gb.yaml

@@ -3,13 +3,14 @@
 # Including England, Wales, Scotland, N. Ireland, the Isle of Man, Guernsey
 # and Jersey.
 #
-# Updated: 2008-11-28.
+# Updated: 2016-04-29
 # Sources:
 # - http://en.wikipedia.org/wiki/List_of_holidays_by_country#United_Kingdom_and_Crown_dependencies
 #
 # Notes:
 # - Jersey, Guernsey and the Isle of Man are encode with both their ISO 3166-1 and ISO 3-3166-2 codes.
 # - England and Wales together should be encoded as [gb_eng, gb_wls, gb_eaw...]
+# - For :gb_sct, St. Andrew's Day is 'informal' 2006 and earlier but a bank holiday from 2007 on.
 ---
 months:
   0:
@@ -78,6 +79,14 @@ months:
     mday: 30
     type: informal
     observed: to_monday_if_weekend(date)
+    year_ranges:
+    - before: 2006
+  - name: St. Andrew's Day
+    regions: [gb_sct]
+    mday: 30
+    observed: to_monday_if_weekend(date)
+    year_ranges:
+    - after: 2007
   12:
   - name: Christmas Day
     regions: [gb]
@@ -99,7 +108,23 @@ tests: |
     end
 
     assert_equal 'St. Patrick\'s Day', Holidays.on(Date.civil(2008,3,17), :gb_nir, :informal)[0][:name]
-    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2008,11,30), :gb_sct, :informal)[0][:name]
+
+    # St. Andrew's Day is informal 2006 and earlier. Should only show up when :informal is passed
+    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]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2002,12,2), :gb_sct, :informal, :observed)[0][:name]
+    assert_equal [], Holidays.on(Date.civil(2004,11,30), :gb_sct)
+    assert_equal [], Holidays.on(Date.civil(2005,11,30), :gb_sct)
+    assert_equal [], Holidays.on(Date.civil(2006,11,30), :gb_sct)
+
+    # St. Andrew's Day is considered a formal bank holiday 2007 and later. It should show up regardless of whether
+    # :informal is specified
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct)[0][:name]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal)[0][:name]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal, :observed)[0][:name]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2016,11,30), :gb_sct)[0][:name]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,11,30), :gb_sct)[0][:name]
+    assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,12,2), :gb_sct, :observed)[0][:name]
 
     assert_equal 'Christmas Day', Holidays.on(Date.civil(2008,12,25), :gb_, :observed)[0][:name]
     assert_equal 'Christmas Day', Holidays.on(Date.civil(2009,12,25), :gb_, :observed)[0][:name]

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_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :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_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :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_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]
 end

data/lib/generated_definitions/ca.rb

@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module CA # :nodoc:
     def self.defined_regions
-      [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :us]
+      [: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]
     end
 
     def self.holidays_by_month
@@ -23,11 +23,13 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :type => :informal, :name => "Easter Monday", :regions => [:ca]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
             {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
-      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
+      2 => [{:wday => 1, :week => 3,  :year_ranges => [{:after => 1990}],:name => "Family Day", :regions => [:ca_ab]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2007}],:name => "Family Day", :regions => [:ca_sk]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2008}],:name => "Family Day", :regions => [:ca_on]},
+            {:wday => 1, :week => 2,  :year_ranges => [{:after => 2013}],:name => "Family Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
-            {:wday => 1, :week => 3, :name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2015}],:name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 3, :name => "Islander Day", :regions => [:ca_pe]},
-            {:wday => 1, :week => 2, :name => "BC Family Day", :regions => [:ca_bc]},
             {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
             {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
       3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]},

data/lib/generated_definitions/europe.rb

@@ -296,7 +296,8 @@ module Holidays
             {:mday => 1, :name => "Toussaint", :regions => [:fr]},
             {:mday => 11, :name => "Armistice 1918", :regions => [:fr]},
             {:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
-            {:mday => 30, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},
+            {:mday => 30,  :year_ranges => [{:before => 2006}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},
+            {:mday => 30,  :year_ranges => [{:after => 2007}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Andrew's Day", :regions => [:gb_sct]},
             {:mday => 1, :name => "Dan svih svetih", :regions => [:hr]},
             {:mday => 1, :name => "Mindenszentek", :regions => [:hu]},
             {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]},

data/lib/generated_definitions/gb.rb

@@ -33,7 +33,8 @@ module Holidays
       8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]},
             {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}],
       11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
-            {:mday => 30, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]}],
+            {:mday => 30,  :year_ranges => [{:before => 2006}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},
+            {:mday => 30,  :year_ranges => [{:after => 2007}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Andrew's Day", :regions => [:gb_sct]}],
       12 => [{:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:gb]},
             {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Boxing Day", :regions => [:gb]}]
       }

data/lib/generated_definitions/north_america.rb

@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/holidays/holidays
   module NORTH_AMERICA # :nodoc:
     def self.defined_regions
-      [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_ns, :ca_pe, :ca_bc, :ca_nf, :ca_nt, :ca_nu, :ca_nb, :ca_yk, :mx, :mx_pue, :us, :us_dc, :us_ca]
+      [: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]
     end
 
     def self.holidays_by_month
@@ -30,11 +30,13 @@ module Holidays
             {:mday => 1, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:us]},
             {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]},
             {:function => "us_inauguration_day(year)", :function_arguments => [:year], :name => "Inauguration Day", :regions => [:us_dc]}],
-      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
+      2 => [{:wday => 1, :week => 3,  :year_ranges => [{:after => 1990}],:name => "Family Day", :regions => [:ca_ab]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2007}],:name => "Family Day", :regions => [:ca_sk]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2008}],:name => "Family Day", :regions => [:ca_on]},
+            {:wday => 1, :week => 2,  :year_ranges => [{:after => 2013}],:name => "Family Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
-            {:wday => 1, :week => 3, :name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2015}],:name => "Nova Scotia Heritage Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 3, :name => "Islander Day", :regions => [:ca_pe]},
-            {:wday => 1, :week => 2, :name => "BC Family Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]},
             {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
             {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},

data/lib/holidays.rb

@@ -122,6 +122,40 @@ module Holidays
       UseCaseFactory.between.call(start_date, end_date, date_driver_hash, regions, observed, informal)
     end
 
+    # Get next holidays occuring from date, inclusively.
+    #
+    # Returns an array of hashes or nil.
+    #
+    # Incoming arguments are below:
+    # [<tt>holidays_count</tt>]  Ruby Numeric object. This is the number of holidays to return
+    # [<tt>options</tt>]     One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
+    # [<tt>from_date</tt>]    Ruby Date object. This is an optional param, defaulted today.
+    #
+    # ==== Example
+    #   Date.today
+    #   => Tue, 23 Feb 2016
+    #
+    #   regions = [:us, :informal]
+    #
+    #   Holidays.next_holidays(3, regions)
+    #   => [{:name => "St. Patrick's Day",...},
+    #       {:name => "Good Friday",...},
+    #       {:name => "Easter Sunday",...}]
+    def next_holidays(holidays_count, options, from_date = Date.today)
+      raise ArgumentError unless holidays_count
+      raise ArgumentError if options.empty?
+      raise ArgumentError unless options.is_a?(Array)
+
+      # remove the timezone
+      from_date = from_date.new_offset(0) + from_date.offset if from_date.respond_to?(:new_offset)
+
+      from_date = get_date(from_date)
+      regions, observed, informal = OptionFactory.parse_options.call(options)
+      date_driver_hash = UseCaseFactory.dates_driver_builder.build(from_date)
+
+      UseCaseFactory.next_holiday.call(holidays_count, from_date, date_driver_hash, regions, observed, informal)
+    end
+
     # Allows a developer to explicitly calculate and cache holidays within a given period
     def cache_between(start_date, end_date, *options)
       start_date, end_date = get_date(start_date), get_date(end_date)

data/lib/holidays/use_case/context/between.rb

@@ -2,6 +2,8 @@ module Holidays
   module UseCase
     module Context
       class Between
+        include ContextCommon
+
         def initialize(holidays_by_month_repo, day_of_month_calculator, custom_methods_repo, proc_result_cache_repo)
           @holidays_by_month_repo = holidays_by_month_repo
           @day_of_month_calculator = day_of_month_calculator
@@ -13,101 +15,17 @@ module Holidays
           validate!(start_date, end_date, dates_driver, regions)
 
           holidays = []
-
-          dates_driver.each do |year, months|
-            months.each do |month|
-              next unless hbm = holidays_by_month_repo.find_by_month(month)
-              hbm.each do |h|
-                next unless in_region?(regions, h[:regions])
-                next if h[:type] == :informal && !informal
-
-                # range check feature.
-                if h[:year_ranges]
-                  valid_range_year = false
-                  h[:year_ranges].each do |year_range|
-                    next unless year_range.is_a?(Hash) && year_range.length == 1
-                    next unless year_range.select{
-                      |operator,year|[:before,"before",:after,"after",:limited,"limited",:between,"between"].include?(operator)}.count > 0
-                    case year_range.keys.first
-                    when :before,"before"
-                      valid_range_year = true if year <= year_range[year_range.keys.first]
-                    when :after,"after"
-                      valid_range_year = true if year >= year_range[year_range.keys.first]
-                    when :limited,"limited"
-                      valid_range_year = true if year_range[year_range.keys.first].include?(year)
-                    when :between,"between"
-                      year_range[year_range.keys.first] = Range.new(*year_range[year_range.keys.first].split("..").map(&:to_i)) if year_range[year_range.keys.first].is_a?(String)
-                      valid_range_year = true if year_range[year_range.keys.first].cover?(year)
-                    end
-                    break if valid_range_year
-                  end
-                  next unless valid_range_year
-                end
-
-                #FIXME I don't like this entire if/else. If it's a function, do something, else do some
-                # weird mday logic? Bollocks. I think this should be a refactor target.
-                if h[:function]
-                  function_arguments = []
-
-                  #FIXME This is a refactor target. We should also allow 'date'. Right now these are the only
-                  # three things that we allow in. I think having a more testable, robust approach here is vital.
-                  if h[:function_arguments].include?(:year)
-                    function_arguments << year
-                  end
-
-                  if h[:function_arguments].include?(:month)
-                    function_arguments << month
-                  end
-
-                  if h[:function_arguments].include?(:day)
-                    function_arguments << h[:mday]
-                  end
-
-                  result = call_proc(h[:function], *function_arguments)
-
-                  #FIXME This is a dangerous assumption. We should raise an error or something
-                  #      if these procs return something unexpected.
-                  #
-                  # Procs may return either Date or an integer representing mday
-                  if result.kind_of?(Date)
-                    if h[:function_modifier]
-                      result = result + h[:function_modifier] # NOTE: This could be a positive OR negative number.
-                    end
-
-                    month = result.month
-                    mday = result.mday
-                  else
-                    mday = result
-                  end
-                else
-                  mday = h[:mday] || day_of_month_calculator.call(year, month, h[:week], h[:wday])
-                end
-
-                # Silently skip bad mdays
-                begin
-                  date = Date.civil(year, month, mday)
-                rescue; next; end
-
-                #FIXME We should be checking the function arguments and passing in what is specified.
-                # Right now all 'observed' functions require 'date' but that is by convention. Nothing
-                # is requiring that. We should be more explicit.
-                if observed && h[:observed]
-                  date = call_proc(h[:observed], date)
-                end
-
-                if date.between?(start_date, end_date)
-                  holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
-                end
-              end
-            end
-          end
-
+          holidays = make_date_array(dates_driver, regions, observed, informal)
+          holidays = holidays.select{|holiday|holiday[:date].between?(start_date, end_date)}
           holidays.sort{|a, b| a[:date] <=> b[:date] }
         end
 
         private
 
-        attr_reader :holidays_by_month_repo, :day_of_month_calculator, :custom_methods_repo, :proc_result_cache_repo
+        attr_reader :holidays_by_month_repo,
+                    :day_of_month_calculator,
+                    :custom_methods_repo,
+                    :proc_result_cache_repo
 
         def validate!(start_date, end_date, dates_driver, regions)
           raise ArgumentError unless start_date
@@ -121,32 +39,6 @@ module Holidays
 
           raise ArgumentError if regions.nil? || regions.empty?
         end
-
-        def call_proc(function_id, *arguments)
-          function = custom_methods_repo.find(function_id)
-          raise Holidays::FunctionNotFound.new("Unable to find function with id '#{function_id}'") if function.nil?
-
-          proc_result_cache_repo.lookup(function, *arguments)
-        end
-
-        # Check sub regions.
-        #
-        # When request :any, all holidays should be returned.
-        # When requesting :ca_bc, holidays in :ca or :ca_bc should be returned.
-        # When requesting :ca, holidays in :ca but not its subregions should be returned.
-        def in_region?(requested, available) # :nodoc:
-          return true if requested.include?(:any)
-
-          # When an underscore is encountered, derive the parent regions
-          # symbol and include both in the requested array.
-          requested = requested.collect do |r|
-            r.to_s =~ /_/ ? [r, r.to_s.gsub(/_[\w]*$/, '').to_sym] : r
-          end
-
-          requested = requested.flatten.uniq
-
-          available.any? { |avail| requested.include?(avail) }
-        end
       end
     end
   end

data/lib/holidays/use_case/context/context_common.rb

@@ -0,0 +1,123 @@
+module Holidays
+  module UseCase
+    module Context
+      module ContextCommon
+        def make_date_array(dates_driver, regions, observed, informal)
+          holidays = []
+          dates_driver.each do |year, months|
+            months.each do |month|
+              next unless hbm = holidays_by_month_repo.find_by_month(month)
+              hbm.each do |h|
+                next unless in_region?(regions, h[:regions])
+                next if h[:type] == :informal && !informal
+
+                # range check feature.
+                if h[:year_ranges]
+                  valid_range_year = false
+                  h[:year_ranges].each do |year_range|
+                    next unless year_range.is_a?(Hash) && year_range.length == 1
+                    next unless year_range.select{
+                      |operator,year|[:before,"before",:after,"after",:limited,"limited",:between,"between"].include?(operator)}.count > 0
+                    case year_range.keys.first
+                    when :before,"before"
+                      valid_range_year = true if year <= year_range[year_range.keys.first]
+                    when :after,"after"
+                      valid_range_year = true if year >= year_range[year_range.keys.first]
+                    when :limited,"limited"
+                      valid_range_year = true if year_range[year_range.keys.first].include?(year)
+                    when :between,"between"
+                      year_range[year_range.keys.first] = Range.new(*year_range[year_range.keys.first].split("..").map(&:to_i)) if year_range[year_range.keys.first].is_a?(String)
+                      valid_range_year = true if year_range[year_range.keys.first].cover?(year)
+                    end
+                    break if valid_range_year
+                  end
+                  next unless valid_range_year
+                end
+
+                #FIXME I don't like this entire if/else. If it's a function, do something, else do some
+                # weird mday logic? Bollocks. I think this should be a refactor target.
+                if h[:function]
+                  function_arguments = []
+
+                  #FIXME This is a refactor target. We should also allow 'date'. Right now these are the only
+                  # three things that we allow in. I think having a more testable, robust approach here is vital.
+                  if h[:function_arguments].include?(:year)
+                    function_arguments << year
+                  end
+
+                  if h[:function_arguments].include?(:month)
+                    function_arguments << month
+                  end
+
+                  if h[:function_arguments].include?(:day)
+                    function_arguments << h[:mday]
+                  end
+
+                  result = call_proc(h[:function], *function_arguments)
+
+                  #FIXME This is a dangerous assumption. We should raise an error or something
+                  #      if these procs return something unexpected.
+                  #
+                  # Procs may return either Date or an integer representing mday
+                  if result.kind_of?(Date)
+                    if h[:function_modifier]
+                      result = result + h[:function_modifier] # NOTE: This could be a positive OR negative number.
+                    end
+
+                    month = result.month
+                    mday = result.mday
+                  else
+                    mday = result
+                  end
+                else
+                  mday = h[:mday] || day_of_month_calculator.call(year, month, h[:week], h[:wday])
+                end
+
+                # Silently skip bad mdays
+                begin
+                  date = Date.civil(year, month, mday)
+                rescue; next; end
+
+                #FIXME We should be checking the function arguments and passing in what is specified.
+                # Right now all 'observed' functions require 'date' but that is by convention. Nothing
+                # is requiring that. We should be more explicit.
+                if observed && h[:observed]
+                  date = call_proc(h[:observed], date)
+                end
+
+                holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
+              end
+            end
+          end
+          holidays
+        end
+
+        def call_proc(function_id, *arguments)
+          function = custom_methods_repo.find(function_id)
+          raise Holidays::FunctionNotFound.new("Unable to find function with id '#{function_id}'") if function.nil?
+
+          proc_result_cache_repo.lookup(function, *arguments)
+        end
+
+        # Check sub regions.
+        #
+        # When request :any, all holidays should be returned.
+        # When requesting :ca_bc, holidays in :ca or :ca_bc should be returned.
+        # When requesting :ca, holidays in :ca but not its subregions should be returned.
+        def in_region?(requested, available) # :nodoc:
+          return true if requested.include?(:any)
+
+          # When an underscore is encountered, derive the parent regions
+          # symbol and include both in the requested array.
+          requested = requested.collect do |r|
+            r.to_s =~ /_/ ? [r, r.to_s.gsub(/_[\w]*$/, '').to_sym] : r
+          end
+
+          requested = requested.flatten.uniq
+
+          available.any? { |avail| requested.include?(avail) }
+        end
+      end
+    end
+  end
+end

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

@@ -11,16 +11,18 @@ module Holidays
         def call(start_date, end_date)
           dates_driver = {}
 
-          (start_date..end_date).each do |current_date|
-            dates_driver[current_date.year] = [] unless dates_driver[current_date.year]
-            dates_driver[current_date.year] << current_date.month
-
-            dates_driver = add_border_months(current_date, dates_driver)
-          end
-
+          (start_date..end_date).map{|current_date|build(dates_driver, current_date)}
           clean(dates_driver)
         end
 
+        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/use_case/context/next_holiday.rb

@@ -0,0 +1,54 @@
+module Holidays
+  module UseCase
+    module Context
+      class NextHoliday
+        include ContextCommon
+
+        def initialize(holidays_by_month_repo, day_of_month_calculator, custom_methods_repo, proc_result_cache_repo)
+          @holidays_by_month_repo = holidays_by_month_repo
+          @day_of_month_calculator = day_of_month_calculator
+          @custom_methods_repo = custom_methods_repo
+          @proc_result_cache_repo = proc_result_cache_repo
+        end
+
+        def call(holidays_count, from_date, dates_driver, regions, observed, informal)
+          validate!(holidays_count, from_date, dates_driver, regions)
+          holidays = []
+          ret_holidays = []
+
+          ret_holidays = make_date_array(dates_driver, regions, observed, informal)
+          ret_holidays.each do |holiday|
+            if holiday[:date] >= from_date
+              holidays << holiday
+              holidays_count -= 1
+              break if holidays_count == 0
+            end
+          end
+
+          holidays.sort{|a, b| a[:date] <=> b[:date] }
+        end
+
+        private
+
+        attr_reader :holidays_by_month_repo,
+                    :day_of_month_calculator,
+                    :custom_methods_repo,
+                    :proc_result_cache_repo
+
+        def validate!(holidays_count, from_date, dates_driver, regions)
+          raise ArgumentError unless holidays_count
+          raise ArgumentError if holidays_count <= 0
+          raise ArgumentError unless from_date
+
+          raise ArgumentError if dates_driver.nil? || dates_driver.empty?
+
+          dates_driver.each do |year, months|
+            raise ArgumentError if months.nil? || months.empty?
+          end
+
+          raise ArgumentError if regions.nil? || regions.empty?
+        end
+      end
+    end
+  end
+end

data/lib/holidays/use_case_factory.rb

@@ -1,4 +1,6 @@
+require 'holidays/use_case/context/context_common'
 require 'holidays/use_case/context/between'
+require 'holidays/use_case/context/next_holiday'
 require 'holidays/use_case/context/dates_driver_builder'
 
 module Holidays
@@ -12,6 +14,14 @@ module Holidays
           DefinitionFactory.proc_result_cache_repository,
         )
       end
+      def next_holiday
+        UseCase::Context::NextHoliday.new(
+          DefinitionFactory.holidays_by_month_repository,
+          DateCalculatorFactory.day_of_month_calculator,
+          DefinitionFactory.custom_methods_repository,
+          DefinitionFactory.proc_result_cache_repository,
+        )
+      end
 
       def dates_driver_builder
         UseCase::Context::DatesDriverBuilder.new

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/test/defs/test_defs_ca.rb

@@ -21,16 +21,104 @@ class CaDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
 end
 
-# Family Day in BC
-[ Date.civil(2013,2,11), Date.civil(2014,2,10) ].each do |date|
-  assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
+# Family Day in Alberta - Should only be active on 1990 or later
+[
+  Date.civil(1990,2,19),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_ab)[0][:name]
 end
 
-# Nova Scotia Heritage Day
-[ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+# Family Day in Alberta - should not be active before 1990
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_ab)
+end
+
+# Family Day in Saskatchewan - Should only be active on 2007 or later
+[
+  Date.civil(2007,2,19),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_sk)[0][:name]
+end
+
+# Family Day in Saskatchewan - should not be active before 2007
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+  Date.civil(2006,2,20),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_sk)
+end
+
+# Family Day in Ontario - Should only be active on 2008 or later
+[
+  Date.civil(2008,2,18),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_on)[0][:name]
+end
+
+# Family Day in Ontario - should not be active before 2008
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+  Date.civil(2006,2,20),
+  Date.civil(2007,2,19),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_on)
+end
+
+# Family Day in BC - Should only be active on 2013 or later
+[
+  Date.civil(2013,2,11),
+  Date.civil(2014,2,10),
+  Date.civil(2044,2,8),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_bc)[0][:name]
+end
+
+# Family Day in BC - should not be active before 2013
+[
+  Date.civil(2000,2,14),
+  Date.civil(2011,2,14),
+  Date.civil(2012,2,13),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_bc)
+end
+
+# Nova Scotia Heritage Day - should only be active on 2015 and later
+[
+  Date.civil(2015,2,16),
+  Date.civil(2016,2,15),
+  Date.civil(2017,2,20),
+  Date.civil(2044,2,15),
+].each do |date|
   assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
 end
 
+# Nova Scotia Heritage Day - should not be active before 2015
+[
+  Date.civil(2000,2,21),
+  Date.civil(2012,2,20),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_ns)
+end
+
 # Islander Day in PE
 [ Date.civil(2013,2,18), Date.civil(2014,2,17) ].each do |date|
   assert_equal 'Islander Day', Holidays.on(date, :ca_pe)[0][:name]

data/test/defs/test_defs_europe.rb

@@ -307,7 +307,23 @@ end
 end
 
 assert_equal 'St. Patrick\'s Day', Holidays.on(Date.civil(2008,3,17), :gb_nir, :informal)[0][:name]
-assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2008,11,30), :gb_sct, :informal)[0][:name]
+
+# St. Andrew's Day is informal 2006 and earlier. Should only show up when :informal is passed
+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]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2002,12,2), :gb_sct, :informal, :observed)[0][:name]
+assert_equal [], Holidays.on(Date.civil(2004,11,30), :gb_sct)
+assert_equal [], Holidays.on(Date.civil(2005,11,30), :gb_sct)
+assert_equal [], Holidays.on(Date.civil(2006,11,30), :gb_sct)
+
+# St. Andrew's Day is considered a formal bank holiday 2007 and later. It should show up regardless of whether
+# :informal is specified
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal, :observed)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2016,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,12,2), :gb_sct, :observed)[0][:name]
 
 assert_equal 'Christmas Day', Holidays.on(Date.civil(2008,12,25), :gb_, :observed)[0][:name]
 assert_equal 'Christmas Day', Holidays.on(Date.civil(2009,12,25), :gb_, :observed)[0][:name]

data/test/defs/test_defs_gb.rb

@@ -18,7 +18,23 @@ class GbDefinitionTests < Test::Unit::TestCase  # :nodoc:
 end
 
 assert_equal 'St. Patrick\'s Day', Holidays.on(Date.civil(2008,3,17), :gb_nir, :informal)[0][:name]
-assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2008,11,30), :gb_sct, :informal)[0][:name]
+
+# St. Andrew's Day is informal 2006 and earlier. Should only show up when :informal is passed
+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]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2002,12,2), :gb_sct, :informal, :observed)[0][:name]
+assert_equal [], Holidays.on(Date.civil(2004,11,30), :gb_sct)
+assert_equal [], Holidays.on(Date.civil(2005,11,30), :gb_sct)
+assert_equal [], Holidays.on(Date.civil(2006,11,30), :gb_sct)
+
+# St. Andrew's Day is considered a formal bank holiday 2007 and later. It should show up regardless of whether
+# :informal is specified
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2007,11,30), :gb_sct, :informal, :observed)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2016,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,11,30), :gb_sct)[0][:name]
+assert_equal 'St. Andrew\'s Day', Holidays.on(Date.civil(2019,12,2), :gb_sct, :observed)[0][:name]
 
 assert_equal 'Christmas Day', Holidays.on(Date.civil(2008,12,25), :gb_, :observed)[0][:name]
 assert_equal 'Christmas Day', Holidays.on(Date.civil(2009,12,25), :gb_, :observed)[0][:name]

data/test/defs/test_defs_north_america.rb

@@ -21,16 +21,104 @@ class North_americaDefinitionTests < Test::Unit::TestCase  # :nodoc:
   assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
 end
 
-# Family Day in BC
-[ Date.civil(2013,2,11), Date.civil(2014,2,10) ].each do |date|
-  assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
+# Family Day in Alberta - Should only be active on 1990 or later
+[
+  Date.civil(1990,2,19),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_ab)[0][:name]
 end
 
-# Nova Scotia Heritage Day
-[ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+# Family Day in Alberta - should not be active before 1990
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_ab)
+end
+
+# Family Day in Saskatchewan - Should only be active on 2007 or later
+[
+  Date.civil(2007,2,19),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_sk)[0][:name]
+end
+
+# Family Day in Saskatchewan - should not be active before 2007
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+  Date.civil(2006,2,20),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_sk)
+end
+
+# Family Day in Ontario - Should only be active on 2008 or later
+[
+  Date.civil(2008,2,18),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+  Date.civil(2044,2,15),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_on)[0][:name]
+end
+
+# Family Day in Ontario - should not be active before 2008
+[
+  Date.civil(1970,2,16),
+  Date.civil(1988,2,15),
+  Date.civil(1989,2,20),
+  Date.civil(2006,2,20),
+  Date.civil(2007,2,19),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_on)
+end
+
+# Family Day in BC - Should only be active on 2013 or later
+[
+  Date.civil(2013,2,11),
+  Date.civil(2014,2,10),
+  Date.civil(2044,2,8),
+].each do |date|
+  assert_equal 'Family Day', Holidays.on(date, :ca_bc)[0][:name]
+end
+
+# Family Day in BC - should not be active before 2013
+[
+  Date.civil(2000,2,14),
+  Date.civil(2011,2,14),
+  Date.civil(2012,2,13),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_bc)
+end
+
+# Nova Scotia Heritage Day - should only be active on 2015 and later
+[
+  Date.civil(2015,2,16),
+  Date.civil(2016,2,15),
+  Date.civil(2017,2,20),
+  Date.civil(2044,2,15),
+].each do |date|
   assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
 end
 
+# Nova Scotia Heritage Day - should not be active before 2015
+[
+  Date.civil(2000,2,21),
+  Date.civil(2012,2,20),
+  Date.civil(2013,2,18),
+  Date.civil(2014,2,17),
+].each do |date|
+  assert_equal [], Holidays.on(date, :ca_ns)
+end
+
 # Islander Day in PE
 [ Date.civil(2013,2,18), Date.civil(2014,2,17) ].each do |date|
   assert_equal 'Islander Day', Holidays.on(date, :ca_pe)[0][:name]

data/test/test_holidays.rb

@@ -57,6 +57,21 @@ class HolidaysTests < Test::Unit::TestCase
     end
   end
 
+  def test_requires_valid_regions_holiday_next
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.next_holidays(1, [:xx], Date.civil(2008,1,1))
+    end
+
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.next_holidays(1, [:ca,:xx], Date.civil(2008,1,1))
+      Holidays.on(Date.civil(2008,1,1), [:ca,:xx])
+    end
+
+    assert_raises Holidays::UnknownRegionError do
+      Holidays.next_holidays(1, [:ca,:xx])
+    end
+  end
+
   def test_region_params
     holidays = Holidays.on(@date, :ca)
     assert_equal 1, holidays.length
@@ -90,6 +105,33 @@ class HolidaysTests < Test::Unit::TestCase
     assert holidays.length >= 3
   end
 
+  def test_any_region_holiday_next
+    # Should return Victoria Day.
+    holidays = Holidays.next_holidays(1, [:ca], Date.civil(2008,5,1))
+    assert_equal 1, holidays.length
+    assert_equal ['2008-05-19','Victoria Day'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
+
+    # Should return 2 holidays.
+    #
+    # Should be 2 in the CA region but other regional files are loaded during the
+    # unit tests add to the :any count.
+    holidays = Holidays.next_holidays(2, [:any], Date.civil(2008,5,1))
+    assert_equal 2, holidays.length
+
+    # Must Region.If there is not region, raise ArgumentError.
+    assert_raises ArgumentError do
+      Holidays.next_holidays(2, '', Date.civil(2008,5,1))
+    end
+    # Options should be present.If they are empty, raise ArgumentError.
+    assert_raises ArgumentError do
+      Holidays.next_holidays(2, [], Date.civil(2008,5,1))
+    end
+    # Options should be Array.If they are not Array, raise ArgumentError.
+    assert_raises ArgumentError do
+      Holidays.next_holidays(2, :ca, Date.civil(2008,5,1))
+    end
+  end
+
   def test_sub_regions
     # Should return Victoria Day.
     holidays = Holidays.between(Date.civil(2008,5,1), Date.civil(2008,5,31), :ca)
@@ -104,6 +146,25 @@ class HolidaysTests < Test::Unit::TestCase
     assert_equal 2, holidays.length
   end
 
+  def test_sub_regions_holiday_next
+    # Should return Victoria Day.
+    holidays = Holidays.next_holidays(2, [:ca], Date.civil(2008,5,1))
+    assert_equal 1, holidays.length
+    assert_equal ['2008-05-19','Victoria Day'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
+
+    # Should return Victoria Da and National Patriotes Day.
+    holidays = Holidays.next_holidays(2, [:ca_qc], Date.civil(2008,5,1))
+    assert_equal 2, holidays.length
+    assert_equal ['2008-05-19','Victoria Day'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
+    assert_equal ['2008-05-19','National Patriotes Day'] , [holidays.last[:date].to_s, holidays.last[:name].to_s]
+
+    # Should return Victoria Day and National Patriotes Day.
+    holidays = Holidays.next_holidays(2, [:ca_], Date.civil(2008,5,1))
+    assert_equal 2, holidays.length
+    assert_equal ['2008-05-19','Victoria Day'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
+    assert_equal ['2008-05-19','National Patriotes Day'] , [holidays.last[:date].to_s, holidays.last[:name].to_s]
+  end
+
   def test_easter_lambda
     [Date.civil(1800,4,11), Date.civil(1899,3,31), Date.civil(1900,4,13),
      Date.civil(2008,3,21), Date.civil(2035,3,23)].each do |date|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -250,7 +251,9 @@ files:
 - lib/holidays/option/context/parse_options.rb
 - lib/holidays/option_factory.rb
 - lib/holidays/use_case/context/between.rb
+- lib/holidays/use_case/context/context_common.rb
 - lib/holidays/use_case/context/dates_driver_builder.rb
+- lib/holidays/use_case/context/next_holiday.rb
 - lib/holidays/use_case_factory.rb
 - lib/holidays/version.rb
 - test/data/test_custom_govt_holiday_defs.yaml