holidays 3.3.0 → 4.0.0

data/lib/generated_definitions/it.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/it'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module IT # :nodoc:
     def self.defined_regions
       [:it]
@@ -18,8 +18,8 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunedì dell'Angelo", :regions => [:it]}],
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasqua", :regions => [:it]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Lunedì dell'Angelo", :regions => [:it]}],
       1 => [{:mday => 1, :name => "Capodanno", :regions => [:it]},
             {:mday => 6, :name => "Epifania", :regions => [:it]}],
       4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}],
@@ -32,9 +32,11 @@ module Holidays
             {:mday => 26, :name => "Santo Stefano", :regions => [:it]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::IT.defined_regions, Holidays::IT.holidays_by_month)

data/lib/generated_definitions/jp.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/jp'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module JP # :nodoc:
     def self.defined_regions
       [:jp]
@@ -20,113 +20,136 @@ module Holidays
       {
               1 => [{:mday => 1, :name => "元日", :regions => [:jp]},
             {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 1, 1) }, :function_id => "jp_substitute_holiday(year, 1, 1)", :name => "振替休日", :regions => [:jp]}],
+            {:mday => 1, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       2 => [{:mday => 11, :name => "建国記念日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 2, 11) }, :function_id => "jp_substitute_holiday(year, 2, 11)", :name => "振替休日", :regions => [:jp]}],
-      3 => [{:function => lambda { |year| Holidays.jp_vernal_equinox_day(year) }, :function_id => "jp_vernal_equinox_day(year)", :name => "春分の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))", :name => "振替休日", :regions => [:jp]}],
+            {:mday => 11, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
+      3 => [{:function => "jp_vernal_equinox_day(year)", :function_arguments => [:year], :name => "春分の日", :regions => [:jp]},
+            {:function => "jp_vernal_equinox_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
       4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 4, 29) }, :function_id => "jp_substitute_holiday(year, 4, 29)", :name => "振替休日", :regions => [:jp]}],
+            {:mday => 29, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       5 => [{:mday => 3, :name => "憲法記念日", :regions => [:jp]},
             {: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]}],
+            {:mday => 3, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
+            {:mday => 4, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
+            {:mday => 5, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       7 => [{:mday => 20,  :year_ranges => [{:between => 1996..2002}],:name => "海の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 7, 20) }, :function_id => "jp_substitute_holiday(year, 7, 20)",  :year_ranges => [{:between => 1996..2002}],:name => "振替休日", :regions => [:jp]},
-            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2003}],:name => "海の日", :regions => [:jp]}],
-      8 => [{:function => lambda { |year| Holidays.jp_mountain_holiday(year) }, :function_id => "jp_mountain_holiday(year)",  :year_ranges => [{:after => 2016}],:name => "山の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_mountain_holiday(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_mountain_holiday(year))",  :year_ranges => [{:after => 2016}],:name => "振替休日", :regions => [:jp]}],
+            {:wday => 1, :week => 3,  :year_ranges => [{:after => 2003}],:name => "海の日", :regions => [:jp]},
+            {:function => "jp_marine_day_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:between => 1996..2002}],:name => "振替休日", :regions => [:jp]}],
+      8 => [{:function => "jp_mountain_holiday(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2016}],:name => "山の日", :regions => [:jp]},
+            {:function => "jp_mountain_holiday_substitute(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2016}],:name => "振替休日", :regions => [:jp]}],
       9 => [{:wday => 1, :week => 3, :name => "敬老の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 9, Holidays.calculate_day_of_month(year, 9, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 9, Holidays.calculate_day_of_month(year, 9, 3, 1))", :name => "振替休日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_citizons_holiday(year) }, :function_id => "jp_citizons_holiday(year)", :name => "国民の休日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_national_culture_day(year) }, :function_id => "jp_national_culture_day(year)", :name => "秋分の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_national_culture_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_national_culture_day(year))", :name => "振替休日", :regions => [:jp]}],
+            {:function => "jp_respect_for_aged_holiday_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]},
+            {:function => "jp_citizens_holiday(year)", :function_arguments => [:year], :name => "国民の休日", :regions => [:jp]},
+            {:function => "jp_national_culture_day(year)", :function_arguments => [:year], :name => "秋分の日", :regions => [:jp]},
+            {:function => "jp_national_culture_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
       10 => [{:wday => 1, :week => 2, :name => "体育の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 10, Holidays.calculate_day_of_month(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Holidays.calculate_day_of_month(year, 10, 2, 1))", :name => "振替休日", :regions => [:jp]}],
+            {:function => "jp_health_sports_day_substitute(year)", :function_arguments => [:year], :name => "振替休日", :regions => [:jp]}],
       11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 3) }, :function_id => "jp_substitute_holiday(year, 11, 3)", :name => "振替休日", :regions => [:jp]},
+            {:mday => 3, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]},
             {:mday => 23, :name => "勤労感謝の日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 23) }, :function_id => "jp_substitute_holiday(year, 11, 23)", :name => "振替休日", :regions => [:jp]}],
+            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}],
       12 => [{:mday => 23, :name => "天皇誕生日", :regions => [:jp]},
-            {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 12, 23) }, :function_id => "jp_substitute_holiday(year, 12, 23)", :name => "振替休日", :regions => [:jp]}]
+            {:mday => 23, :function => "jp_substitute_holiday(year, month, day)", :function_arguments => [:year, :month, :day], :name => "振替休日", :regions => [:jp]}]
       }
     end
