holidays 3.3.0 → 4.0.0

data/test/defs/test_defs_north_america.rb

@@ -58,8 +58,8 @@ end
 end
 
 
-{Date.civil(2007,1,1) => 'Año nuevo', 
- Date.civil(2007,2,5) => 'Día de la Constitución', 
+{Date.civil(2007,1,1) => 'Año nuevo',
+ Date.civil(2007,2,5) => 'Día de la Constitución',
  Date.civil(2007,5,1) => 'Día del Trabajo',
  Date.civil(2007,5,5) => 'Cinco de Mayo',
  Date.civil(2007,9,16) => 'Día de la Independencia',
@@ -68,7 +68,8 @@ end
  Date.civil(2007,11,19) => 'Día de la Revolución',
  Date.civil(2007,12,25) => 'Navidad'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :mx, :informal)[0] || {})[:name]
-end  
+end
+
 
 {Date.civil(2008,1,1) => 'New Year\'s Day',
  Date.civil(2008,1,21) => 'Martin Luther King, Jr. Day',

data/test/defs/test_defs_nyse.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class NyseDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nyse
-{Date.civil(2008,1,1) => 'New Year\'s Day', 
+{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,3,21) => 'Good Friday',
@@ -18,5 +18,6 @@ class NyseDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :nyse)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_pl.rb

@@ -141,5 +141,6 @@ end
 # Wniebowzięcie Najświętszej Maryi Panny & Święto Wojska Polskiego
   assert_equal 'Wniebowzięcie Najświętszej Maryi Panny', (Holidays.on(Date.civil(2011,8,15), :pl)[0] || {})[:name]
   assert_equal 'Święto Wojska Polskiego', (Holidays.on(Date.civil(2011,8,15), :pl)[1] || {})[:name]
+
   end
 end

data/test/defs/test_defs_ro.rb

@@ -8,17 +8,17 @@ class RoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ro
 {
- Date.civil(1961,4,9) => 'Paștele',
- Date.civil(1961,4,10) => 'Paștele',
- Date.civil(2013,5,5) => 'Paștele',
- Date.civil(2013,5,6) => 'Paștele',
- Date.civil(2027,5,2) => 'Paștele',
- Date.civil(2027,5,3) => 'Paștele',
- Date.civil(2012,6,4) => 'Rusaliile',
- Date.civil(2013,6,23) => 'Rusaliile',
- Date.civil(2013,6,24) => 'Rusaliile',
- Date.civil(1986,6,22) => 'Rusaliile',
- Date.civil(1986,6,23) => 'Rusaliile',
+ Date.civil(1961,4,9) => 'Paștele - duminică',
+ Date.civil(1961,4,10) => 'Paștele - luni',
+ Date.civil(2013,5,5) => 'Paștele - duminică',
+ Date.civil(2013,5,6) => 'Paștele - luni',
+ Date.civil(2027,5,2) => 'Paștele - duminică',
+ Date.civil(2027,5,3) => 'Paștele - luni',
+ Date.civil(2012,6,4) => 'Rusaliile - 51',
+ Date.civil(2013,6,23) => 'Rusaliile - 50',
+ Date.civil(2013,6,24) => 'Rusaliile - 51',
+ Date.civil(1986,6,22) => 'Rusaliile - 50',
+ Date.civil(1986,6,23) => 'Rusaliile - 51',
  Date.civil(2009,1,1) => 'Anul nou',
  Date.civil(2014,1,2) => 'Anul nou',
  Date.civil(2009,5,1) => 'Ziua muncii',

data/test/defs/test_defs_scandinavia.rb

@@ -7,8 +7,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ScandinaviaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_scandinavia
-{Date.civil(2007,1,1) => 'Nytårsdag', 
- Date.civil(2007,2,18) => 'Fastelavn', 
+{Date.civil(2007,1,1) => 'Nytårsdag',
+ Date.civil(2007,2,18) => 'Fastelavn',
  Date.civil(2007,4,9) => 'Danmarks besættelse',
  Date.civil(2007,4,16) => 'Dronningens fødselsdag',
  Date.civil(2007,4,5) => 'Skærtorsdag',
@@ -28,7 +28,7 @@ class ScandinaviaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 end
 
 
-{Date.civil(2007,1,1) => 'Nýársdagur', 
+{Date.civil(2007,1,1) => 'Nýársdagur',
  Date.civil(2007,1,6) => 'Þrettándinn',
  Date.civil(2007,1,19) => 'Bóndadagur',
  Date.civil(2007,2,18) => 'Konudagur',
@@ -51,6 +51,7 @@ end
   assert_equal name, (Holidays.on(date, :is, :informal)[0] || {})[:name]
 end
 
+
 {Date.civil(2010,1,1) => 'Nyttårsdag',
  Date.civil(2010,5,1) => '1. mai',
  Date.civil(2010,5,17) => '17. mai',
@@ -70,11 +71,12 @@ end
    assert_equal name, (Holidays.on(date, :no, :informal)[0] || {})[:name]
  end
 
-{Date.civil(2008,1,1) => 'Nyårsdagen', 
+
+{Date.civil(2008,1,1) => 'Nyårsdagen',
  Date.civil(2008,1,6) => 'Trettondedag jul',
  Date.civil(2008,3,21) => 'Långfredagen',
  Date.civil(2008,3,22) => 'Påskafton',
- Date.civil(2008,3,23) => 'Påskdagen', 
+ Date.civil(2008,3,23) => 'Påskdagen',
  Date.civil(2008,3,24) => 'Annandag påsk',
  Date.civil(2008,5,1) => 'Första maj',
  Date.civil(2008,5,1) => 'Kristi himmelsfärdsdag',
@@ -99,10 +101,11 @@ end
   assert_equal name, (Holidays.on(date, :se, :informal)[0] || {})[:name]
 end
 
-{Date.civil(2008,1,1) => 'Uudenvuodenpäivä', 
+
+{Date.civil(2008,1,1) => 'Uudenvuodenpäivä',
  Date.civil(2008,1,6) => 'Loppiainen',
- Date.civil(2008,3,21) => 'Pitkäperjantai', 
- Date.civil(2008,3,23) => 'Pääsiäispäivä', 
+ Date.civil(2008,3,21) => 'Pitkäperjantai',
+ Date.civil(2008,3,23) => 'Pääsiäispäivä',
  Date.civil(2008,3,24) => '2. Pääsiäispäivä',
  Date.civil(2008,5,1) => 'Vappu',
  Date.civil(2008,5,1) => 'Helatorstai',
@@ -126,5 +129,6 @@ end
  Date.civil(2008,12,26) => 'Tapaninpäivä'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :fi, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_se.rb

@@ -7,11 +7,11 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class SeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_se
-{Date.civil(2008,1,1) => 'Nyårsdagen', 
+{Date.civil(2008,1,1) => 'Nyårsdagen',
  Date.civil(2008,1,6) => 'Trettondedag jul',
  Date.civil(2008,3,21) => 'Långfredagen',
  Date.civil(2008,3,22) => 'Påskafton',
- Date.civil(2008,3,23) => 'Påskdagen', 
+ Date.civil(2008,3,23) => 'Påskdagen',
  Date.civil(2008,3,24) => 'Annandag påsk',
  Date.civil(2008,5,1) => 'Första maj',
  Date.civil(2008,5,1) => 'Kristi himmelsfärdsdag',
@@ -35,5 +35,6 @@ class SeDefinitionTests < Test::Unit::TestCase  # :nodoc:
  }.each do |date, name|
   assert_equal name, (Holidays.on(date, :se, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_sg.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class SgDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_sg
-{Date.civil(2014,1,1) => 'New Year\'s Day', 
+{Date.civil(2014,1,1) => 'New Year\'s Day',
  Date.civil(2014,2,14) => 'Valentine\'s Day',
  Date.civil(2014,2,15) => 'Total Defence Day',
  Date.civil(2014,4,18) => 'Good Friday',
@@ -16,5 +16,6 @@ class SgDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2014,12,25) => 'Christmas Day'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :sg, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/defs/test_defs_vi.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ViDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_vi
-{Date.civil(2014,1,1) => 'New Year', 
+{Date.civil(2014,1,1) => 'New Year',
  Date.civil(2014,4,30) => 'Liberation Day',
  Date.civil(2014,5,1) => "International Workers' Day",
  Date.civil(2014,9,2) => 'National Day'}.each do |date, name|

data/test/defs/test_defs_za.rb

@@ -7,8 +7,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ZaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_za
-{Date.civil(2007,1,1) => 'New Year\'s Day', 
- Date.civil(2007,3,21) => 'Human Rights Day', 
+{Date.civil(2007,1,1) => 'New Year\'s Day',
+ Date.civil(2007,3,21) => 'Human Rights Day',
  Date.civil(2007,4,6) => 'Good Friday',
  Date.civil(2007,4,9) => 'Family Day',
  Date.civil(2007,4,27) => 'Freedom Day',
@@ -21,5 +21,6 @@ class ZaDefinitionTests < Test::Unit::TestCase  # :nodoc:
  Date.civil(2007,12,26) => 'Day of Goodwill'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :za, :informal)[0] || {})[:name]
 end
+
   end
 end

data/test/holidays/date_calculator/test_weekend_modifier.rb

@@ -10,10 +10,15 @@ class WeekendModifierDateCalculatorTests < Test::Unit::TestCase
   def test_to_monday_if_weekend
     assert_equal Date.civil(2015, 5, 4), @subject.to_monday_if_weekend(Date.civil(2015, 5, 3))
     assert_equal Date.civil(2015, 5, 4), @subject.to_monday_if_weekend(Date.civil(2015, 5, 2))
+    assert_equal Date.civil(2015, 5, 4), @subject.to_monday_if_weekend(Date.civil(2015, 5, 4))
+    assert_equal Date.civil(2015, 5, 1), @subject.to_monday_if_weekend(Date.civil(2015, 5, 1))
   end
 
   def test_to_monday_if_sunday
     assert_equal Date.civil(2015, 5, 4), @subject.to_monday_if_sunday(Date.civil(2015, 5, 3))
+    assert_equal Date.civil(2015, 5, 4), @subject.to_monday_if_sunday(Date.civil(2015, 5, 4))
+    assert_equal Date.civil(2015, 5, 1), @subject.to_monday_if_sunday(Date.civil(2015, 5, 1))
+    assert_equal Date.civil(2015, 5, 2), @subject.to_monday_if_sunday(Date.civil(2015, 5, 2))
   end
 
   def test_to_weekday_if_boxing_weekend
@@ -40,4 +45,10 @@ class WeekendModifierDateCalculatorTests < Test::Unit::TestCase
     assert_equal Date.civil(2016, 12, 26), @subject.to_tuesday_if_sunday_or_monday_if_saturday(Date.civil(2016, 12, 24)) # sat to mon
     assert_equal Date.civil(2016, 12, 27), @subject.to_tuesday_if_sunday_or_monday_if_saturday(Date.civil(2016, 12, 25)) # sun to tue
   end
+
+  def test_to_next_weekday
+    assert_equal Date.civil(2016, 3, 21), @subject.to_next_weekday(Date.civil(2016, 3, 20))
+    assert_equal Date.civil(2016, 3, 22), @subject.to_next_weekday(Date.civil(2016, 3, 21))
+    assert_equal Date.civil(2016, 3, 28), @subject.to_next_weekday(Date.civil(2016, 3, 25))
+  end
 end

data/test/holidays/definition/context/test_generator.rb

@@ -4,7 +4,21 @@ require 'holidays/definition/context/generator'
 
 class GeneratorTests < Test::Unit::TestCase
   def setup
-    @generator = Holidays::Definition::Context::Generator.new
+    @custom_method_parser = mock()
+    @custom_method_source_decorator = mock()
+    @custom_methods_repository = mock()
+
+    @parsed_custom_method = Holidays::Definition::Entity::CustomMethod.new(
+      name: 'custom_method',
+      arguments: [:year, :month],
+      source: "some source",
+    )
+
+    @generator = Holidays::Definition::Context::Generator.new(
+      @custom_method_parser,
+      @custom_method_source_decorator,
+      @custom_methods_repository,
+    )
   end
 
   def test_parse_definition_files_raises_error_if_argument_is_nil
@@ -21,6 +35,8 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_parse_definition_files_correctly_parse_regions
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
 
     assert_equal [:custom_single_file], regions
@@ -28,6 +44,8 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_parse_definitions_files_correctly_parse_rules_by_month
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
 
     expected_rules_by_month = {
@@ -45,6 +63,8 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_parse_definition_files_correctly_parse_custom_methods
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
 
     expected_custom_methods = {}
@@ -53,6 +73,8 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_parse_definition_files_correctly_parse_tests
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
 
     expected_tests = [[
@@ -64,16 +86,20 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_generate_definition_source_correctly_generate_module_src
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
 
-    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/alexdunae/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n  end\n\n\nend\n\nHolidays.merge_defs(Holidays::TEST.defined_regions, Holidays::TEST.holidays_by_month)\n"
+    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
 
     assert_equal expected_module_src, module_src
   end
 
-  def test_generate_definition_source_correctly_genrate_test_src
+  def test_generate_definition_source_correctly_generate_test_src
     files = ['test/data/test_single_custom_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
 
@@ -84,6 +110,8 @@ class GeneratorTests < Test::Unit::TestCase
 
   def test_parse_definitions_files_correctly_parse_year_range_by_month
     files = ['test/data/test_custom_year_range_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
 
     expected_rules_by_month = {
@@ -124,13 +152,44 @@ class GeneratorTests < Test::Unit::TestCase
     assert_equal expected_rules_by_month, rules_by_month
   end
 
-  def test_generate_definition_source_correctly_genrate_yearrange_test_src
+  def test_generate_definition_source_correctly_generate_yearrange_test_src
     files = ['test/data/test_custom_year_range_holiday_defs.yaml']
+    @custom_method_parser.expects(:call).with(nil).returns({})
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
-    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_custom_year_range_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/alexdunae/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_year_range_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 1,  :year_ranges => [{:after => 2016}],:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3,  :year_ranges => [{:between => 2016..2018}],:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4,  :year_ranges => [{:limited => [2016, 2018, 2019]}],:name => \"limited_year\", :regions => [:custom_year_range_file]},\n            {:mday => 5,  :year_ranges => [{:before => 2015},{:after => 2017}],:name => \"multiple_conditions\", :regions => [:custom_year_range_file]}]\n      }\n    end\n  end\n\n\nend\n\nHolidays.merge_defs(Holidays::TEST.defined_regions, Holidays::TEST.holidays_by_month)\n"
+    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_custom_year_range_holiday_defs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_year_range_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 1,  :year_ranges => [{:after => 2016}],:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3,  :year_ranges => [{:between => 2016..2018}],:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4,  :year_ranges => [{:limited => [2016, 2018, 2019]}],:name => \"limited_year\", :regions => [:custom_year_range_file]},\n            {:mday => 5,  :year_ranges => [{:before => 2015},{:after => 2017}],:name => \"multiple_conditions\", :regions => [:custom_year_range_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
 
     assert_equal expected_module_src, module_src
   end
 
+  def test_generate_definition_source_correctly_generate_module_src_with_custom_methods
+    files = ['test/data/test_single_custom_holiday_with_custom_procs.yaml']
+
+    @custom_method_parser.expects(:call).with('custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}).returns({"custom_method(year, month)" => @parsed_custom_method})
+    @custom_methods_repository.expects(:find).twice.with('custom_method(year, month)').returns(nil)
+    @custom_method_source_decorator.expects(:call).once.with(@parsed_custom_method).returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
+
+    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+
+    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_with_custom_procs.yaml\n  #\n  # To use the definitions in this file, load it right after you load the\n  # Holiday gem:\n  #\n  #   require 'holidays'\n  #   require 'generated_definitions/test'\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              0 => [{:function => \"custom_method(year, month)\", :function_arguments => [:year, :month], :function_modifier => 5, :name => \"Custom Holiday\", :regions => [:custom_single_file]}],\n      6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n},\n\n\n      }\n    end\n  end\nend\n"
+
+    assert_equal expected_module_src, module_src
+  end
+
+  def test_generate_definition_source_correctly_generate_test_src_with_custom_methods
+    files = ['test/data/test_single_custom_holiday_with_custom_procs.yaml']
+
+    @custom_method_parser.expects(:call).with('custom_method' => {'arguments' => 'year, month', 'source' => "d = Date.civil(year, month, 1)\nd + 2\n"}).returns({:parsed => "method"})
+    @custom_methods_repository.expects(:find).twice.with('custom_method(year, month)').returns(nil)
+    @custom_method_source_decorator.expects(:call).once.with("method").returns("\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n}")
+
+    regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
+    module_src, test_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)
+
+    expected_test_src = "# encoding: utf-8\nrequire File.expand_path(File.dirname(__FILE__)) + '/../test_helper'\n\n# This file is generated by the Ruby Holiday gem.\n#\n# Definitions loaded: test/data/test_single_custom_holiday_with_custom_procs.yaml\nclass TestDefinitionTests < Test::Unit::TestCase  # :nodoc:\n\n  def test_test\n{Date.civil(2013,6,20) => 'Company Founding'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {})[:name]\nend\n\n{Date.civil(2015, 1, 1) => 'Custom Holiday'}.each do |date, name|\n  assert_equal name, (Holidays.on(date, :custom_single_file)[0] || {}[:name]\nend\n\n  end\nend\n"
+
+    assert_equal expected_test_src, test_src
+  end
 end

data/test/holidays/definition/context/test_merger.rb

@@ -6,17 +6,20 @@ class MergerTests < Test::Unit::TestCase
   def setup
     @target_regions = [:new_region]
     @target_holidays = {0 => [:mday => 1, :name => "Test", :regions => [:test2, :test]]}
+    @target_custom_methods = {"test_method" => Proc.new { |year| Date.civil(year, 1, 1) } }
 
     @holidays_repo = mock()
     @regions_repo = mock()
+    @custom_methods_repo = mock()
 
-    @subject = Holidays::Definition::Context::Merger.new(@holidays_repo, @regions_repo)
+    @subject = Holidays::Definition::Context::Merger.new(@holidays_repo, @regions_repo, @custom_methods_repo)
   end
 
   def test_repos_are_called_to_add_regions_and_holidays
     @holidays_repo.expects(:add).with(@target_holidays)
     @regions_repo.expects(:add).with(@target_regions)
+    @custom_methods_repo.expects(:add).with(@target_custom_methods)
 
-    @subject.call(@target_regions, @target_holidays)
+    @subject.call(@target_regions, @target_holidays, @target_custom_methods)
   end
 end

data/test/holidays/definition/decorator/test_custom_method_proc.rb

@@ -0,0 +1,113 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/definition/decorator/custom_method_proc'
+require 'holidays/definition/entity/custom_method'
+
+class DecoratorCustomMethodProcTests < Test::Unit::TestCase
+  def setup
+    @decorator = Holidays::Definition::Decorator::CustomMethodProc.new
+  end
+
+  def test_generates_lambda_from_entity
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: ["year"],
+      source: "Date.civil(year, 1, 1)"
+    )
+
+    proc = @decorator.call(entity)
+    expected_proc = Proc.new { |year| eval("Date.civil(year, 1, 1)") }
+
+    assert_equal expected_proc.call(2015), proc.call(2015)
+  end
+
+  def test_generates_lamba_from_entity_with_multiple_lines
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: ["year"],
+      source: "d = Date.civil(year, 1, 1)\nd + 2"
+    )
+
+    proc = @decorator.call(entity)
+    expected_proc = Proc.new { |year| eval("d = Date.civil(year, 1, 1)\nd + 2") }
+
+    assert_equal expected_proc.call(2015), proc.call(2015)
+  end
+
+  def test_generates_lamba_from_entity_with_multiple_arguments
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: ["year", "month"],
+      source: "Date.civil(year, month, 1)"
+    )
+
+    proc = @decorator.call(entity)
+    expected_proc = Proc.new { |year, month| eval("Date.civil(year, month, 1)") }
+
+    assert_equal expected_proc.call(2015, 6), proc.call(2015, 6)
+  end
+
+  def test_generate_returns_error_if_missing_name
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      arguments: ["year", "month"],
+      source: "Date.civil(year, month, 1)"
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "",
+      arguments: ["year", "month"],
+      source: "Date.civil(year, month, 1)"
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+  end
+
+  def test_generate_returns_error_if_arguments_is_missing
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      source: "Date.civil(year, month, 1)"
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: [],
+      source: "Date.civil(year, month, 1)"
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+  end
+
+
+  def test_generate_returns_error_if_source_is_missing
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: ["year"],
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+
+    entity = Holidays::Definition::Entity::CustomMethod.new(
+      name: "test",
+      arguments: ["year"],
+      source: "",
+    )
+
+    assert_raises ArgumentError do
+      @decorator.call(entity)
+    end
+  end
+end