holidays 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc0c740698c7bcfadd4790786cb1608c2376473
-  data.tar.gz: 2920fa5efbd181e979856a7d0af8e70cdc253d3d
+  metadata.gz: aa61e29b2f89d86de3786a510f1fad83961b834c
+  data.tar.gz: 7018c5e32b6f23c09daa46f0c8fe397c03e026b9
 SHA512:
-  metadata.gz: 9622f1697699f8f9921fb74a5178f809b3f5b0598892d2d3fbb48bf47763cee2152aac30470d0c0c3ab2b917a5069c77f40a0c613be30435abe7fa878525e18c
-  data.tar.gz: a18c5423a237e3431bd501fc61b0b2200d440e1d43bcb1093862dfc40a40e196b6101aafa4cd7c681632d95ed55b00cbce6a71d8066e234438a4b1d436cb4770
+  metadata.gz: 24d5aeae9b85a30eee244197d5f33486c240a8842510b58fa9938c7d5b440d122ebbd2ad7430ec2bceab7827ff066a0b5b1c7c8e698c55e9ba7f6de2a6296f4d
+  data.tar.gz: f628f94e2de462f34ff82eb8da002f6a97c16a2a1e185abce30e0a0c325f90ec12168e585778bd235b2e1f0f0dfd729b1c70e60f84ce699c7d63ae996f204c5d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 2.1.0
+
+* Updated Slovak holiday definitions (https://github.com/guitarman)
+* Fix Japanese non-Monday substitute holidays (https://github.com/shuhei)
+* Fixed typo in Slovak holiday definitions (https://github.com/martinsabo)
+* Updated New Zealand definitions to reflect new weekend-to-monday rules (https://github.com/SebastianEdwards)
+* Fix Australian definitions (https://github.com/ghiculescu)
+
 ## 2.0.0
 
 * Add test coverage

data/README.md

@@ -12,7 +12,7 @@ To install the gem from RubyGems:
 
     gem install holidays
 
-The Holidays gem is tested on Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.0, REE and JRuby.
+The Holidays gem is tested on Ruby 1.9.2, 1.9.3, 2.0.0, 2.1.0, 2.2.0 and JRuby.
 
 ## Time zones
 
@@ -104,6 +104,8 @@ If you are checking holidays regularly you can cache your results for improved p
 
 Holidays for the regions specified within the dates specified will be pre-calculated.
 
+See the [original pull request](https://github.com/alexdunae/holidays/pull/36) for more details.
+
 ### How to contribute
 
 To make changes to any of the definitions, edit the YAML files only.

data/data/au.yaml

@@ -15,14 +15,11 @@ months:
     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]
+    regions: [au_nsw, au_vic]
     function: easter(year)
   - name: Easter Monday
     regions: [au]
     function: easter(year)+1
-  - name: Easter Monday
-    regions: [au_tas]
-    function: easter(year)+2
   1: 
   - name: New Year's Day
     regions: [au]
@@ -50,10 +47,20 @@ months:
     regions: [au_vic]
     week: 2
     wday: 1
+  - name: March Public Holiday
+    regions: [au_sa]
+    function: march_pub_hol_sa(year)
   4: 
   - name: ANZAC Day
     regions: [au]
     mday: 25
+  - name: ANZAC Day
+    regions: [au_nsw, au_vic, au_qld, au_nt, au_act, au_sa, au_tas]
+    mday: 25
+    observed: to_monday_if_sunday
+  - name: ANZAC Day
+    regions: [au_wa]
+    mday: 25
     observed: to_monday_if_weekend
   5: 
   - name: Labour Day
@@ -63,6 +70,9 @@ months:
     regions: [au_nt]
     week: 1
     wday: 1
+  - name: May Public Holiday
+    regions: [au_sa]
+    function: may_pub_hol_sa(year)
   6: 
   - name: Foundation Day
     regions: [au_wa]
@@ -164,6 +174,26 @@ methods:
       fourth_sat_in_oct = Date.civil(year, 10, Date.calculate_mday(year, 10, 4, :saturday))
       fourth_sat_in_oct - 2 # the thursday before
     end
+  march_pub_hol_sa: |
+    # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
+    # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
+    def self.march_pub_hol_sa(year)
+      if year < 2006
+        nil
+      else
+        Date.civil(year, 3, Date.calculate_mday(year, 3, :second, :monday))
+      end
+    end
+  may_pub_hol_sa: |
+    # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
+    # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
+    def self.may_pub_hol_sa(year)
+      if year >= 2006
+        nil
+      else
+        Date.civil(year, 5, Date.calculate_mday(year, 5, :third, :monday))
+      end
+    end
 tests: |
     {Date.civil(2007,1,1) => 'New Year\'s Day', 
      Date.civil(2007,1,26) => 'Australia Day', 
@@ -234,4 +264,18 @@ tests: |
     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]
+    assert_equal 'Royal Hobart Regatta', Date.civil(2016, 2, 8).holidays(:au_tas_south)[0][:name]
+
+    assert_equal "May Public Holiday", Date.civil(2005, 5, 16).holidays(:au_sa)[0][:name]
+    assert_equal [], Date.civil(2014, 5, 19).holidays(:au_sa)
+
+    assert_equal [], Date.civil(2005, 3, 14).holidays(:au_sa)
+    assert_equal "March Public Holiday", Date.civil(2014, 3, 10).holidays(:au_sa)[0][:name]
+    assert_equal "March Public Holiday", Date.civil(2015, 3, 9).holidays(:au_sa)[0][:name]
+    assert_equal "March Public Holiday", Date.civil(2016, 3, 14).holidays(:au_sa)[0][:name]
+    assert_equal "March Public Holiday", Date.civil(2017, 3, 13).holidays(:au_sa)[0][:name]
+
+    assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_qld)[0][:name]
+    assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_wa)[0][:name]
+    assert_equal [], Date.civil(2015, 4, 27).holidays(:au_qld, :observed)
+    assert_equal "ANZAC Day", Date.civil(2015, 4, 27).holidays(:au_wa, :observed)[0][:name]

data/data/jp.yaml

@@ -9,6 +9,7 @@
 # CHANGES:
 #  2010-12-25: Initial version by Tatsuki Sugiura <sugi@nemui.org>
 #  2014-11-09: Added substitute holiday by Yoshiyuki Hirano <yoshiyuki.hirano@henteco-labs.com>
+#  2015-05-10: Non-Monday substitute holidays by Shuhei Kagawa <shuhei.kagawa@gmail.com>
 # 
 ---
 months:
@@ -57,6 +58,9 @@ months:
   - name: 振替休日
     regions: [jp]
     function: jp_substitute_holiday(year, 5, 3)
+  - name: 振替休日
+    regions: [jp]
+    function: jp_substitute_holiday(year, 5, 4)
   - name: 振替休日
     regions: [jp]
     function: jp_substitute_holiday(year, 5, 5)
@@ -165,7 +169,14 @@ methods:
   jp_substitute_holiday: |
     def self.jp_substitute_holiday(*date)
       date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
-      date.wday == 0 ? date+1 : nil
+      date.wday == 0 ? Holidays.jp_next_weekday(date+1) : nil
+    end
+  jp_next_weekday(date): |
+    def self.jp_next_weekday(date)
+      is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
+        holiday[:mday] == date.day
+      end
+      date.wday == 0 || is_holiday ? Holidays.jp_next_weekday(date+1) : date
     end
 tests: |
   {Date.civil(2008,1,1) => '元日', 
@@ -183,6 +194,9 @@ tests: |
    Date.civil(2010,3,22) => '振替休日',
    Date.civil(2008,11,24) => '振替休日',
    Date.civil(2012,1,2) => '振替休日',
+   Date.civil(2013,5,6) => '振替休日',
+   Date.civil(2014,5,6) => '振替休日',
+   Date.civil(2015,5,6) => '振替休日'
   }.each do |date, name|
      assert_equal name, (Holidays.on(date, :jp, :informal)[0] || {})[:name]
   end

data/data/nz.yaml

@@ -46,6 +46,7 @@ months:
   - name: Waitangi Day
     regions: [nz]
     mday: 6
+    observed: to_monday_if_weekend
   3:
   - name: Otago Anniversary Day
     regions: [nz_ot]
@@ -59,6 +60,7 @@ months:
   - name: ANZAC Day
     regions: [nz]
     mday: 25
+    observed: to_monday_if_weekend
   6:
   - name: Queen's Birthday
     regions: [nz]
@@ -117,6 +119,14 @@ tests: |
      Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :nz, :informal)[0] || {})[:name]
     end
+    assert_equal 'ANZAC Day', Date.civil(2015, 4, 25).holidays(:nz)[0][:name]
+    assert_equal 'ANZAC Day', Date.civil(2015, 4, 27).holidays(:nz, :observed)[0][:name]
+    assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz)[0][:name]
+    assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz, :observed)[0][:name]
+    assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz)[0][:name]
+    assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz, :observed)[0][:name]
+    assert_equal 'Waitangi Day', Date.civil(2016, 2, 6).holidays(:nz)[0][:name]
+    assert_equal 'Waitangi Day', Date.civil(2016, 2, 8).holidays(:nz, :observed)[0][:name]
 methods:
   closest_monday: |
     def self.closest_monday(date)