-  end
-
-def self.jp_vernal_equinox_day(year)
-  day =
-    case year
-    when 1851..1899
-      19.8277
-    when 1900..1979
-      20.8357
-    when 1980..2099
-      20.8431
-    when 2100..2150
-      21.8510
-    else
-      raise IndexError.new("Out of range")
-    end
-  day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
-  day = day.floor
-  Date.civil(year, 3, day)
-end
-
-
-def self.jp_national_culture_day(year)
-  day =
-    case year
-    when 1851..1899
-      22.2588
-    when 1900..1979
-      23.2588
-    when 1980..2099
-      23.2488
-    when 2100..2150
-      24.2488
-    else
-      raise IndexError.new("Out of range")
-    end
-  day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
-  day = day.floor
-  Date.civil(year, 9, day)
-end
-
 
-def self.jp_citizons_holiday(year)
-  year < 2003 and return nil
-  ncd = Holidays.jp_national_culture_day(year)
-  if ncd.wday == 3
-    ncd - 1
+    def self.custom_methods
+      {
+        "jp_health_sports_day_substitute(year)" => Proc.new { |year|
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 10, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 10, 2, 1))
+},
+
+"jp_vernal_equinox_day(year)" => Proc.new { |year|
+day =
+  case year
+  when 1851..1899
+    19.8277
+  when 1900..1979
+    20.8357
+  when 1980..2099
+    20.8431
+  when 2100..2150
+    21.8510
   else
-    nil
+    raise IndexError.new("Out of range")
   end
+day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
+day = day.floor
+Date.civil(year, 3, day)
+},
+
+"jp_vernal_equinox_day_substitute(year)" => Proc.new { |year|
+date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_vernal_equinox_day(year)").call(year)
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+},
+
+"jp_marine_day_substitute(year)" => Proc.new { |year|
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 7, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 7, 3, 1))
+},
+
+"jp_national_culture_day(year)" => Proc.new { |year|
+day =
+  case year
+  when 1851..1899
+    22.2588
+  when 1900..1979
+    23.2588
+  when 1980..2099
+    23.2488
+  when 2100..2150
+    24.2488
+  else
+    raise IndexError.new("Out of range")
+  end
+day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor
+day = day.floor
+Date.civil(year, 9, day)
+},
+
+"jp_national_culture_day_substitute(year)" => Proc.new { |year|
+date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+},
+
+"jp_citizens_holiday(year)" => Proc.new { |year|
+year < 2003 and return nil
+ncd = Holidays::DefinitionFactory.custom_methods_repository.find("jp_national_culture_day(year)").call(year)
+if ncd.wday == 3
+  ncd - 1
+else
+  nil
 end
-
-
-def self.jp_mountain_holiday(year)
-  Date.civil(year, 8, 11)
-end
-
-
-def self.jp_substitute_holiday(*date)
-  return nil unless date[0]
-  date = date[0].kind_of?(Date) ? date.first : Date.civil(*date)
-  date.wday == 0 ? Holidays.jp_next_weekday(date+1) : nil
+},
+
+"jp_mountain_holiday(year)" => Proc.new { |year|
+return nil if year < 2016
+Date.civil(year, 8, 11)
+},
+
+"jp_mountain_holiday_substitute(year)" => Proc.new { |year|
+date = Holidays::DefinitionFactory.custom_methods_repository.find("jp_mountain_holiday(year)").call(year)
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, date.month, date.mday)
+},
+
+"jp_respect_for_aged_holiday_substitute(year)" => Proc.new { |year|
+Holidays::DefinitionFactory.custom_methods_repository.find("jp_substitute_holiday(year, month, day)").call(year, 9, Holidays::DateCalculatorFactory.day_of_month_calculator.call(year, 9, 3, 1))
+},
+
+"jp_substitute_holiday(year, month, day)" => Proc.new { |year, month, day|
+date = Date.civil(year, month, day)
+date.wday == 0 ? (Holidays::DefinitionFactory.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : nil
+},
+
+"jp_next_weekday(date)" => Proc.new { |date|
+is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
+  holiday[:mday] == date.day
 end
+date.wday == 0 || is_holiday ? (Holidays::DefinitionFactory.custom_methods_repository.find("jp_next_weekday(date)").call(date+1)) : date
+},
 
 
-def self.jp_next_weekday(date)
-  is_holiday = Holidays::JP.holidays_by_month[date.month].any? do |holiday|
-    holiday[:mday] == date.day
+      }
+    end
   end
