Issue-24: Specify ruby source for custom methods

Author: Phil Peble

METHODS.yml

@@ -0,0 +1,26 @@
+---
+methods:
+  easter:
+    arguments: year
+  orthodox_easter:
+    arguments: year
+  orthodox_easter_julian:
+    arguments: year
+  to_monday_if_sunday:
+    arguments: date
+  to_monday_if_weekend:
+    arguments: date
+  to_weekday_if_boxing_weekend:
+    arguments: date
+  to_weekday_if_boxing_weekend_from_year:
+    arguments: year
+  to_weekday_if_weekend:
+    arguments: date
+  calculate_day_of_month:
+    arguments: year, month, day, wday
+  to_weekday_if_boxing_weekend_from_year_or_to_tuesday_if_monday:
+    arguments: year
+  to_tuesday_if_sunday_or_monday_if_saturday:
+    arguments: date
+  lunar_to_solar:
+    arguments: year, month, day, region

SYNTAX.md

@@ -236,7 +236,7 @@ For example, Canada celebrates Victoria Day, which falls on the Monday on or bef
 methods:
   ca_victoria_day:
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year, 5, 24)
       if date.wday > 1
         date -= (date.wday - 1)

au.yaml

@@ -178,101 +178,84 @@ months:
 methods:
   afl_grand_final:
     arguments: year
-    logic:
-      if:
-        condition: year == 2015
-          result: '2015-10-2'
-        condition: year == 2016
-          result: '2016-9-30'
-        condition: year == 2017
-          result: '2017-9-29'
-
+    ruby: |
+      case year
+      when 2015
+        Date.civil(2015, 10, 2)
+      when 2016
+        Date.civil(2016, 9, 30)
+      when 2017
+        Date.civil(2017, 9, 29)
+      end
   qld_queens_bday_october:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # celebrated twice in 2012
     # in october again from 2016
     arguments: year
-    logic:
-      if:
-        condition: year >= 2016
-          function: day_of_month(year, 10, 1, 1) # This is a problem, it just returns a single integer, should we return a date?
-        condition: year == 2012
-          result: 1 #TODO Same here?
-      else:
-        result: null
-
+    ruby: |
+      if year >= 2016
+        %{CALCULATE_DAY_OF_MONTH}(year, 10, 1, 1)
+      elsif year == 2012
+        1
+      else
+        nil
+      end
   qld_queens_birthday_june:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # in june until 2015
     arguments: year
-    logic:
-        if:
-          condition: year <= 2015
-            result: day_of_month(year, 6, 1, 1)
-
+    ruby: |
+      if year <= 2015
+        %{CALCULATE_DAY_OF_MONTH}(year, 6, 2, 1)
+      end
   qld_labour_day_may:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # for 2013 to 2016 it was in October, otherwise it's in May
     arguments: year
-    logic:
-      if:
-        condition: year < 2013 || year >= 2016
-          function: day_of_month(year, 5, 1, 1)
-
+    ruby: |
+      if year < 2013 || year >= 2016
+        %{CALCULATE_DAY_OF_MONTH}(year, 5, 1, 1)
+      end
   qld_labour_day_october:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # for 2013 to 2016 it was in October, otherwise it's in May
     arguments: year
-    logic:
-      if:
-        condition: year >= 2013 && year < 2016
-          function: day_of_month(year, 10, 1, 1)
-
+    ruby: |
+      if year >= 2013 && year < 2016
+        %{CALCULATE_DAY_OF_MONTH}(year, 10, 1, 1)
+      end
   g20_day_2014_only:
     # http://www.justice.qld.gov.au/fair-and-safe-work/industrial-relations/public-holidays/dates
     # G20 day in brisbane, in 2014, on november 14
     arguments: year
-    logic:
-      if:
-        condition: year == 2014
-          result: 14
-      else:
-        result: null
-
+    ruby: |
+      year == 2014 ? 14 : nil
   hobart_show_day:
     # http://worksafe.tas.gov.au/__data/assets/pdf_file/0008/287036/Public_Holidays_2014.pdf
     # The Thursday before the fourth Saturday in October.
     arguments: year
-    logic:
-      function: day_of_month(year, 10, 4, :saturday)
-      function_modifier: -2 # the thursday before
-
+    ruby: |
       fourth_sat_in_oct = Date.civil(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 4, :saturday))
       fourth_sat_in_oct - 2 # the thursday before
-
-    source: |
-      fourth_sat_in_oct = Date.civil(year, 10, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 10, 4, :saturday))
-      fourth_sat_in_oct - 2 # the thursday before
-
   march_pub_hol_sa:
     # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
     # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
     arguments: year
-    source: |
+    ruby: |
       if year < 2006
         nil
       else
