holidays 1.0.5 → 1.0.6

data/lib/holidays.rb

@@ -17,7 +17,7 @@ require 'date'
 #   By region and sub regions. For example, return holidays in Germany
 #   and all its sub regions with <tt>:de_</tt>.
 # [<tt>:region_sub</tt>]
-#   By sub region. Return national holidays in Spain plus holidays in Spain's 
+#   By sub region. Return national holidays in Spain plus holidays in Spain's
 #   Valencia region with <tt>:es_v</tt>.
 # [<tt>:any</tt>]
 #   Any region.  Return holidays from any loaded region.
@@ -46,7 +46,7 @@ module Holidays
   # Exception thrown when an unknown region is requested.
   class UnknownRegionError < ArgumentError; end
 
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   @@regions = []
   @@holidays_by_month = {}
@@ -62,7 +62,7 @@ module Holidays
   # [<tt>date</tt>]     A Date object.
   # [<tt>:options</tt>] One or more region symbols, <tt>:informal</tt> and/or <tt>:observed</tt>.
   #
-  # Returns an array of hashes or nil. See Holidays#between for the output 
+  # Returns an array of hashes or nil. See Holidays#between for the output
   # format.
   #
   # Also available via Date#holidays.
@@ -86,7 +86,7 @@ module Holidays
     options.delete(:no_observed)
     self.between(start_date, end_date, options).empty?
   end
-  
+
   # Get all holidays occuring between two dates, inclusively.
   #
   # Returns an array of hashes or nil.
@@ -110,16 +110,16 @@ module Holidays
 
     # get simple dates
     if start_date.respond_to?(:to_date)
-      start_date = start_date.to_date 
+      start_date = start_date.to_date
     else
       start_date = Date.civil(start_date.year, start_date.mon, start_date.mday)
-    end 
+    end
 
     if end_date.respond_to?(:to_date)
       end_date = end_date.to_date
     else
       end_date = Date.civil(end_date.year, end_date.mon, end_date.mday)
-    end 
+    end
 
     regions, observed, informal = parse_options(options)
     holidays = []
@@ -127,7 +127,7 @@ module Holidays
     dates = {}
     (start_date..end_date).each do |date|
       # Always include month '0' for variable-month holidays
-      dates[date.year] = [0] unless dates[date.year]      
+      dates[date.year] = [0] unless dates[date.year]
       # TODO: test this, maybe should push then flatten
       dates[date.year] << date.month unless dates[date.year].include?(date.month)
     end
@@ -138,14 +138,14 @@ module Holidays
 
         hbm.each do |h|
           next unless in_region?(regions, h[:regions])
-          
+
           # Skip informal holidays unless they have been requested
           next if h[:type] == :informal and not informal
-          
+
           if h[:function]
             # Holiday definition requires a calculation
             result = call_proc(h[:function], year)
-            
+
             # Procs may return either Date or an integer representing mday
             if result.kind_of?(Date)
               month = result.month
@@ -187,7 +187,7 @@ module Holidays
   def self.merge_defs(regions, holidays) # :nodoc:
     @@regions = @@regions | regions
     @@regions.uniq!
-    
+
     holidays.each do |month, holiday_defs|
       @@holidays_by_month[month] = [] unless @@holidays_by_month[month]
       holiday_defs.each do |holiday_def|
@@ -198,15 +198,15 @@ module Holidays
             if ex[:name] == holiday_def[:name] and ex[:wday] == holiday_def[:wday] and ex[:mday] == holiday_def[:mday] and ex[:week] == holiday_def[:week] and ex[:function_id] == holiday_def[:function_id] and ex[:type] == holiday_def[:type] and ex[:observed_id] == holiday_def[:observed_id]
               # append regions
               ex[:regions] << holiday_def[:regions]
-              
+
               # Should do this once we're done
               ex[:regions].flatten!
               ex[:regions].uniq!
               exists = true
             end
           end
-          
-          @@holidays_by_month[month] << holiday_def  unless exists            
+
+          @@holidays_by_month[month] << holiday_def  unless exists
       end
     end
   end
@@ -232,7 +232,7 @@ module Holidays
     day = ((h + l - 7 * m + 114) % 31) + 1
     Date.civil(year, month, day)
   end
-  
+
   # A method to calculate the orthodox easter date, returns date in the Gregorian (western) calendar
   # Safe until appr. 4100 AD, when one leap day will be removed.
   # Returns a Date object.
@@ -251,12 +251,12 @@ module Holidays
       # between the years 1583 and 1699 10 days are added to the julian day count
       when (year >= 1583 and year <= 1699)
         offset = 10
-      # after 1700, 1 day is added for each century, except if the century year is exactly divisible by 400 (in which case no days are added). 
+      # after 1700, 1 day is added for each century, except if the century year is exactly divisible by 400 (in which case no days are added).
       # Safe until 4100 AD, when one leap day will be removed.
-      when year >= 1700 
+      when year >= 1700
         offset = (year - 1700).divmod(100)[0] + ((year - year.divmod(100)[1]).divmod(400)[1] == 0 ? 0 : 1) - (year - year.divmod(100)[1] - 1700).divmod(400)[0] + 10
     end
