holidays 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcfe36fdf6e053184b4e01f9fb8379b2bb3e485d
-  data.tar.gz: 35935e8eaf4daabcb40102eb025cb6c88dca4d47
+  metadata.gz: a6ab4b51615aa61fac469c01fb99d7d94ad6d876
+  data.tar.gz: 4ee8ff425142c2e74de1ca88784679af0a0c99a5
 SHA512:
-  metadata.gz: c5b671008022b80ceaf7f385e7e44f95a5100f18fe401c3558777b1b988ef20e325033736b345037280e5b3206275074cea4ca8e7efe2dcbe0198fd399bc5902
-  data.tar.gz: 7522fa306023cb3d48808cfc3a40cf9e82c56df7e3f967fe10be7e54363c1160aa449a3621d16d56e1e18e5ff621fe7af79cc7ad6d8a1230f54753117a0ef4bc
+  metadata.gz: e430c6651f9fd96b2c5ec24fccc1e3f8ac93d11e7726e5f6d4c9265296cfd2ad4bc41da5b629f93d883f0ef05f90471f5a37215585747d76d89be708ad78d259
+  data.tar.gz: e586b641f155808fbfd03ce5a0af6207a890aa55c7fbb514be390e6082110a894d1fa69f82af44ac999b80bca568298c18468227646ff46a49dbc3a8e86d33c9

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 1.1.0
+
+* Add support to load custom holidays on the fly
+* Add hobart & launceston show days (https://github.com/ghiculescu)
+* Add Melbourne Cup day (https://github.com/ghiculescu)
+* Add Hobart Regatte Day (https://github.com/ghiculescu)
+* Add Costa Rican holidays (https://github.com/kevinwmerritt)
+* Update Canadian Holidays (https://github.com/KevinBrowne)
+* Add substitute holidays for Japan (https://github.com/YoshiyukiHirano)
+* Fix USA Federal Reserve Holidays
+* Add FedEx holidays (https://github.com/adamrunner)
+
 ## 1.0.7
 
 * Load parent region even when sub region is not explicitly defined (https://github.com/csage)

data/README.md

@@ -53,6 +53,25 @@ Get informal holidays in February.
     Holidays.between(from, to, :informal)
     => [{:name => 'Valentine\'s Day',...}]
 
+### Loading Custom Definitions on the fly
+
+Load custom definitions file on the fly and use them immediately.
+
+Load custom 'Company Founding' holiday on June 1st:
+
+    Holidays.load_custom('/home/user/holiday_definitions/custom_holidays.yaml')
+
+    date = Date.civil(2013,6,1)
+
+    Holidays.on(date, :my_custom_region)
+      => [{:name => 'Company Founding',...}]
+
+Custom definition files must match the format of the existing definition YAML files location in the 'data' directory.
+
+Multiple files can also be passed:
+
+    Holidays.load_custom('/home/user/holidays/custom_holidays1.yaml', '/home/user/holidays/custom_holidays2.yaml')
+
 ### Extending Ruby's Date class
 
 Check which holidays occur in Iceland on January 1, 2008.

data/Rakefile

@@ -5,7 +5,6 @@ require 'rake/testtask'
 require 'yaml'
 require 'fileutils'
 require 'holidays'
-require File.expand_path('data/build_defs')
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
@@ -29,7 +28,7 @@ namespace :generate do
       puts "Building #{region} definition module:"
       files = files.collect { |f| "#{DATA_PATH}/#{f}" }.uniq
 
-      module_src, test_src = parse_holiday_defs(region, files)
+      module_src, test_src = Holidays.parse_definition_files_and_return_source(region, files)
       File.open("lib/holidays/#{region.downcase.to_s}.rb","w") do |file|
         file.puts module_src
       end

data/data/au.yaml

@@ -12,7 +12,7 @@ months:
     regions: [au]
     function: easter(year)-2
   - name: Easter Saturday
-    regions: [au_nsw, au_vic, au_qld, au_nt, au_act, au_sa, au_qld_brisbane]
+    regions: [au_nsw, au_vic, au_qld, au_nt, au_act, au_sa, au_qld_brisbane, au_qld_cairns]
     function: easter(year)-1
   - name: Easter Sunday
     regions: [au_nsw]
@@ -32,6 +32,11 @@ months:
     regions: [au]
     mday: 26
     observed: to_monday_if_weekend
+  2:
+  - name: Royal Hobart Regatta
+    regions: [au_tas_south]
+    week: 2
+    wday: 1
   3: 
   - name: Labour Day
     regions: [au_wa]
@@ -71,11 +76,25 @@ months:
     regions: [au_qld]
     mday: 6
     type: informal
+  7:
+  - name: Cairns Show
+    regions: [au_qld_cairns]
+    week: 3
+    wday: 5
   8:
   - name: Ekka
     regions: [au_qld_brisbane]
     week: -3
     wday: 3
+  9:
+  - name: Queen's Birthday
+    regions: [au_wa]
+    week: -1
+    wday: 1
+  - name: "Family & Community Day"
+    regions: [au_act]
+    week: -1
+    wday: 1
   10: 
   - name: Labour Day
     regions: [au_act, au_nsw, au_sa]
@@ -89,6 +108,21 @@ months:
     regions: [au_qld]
     function: qld_queens_bday_october(year)
     observed: to_monday_if_weekend
+  - name: Royal Hobart Show
+    regions: [au_tas_south]
+    function: hobart_show_day(year)
+  11:
+  - name: G20 Day
+    regions: [au_qld_brisbane]
+    function: g20_day_2014_only(year)
+  - name: Recreation Day # http://www.timeanddate.com/holidays/australia/recreation-day
+    regions: [au_tas_north]
+    wday: 1
+    week: 1
+  - name: Melbourne Cup Day
+    regions: [au_vic]
+    week: 1
+    wday: 2
   12: 
   - name: Christmas Day
     regions: [au]
@@ -117,6 +151,19 @@ methods:
     def self.qld_labour_day_october(year)
       year <= 2012 ? nil : Date.calculate_mday(year, 10, 1, 1)
     end
+  g20_day_2014_only: |
+    # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+    # G20 day in brisbane, in 2014, on november 14
+    def self.g20_day_2014_only(year)
+      year == 2014 ? 14 : nil
+    end
+  hobart_show_day: |
+    # http://worksafe.tas.gov.au/__data/assets/pdf_file/0008/287036/Public_Holidays_2014.pdf
+    # The Thursday before the fourth Saturday in October. 
+    def self.hobart_show_day(year)
+      fourth_sat_in_oct = Date.civil(year, 10, Date.calculate_mday(year, 10, 4, :saturday))
+      fourth_sat_in_oct - 2 # the thursday before
+    end
 tests: |
     {Date.civil(2007,1,1) => 'New Year\'s Day', 
      Date.civil(2007,1,26) => 'Australia Day', 
@@ -153,5 +200,38 @@ tests: |
     assert_equal "Queen's Birthday", Date.civil(2012,10,1).holidays(:au_qld)[0][:name]
     assert_equal "Queen's Birthday", Date.civil(2013,6,10).holidays(:au_qld)[0][:name]
 
+    assert_equal "Queen's Birthday", Date.civil(2014, 9, 29).holidays(:au_wa)[0][:name]
+    assert_equal "Queen's Birthday", Date.civil(2015, 9, 28).holidays(:au_wa)[0][:name]
+    assert_equal "Queen's Birthday", Date.civil(2016, 9, 26).holidays(:au_wa)[0][:name]
+
+    assert_equal "Family & Community Day", Date.civil(2014, 9, 29).holidays(:au_act)[0][:name]
+    assert_equal "Family & Community Day", Date.civil(2015, 9, 28).holidays(:au_act)[0][:name]
+    assert_equal "Family & Community Day", Date.civil(2016, 9, 26).holidays(:au_act)[0][:name]
+
     assert_equal 'Australia Day', Date.civil(2014,1,26).holidays(:au_qld)[0][:name]
     assert_equal 'Australia Day', Date.civil(2014,1,27).holidays(:au_qld, :observed)[0][:name]
+
+    assert_equal 'Cairns Show', Date.civil(2014,7,18).holidays(:au_qld_cairns)[0][:name]
+    assert_equal 'Cairns Show', Date.civil(2013,7,19).holidays(:au_qld_cairns)[0][:name]
+
+    assert_equal 'Royal Hobart Show', Date.civil(2013, 10, 24).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Show', Date.civil(2014, 10, 23).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Show', Date.civil(2015, 10, 22).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Show', Date.civil(2016, 10, 20).holidays(:au_tas_south)[0][:name]
+
+    assert_equal 'Recreation Day', Date.civil(2013, 11, 4).holidays(:au_tas_north)[0][:name]
+    assert_equal 'Recreation Day', Date.civil(2014, 11, 3).holidays(:au_tas_north)[0][:name]
+    assert_equal 'Recreation Day', Date.civil(2015, 11, 2).holidays(:au_tas_north)[0][:name]
+    assert_equal 'Recreation Day', Date.civil(2016, 11, 7).holidays(:au_tas_north)[0][:name]
+
+    assert_equal 'G20 Day', Date.civil(2014,11,14).holidays(:au_qld_brisbane)[0][:name]
+    assert_equal [], Date.civil(2014,11,14).holidays(:au_qld)
+    assert_equal [], Date.civil(2015,11,14).holidays(:au_qld_brisbane)
+
+    assert_equal 'Melbourne Cup Day', Date.civil(2014,11,4).holidays(:au_vic)[0][:name]
+    assert_equal 'Melbourne Cup Day', Date.civil(2015,11,3).holidays(:au_vic)[0][:name]
+
+    assert_equal 'Royal Hobart Regatta', Date.civil(2012, 2, 13).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Regatta', Date.civil(2014, 2, 10).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Regatta', Date.civil(2015, 2, 9).holidays(:au_tas_south)[0][:name]
+    assert_equal 'Royal Hobart Regatta', Date.civil(2016, 2, 8).holidays(:au_tas_south)[0][:name]

data/data/ca.yaml

@@ -1,5 +1,5 @@
 # Canadian holiday definitions for the Ruby Holiday gem.
-# Updated 2008-11-21.
+# Updated 2014-11-12.
 ---
 months:
   0:
@@ -29,7 +29,15 @@ months:
     regions: [ca_mb]
     wday: 1
     week: 3
-  - name: BC Family Day
+  - name: Nova Scotia Heritage Day # Ideally would be restricted to 2015 or later
+    regions: [ca_ns]
+    wday: 1
+    week: 3
+  - 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
@@ -88,7 +96,11 @@ months:
     wday: 1
   - name: Civic Holiday
     week: 1
-    regions: [ca_on]
+    regions: [ca_on, ca_nt, ca_nu, ca_pe] # Appears to be a holiday in Ontario by convention
+    wday: 1
+  - name: New Brunswick Day
+    week: 1
+    regions: [ca_nb]
     wday: 1
   - name: Discovery Day
     week: 3
@@ -147,8 +159,33 @@ tests: |
       assert_equal 'BC Family Day', Holidays.on(date, :ca_bc)[0][:name]
     end
 
+    # Nova Scotia Heritage Day
+    [ Date.civil(2015,2,16), Date.civil(2016,2,15) ].each do |date|
+      assert_equal 'Nova Scotia Heritage Day', Holidays.on(date, :ca_ns)[0][:name]
+    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]
+    end
+
     # Victoria Day
     [Date.civil(2004,5,24), Date.civil(2005,5,23), Date.civil(2006,5,22),
      Date.civil(2007,5,21), Date.civil(2008,5,19)].each do |date|
       assert_equal 'Victoria Day', Holidays.on(date, :ca)[0][:name]
     end
+
+    # First Monday in August
+    [Date.civil(2013,8,5), Date.civil(2014,8,4), Date.civil(2015,8,3)].each do |date|
+      { :ca_bc => 'BC Day',
+        :ca_sk => 'Saskatchewan Day',
+        :ca_ab => 'Heritage Day',
+        :ca_ns => 'Natal Day',
+        :ca_on => 'Civic Holiday',
+        :ca_nt => 'Civic Holiday',
+        :ca_nu => 'Civic Holiday',
+        :ca_pe => 'Civic Holiday',
+        :ca_nb => 'New Brunswick Day' }.each do |region, name|
+        assert_equal name, Holidays.on(date, region)[0][:name]
+      end
+    end

data/data/cr.yaml

@@ -0,0 +1,63 @@
+# Costa Rican holiday definitions for the Ruby Holiday gem.
+#
+#
+# Updated: 2014-11-22.
+#
+# Sources:
+# - http://en.wikipedia.org/wiki/Public_holidays_in_Costa_Rica
+#
+months:
+  0:
+  - name: Jueves Santo
+    regions: [cr]
+    function: easter(year)-3
+  - name: Viernes Santo
+    regions: [cr]
+    function: easter(year)-2
+  1:
+  - name: Año Nuevo
+    regions: [cr]
+    mday: 1
+  4:
+  - name: Día de Juan Santamaría
+    regions: [cr]
+    mday: 11
+  5:
+  - name: Día del Trabajador
+    regions: [cr]
+    mday: 1
+  7:
+  - name: Día de la Anexión de Guanacaste
+    regions: [cr]
+    mday: 25
+  8:
+  - name: Día de la Virgen de los Angeles
+    regions: [cr]
+    mday: 2
+  - name: Día de la Madre
+    regions: [cr]
+    mday: 15
+  9:
+  - name: Día de la Independencia
+    regions: [cr]
+    mday: 15
+  10:
+  - name: Día de las Culturas
+    regions: [cr]
+    mday: 12
+  12:
+  - name: Navidad
+    regions: [cr]
+    mday: 25
+tests: |
+    {Date.civil(2015,1,1) => 'Año Nuevo',
+     Date.civil(2015,4,11) => 'Día de Juan Santamaría',
+     Date.civil(2015,5,1) => 'Día del Trabajador',
+     Date.civil(2015,7,25) => 'Día de la Anexión de Guanacaste',
+     Date.civil(2015,8,2) => 'Día de la Virgen de los Angeles',
+     Date.civil(2015,8,15) => 'Día de la Madre',
+     Date.civil(2015,9,15) => 'Día de la Independencia',
+     Date.civil(2015,10,12) => 'Día de las Culturas',
+     Date.civil(2016,12,25) => 'Navidad'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :cr)[0] || {})[:name]
+    end

data/data/federal_reserve.yaml

@@ -1,15 +1,11 @@
 # Federal reserve holidays definition for the Ruby Holiday gem.
 #
-# Updated: 2012-08-17
+# Updated: 2015-03-16
 # 
 # Sources:
-#  - 
+#  - http://www.federalreserve.gov/aboutthefed/k8.htm
 ---
 months:
-  0: 
-  - name: Good Friday
-    function: easter(year)-2
-    regions: [federal_reserve]
   1:
   - name: New Year's Day
     regions: [federal_reserve]
@@ -57,17 +53,10 @@ months:
     wday: 4
     regions: [federal_reserve]
   12: 
-  - name: Christmas Eve
-    regions: [federal_reserve]
-    mday: 24
-    observed: to_monday_if_sunday
   - name: Christmas Day
     regions: [federal_reserve]
     mday: 25
     observed: to_monday_if_sunday
-  - name: New Year's Eve
-    regions: [federal_reserve]
-    mday: 31
 methods:
   us_inauguration_day: |
     # January 20, every fourth year, following Presidential election
@@ -80,72 +69,59 @@ tests: |
   {Date.civil(2012,1,2) => "New Year's Day",
    Date.civil(2012,1,16) => "Birthday of Martin Luther King, Jr",
    Date.civil(2012,2,20) => "Washington's Birthday",
-   Date.civil(2012,4,6) => "Good Friday",
    Date.civil(2012,5,28) => "Memorial Day",
    Date.civil(2012,7,4) => "Independence Day",
    Date.civil(2012,9,3) => "Labor Day",
    Date.civil(2012,10,8) => "Columbus Day",
    Date.civil(2012,11,12) => "Veterans Day",
    Date.civil(2012,11,22) => "Thanksgiving Day",
-   Date.civil(2012,12,24) => "Christmas Eve",
    Date.civil(2012,12,25) => "Christmas Day",
-   Date.civil(2012,12,31) => "New Year's Eve",
 
    Date.civil(2013,1,1) => "New Year's Day",
    Date.civil(2013,1,21) => "Birthday of Martin Luther King, Jr",
    Date.civil(2013,2,18) => "Washington's Birthday",
-   Date.civil(2013,3,29) => "Good Friday",
    Date.civil(2013,5,27) => "Memorial Day",
    Date.civil(2013,7,4) => "Independence Day",
    Date.civil(2013,9,2) => "Labor Day",
    Date.civil(2013,10,14) => "Columbus Day",
    Date.civil(2013,11,11) => "Veterans Day",
    Date.civil(2013,11,28) => "Thanksgiving Day",
-   Date.civil(2013,12,24) => "Christmas Eve",
    Date.civil(2013,12,25) => "Christmas Day",
-   Date.civil(2013,12,31) => "New Year's Eve",
    
    Date.civil(2014,1,1) => "New Year's Day",
    Date.civil(2014,1,20) => "Birthday of Martin Luther King, Jr",
    Date.civil(2014,2,17) => "Washington's Birthday",
-   Date.civil(2014,4,18) => "Good Friday",
    Date.civil(2014,5,26) => "Memorial Day",
    Date.civil(2014,7,4) => "Independence Day",
    Date.civil(2014,9,1) => "Labor Day",
    Date.civil(2014,10,13) => "Columbus Day",
    Date.civil(2014,11,11) => "Veterans Day",
    Date.civil(2014,11,27) => "Thanksgiving Day",
-   Date.civil(2014,12,24) => "Christmas Eve",
    Date.civil(2014,12,25) => "Christmas Day",
-   Date.civil(2014,12,31) => "New Year's Eve",
 
    Date.civil(2015,1,1) => "New Year's Day",
    Date.civil(2015,1,19) => "Birthday of Martin Luther King, Jr",
    Date.civil(2015,2,16) => "Washington's Birthday",
-   Date.civil(2015,4,3) => "Good Friday",
    Date.civil(2015,5,25) => "Memorial Day",
    Date.civil(2015,7,4) => "Independence Day",
    Date.civil(2015,9,7) => "Labor Day",
    Date.civil(2015,10,12) => "Columbus Day",
    Date.civil(2015,11,11) => "Veterans Day",
    Date.civil(2015,11,26) => "Thanksgiving Day",
-   Date.civil(2015,12,24) => "Christmas Eve",
    Date.civil(2015,12,25) => "Christmas Day",
-   Date.civil(2015,12,31) => "New Year's Eve",
 
    Date.civil(2016,1,1) => "New Year's Day",
    Date.civil(2016,1,18) => "Birthday of Martin Luther King, Jr",
    Date.civil(2016,2,15) => "Washington's Birthday",
-   Date.civil(2016,3,25) => "Good Friday",
    Date.civil(2016,5,30) => "Memorial Day",
    Date.civil(2016,7,4) => "Independence Day",
    Date.civil(2016,9,5) => "Labor Day",
    Date.civil(2016,10,10) => "Columbus Day",
    Date.civil(2016,11,11) => "Veterans Day",
    Date.civil(2016,11,24) => "Thanksgiving Day",
-   Date.civil(2016,12,24) => "Christmas Eve",
    Date.civil(2016,12,26) => "Christmas Day",
-   Date.civil(2016,12,31) => "New Year's Eve",
+
+   Date.civil(2017,1, 20) => "Inauguration Day",
    }.each do |date, name|
      assert_equal name, (Holidays.on(date, :federal_reserve, :observed)[0] || {})[:name]
    end

data/data/fedex.yaml

@@ -0,0 +1,56 @@
+# FedEx holiday definitions for the Ruby Holiday gem.
+#
+# By Adam Runner
+#
+# Updated: 2015-03-09.
+# Source:  http://www.fedex.com/us/service-guide/holiday-schedule.html
+---
+months:
+  1:
+  - name: New Year's Day
+    regions: [fedex]
+    mday: 1
+    observed: to_weekday_if_weekend
+  5:
+  - name: Memorial Day
+    week: -1
+    regions: [fedex]
+    wday: 1
+  7:
+  - name: Independence Day
+    regions: [fedex]
+    mday: 4
+    observed: to_weekday_if_weekend
+  9:
+  - name: Labor Day
+    week: 1
+    regions: [fedex]
+    wday: 1
+  11:
+  - name: Thanksgiving
+    week: 4
+    regions: [fedex]
+    wday: 4
+  - name: Day After Thanksgiving
+    week: 4
+    regions: [fedex]
+    wday: 5
+  12:
+  - name: Christmas Day
+    regions: [fedex]
+    mday: 25
+    observed: to_weekday_if_weekend
+  - name: New Year's Eve
+    regions: [fedex]
+    mday: 31
+tests: |
+    {Date.civil(2015,1,1) => 'New Year\'s Day',
+     Date.civil(2015,5,25) => 'Memorial Day',
+     Date.civil(2015,7,4) => 'Independence Day',
+     Date.civil(2015,9,7) => 'Labor Day',
+     Date.civil(2015,11,26) => 'Thanksgiving',
+     Date.civil(2015,11,27) => 'Day After Thanksgiving',
+     Date.civil(2015,12,25) => 'Christmas Day',
+     Date.civil(2015,12,31) => 'New Year\'s Eve',}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :ups)[0] || {})[:name]
+    end