-  date.wday == 0 || is_holiday ? Holidays.jp_next_weekday(date+1) : date
-end
-
-
-
 end
-
-Holidays.merge_defs(Holidays::JP.defined_regions, Holidays::JP.holidays_by_month)

data/lib/generated_definitions/li.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/li'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module LI # :nodoc:
     def self.defined_regions
       [:li]
@@ -18,13 +18,13 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Fasnachtsdienstag", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Ostern", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Auffahrt", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:li]},
-            {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:li]}],
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Fasnachtsdienstag", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Karfreitag", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Ostern", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Auffahrt", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:li]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:li]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:li]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:li]}],
       2 => [{:mday => 2, :name => "Maria Lichtmess", :regions => [:li]}],
@@ -40,9 +40,11 @@ module Holidays
             {:mday => 31, :name => "Silvester", :regions => [:li]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::LI.defined_regions, Holidays::LI.holidays_by_month)

data/lib/generated_definitions/lt.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/lt'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module LT # :nodoc:
     def self.defined_regions
       [:lt]
@@ -18,8 +18,8 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Šv. Velykos", :regions => [:lt]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Antroji Velykų diena", :regions => [:lt]}],
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Šv. Velykos", :regions => [:lt]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Antroji Velykų diena", :regions => [:lt]}],
       1 => [{:mday => 1, :name => "Naujieji metai", :regions => [:lt]}],
       2 => [{:mday => 16, :name => "Valstybės atkūrimo diena", :regions => [:lt]}],
       3 => [{:mday => 11, :name => "Nepriklausomybės atkūrimo diena", :regions => [:lt]}],
@@ -33,9 +33,11 @@ module Holidays
             {:mday => 26, :name => "Antroji Kalėdų diena", :regions => [:lt]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::LT.defined_regions, Holidays::LT.holidays_by_month)

data/lib/generated_definitions/ma.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/ma'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module MA # :nodoc:
     def self.defined_regions
       [:ma]
@@ -29,9 +29,11 @@ module Holidays
             {:mday => 18, :name => "Eid Al Istiqulal", :regions => [:ma]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::MA.defined_regions, Holidays::MA.holidays_by_month)

data/lib/generated_definitions/mx.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/mx'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module MX # :nodoc:
     def self.defined_regions
       [:mx, :mx_pue, :us, :ca]
@@ -50,9 +50,11 @@ module Holidays
             {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::MX.defined_regions, Holidays::MX.holidays_by_month)

data/lib/generated_definitions/nerc.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/nerc'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module NERC # :nodoc:
     def self.defined_regions
       [:nerc]
@@ -18,17 +18,19 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "New Year's Day", :regions => [:nerc]}],
+              1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:nerc]}],
       5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:nerc]}],
-      7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Independence Day", :regions => [:nerc]}],
+      7 => [{:mday => 4, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Independence Day", :regions => [:nerc]}],
       9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:nerc]}],
       11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:nerc]}],
-      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Christmas Day", :regions => [:nerc]}]
+      12 => [{:mday => 25, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:nerc]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::NERC.defined_regions, Holidays::NERC.holidays_by_month)

data/lib/generated_definitions/nl.rb

@@ -10,7 +10,7 @@ module Holidays
   #   require 'holidays'
   #   require 'generated_definitions/nl'
   #
-  # All the definitions are available at https://github.com/alexdunae/holidays
+  # All the definitions are available at https://github.com/holidays/holidays
   module NL # :nodoc:
     def self.defined_regions
       [:nl]
@@ -18,24 +18,26 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Goede Vrijdag", :regions => [:nl]},
-            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasen", :regions => [:nl]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Pasen", :regions => [:nl]},
-            {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Hemelvaartsdag", :regions => [:nl]},
-            {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinksteren", :regions => [:nl]},
-            {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinksteren", :regions => [:nl]}],
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Goede Vrijdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :name => "Eerste Pasen", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Tweede Pasen", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Hemelvaartsdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Eerste Pinksteren", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Tweede Pinksteren", :regions => [:nl]}],
       1 => [{:mday => 1, :name => "Nieuwjaar", :regions => [:nl]}],
       4 => [{:mday => 27, :name => "Koningsdag", :regions => [:nl]}],
       5 => [{:mday => 4, :type => :informal, :name => "Dodenherdenking", :regions => [:nl]},
             {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}],
       12 => [{:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
-            {:mday => 25, :name => "Kerstmis", :regions => [:nl]},
-            {:mday => 26, :name => "Kerstmis", :regions => [:nl]}]
+            {:mday => 25, :name => "Eerste Kerstmis", :regions => [:nl]},
+            {:mday => 26, :name => "Tweede Kerstmis", :regions => [:nl]}]
       }
     end
-  end
-
 
+    def self.custom_methods
+      {
+        
+      }
+    end
+  end
 end
-
-Holidays.merge_defs(Holidays::NL.defined_regions, Holidays::NL.holidays_by_month)