@@ -138,4 +148,4 @@ methods:
   next_week: |
     def self.next_week(date)
       date + 7
-    end
+    end

data/data/sk.yaml

@@ -3,9 +3,9 @@
 # Updated: 2013-12-26.
 # Sources:
 # - http://sk.wikipedia.org/wiki/Slovensk%C3%A9_%C5%A1t%C3%A1tne_sviatky
---- 
+---
 months:
-  0: 
+  0:
   - name: Veľkonočný pondelok
     regions: [sk]
     function: easter(year)+1
@@ -16,11 +16,14 @@ months:
   - name: Nový rok
     regions: [sk]
     mday: 1
+  - name: Zjavenie Pána (Traja králi)
+    regions: [sk]
+    mday: 6
   5:
   - name: Sviatok práce
     regions: [sk]
     mday: 1
-  - name: Deň víťazstva
+  - name: Deň víťazstva nad fašizmom
     regions: [sk]
     mday: 8
   7:
@@ -52,15 +55,16 @@ months:
   - name: 1. sviatok vianočný
     regions: [sk]
     mday: 25
-  - name: 2. sviatek vianočný
+  - name: 2. sviatok vianočný
     regions: [sk]
     mday: 26
 tests: |
     {Date.civil(2013,1,1) => 'Nový rok',
+     Date.civil(2013,1,6) => 'Zjavenie Pána (Traja králi)',
      Date.civil(2013,3,29) => 'Veľký piatok',
      Date.civil(2013,4,1) => 'Veľkonočný pondelok',
      Date.civil(2013,5,1) => 'Sviatok práce',
-     Date.civil(2013,5,8) => 'Deň víťazstva',
+     Date.civil(2013,5,8) => 'Deň víťazstva nad fašizmom',
      Date.civil(2013,7,5) => 'Sviatok svätého Cyrila a svätého Metoda',
      Date.civil(2013,8,29) => 'Výročie Slovenského národného povstania',
      Date.civil(2013,9,1) => 'Deň Ústavy Slovenskej republiky',
@@ -69,6 +73,6 @@ tests: |
      Date.civil(2013,11,17) => 'Deň boja za slobodu a demokraciu',
      Date.civil(2013,12,24) => 'Štedrý deň',
      Date.civil(2013,12,25) => '1. sviatok vianočný',
-     Date.civil(2013,12,26) => '2. sviatek vianočný'}.each do |date, name|
+     Date.civil(2013,12,26) => '2. sviatok vianočný'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :sk, :informal)[0] || {})[:name]
     end