-    # add offset to the julian day 
+    # add offset to the julian day
     return Date.jd(j_date.jd + offset)
   end
 
@@ -278,7 +278,11 @@ module Holidays
   # Move Boxing Day if it falls on a weekend, leaving room for Christmas.
   # Used as a callback function.
   def self.to_weekday_if_boxing_weekend(date)
-    date += 2 if date.wday == 6 or date.wday == 0
+    if date.wday == 6 or date.wday == 0
+      date += 2
+    elsif date.wday == 1
+      date += 1
+    end
     date
   end
 
@@ -290,7 +294,7 @@ module Holidays
     date -= 1 if date.wday == 6
     date
   end
-  
+
   # Returns an array of symbols all the available holiday definitions.
   #
   # Optional `full_path` param is used internally for loading all the definitions.
@@ -298,7 +302,12 @@ module Holidays
     paths = Dir.glob(DEFINITION_PATH + '/*.rb')
     full_path ? paths : paths.collect { |path| path.match(/([a-z_-]+)\.rb/i)[1].to_sym }
   end
-  
+
+  # Returns an array of symbols of all the available holiday regions.
+  def self.regions
+    @@regions
+  end
+
   # Load all available holiday definitions
   def self.load_all
     self.available(true).each { |path| require path }
@@ -314,7 +323,7 @@ private
     return regions, observed, informal
   end
 
-  # Check regions against list of supported regions and return an array of 
+  # Check regions against list of supported regions and return an array of
   # symbols.
   #
   # If a wildcard region is found (e.g. <tt>:ca_</tt>) it is expanded into all
@@ -329,17 +338,31 @@ private
     regions.delete_if do |reg|
       if reg.to_s =~ /_$/
         prefix = reg.to_s.split('_').first
-        raise UnknownRegionError unless @@regions.include?(prefix.to_sym) or begin require "holidays/#{prefix}"; rescue LoadError; false; end
+        unless @@regions.include?(prefix.to_sym)
+          begin
+            require "holidays/#{prefix}"
+          rescue LoadError
+            raise UnknownRegionError, "Could not load holidays/#{prefix}"
+          end
+        end
         regions << @@regions.select { |dr| dr.to_s =~ Regexp.new("^#{reg}") }
         true
       end
     end
 
     regions.flatten!
-    
+
     require "holidays/north_america" if regions.include?(:us) # special case for north_america/US cross-linking
 
-    raise UnknownRegionError unless regions.all? { |r| r == :any or @@regions.include?(r) or begin require "holidays/#{r.to_s}"; rescue LoadError; false; end }
+    regions.each do |r|
+      unless r == :any or @@regions.include?(r)
+        begin
+          require "holidays/#{r.to_s}"
+        rescue LoadError => e
+          raise UnknownRegionError, "Could not load holidays/#{r}"
+        end
+      end
+    end
     regions
   end
 
@@ -350,7 +373,7 @@ private
   # When requesting :ca, holidays in :ca but not its subregions should be returned.
   def self.in_region?(requested, available) # :nodoc:
     return true if requested.include?(:any)
-    
+
     # When an underscore is encountered, derive the parent regions
     # symbol and include both in the requested array.
     requested = requested.collect do |r|
@@ -369,16 +392,16 @@ private
   # ==== Benchmarks
   #
   # Lookup Easter Sunday, with caching, by number of iterations:
-  # 
+  #
   #       user     system      total        real
   # 0001  0.000000   0.000000   0.000000 (  0.000000)
   # 0010  0.000000   0.000000   0.000000 (  0.000000)
   # 0100  0.078000   0.000000   0.078000 (  0.078000)
   # 1000  0.641000   0.000000   0.641000 (  0.641000)
   # 5000  3.172000   0.015000   3.187000 (  3.219000)
-  # 
+  #
   # Lookup Easter Sunday, without caching, by number of iterations:
-  # 
+  #
   #       user     system      total        real
   # 0001  0.000000   0.000000   0.000000 (  0.000000)
   # 0010  0.016000   0.000000   0.016000 (  0.016000)
@@ -435,7 +458,7 @@ class Date
     holidays && !holidays.empty?
   end
 
-  # Calculate day of the month based on the week number and the day of the 
+  # Calculate day of the month based on the week number and the day of the
   # week.
   #
   # ==== Parameters
@@ -476,11 +499,11 @@ class Date
     if week > 0
       return ((week - 1) * 7) + 1 + ((wday - Date.civil(year, month,(week-1)*7 + 1).wday) % 7)
     end
-    
+
     days = MONTH_LENGTHS[month-1]
 
     days = 29 if month == 2 and Date.leap?(year)
-      
+
     return days - ((Date.civil(year, month, days).wday - wday + 7) % 7) - (7 * (week.abs - 1))
   end
-end
+end

data/lib/holidays/MANIFEST

@@ -1,34 +1,45 @@
 ==== Regional definitions
 The following definition files are included in this installation:
 
-* holidays/mx
+* holidays/ar
 * holidays/at
