deac/holidays
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug in data/index.yaml

Browse source
This commit is contained in:
Alex Dunae 2008-01-15 04:29:21 +00:00
parent aec930df1d
commit 02e84c544c
3 changed files with 36 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/index.yaml
View file

@ -14,7 +14,7 @@ defs:
MX: ['mx.yaml', 'north_america_informal.yaml'] MX: ['mx.yaml', 'north_america_informal.yaml']
NL: ['nl.yaml'] NL: ['nl.yaml']
PT: ['se.yaml'] PT: ['se.yaml']
US: ['au.yaml', 'north_america_informal.yaml'] US: ['us.yaml', 'north_america_informal.yaml']
United_Nations: ['united_nations.yaml'] United_Nations: ['united_nations.yaml']
ZA: ['za.yaml'] ZA: ['za.yaml']
North_America: ['ca.yaml', 'mx.yaml', 'us.yaml', 'north_america_informal.yaml'] North_America: ['ca.yaml', 'mx.yaml', 'us.yaml', 'north_america_informal.yaml']

46
lib/holidays/us.rb
View file

@ -1,7 +1,7 @@
module Holidays module Holidays
# This file is generated by the Ruby Holiday gem. # This file is generated by the Ruby Holiday gem.
# #
# Definitions loaded: data/au.yaml, data/north_america_informal.yaml # Definitions loaded: data/us.yaml, data/north_america_informal.yaml
# #
# To use the definitions in this file, load them right after you load the # To use the definitions in this file, load them right after you load the
# Holiday gem: # Holiday gem:
@ -11,37 +11,37 @@ module Holidays
# #
# More definitions are available at http://code.dunae.ca/holidays. # More definitions are available at http://code.dunae.ca/holidays.
module US # :nodoc: module US # :nodoc:
DEFINED_REGIONS = [:au_qld, :au_nt, :au, :au_tas, :au_wa, :au_act, :au_nsw, :au_sa, :au_vic, :us, :ca] DEFINED_REGIONS = [:us, :us_dc, :ca]
HOLIDAYS_BY_MONTH = { HOLIDAYS_BY_MONTH = {
5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]}, 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]},
{:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]},
{:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]}, 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}],
{:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au]}, 11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]}, {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}],
{:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}], 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]},
6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]}, {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]},
{:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]}, {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}],
{:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}], 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]}, 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}],
{:mday => 26, :name => "Australia Day", :regions => [:au]}], 2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]}, {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
{:mday => 26, :name => "Boxing Day", :regions => [:au]}],
2 => [{:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
{:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]}, 3 => [{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
{:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]}, 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}],
{:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}, 4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]},
{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
{:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}, 10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]},
{:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}] {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}]
} }
end end
# January 20, every fourth year, following Presidential election
def self.us_inauguration_day(year)
year % 4 == 1 ? 20 : nil
end
end end

37
test/defs/test_defs_us.rb
View file

@ -3,34 +3,21 @@ require 'holidays/us'
# This file is generated by the Ruby Holiday gem. # This file is generated by the Ruby Holiday gem.
# #
# Definitions loaded: data/au.yaml, data/north_america_informal.yaml # Definitions loaded: data/us.yaml, data/north_america_informal.yaml
class UsDefinitionTests < Test::Unit::TestCase # :nodoc: class UsDefinitionTests < Test::Unit::TestCase # :nodoc:
def test_us def test_us
{Date.civil(2007,1,1) => 'New Year\'s Day', {Date.civil(2008,1,1) => 'New Year\'s Day',
Date.civil(2007,1,26) => 'Australia Day', Date.civil(2008,1,21) => 'Martin Luther King, Jr. Day',
Date.civil(2007,4,6) => 'Good Friday', Date.civil(2008,2,18) => 'Presidents\' Day',
Date.civil(2007,4,9) => 'Easter Monday', Date.civil(2008,5,26) => 'Memorial Day',
Date.civil(2007,4,25) => 'ANZAC Day', Date.civil(2008,7,4) => 'Independence Day',
Date.civil(2007,12,25) => 'Christmas Day', Date.civil(2008,9,1) => 'Labor Day',
Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name| Date.civil(2008,10,13) => 'Columbus Day',
assert_equal name, Holidays.on(date, :au, :informal)[0][:name] Date.civil(2008,11,11) => 'Veterans Day',
Date.civil(2008,11,27) => 'Thanksgiving',
Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
assert_equal name, Holidays.on(date, :us)[0][:name]
end 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]
end end
end end