data/lib/holidays/au.rb

@@ -13,25 +13,28 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module AU # :nodoc:
     def self.defined_regions
-      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_qld_cairns, :au_tas, :au_tas_south, :au_wa, :au_tas_north]
+      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_qld_cairns, :au_tas_south, :au_wa, :au_tas, :au_tas_north]
     end
 
     def self.holidays_by_month
       {
               0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_qld_cairns]},
-            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:au_nsw]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]},
-            {:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}],
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:au_nsw, :au_vic]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]}],
       1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:au]},
             {:mday => 26, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Australia Day", :regions => [:au]}],
       2 => [{:wday => 1, :week => 2, :name => "Royal Hobart Regatta", :regions => [:au_tas_south]}],
       3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
-            {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}],
-      4 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "ANZAC Day", :regions => [:au]}],
+            {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]},
+            {:function => lambda { |year| Holidays.march_pub_hol_sa(year) }, :function_id => "march_pub_hol_sa(year)", :name => "March Public Holiday", :regions => [:au_sa]}],
+      4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "ANZAC Day", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_tas]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "ANZAC Day", :regions => [:au_wa]}],
       5 => [{:function => lambda { |year| Holidays.qld_labour_day_may(year) }, :function_id => "qld_labour_day_may(year)", :name => "Labour Day", :regions => [:au_qld]},
-            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}],
+            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]},
+            {:function => lambda { |year| Holidays.may_pub_hol_sa(year) }, :function_id => "may_pub_hol_sa(year)", :name => "May Public Holiday", :regions => [:au_sa]}],
       6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_qld, :au_tas, :au_nt, :au_vic]},
             {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
@@ -88,6 +91,28 @@ def self.hobart_show_day(year)
 end
 
 
+# http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
+# The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
+def self.march_pub_hol_sa(year)
+  if year < 2006
+    nil
+  else
+    Date.civil(year, 3, Date.calculate_mday(year, 3, :second, :monday))
+  end
+end
+
+
+# http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
+# The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
+def self.may_pub_hol_sa(year)
+  if year >= 2006
+    nil
+  else
+    Date.civil(year, 5, Date.calculate_mday(year, 5, :third, :monday))
+  end
+end
+
+
 
 end
 

data/lib/holidays/europe.rb

@@ -173,6 +173,7 @@ module Holidays
             {:mday => 1, :name => "Anul nou", :regions => [:ro]},
             {:mday => 2, :name => "Anul nou", :regions => [:ro]},
             {:mday => 1, :name => "Nový rok", :regions => [:sk]},
+            {:mday => 6, :name => "Zjavenie Pána (Traja králi)", :regions => [:sk]},
             {:mday => 1, :name => "novo leto", :regions => [:si]}],
       5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]},
             {:mday => 1, :name => "Fête du travail", :regions => [:be]},