-        Date.civil(year, 3, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 3, :second, :monday))
+        Date.civil(year, 3, %{CALCULATE_DAY_OF_MONTH}(year, 3, :second, :monday))
       end
   may_pub_hol_sa:
     # http://www.safework.sa.gov.au/show_page.jsp?id=2483#.VQ9Mfmb8-8E
     # The Holidays Act 1910 provides for the third Monday in May to be a public holiday. Since 2006 this public holiday has been observed on the second Monday in March through the issuing of a special Proclamation by the Governor.
     arguments: year
-    source: |
+    ruby: |
       if year >= 2006
         nil
       else
-        Date.civil(year, 5, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, :third, :monday))
+        Date.civil(year, 5, %{CALCULATE_DAY_OF_MONTH}(year, 5, :third, :monday))
       end
 
 tests:

ca.yaml

@@ -188,8 +188,8 @@ months:
 methods:
   ca_victoria_day:
     # Monday on or before May 24
-    arguments: year
-    source: |
+    arguments: year, month, day
+    ruby: |
       date = Date.civil(year,5,24)
       if date.wday > 1
         date -= (date.wday - 1)

ch.yaml

@@ -130,7 +130,7 @@ methods:
   ch_vd_lundi_du_jeune_federal:
     # Monday after the third Sunday of September
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,9,1)
       # Find the first Sunday of September
       until date.wday.eql? 0 do
@@ -142,7 +142,7 @@ methods:
   ch_ge_jeune_genevois:
     # Thursday after the first Sunday of September
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,9,1)
       # Find the first Sunday of September
       until date.wday.eql? 0 do
@@ -153,14 +153,14 @@ methods:
   ch_gl_naefelser_fahrt:
     # First Thursday of April. If the first Thursday of April is in the week before easter, then a week later.
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,4,1)
       # Find the first Thursday of April
       until date.wday.eql? 4 do
         date += 1
       end
 
-      if date.eql?(Holidays::Factory::DateCalculator::Easter::Gregorian.easter_calculator.calculate_easter_for(year)-3)
+      if date.eql?(%{EASTER}(year)-3)
         date += 7
       end
       date

cl.yaml

@@ -86,7 +86,7 @@ methods:
   st_peter_st_paul_cl:
     arguments: year
     # Nearest monday
-    source: |
+    ruby: |
       date = Date.civil(year, 6, 29)
       if [2,3,4].include?(date.wday)
         date -= (date.wday - 1)
@@ -97,7 +97,7 @@ methods:
   columbus_day_cl:
     arguments: year
     # Nearest monday
-    source: |
+    ruby: |
       date = Date.civil(year, 10, 12)
       if [2,3,4].include?(date.wday)
         date -= (date.wday - 1)
@@ -108,7 +108,7 @@ methods:
   other_churches_day_cl:
     arguments: year
     # If on tuesday, friday before, if on wednesday, next friday
-    source: |
+    ruby: |
       date = Date.civil(year, 10, 31)
       if date.wday == 2
         date -= 4

de.yaml

@@ -139,7 +139,7 @@ methods:
   de_buss_und_bettag:
     # Germany: Wednesday before November 23
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,11,23)
       if date.wday > 3
         date -= (date.wday - 3)

fedex.yaml

@@ -42,11 +42,12 @@ months:
   - name: New Year's Eve
     regions: [fedex]
     mday: 31
+
 methods:
   day_after_thanksgiving:
     arguments: year
-    source: |
-      Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 4, 4) + 1
+    ruby: |
+      %{CALCULATE_DAY_OF_MONTH}(year, 11, 4, 4) + 1
 
 tests:
   - given:

fi.yaml

@@ -59,11 +59,12 @@ months:
   - name: Tapaninpäivä
     regions: [fi]
     mday: 26
+
 methods:
   fi_juhannusaatto:
     # Finland: Mid-summer eve (Friday between June 19–25)
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,6,19)
       if date.wday > 5 #if 19.6 is saturday
         date += 6
@@ -74,14 +75,14 @@ methods:
   fi_juhannuspaiva:
     # Finland: Mid-summer (Saturday between June 20–26)
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,6,20)
       date += (6 - date.wday)
       date
   fi_pyhainpaiva:
     # Finland: All Saint's Day (Saturday between Oct 31 and Nov 6)
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,10,31)
       date += (6 - date.wday)
       date

hk.yaml

@@ -71,7 +71,7 @@ months:
 methods:
   cn_new_lunar_day:
     arguments: year
-    source: |
+    ruby: |
       month_day = case year
         when 1930, 1949, 1987, 2025, 2063, 2082, 2101, 2112, 2131, 2150, 2207, 2245, 2253, 2283, 2321
           [1, 29]

is.yaml

@@ -114,7 +114,7 @@ methods:
   is_sumardagurinn_fyrsti:
     # Iceland: first day of summer (Thursday after 18 April)
     arguments: year
-    source: |
+    ruby: |
       date = Date.civil(year,4,18)
       if date.wday < 4
         date += (4 - date.wday)