-* holidays/nz
-* holidays/nl
-* holidays/dk
-* holidays/cz
-* holidays/scandinavia
-* holidays/no
-* holidays/pt
-* holidays/nyse
-* holidays/it
-* holidays/united_nations
 * holidays/au
-* holidays/us
-* holidays/ie
-* holidays/za
-* holidays/is
-* holidays/north_america
-* holidays/es
-* holidays/fi
+* holidays/be
+* holidays/br
+* holidays/ca
+* holidays/ch
+* holidays/cz
+* holidays/de
+* holidays/dk
 * holidays/el
+* holidays/es
 * holidays/europe
-* holidays/de
+* holidays/federal_reserve
+* holidays/fi
+* holidays/fr
 * holidays/gb
-* holidays/ups
+* holidays/hr
+* holidays/hu
+* holidays/ie
+* holidays/is
+* holidays/it
 * holidays/jp
-* holidays/fr
-* holidays/se
-* holidays/ca
-* holidays/br
+* holidays/li
+* holidays/ma
+* holidays/mx
+* holidays/nerc
+* holidays/nl
+* holidays/no
+* holidays/north_america
+* holidays/nyse
+* holidays/nz
 * holidays/pl
+* holidays/pt
+* holidays/ro
+* holidays/scandinavia
+* holidays/se
+* holidays/united_nations
+* holidays/ups
+* holidays/us
+* holidays/ve
+* holidays/za

data/lib/holidays/ar.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: data/ar.yaml
+  #
+  # To use the definitions in this file, load it right after you load the 
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'holidays/ar'
+  #
+  # All the definitions are available at https://github.com/alexdunae/holidays
+  module AR # :nodoc:
+    def self.defined_regions
+      [:ar]
+    end
+
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:ar]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:ar]}],
+      1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:ar]}],
+      3 => [{:mday => 24, :name => "Día Nacional de la Memoria por la Verdad y la Justicia", :regions => [:ar]}],
+      4 => [{:mday => 2, :name => "Día del Veterano y de los Caídos en la Guerra de Malvinas", :regions => [:ar]}],
+      5 => [{:mday => 1, :name => "Día del Trabajador", :regions => [:ar]},
+            {:mday => 25, :name => "Día de la Revolución de Mayo", :regions => [:ar]}],
+      6 => [{:mday => 20, :name => "Día de la Bandera", :regions => [:ar]}],
+      7 => [{:mday => 9, :name => "Día de la Independencia", :regions => [:ar]}],
+      8 => [{:wday => 1, :week => 3, :name => "Paso a la Inmortalidad del General José de San Martín", :regions => [:ar]}],
+      10 => [{:wday => 1, :week => 2, :name => "Día del Respeto a la Diversidad Cultural", :regions => [:ar]}],
+      11 => [{:wday => 1, :week => 4, :name => "Día de la Soberanía nacional", :regions => [:ar]}],
+      12 => [{:mday => 8, :name => "Inmaculada Concepción de María", :regions => [:ar]},
+            {:mday => 25, :name => "Navidad", :regions => [:ar]}]
+      }
+    end
+  end
+
+
+end
+
+Holidays.merge_defs(Holidays::AR.defined_regions, Holidays::AR.holidays_by_month)

data/lib/holidays/at.rb

@@ -23,12 +23,12 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:at]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:at]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]},
-            {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]}],
+            {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]}],
       5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]}],
-      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]}],
+      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]}],
       10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}],
       11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}],
-      12 => [{:mday => 8, :name => "Mariä Empfängnis", :regions => [:at]},
+      12 => [{:mday => 8, :name => "Mariä Empfägnis", :regions => [:at]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at]},
             {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}]
       }

data/lib/holidays/au.rb

@@ -13,13 +13,14 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module AU # :nodoc:
     def self.defined_regions
-      [:au, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_nsw, :au_sa, :au_qld_brisbane]
+      [:au, :au_nsw, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane]
     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]},
+            {: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]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]},
@@ -28,19 +29,42 @@ module Holidays
             {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
             {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}],
       4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]}],
-      5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]},
+      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]}],
       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]},
+            {: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]}],
       8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
-      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}],
+      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]},
+            {:function => lambda { |year| Holidays.qld_labour_day_october(year) }, :function_id => "qld_labour_day_october(year)", :name => "Labour Day", :regions => [:au_qld]},
+            {:function => lambda { |year| Holidays.qld_queens_bday_october(year) }, :function_id => "qld_queens_bday_october(year)", :name => "Queen's Birthday", :regions => [:au_qld]}],
       12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
             {:mday => 26, :name => "Boxing Day", :regions => [:au]}]
       }
     end
   end
 
+# http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+# celebrated twice in 2012
+def self.qld_queens_bday_october(year)
+  year == 2012 ? 1 : nil
+end
+
+
+# http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+# changed from may to october after 2012
+def self.qld_labour_day_may(year)
+  year <= 2012 ? Date.calculate_mday(year, 5, 1, 1) : nil
+end
+
+
+# http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
+# changed from may to october after 2012
+def self.qld_labour_day_october(year)
+  year <= 2012 ? nil : Date.calculate_mday(year, 10, 1, 1)
+end
+
+
 
 end