@@ -210,7 +211,7 @@ module Holidays
             {:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]},
             {:mday => 1, :name => "Ziua muncii", :regions => [:ro]},
             {:mday => 1, :name => "Sviatok práce", :regions => [:sk]},
-            {:mday => 8, :name => "Deň víťazstva", :regions => [:sk]},
+            {:mday => 8, :name => "Deň víťazstva nas fašizmom", :regions => [:sk]},
             {:mday => 1, :name => "praznik dela", :regions => [:si]},
             {:mday => 2, :name => "praznik dela", :regions => [:si]}],
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]},
@@ -343,7 +344,7 @@ module Holidays
             {:mday => 26, :name => "Sărbătoarea Nașterii Domnului", :regions => [:ro]},
             {:mday => 24, :name => "Štedrý deň", :regions => [:sk]},
             {:mday => 25, :name => "1. sviatok vianočný", :regions => [:sk]},
-            {:mday => 26, :name => "2. sviatek vianočný", :regions => [:sk]},
+            {:mday => 26, :name => "2. sviatok vianočný", :regions => [:sk]},
             {:mday => 25, :name => "božič", :regions => [:si]},
             {:mday => 26, :name => "dan samostojnosti in enotnosti", :regions => [:si]}],
       7 => [{:mday => 21, :name => "Fête nationale", :regions => [:be]},

data/lib/holidays/jp.rb

@@ -31,6 +31,7 @@ module Holidays
             {:mday => 4, :name => "みどりの日", :regions => [:jp]},
             {:mday => 5, :name => "こどもの日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 3) }, :function_id => "jp_substitute_holiday(year, 5, 3)", :name => "振替休日", :regions => [:jp]},
+            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 4) }, :function_id => "jp_substitute_holiday(year, 5, 4)", :name => "振替休日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 5) }, :function_id => "jp_substitute_holiday(year, 5, 5)", :name => "振替休日", :regions => [:jp]}],
       7 => [{:wday => 1, :week => 3, :name => "海の日", :regions => [:jp]},
             {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1))", :name => "振替休日", :regions => [:jp]}],
@@ -104,7 +105,15 @@ end
 
 def self.jp_substitute_holiday(*date)
   date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
-  date.wday == 0 ? date+1 : nil
+  date.wday == 0 ? Holidays.jp_next_weekday(date+1) : nil
+end
+
+
+def self.jp_next_weekday(date)
+  is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
+    holiday[:mday] == date.day
+  end
+  date.wday == 0 || is_holiday ? Holidays.jp_next_weekday(date+1) : date
 end
 
 

