holidays 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371634066d0abbf2aa11ace0e06461808a38a69a
-  data.tar.gz: 2abd58ba908382b7b3c2a265c41d7a48652332ed
+  metadata.gz: 314e234058d757423c0e873ac27f9ce001a54fa0
+  data.tar.gz: f827b9614cd1037c20153fa2b316d000b784e2f4
 SHA512:
-  metadata.gz: 03b8ea83d6100f4308ac35dbc01c0eeaefa75dc6263457457fa12e6cd6bf5a3000aedc570bc841d0c4357abffad09e796cd622957dcd5256ae92630f8ebdef0f
-  data.tar.gz: d893607cb825d6f73c020bad7dff40dec30f032fa0e4c6ab9d6524d3e7b9bafd8111f0c397410ab5676e01b0395434db0b12b7f8a1413f6d1b2d45f58e4ba90f
+  metadata.gz: 3fbe210da7f49b7e8c5d5693e230ee2b5bb46190656be2c99bd28f795bc9e8e8ede109e699ebd87ed7b024ca76cfa6cc34220d2853603296700c8feaf3e95562
+  data.tar.gz: 66f1d44e7a7fc1c10b84f959dccc5c0710a10f802d0ee9bcdd8b74e7bf526d3be95ee1c36dc4dd2a756086bc3753218d7b87b6f8c872cc252e5cf8ba4e04c21e

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 3.3.0
+
+This is the final minor point release in v3.X.X. I am releasing it so that all of the latest definitions can be
+used by anyone that is not ready to jump to version 4.0.0. I am not planning on supporting this version unless a major
+issue is found that needs to be immediately addressed.
+
+* Update public holidays for Argentina (https://github.com/schmierkov)
+* Remove redundant `require` from weekend modifier (https://github.com/Eric-Guo)
+* FIX: Easter Saturday not a holiday in NZ (https://github.com/ghiculescu)
+* FIX: Japan 'Marine Day' for 1996-2002 year ranges (https://github.com/shuhei)
+* FIX: Australia calculations for Christmas and Boxing (https://github.com/ghiculescu)
+* Add dutch language version of definitions for Belgium (michael.cox@novalex.be)
+* Make 'Goede Vrijdag' informal for NL definitions (https://github.com/MathijsK93)
+* Add 'Great Friday' to Czech holidays (juris@uol.cz)
+* Add new informal holidays for Germany (https://github.com/knut2)
+* FIX: correctly check for new `year_range` attribute in holidays by month repository (https://github.com/knut2)
+* Add DE-Reformationstag for 2017 (https://github.com/knut2)
+* Update Australia QLD definition Queens Bday and Labour Day (https://github.com/ghiculescu)
+
 ## 3.2.0
 
 * add 'valid year' functionality to definitions - https://github.com/holidays/holidays/issues/33 - (thanks to https://github.com/ttwo32)

data/README.md

@@ -14,14 +14,12 @@ To install the gem from RubyGems:
 
 The Holidays gem is tested on Ruby 2.0.0, 2.1.0, 2.2.0, 2.3.0 and JRuby.
 
+The Holidays gem follows [semantic versioning](http://semver.org/). Please take this into account when relying on this gem as a dependency.
+
 ## Time zones
 
 Time zones are ignored.  This library assumes that all dates are within the same time zone.
 
-## Examples
-
-For more information, see the notes at the top of the Holidays module.
-
 ### Using the Holidays class
 
 Get all holidays on April 25, 2008 in Australia.
@@ -120,15 +118,26 @@ See the [original pull request](https://github.com/alexdunae/holidays/pull/36) f
 
 ### How to contribute
 
-To make changes to any of the definitions, edit the YAML files under the 'definitions' directory only. These YAML files are read by the 'generate' rake target and the final definition files are created automatically. Don't directly edit any other files.
+#### For definition updates
+
+* 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 `bundle exec rake generate` to generate updated final definitions (they will be located under `lib/generated_definitions/`)
+* Run `bundle exec rake test` to ensure your changes did not introduce errors
+* Open a PR with *all* of these changes. You *MUST* include the generated definition files in your PR. There is no automatic process to generated definitions at this time
+
+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.
+
+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`.
 
-Tests are also allowed at the end of the YAML files. Please add tests. PRs will not be accepted unless there are tests proving that the new definitions work.
+#### For non-definition functionality
 
-After you're satisfied with the YAML file if you have added a brand-new region you must edit the index.yaml file to include the new region. Then run `rake generate`, which will generate the Ruby files that make up the actual code as well as the tests.  Then run `rake test`. If that passes then add all of the changed files to a commit and open a pull request.
+* Fork the repository
+* Make your changes
+* Create a PR pointing back to `master`
 
-It is also very appreciated if documentation is attached to the pull request.  A simple Wikipedia or government link referencing the change would be perfect.
+Don't worry about versioning, we'll handle it on our end.
 
-If you wish to test out your changes via irb you can run `bin/console`. This will load all required lib files and open an irb session.
+Tests are required. If your PR results in lower test coverage then it will not be accepted.
 
 ### Credits and code
 

data/definitions/README.md

@@ -0,0 +1,174 @@
+# Holiday Gem Definition Syntax
+
+All holidays are defined in YAML files in the `definitions/` directory. These definition files have three main top-level properties:
+
+* `months` - this is the meat! All definitions for months 1-12 are defined here
+* `methods` - this contains any custom logic that your definitions require
+* `tests` - this contains the tests for your definitions
+
+The `months` property is required. The two other properties are not strictly required but are almost always used.
+
+In fact, if you leave out `tests` your PR will probably not be accepted unless there is a very, very good reason for leaving it out.
+
+## Key Words
+
+There are some terms that you should be familiar with before we dive into each section:
+
+#### `region`
+
+A region is a symbol that denotes the geographic or cultural region for that holiday. In general these symbols will be the [ISO 3166](https://en.wikipedia.org/wiki/ISO_3166) code for a country or region.
+
+Please note that before version v1.1.0 the compliance with ISO 3166 was not as strict. There might be cases where an existing region symbol does not match the standard.
+
+In addition, some sub-regions do not have a matching ISO 3116 entry. In those cases we attempt to choose symbols that are reasonably clear.
+
+Examples: `:us` for USA, `:fr` for France, `:us_dc` for Washington, D.C in USA
+
+#### `formal`/`informal`
+
+We consider `formal` dates as government-defined holidays. These could be the kinds of holidays where everyone stays home from work or perhaps are bank holidays but it is *not required* for a holiday to have these features to be considered formal.
+
+`Informal` holidays are holidays that everyone knows about but aren't enshrined in law. For example, Valentine's Day in the US is considered an informal holiday.
+
+We recognize that these definitions can be highly subjective. If you disagree with the current status of a holiday please open an issue so we can discuss it.
+
+#### `observed`
+
+There are certain holidays that can be legally observed on different days than they occur. For example, if a holiday falls on a Saturday but it is legally observed on the following Monday then you can define it as `observed` on the Monday. Please see the section below for more details and examples.
+
+## Months
+
+Holidays are grouped by month from 1 through 12.  Each entry within a month can have several properties depending on the behavior of the holiday. Each section below lays out the various different ways you can define your holiday.
+
+The two required properties are:
+
+* `name` - The name of the holiday
+* `regions` - One or more region codes (targeted to match [ISO 3166](https://en.wikipedia.org/wiki/ISO_3166))
+
+### Dates defined by a fixed date (e.g. January 1st)
+
+* `mday` - A non-negative integer representing day of the month (1 through 31).
+
+For example, the following holiday is on the first of January and available in the `:ca`, `:us` and `:au` regions:
+
+```
+1:
+- name: New Year's Day
+  regions: [ca, us, au]
+  mday: 1
+```
+
+### Dates defined by a week number (e.g. first Monday of a month)
+
+* `wday` - A non-negative integer representing day of the week (0 = Sunday through 6 = Saturday).
+* `week` - A non-negative integer representing week number (1 = first week, 3 = third week, -1 = last week),
+
+For example, the following holiday is on the first Monday of September and available in the `:ca` region:
+
+```
+9:
+- name: Labour Day
+  regions: [ca]
+  week: 1
+  wday: 1
+```
+
+## Methods
+
+In addition to defining holidays by day or week, you can create custom methods to calculate a date. These should be placed under the `methods` property. Methods named in this way can then be referenced by entries in the `months` property.
+
+For example, Canada celebrates Victoria Day, which falls on the Monday on or before May 24.  So, under the `methods` property we create a custom method that returns a Date object.
+
+```
+methods:
+  ca_victoria_day: |
+    def self.ca_victoria_day(year)
+      date = Date.civil(year,5,24)
+      if date.wday > 1
+        date -= (date.wday - 1)
+      elsif date.wday == 0
+        date -= 6
+      end
+      date
+    end
+```
+
+This would be represented in `months` entry as:
+
+```
+5:
+- name: Victoria Day
+  regions: [ca]
+  function: ca_victoria_day(year)
+```
+
+If a holiday can occur in different months (e.g. Easter) it can go in the '0' month.
+
+```
+0:
+- name: Easter Monday
+  regions: [ca]
+  function: easter(year)+1
+```
+
+There are pre-existing methods for highly-used calculations. They are:
+
+* `easter(year)` - calculates Easter via Gregorian calendar for a given year
+* `orthodox_easter(year)` - calculates Easter via Julian calendar for a given year
+* `to_monday_if_sunday(date)` - returns date of the following Monday if the 'date' argument falls on a Sunday
+* `to_monday_if_weekend(date)` - returns date of the following Monday if the 'date' argument falls on a weekend (Saturday or Sunday)
+* `to_weekday_if_boxing_weekend(date)` - returns nearest following weekday if the 'date' argument falls on Boxing Day
+* `to_weekday_if_boxing_weekend_from_year(year)` - calculates nearest weekday following Boxing weekend for given year
+* `to_weekday_if_weekend(date)` - returns nearest weekday (Monday or Friday) if 'date' argument falls on a weekend (Saturday or Sunday)
+
+*Protip*: you can use the `easter` methods to calculate all of the dates that are based around Easter. It's especially useful to use since the Easter calculation is complex. For example, 'Good Friday' in the US is 2 days before Easter. Therefore you could do the following:
+
+```
+0:
+- name: Good Friday
+  regions: [us]
+  function: easter(year)-2
+  type: informal
+```
+
+### Calculating observed dates
+
+Users can specify that this gem only return holidays on their 'observed' day. This can be especially useful if they are using this gem for business-related logic. If you wish for your definitions to allow for this then you can add the `observed` property to your entry. This requires a method to help calculate the observed day.
+
+Several built-in methods are available for holidays that are observed on varying dates.  For example, for a holiday that is observed on Monday if it falls on a weekend you could write:
+
+```
+7:
+- name: Canada Day
+  regions: [ca]
+  mday: 1
+  observed: to_monday_if_weekend(date)
+```
+
+If a user does not specify `observed` when calling the gem then 1/1 will be the date found for 'Canada Day', regardless of whether it falls on a Saturday or Sunday. If a user specifies 'observed' then it will show as the following Monday if the date falls on a Saturday or Sunday.
+
+## Tests
+
+All definition files should have tests included.  In the YAML file, tests are just a block of Ruby code:
+
+```
+tests: |
+  {Date.civil(2008,1,1) => 'New Year\'s Day',
+   Date.civil(2008,3,21) => 'Good Friday',
+   Date.civil(2008,3,24) => 'Easter Monday',
+   Date.civil(2008,9,1) => 'Labour Day',
+   Date.civil(2008,12,25) => 'Christmas Day',
+   Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name|
+    assert_equal name, (Holidays.on(date, :ca, :informal)[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
+```
+
+These tests will be picked up by the `generate` process and written into actual Test::Unit tests that are run when a user executes the test suite.
+
+Please please please include tests. Your PR won't be accepted if tests are not included with your changes.

data/definitions/ar.yaml

@@ -1,16 +1,13 @@
 # Argentinian holiday definitions for the Ruby Holiday gem.
 #
-# Updated: 2013-10-17.
+# Updated: 2016-02-26.
 #
 # Sources:
 # - http://en.wikipedia.org/wiki/Public_holidays_in_Argentina
-#
+# - http://servicios.lanacion.com.ar/feriados/2016
 ---
 months:
   0:
-  - name: Jueves Santo
-    regions: [ar]
-    function: easter(year)-3
   - name: Viernes Santo
     regions: [ar]
     function: easter(year)-2
@@ -18,6 +15,13 @@ months:
   - name: Año Nuevo
     regions: [ar]
     mday: 1
+  2:
+  - name: Carnaval
+    regions: [ar]
+    mday: 8
+  - name: Carnaval
+    regions: [ar]
+    mday: 9
   3:
   - name: Día Nacional de la Memoria por la Verdad y la Justicia
     regions: [ar]
@@ -38,45 +42,51 @@ months:
     regions: [ar]
     mday: 20
   7:
+  - name: Feriado puente turístico
+    regions: [ar]
+    mday: 8
   - name: Día de la Independencia
     regions: [ar]
     mday: 9
   8:
   - name: Paso a la Inmortalidad del General José de San Martín
     regions: [ar]
-    week: 3
-    wday: 1
+    mday: 15
   10:
   - name: Día del Respeto a la Diversidad Cultural
     regions: [ar]
-    week: 2
-    wday: 1
+    mday: 12
   11:
-  - name: Día de la Soberanía nacional
+  - name: Día de la Soberanía Nacional
     regions: [ar]
-    week: 4
-    wday: 1
+    mday: 20
   12:
   - name: Inmaculada Concepción de María
     regions: [ar]
     mday: 8
+  - name: Feriado puente turístico
+    regions: [ar]
+    mday: 9
   - name: Navidad
     regions: [ar]
     mday: 25
 tests: |
-    {Date.civil(2013,1,1) => 'Año Nuevo',
-     Date.civil(2013,3,24) => 'Día Nacional de la Memoria por la Verdad y la Justicia',
-     Date.civil(2013,3,28) => 'Jueves Santo',
-     Date.civil(2013,3,29) => 'Viernes Santo',
-     Date.civil(2013,4,2) => 'Día del Veterano y de los Caídos en la Guerra de Malvinas',
-     Date.civil(2013,5,1) => 'Día del Trabajador',
-     Date.civil(2013,5,25) => 'Día de la Revolución de Mayo',
-     Date.civil(2013,6,20) => 'Día de la Bandera',
-     Date.civil(2013,7,9) => 'Día de la Independencia',
-     Date.civil(2013,8,19) => 'Paso a la Inmortalidad del General José de San Martín',
-     Date.civil(2013,10,14) => 'Día del Respeto a la Diversidad Cultural',
-     Date.civil(2013,11,25) => 'Día de la Soberanía nacional',
-     Date.civil(2013,12,8) => 'Inmaculada Concepción de María',
-     Date.civil(2013,12,25) => 'Navidad'}.each do |date, name|
+    {Date.civil(2016,1,1) => 'Año Nuevo',
+     Date.civil(2016,2,8) => 'Carnaval',
+     Date.civil(2016,2,9) => 'Carnaval',
+     Date.civil(2016,3,24) => 'Día Nacional de la Memoria por la Verdad y la Justicia',
+     Date.civil(2016,3,25) => 'Viernes Santo',
+     Date.civil(2016,4,2) => 'Día del Veterano y de los Caídos en la Guerra de Malvinas',
+     Date.civil(2016,5,1) => 'Día del Trabajador',
+     Date.civil(2016,5,25) => 'Día de la Revolución de Mayo',
+     Date.civil(2016,6,20) => 'Día de la Bandera',
+     Date.civil(2016,7,8) => 'Feriado puente turístico',
+     Date.civil(2016,7,9) => 'Día de la Independencia',
+     Date.civil(2016,8,15) => 'Paso a la Inmortalidad del General José de San Martín',
+     Date.civil(2016,10,12) => 'Día del Respeto a la Diversidad Cultural',
+     Date.civil(2016,11,20) => 'Día de la Soberanía Nacional',
+     Date.civil(2016,12,8) => 'Inmaculada Concepción de María',
+     Date.civil(2016,12,9) => 'Feriado puente turístico',
+     Date.civil(2016,12,25) => 'Navidad'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :ar, :informal)[0] || {})[:name]
-    end
+    end

data/definitions/au.yaml

@@ -4,7 +4,7 @@
 # - http://en.wikipedia.org/wiki/Australian_public_holidays
 # - http://www.docep.wa.gov.au/lr/LabourRelations/Content/Wages%20and%20Conditions/Public%20Holidays/Public_Holidays.html
 # - http://www.wst.tas.gov.au/employment_info/public_holidays
-# TODO: missing some regional holidays
+# - https://www.fairwork.gov.au/leave/public-holidays/list-of-public-holidays
 --- 
 months:
   0: 
@@ -79,9 +79,12 @@ months:
     week: 1
     wday: 1
   - name: Queen's Birthday
-    regions: [au_act, au_nsw, au_sa, au_qld, au_tas, au_nt, au_vic]
+    regions: [au_act, au_nsw, au_sa, au_tas, au_nt, au_vic]
     week: 2
     wday: 1
+  - name: Queen's Birthday
+    regions: [au_qld]
+    function: qld_queens_birthday_june(year)
   - name: Queensland Day
     regions: [au_qld]
     mday: 6
@@ -137,16 +140,26 @@ months:
     week: 1
     wday: 2
   12: 
-  - name: Christmas Day
-    regions: [au]
+  - name: Christmas Day # CHRISTMAS DAY - ACT, NSW, QLD, Tas, WA observe on 27th (and 25th) if 25th is a Sunday
+    regions: [au_qld, au_nsw, au_act, au_tas, au_wa]
+    mday: 25
+    observed: to_tuesday_if_sunday_or_monday_if_saturday
+  - name: Christmas Day # CHRISTMAS DAY - SA observes on 26th if 25th is a Sunday (Boxing Day goes to 27th)
+    regions: [au_sa]
     mday: 25
     observed: to_monday_if_weekend
+  - name: Christmas Day # CHRISTMAS DAY - Victoria and NT don't observe 25th if weekend - xmas is on the 27th
+    regions: [au_vic, au_nt]
+    function: xmas_to_weekday_if_weekend(year)
   - name: Boxing Day
     regions: [au_nsw, au_vic, au_qld, au_act, au_wa]
     mday: 26
-    observed: to_weekday_if_boxing_weekend
+    observed: to_tuesday_if_sunday_or_monday_if_saturday
   - name: Boxing Day
-    regions: [au_sa, au_tas, au_nt]
+    regions: [au_sa]
+    function: to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday(year)
+  - name: Boxing Day
+    regions: [au_tas, au_nt]
     function: to_weekday_if_boxing_weekend_from_year(year)
 methods:
   afl_grand_final: |
@@ -158,20 +171,39 @@ methods:
   qld_queens_bday_october: |
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # celebrated twice in 2012
+    # in october again from 2016
     def self.qld_queens_bday_october(year)
-      year == 2012 ? 1 : nil
+      if year >= 2016
+        Holidays.calculate_day_of_month(year, 10, 1, 1)
+      elsif year == 2012
+        1
+      else
+        nil
+      end
     end
   qld_labour_day_may: |
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
-    # changed from may to october after 2012
+    # for 2013 to 2016 it was in October, otherwise it's in May
     def self.qld_labour_day_may(year)
-      year <= 2012 ? Holidays.calculate_day_of_month(year, 5, 1, 1) : nil
+      if year < 2013 || year >= 2016
+        Holidays.calculate_day_of_month(year, 5, 1, 1)
+      end
     end
   qld_labour_day_october: |
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
-    # changed from may to october after 2012
+    # for 2013 to 2016 it was in October, otherwise it's in May
     def self.qld_labour_day_october(year)
-      year <= 2012 ? nil : Holidays.calculate_day_of_month(year, 10, 1, 1)
+      if year >= 2013 && year < 2016
+        Holidays.calculate_day_of_month(year, 10, 1, 1)
+      end
+    end
+  qld_queens_birthday_june: |
+    # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+    # in june until 2015
+    def self.qld_queens_birthday_june(year)
+      if year <= 2015
+        Holidays.calculate_day_of_month(year, 6, 2, 1)
+      end
     end
   g20_day_2014_only: |
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
@@ -211,8 +243,7 @@ tests: |
      Date.civil(2007,1,26) => 'Australia Day', 
      Date.civil(2007,4,6) => 'Good Friday',
      Date.civil(2007,4,9) => 'Easter Monday',
-     Date.civil(2007,4,25) => 'ANZAC Day',
-     Date.civil(2007,12,25) => 'Christmas Day'}.each do |date, name|
+     Date.civil(2007,4,25) => 'ANZAC Day'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :au, :informal)[0] || {})[:name]
     end
 
@@ -236,10 +267,14 @@ tests: |
 
     assert_equal 'Labour Day', Holidays.on(Date.civil(2013,10,7), :au_qld)[0][:name]
     assert_equal 'Labour Day', Holidays.on(Date.civil(2012,5,7), :au_qld)[0][:name]
+    assert_equal 'Labour Day', Holidays.on(Date.civil(2015,10,5), :au_qld)[0][:name]
+    assert_equal 'Labour Day', Holidays.on(Date.civil(2016,5,2), :au_qld)[0][:name]
 
     assert_equal "Queen's Birthday", Holidays.on(Date.civil(2012,6,11), :au_qld)[0][:name]
     assert_equal "Queen's Birthday", Holidays.on(Date.civil(2012,10,1), :au_qld)[0][:name]
     assert_equal "Queen's Birthday", Holidays.on(Date.civil(2013,6,10), :au_qld)[0][:name]
+    assert_equal "Queen's Birthday", Holidays.on(Date.civil(2015,6,8), :au_qld)[0][:name]
+    assert_equal "Queen's Birthday", Holidays.on(Date.civil(2016,10,3), :au_qld)[0][:name]
 
     assert_equal "Queen's Birthday", Holidays.on(Date.civil(2014, 9, 29), :au_wa)[0][:name]
     assert_equal "Queen's Birthday", Holidays.on(Date.civil(2015, 9, 28), :au_wa)[0][:name]
@@ -308,3 +343,28 @@ tests: |
     assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2014, 2, 10), :au_tas_south)[0][:name]
     assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2015, 2, 9), :au_tas_south)[0][:name]
     assert_equal 'Royal Hobart Regatta', Holidays.on(Date.civil(2016, 2, 8), :au_tas_south)[0][:name]
+
+    # CHRISTMAS DAY - ACT, NSW, QLD, Tas, WA observe on 27th (and 25th) if 25th is a Sunday
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_qld)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_qld, :observed)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_nsw)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nsw, :observed)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_act)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_act, :observed)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_tas)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_tas, :observed)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_wa)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_wa, :observed)[0][:name]
+
+    # CHRISTMAS DAY - SA observes on 26th if 25th is a Sunday (Boxing Day goes to 27th)
+    assert_equal "Christmas Day", Date.civil(2016, 12, 25).holidays(:au_sa)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 26).holidays(:au_sa, :observed)[0][:name]
+    assert_equal "Boxing Day", Date.civil(2016, 12, 27).holidays(:au_sa)[0][:name]
+
+    # CHRISTMAS DAY - Victoria and NT don't observe 25th if weekend - xmas is on the 27th
+    assert_nil Date.civil(2016, 12, 25).holidays(:au_vic)[0]
+    assert_nil Date.civil(2016, 12, 25).holidays(:au_nt)[0]
+    assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_vic)[0][:name]
+    assert_equal "Boxing Day", Date.civil(2016, 12, 26).holidays(:au_nt)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_vic)[0][:name]
+    assert_equal "Christmas Day", Date.civil(2016, 12, 27).holidays(:au_nt)[0][:name]