holidays 0.9.3 → 1.0.0

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.gem
+nbproject

data/CHANGELOG

@@ -1,5 +1,12 @@
 = Ruby Holidays Gem CHANGELOG
   
+== 1.0.0
+* Support calculating mday from negative weeks other than -1 (thanks http://github.com/bjeanes)
+* Use class method to check leap years and fixed bug in Date.calculate_mday 
+ (thanks http://github.com/dgrambow)
+* Added Czech (thanks http://github.com/boblin), Brazilian (http://github.com/fabiokr), Norwegian (thanks to Peter Skeide) and Australia/Brisbane (http://github.com/bjeanes) definitions
+* Cleaned up rake and gemspec
+
 == 0.9.3
 * Added New York Stock Exchange holidays (thank you Alan Larkin).
 * Added UPS holidays (thank you Tim Anglade).

data/{README → README.rdoc}

@@ -1,76 +1,73 @@
 = Ruby Holidays Gem
   
 A set of functions to deal with holidays in Ruby.
-
+ 
 Extends Ruby's built-in Date class and supports custom holiday definition lists.
-
+ 
 === Installation
-
-To install the gem from RubyForge:
-
+ 
+To install the gem from RubyGems:
+ 
   gem install holidays
-
-Or, download the source <tt>.tgz</tt> file from http://rubyforge.org/holidays and 
-extract it somewhere in your include path.
-
+ 
 === 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.
   date = Date.civil(2008,4,25)
-
+ 
   Holidays.on(date, :au)
   => [{:name => 'ANZAC Day',...}]
-
+ 
 Get holidays that are observed on July 2, 2007 in British Columbia, Canada.
   date = Date.civil(2007,7,2)
-
+ 
   Holidays.on(date, :ca_bc, :observed)
   => [{:name => 'Canada Day',...}]
-
+ 
 Get all holidays in July, 2008 in Canada and the US.
   from = Date.civil(2008,7,1)
-  to   = Date.civil(2008,7,31)
-
+  to = Date.civil(2008,7,31)
+ 
   Holidays.between(from, to, :ca, :us)
   => [{:name => 'Canada Day',...}
       {:name => 'Independence Day',...}]
-
+ 
 Get informal holidays in February.
   from = Date.civil(2008,2,1)
-  to   = Date.civil(2008,2,15)
-
+  to = Date.civil(2008,2,15)
+ 
   Holidays.between(from, to)
   => [{:name => 'Valentine\'s Day',...}]
-
-
+ 
+ 
 ==== Extending Ruby's Date class
 Check which holidays occur in Iceland on January 1, 2008.
   d = Date.civil(2008,7,1)
-
+ 
   d.holidays(:is)
   => [{:name => 'Nýársdagur'}...]
-
+ 
 Lookup Canada Day in different regions.
   d = Date.civil(2008,7,1)
-
-  d.holiday?(:ca)     # Canada
+ 
+  d.holiday?(:ca) # Canada
   => true
-
-  d.holiday?(:ca_bc)  # British Columbia, Canada
+ 
+  d.holiday?(:ca_bc) # British Columbia, Canada
   => true
-
-  d.holiday?(:fr)     # France
+ 
+  d.holiday?(:fr) # France
   => false
-
+ 
 === Credits and code
-
-* Project page: http://code.dunae.ca/holidays
-* Source: http://code.dunae.ca/svn/holidays
-* Docs: http://code.dunae.ca/holidays/doc
-
-By Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-08.
-
-Made on Vancouver Island.
+ 
+* Source: https://github.com/alexdunae/holidays
+* Docs: http://rdoc.info/github/alexdunae/holidays/master/frames
+* Contributors: https://github.com/alexdunae/holidays/contributors
+ 
+Started by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-10.
+ 
+Made on Vancouver Island.

data/data/SYNTAX

@@ -101,7 +101,7 @@ All definition files should have tests included.  In the YAML file, tests are ju
      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]
+      assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
     end
 
     # Victoria Day

data/data/au.yaml

@@ -1,106 +1,111 @@
-# Australian holiday definitions for the Ruby Holiday gem.
-# Updated: 2008-11-29.
-# Sources:  
-# - 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
---- 
-months:
-  0: 
-  - name: Good Friday
-    regions: [au]
-    function: easter(year)-2
-  - name: Easter Saturday
-    regions: [au]
-    function: easter(year)-1
-  - 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]
-    mday: 1
-  - name: Australia Day
-    regions: [au]
-    mday: 26
-  3: 
-  - name: Labour Day
-    regions: [au_wa]
-    week: 1
-    wday: 1
-  - name: Eight Hours Day
-    regions: [au_tas]
-    week: 2
-    wday: 1
-  - name: Labour Day
-    regions: [au_vic]
-    week: 2
-    wday: 1
-  4: 
-  - name: ANZAC Day
-    regions: [au]
-    mday: 25
-  5: 
-  - name: Labour Day
-    regions: [au_qld]
-    week: 1
-    wday: 1
-  - name: May Day
-    regions: [au_nt]
-    week: 1
-    wday: 1
-  6: 
-  - name: Foundation Day
-    regions: [au_wa]
-    week: 1
-    wday: 1
-  - name: Queen's Birthday
-    regions: [au_act, au_nsw, au_sa, au_tas, au_nt, au_qld, au_vic]
-    week: 2
-    wday: 1
-  - name: Queensland Day
-    regions: [au_qld]
-    mday: 6
-    type: informal
-  10: 
-  - name: Labour Day
-    regions: [au_act, au_nsw, au_sa]
-    week: 1
-    wday: 1
-  12: 
-  - name: Christmas Day
-    regions: [au]
-    mday: 25
-  - name: Boxing Day
-    regions: [au]
-    mday: 26
-tests: |
-    {Date.civil(2007,1,1) => 'New Year\'s Day', 
-     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',
-     Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :au, :informal)[0][:name]
-    end
-
-    [:au_sa, :au_act, :au_nsw, :au_].each do |r|
-      assert_equal 'Labour Day', Date.civil(2007,10,1).holidays(r)[0][:name]
-    end
-
-    [:au_sa, :au_act, :au_nsw, :au_vic, :au_tas, :au_qld, :au_nt, :au_].each do |r|
-      assert_equal 'Queen\'s Birthday', Date.civil(2007,6,11).holidays(r)[0][:name]
-    end
-
-    assert_equal 'Labour Day', Date.civil(2007,3,5).holidays(:au_wa)[0][:name]
-    assert_equal 'Labour Day', Date.civil(2007,3,12).holidays(:au_vic)[0][:name]
-    assert_equal 'Labour Day', Date.civil(2007,5,7).holidays(:au_qld)[0][:name]
-
-    assert_equal 'May Day', Date.civil(2007,5,7).holidays(:au_nt)[0][:name]
-    
+# Australian holiday definitions for the Ruby Holiday gem.
+# Updated: 2008-11-29.
+# Sources:  
+# - 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
+--- 
+months:
+  0: 
+  - name: Good Friday
+    regions: [au]
+    function: easter(year)-2
+  - name: Easter Saturday
+    regions: [au]
+    function: easter(year)-1
+  - 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]
+    mday: 1
+  - name: Australia Day
+    regions: [au]
+    mday: 26
+  3: 
+  - name: Labour Day
+    regions: [au_wa]
+    week: 1
+    wday: 1
+  - name: Eight Hours Day
+    regions: [au_tas]
+    week: 2
+    wday: 1
+  - name: Labour Day
+    regions: [au_vic]
+    week: 2
+    wday: 1
+  4: 
+  - name: ANZAC Day
+    regions: [au]
+    mday: 25
+  5: 
+  - name: Labour Day
+    regions: [au_qld]
+    week: 1
+    wday: 1
+  - name: May Day
+    regions: [au_nt]
+    week: 1
+    wday: 1
+  6: 
+  - name: Foundation Day
+    regions: [au_wa]
+    week: 1
+    wday: 1
+  - name: Queen's Birthday
+    regions: [au_act, au_nsw, au_sa, au_tas, au_nt, au_qld, au_vic]
+    week: 2
+    wday: 1
+  - name: Queensland Day
+    regions: [au_qld]
+    mday: 6
+    type: informal
+  8:
+  - name: Ekka
+    regions: [au_qld_brisbane]
+    week: -3
+    wday: 3
+  10: 
+  - name: Labour Day
+    regions: [au_act, au_nsw, au_sa]
+    week: 1
+    wday: 1
+  12: 
+  - name: Christmas Day
+    regions: [au]
+    mday: 25
+  - name: Boxing Day
+    regions: [au]
+    mday: 26
+tests: |
+    {Date.civil(2007,1,1) => 'New Year\'s Day', 
+     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',
+     Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
+      assert_equal name, (Holidays.on(date, :au, :informal)[0] || {})[:name]
+    end
+
+    [:au_sa, :au_act, :au_nsw, :au_].each do |r|
+      assert_equal 'Labour Day', Date.civil(2007,10,1).holidays(r)[0][:name]
+    end
+
+    [:au_sa, :au_act, :au_nsw, :au_vic, :au_tas, :au_qld, :au_nt, :au_].each do |r|
+      assert_equal 'Queen\'s Birthday', Date.civil(2007,6,11).holidays(r)[0][:name]
+    end
+
+    assert_equal 'Labour Day', Date.civil(2007,3,5).holidays(:au_wa)[0][:name]
+    assert_equal 'Labour Day', Date.civil(2007,3,12).holidays(:au_vic)[0][:name]
+    assert_equal 'Labour Day', Date.civil(2007,5,7).holidays(:au_qld)[0][:name]
+
+    assert_equal 'May Day', Date.civil(2007,5,7).holidays(:au_nt)[0][:name]
+    
     assert_equal 'Eight Hours Day', Date.civil(2007,3,12).holidays(:au_tas)[0][:name]

data/data/build_defs.rb

@@ -52,7 +52,7 @@ def parse_holiday_defs(module_name, files)
     end
 
     if def_file['tests']
-      puts "   - importing testings..."
+      puts "   - importing tests..."
       test_strs << def_file['tests']
     end
   end
@@ -102,6 +102,7 @@ def parse_holiday_defs(module_name, files)
 
   # Build the module file
   module_src =<<-EOM
+# encoding: utf-8
 module Holidays
   # This file is generated by the Ruby Holiday gem.
   #
@@ -132,8 +133,8 @@ EOM
 # Build the test file
   unless test_strs.empty?
     test_src =<<-EndOfTests
-require File.dirname(__FILE__) + '/../test_helper'
-require 'holidays/#{module_name.downcase}'
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #

data/data/ca.yaml

@@ -1,141 +1,141 @@
-# Canadian holiday definitions for the Ruby Holiday gem.
-# Updated 2008-11-21.
---- 
-months:
-  0: 
-  - name: Good Friday
-    regions: [ca]
-    function: easter(year)-2
-  - name: Easter Monday
-    regions: [ca]
-    function: easter(year)+1
-    type: informal
-  1: 
-  - name: New Year's Day
-    regions: [ca]
-    mday: 1
-  - name: New Year's
-    regions: [ca_qc]
-    mday: 2
-  2: 
-  - name: Family Day
-    regions: [ca_ab, ca_on, ca_sk]
-    wday: 1
-    week: 3
-  - name: Louis Riel Day
-    regions: [ca_mb]
-    wday: 1
-    week: 3
-  3: 
-  - name: St. Patrick's Day
-    regions: [ca_nf]
-    mday: 17
-  3: 
-  - name: St. George's Day
-    regions: [ca_nf]
-    mday: 23
-  5: 
-  - name: Victoria Day
-    regions: [ca]
-    function: ca_victoria_day(year)
-  - name: National Patriotes Day
-    regions: [ca_qc]
-    function: ca_victoria_day(year)
-  6: 
-  - name: Discovery Day
-    regions: [ca_nf]
-    mday: 24
-  - name: Fête Nationale
-    regions: [ca_qc]
-    mday: 24
-  - name: National Aboriginal Day
-    regions: [ca_nt]
-    mday: 21
-  7: 
-  - name: Canada Day
-    regions: [ca]
-    mday: 1
-    observed: to_monday_if_sunday
-  - name: Orangemen's Day
-    regions: [ca_nf]
-    mday: 12
-  - name: Nunavut Day
-    regions: [ca_nu]
-    mday: 9
-  8: 
-  - name: BC Day
-    week: 1
-    regions: [ca_bc]
-    wday: 1
-  - name: Saskatchewan Day
-    week: 1
-    regions: [ca_sk]
-    wday: 1
-  - name: Heritage Day
-    week: 1
-    regions: [ca_ab]
-    wday: 1
-  - name: Natal Day
-    week: 1
-    regions: [ca_ns]
-    wday: 1
-  - name: Civic Holiday
-    week: 1
-    regions: [ca_on]
-    wday: 1
-  - name: Discovery Day
-    week: 3
-    regions: [ca_yk]
-    wday: 1
-  9: 
-  - name: Labour Day
-    week: 1
-    regions: [ca]
-    wday: 1
-  10: 
-  - name: Thanksgiving
-    week: 2
-    regions: [ca]
-    wday: 1
-  11: 
-  - name: Rememberance Day
-    regions: [ca]
-    mday: 11
-  12: 
-  - name: Christmas Day
-    regions: [ca]
-    mday: 25
-  - name: Boxing Day
-    regions: [ca]
-    mday: 26
-methods:
-  ca_victoria_day: |
-    # Monday on or before May 24
-    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
-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,5,19) => 'Victoria Day',
-     Date.civil(2008,7,1) => 'Canada Day',
-     Date.civil(2008,9,1) => 'Labour Day',
-     Date.civil(2008,10,13) => 'Thanksgiving',
-     Date.civil(2008,11,11) => 'Rememberance 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]
+# Canadian holiday definitions for the Ruby Holiday gem.
+# Updated 2008-11-21.
+--- 
+months:
+  0: 
+  - name: Good Friday
+    regions: [ca]
+    function: easter(year)-2
+  - name: Easter Monday
+    regions: [ca]
+    function: easter(year)+1
+    type: informal
+  1: 
+  - name: New Year's Day
+    regions: [ca]
+    mday: 1
+  - name: New Year's
+    regions: [ca_qc]
+    mday: 2
+  2: 
+  - name: Family Day
+    regions: [ca_ab, ca_on, ca_sk]
+    wday: 1
+    week: 3
+  - name: Louis Riel Day
+    regions: [ca_mb]
+    wday: 1
+    week: 3
+  3: 
+  - name: St. Patrick's Day
+    regions: [ca_nf]
+    mday: 17
+  3: 
+  - name: St. George's Day
+    regions: [ca_nf]
+    mday: 23
+  5: 
+  - name: Victoria Day
+    regions: [ca]
+    function: ca_victoria_day(year)
+  - name: National Patriotes Day
+    regions: [ca_qc]
+    function: ca_victoria_day(year)
+  6: 
+  - name: Discovery Day
+    regions: [ca_nf]
+    mday: 24
+  - name: Fête Nationale
+    regions: [ca_qc]
+    mday: 24
+  - name: National Aboriginal Day
+    regions: [ca_nt]
+    mday: 21
+  7: 
+  - name: Canada Day
+    regions: [ca]
+    mday: 1
+    observed: to_monday_if_sunday
+  - name: Orangemen's Day
+    regions: [ca_nf]
+    mday: 12
+  - name: Nunavut Day
+    regions: [ca_nu]
+    mday: 9
+  8: 
+  - name: BC Day
+    week: 1
+    regions: [ca_bc]
+    wday: 1
+  - name: Saskatchewan Day
+    week: 1
+    regions: [ca_sk]
+    wday: 1
+  - name: Heritage Day
+    week: 1
+    regions: [ca_ab]
+    wday: 1
+  - name: Natal Day
+    week: 1
+    regions: [ca_ns]
+    wday: 1
+  - name: Civic Holiday
+    week: 1
+    regions: [ca_on]
+    wday: 1
+  - name: Discovery Day
+    week: 3
+    regions: [ca_yk]
+    wday: 1
+  9: 
+  - name: Labour Day
+    week: 1
+    regions: [ca]
+    wday: 1
+  10: 
+  - name: Thanksgiving
+    week: 2
+    regions: [ca]
+    wday: 1
+  11: 
+  - name: Rememberance Day
+    regions: [ca]
+    mday: 11
+  12: 
+  - name: Christmas Day
+    regions: [ca]
+    mday: 25
+  - name: Boxing Day
+    regions: [ca]
+    mday: 26
+methods:
+  ca_victoria_day: |
+    # Monday on or before May 24
+    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
+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,5,19) => 'Victoria Day',
+     Date.civil(2008,7,1) => 'Canada Day',
+     Date.civil(2008,9,1) => 'Labour Day',
+     Date.civil(2008,10,13) => 'Thanksgiving',
+     Date.civil(2008,11,11) => 'Rememberance 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