data/lib/holidays/nz.rb

@@ -28,10 +28,10 @@ module Holidays
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Auckland Anniversary Day", :regions => [:nz_ak]},
             {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Northland Anniversary Day", :regions => [:nz_nl]}],
       2 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Nelson Anniversary Day", :regions => [:nz_ak]},
-            {:mday => 6, :name => "Waitangi Day", :regions => [:nz]}],
+            {:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Waitangi Day", :regions => [:nz]}],
       3 => [{:mday => 23, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Otago Anniversary Day", :regions => [:nz_ot]},
             {:wday => 1, :week => 2, :name => "Taranaki Anniversary Day", :regions => [:nz_ak]}],
-      4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:nz]}],
+      4 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "ANZAC Day", :regions => [:nz]}],
       6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}],
       9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}],
       10 => [{:wday => 1, :week => 1, :observed => lambda { |date| Holidays.previous_friday(date) }, :observed_id => "previous_friday", :name => "Hawke's bay Anniversary Day", :regions => [:nz_hb]},
@@ -68,6 +68,7 @@ def self.next_week(date)
 end
 
 
+
 end
 
 Holidays.merge_defs(Holidays::NZ.defined_regions, Holidays::NZ.holidays_by_month)

data/lib/holidays/sk.rb

@@ -20,9 +20,10 @@ module Holidays
       {
               0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Veľkonočný pondelok", :regions => [:sk]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Veľký piatok", :regions => [:sk]}],
-      1 => [{:mday => 1, :name => "Nový rok", :regions => [:sk]}],
+      1 => [{:mday => 1, :name => "Nový rok", :regions => [:sk]},
+            {:mday => 6, :name => "Zjavenie Pána (Traja králi)", :regions => [:sk]}],
       5 => [{:mday => 1, :name => "Sviatok práce", :regions => [:sk]},
-            {:mday => 8, :name => "Deň víťazstva", :regions => [:sk]}],
+            {:mday => 8, :name => "Deň víťazstva nad fašizmom", :regions => [:sk]}],
       7 => [{:mday => 5, :name => "Sviatok svätého Cyrila a svätého Metoda", :regions => [:sk]}],
       8 => [{:mday => 29, :name => "Výročie Slovenského národného povstania", :regions => [:sk]}],
       9 => [{:mday => 1, :name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
@@ -31,7 +32,7 @@ module Holidays
             {:mday => 17, :name => "Deň boja za slobodu a demokraciu", :regions => [:sk]}],
       12 => [{:mday => 24, :name => "Štedrý deň", :regions => [:sk]},
             {:mday => 25, :name => "1. sviatok vianočný", :regions => [:sk]},
-            {:mday => 26, :name => "2. sviatek vianočný", :regions => [:sk]}]
+            {:mday => 26, :name => "2. sviatok vianočný", :regions => [:sk]}]
       }
     end
   end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/test/defs/test_defs_au.rb

@@ -77,5 +77,19 @@ assert_equal 'Royal Hobart Regatta', Date.civil(2012, 2, 13).holidays(:au_tas_so
 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]
+
+assert_equal "May Public Holiday", Date.civil(2005, 5, 16).holidays(:au_sa)[0][:name]
+assert_equal [], Date.civil(2014, 5, 19).holidays(:au_sa)
+
+assert_equal [], Date.civil(2005, 3, 14).holidays(:au_sa)
+assert_equal "March Public Holiday", Date.civil(2014, 3, 10).holidays(:au_sa)[0][:name]
+assert_equal "March Public Holiday", Date.civil(2015, 3, 9).holidays(:au_sa)[0][:name]
+assert_equal "March Public Holiday", Date.civil(2016, 3, 14).holidays(:au_sa)[0][:name]
+assert_equal "March Public Holiday", Date.civil(2017, 3, 13).holidays(:au_sa)[0][:name]
+
+assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_qld)[0][:name]
+assert_equal "ANZAC Day", Date.civil(2015, 4, 25).holidays(:au_wa)[0][:name]
+assert_equal [], Date.civil(2015, 4, 27).holidays(:au_qld, :observed)
+assert_equal "ANZAC Day", Date.civil(2015, 4, 27).holidays(:au_wa, :observed)[0][:name]
   end
 end

