holidays 0.9.0 → 0.9.1

data/CHANGELOG

@@ -0,0 +1,7 @@
+= Ruby Holidays Gem CHANGELOG
+  
+== 0.9.1
+* au.yaml was being included incorrectly in US holiday definitions. Thanks to Glenn Vanderburg (http://vanderburg.org/) for the fix.
+
+== 0.9.0
+* Initial release.

data/data/index.yaml

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

data/lib/holidays/us.rb

@@ -1,7 +1,7 @@
 module Holidays
   # 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 
   # Holiday gem:
@@ -11,37 +11,37 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   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 = {
-      5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]},
-            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]},
+      5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]},
             {: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]},
-            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au]},
-            {: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]}],
-      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_tas, :au_nt, :au_qld, :au_vic]},
-            {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]},
-            {:mday => 26, :name => "Australia Day", :regions => [:au]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:au]}],
-      2 => [{:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
+      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}],
+      11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]},
+            {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}],
+      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]},
+            {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]},
+            {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}],
+      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}],
+      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}],
+      2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
+            {:mday => 2, :type => :informal, :name => "Groundhog 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]},
-            {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
-            {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]},
-            {: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]},
+      3 => [{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
+      9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}],
+      4 => [{:mday => 1, :type => :informal, :name => "April Fool's 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]}]
     }
   end
 
+# January 20, every fourth year, following Presidential election
+def self.us_inauguration_day(year)
+  year % 4 == 1 ? 20 : nil
+end
+
+
 
 end
 

data/test/defs/test_defs_us.rb

@@ -3,34 +3,21 @@ require 'holidays/us'
 
 # 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:
 
   def test_us
-{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]
+{Date.civil(2008,1,1) => 'New Year\'s Day', 
+ Date.civil(2008,1,21) => 'Martin Luther King, Jr. Day',
+ Date.civil(2008,2,18) => 'Presidents\' Day',
+ Date.civil(2008,5,26) => 'Memorial Day',
+ Date.civil(2008,7,4) => 'Independence Day',
+ Date.civil(2008,9,1) => 'Labor Day',
+ Date.civil(2008,10,13) => 'Columbus Day',
+ 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
-
-[: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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: holidays
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-12-19 00:00:00 -08:00
+  version: 0.9.1
+date: 2008-01-14 00:00:00 -08:00
 summary: A collection of Ruby methods to deal with statutory and other holidays.  You deserve a holiday!
 require_paths: 
 - lib
@@ -30,7 +30,6 @@ authors:
 - Alex Dunae
 files: 
 - lib/holidays
-- lib/holidays.rb
 - lib/holidays/au.rb
 - lib/holidays/ca.rb
 - lib/holidays/de.rb
@@ -52,6 +51,7 @@ files:
 - lib/holidays/united_nations.rb
 - lib/holidays/us.rb
 - lib/holidays/za.rb
+- lib/holidays.rb
 - data/au.yaml
 - data/build_defs.rb
 - data/ca.yaml
@@ -75,6 +75,7 @@ files:
 - data/za.yaml
 - README
 - REFERENCES
+- CHANGELOG
 - LICENSE
 test_files: 
 - test/defs/test_defs_au.rb
@@ -107,6 +108,7 @@ extra_rdoc_files:
 - data/SYNTAX
 - lib/holidays/MANIFEST
 - REFERENCES
+- CHANGELOG
 - LICENSE
 executables: []