data/test/defs/test_defs_europe.rb

@@ -669,10 +669,11 @@ end
 
 
 {Date.civil(2013,1,1) => 'Nový rok',
+ Date.civil(2013,1,6) => 'Zjavenie Pána (Traja králi)',
  Date.civil(2013,3,29) => 'Veľký piatok',
  Date.civil(2013,4,1) => 'Veľkonočný pondelok',
  Date.civil(2013,5,1) => 'Sviatok práce',
- Date.civil(2013,5,8) => 'Deň víťazstva',
+ Date.civil(2013,5,8) => 'Deň víťazstva nad fašizmom',
  Date.civil(2013,7,5) => 'Sviatok svätého Cyrila a svätého Metoda',
  Date.civil(2013,8,29) => 'Výročie Slovenského národného povstania',
  Date.civil(2013,9,1) => 'Deň Ústavy Slovenskej republiky',
@@ -681,7 +682,7 @@ end
  Date.civil(2013,11,17) => 'Deň boja za slobodu a demokraciu',
  Date.civil(2013,12,24) => 'Štedrý deň',
  Date.civil(2013,12,25) => '1. sviatok vianočný',
- Date.civil(2013,12,26) => '2. sviatek vianočný'}.each do |date, name|
+ Date.civil(2013,12,26) => '2. sviatok vianočný'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :sk, :informal)[0] || {})[:name]
 end
 

data/test/defs/test_defs_jp.rb

@@ -22,6 +22,9 @@ class JpDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2010,3,22) => '振替休日',
  Date.civil(2008,11,24) => '振替休日',
  Date.civil(2012,1,2) => '振替休日',
+ Date.civil(2013,5,6) => '振替休日',
+ Date.civil(2014,5,6) => '振替休日',
+ Date.civil(2015,5,6) => '振替休日'
 }.each do |date, name|
    assert_equal name, (Holidays.on(date, :jp, :informal)[0] || {})[:name]
 end

data/test/defs/test_defs_nz.rb

@@ -17,6 +17,14 @@ class NzDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :nz, :informal)[0] || {})[:name]
 end
+assert_equal 'ANZAC Day', Date.civil(2015, 4, 25).holidays(:nz)[0][:name]
+assert_equal 'ANZAC Day', Date.civil(2015, 4, 27).holidays(:nz, :observed)[0][:name]
+assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz)[0][:name]
+assert_equal 'ANZAC Day', Date.civil(2016, 4, 25).holidays(:nz, :observed)[0][:name]
+assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz)[0][:name]
+assert_equal 'Waitangi Day', Date.civil(2015, 2, 6).holidays(:nz, :observed)[0][:name]
+assert_equal 'Waitangi Day', Date.civil(2016, 2, 6).holidays(:nz)[0][:name]
+assert_equal 'Waitangi Day', Date.civil(2016, 2, 8).holidays(:nz, :observed)[0][:name]
 
   end
 end

data/test/defs/test_defs_sk.rb

@@ -8,10 +8,11 @@ class SkDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_sk
 {Date.civil(2013,1,1) => 'Nový rok',
+ Date.civil(2013,1,6) => 'Zjavenie Pána (Traja králi)',
  Date.civil(2013,3,29) => 'Veľký piatok',
  Date.civil(2013,4,1) => 'Veľkonočný pondelok',
  Date.civil(2013,5,1) => 'Sviatok práce',
- Date.civil(2013,5,8) => 'Deň víťazstva',
+ Date.civil(2013,5,8) => 'Deň víťazstva nad fašizmom',
  Date.civil(2013,7,5) => 'Sviatok svätého Cyrila a svätého Metoda',
  Date.civil(2013,8,29) => 'Výročie Slovenského národného povstania',
  Date.civil(2013,9,1) => 'Deň Ústavy Slovenskej republiky',
@@ -20,7 +21,7 @@ class SkDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2013,11,17) => 'Deň boja za slobodu a demokraciu',
  Date.civil(2013,12,24) => 'Štedrý deň',
  Date.civil(2013,12,25) => '1. sviatok vianočný',
- Date.civil(2013,12,26) => '2. sviatek vianočný'}.each do |date, name|
+ Date.civil(2013,12,26) => '2. sviatok vianočný'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :sk, :informal)[0] || {})[:name]
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler