Hotfix/maritiaus holidays

be_fr.yaml

@@ -17,10 +17,6 @@ months:
     regions: ['be_fr']
     function: easter(year)
     function_modifier: 39
-  - name: Pentecôte
-    regions: ['be_fr']
-    function: easter(year)
-    function_modifier: 49
   - name: Lundi de Pentecôte
     regions: ['be_fr']
     function: easter(year)
@@ -84,12 +80,6 @@ tests:
       options: ["informal"]
     expect:
       name: 'Ascension'
-  - given:
-      date: '2007-05-27'
-      regions: ['be_fr']
-      options: ["informal"]
-    expect:
-      name: 'Pentecôte'
   - given:
       date: '2007-05-28'
       regions: ['be_fr']

be_nl.yaml

@@ -17,10 +17,6 @@ months:
     regions: [be_nl]
     function: easter(year)
     function_modifier: 39
-  - name: Pinksteren
-    regions: [be_nl]
-    function: easter(year)
-    function_modifier: 49
   - name: Pinkstermaandag
     regions: [be_nl]
     function: easter(year)
@@ -84,12 +80,6 @@ tests:
       options: ["informal"]
     expect:
       name: 'O.H. Hemelvaart'
-  - given:
-      date: '2007-05-27'
-      regions: ["be_nl"]
-      options: ["informal"]
-    expect:
-      name: 'Pinksteren'
   - given:
       date: '2007-05-28'
       regions: ["be_nl"]

cy.yaml

@@ -0,0 +1,174 @@
+# Cyprus holiday definitions for the Ruby Holiday gem.
+#
+# Created: 2023-11-13.
+# Sources:
+    # https://www.officeholidays.com/countries/cyprus/2023
+    # https://www.officeholidays.com/countries/cyprus/2024
+    # https://en.wikipedia.org/wiki/Public_holidays_in_Cyprus
+---
+months:
+  0:
+  - name: Μεγάλη Παρασκευή
+    regions: [cy]
+    function: orthodox_easter(year)
+    function_modifier: -2
+  - name: Μεγάλο Σάββατο
+    regions: [cy]
+    function: orthodox_easter(year)
+    function_modifier: -1
+  - name: Κυριακή του Πάσχα
+    regions: [cy]
+    function: orthodox_easter(year)
+  - name: Δευτέρα του Πάσχα
+    regions: [cy]
+    function: orthodox_easter(year)
+    function_modifier: 1
+  - name: Καθαρά Δευτέρα
+    regions: [cy]
+    function: orthodox_easter(year)
+    function_modifier: -48
+  - name: Αγίου Πνεύματος
+    regions: [cy]
+    function: orthodox_easter(year)
+    function_modifier: 50
+  1:
+  - name: Πρωτοχρονιά
+    regions: [cy]
+    mday: 1
+  - name: Θεοφάνεια
+    regions: [cy]
+    mday: 6
+  3:
+  - name: Επέτειος της Επανάστασης του 1821
+    regions: [cy]
+    mday: 25
+  4:
+  - name: Εθνική Ημέρα της Κύπρου
+    regions: [cy]
+    mday: 1
+  5:
+  - name: Πρωτομαγιά
+    regions: [cy]
+    mday: 1
+  8:
+  - name: Κοίμηση της Θεοτόκου
+    regions: [cy]
+    mday: 15
+  10:
+  - name: Ημέρα Ανεξαρτησίας
+    regions: [cy]
+    mday: 1
+  - name: Επέτειος του Όχι
+    regions: [cy]
+    mday: 28
+  12:
+  - name: Χριστούγεννα
+    regions: [cy]
+    mday: 25
+  - name: Ημέρα Πυγμαχίας
+    regions: [cy]
+    mday: 26
+
+tests:
+  - given:
+      date: '2023-04-01'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Εθνική Ημέρα της Κύπρου"
+  - given:
+      date: '2023-10-01'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Ημέρα Ανεξαρτησίας"
+  - given:
+      date: '2011-01-01'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Πρωτοχρονιά"
+  - given:
+      date: '2011-01-06'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Θεοφάνεια"
+  - given:
+      date: '2011-04-22'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Μεγάλη Παρασκευή"
+  - given:
+      date: '1970-04-25'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Μεγάλο Σάββατο"
+  - given:
+      date: '1985-04-14'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Κυριακή του Πάσχα"
+  - given:
+      date: '2011-04-24'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Κυριακή του Πάσχα"
+  - given:
+      date: '2027-05-02'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Κυριακή του Πάσχα"
+  - given:
+      date: '2046-04-30'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Δευτέρα του Πάσχα"
+  - given:
+      date: '2011-05-01'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Πρωτομαγιά"
+  - given:
+      date: '2011-06-13'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Αγίου Πνεύματος"
+  - given:
+      date: '2012-06-04'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Αγίου Πνεύματος"
+  - given:
+      date: '2011-03-07'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Καθαρά Δευτέρα"
+  - given:
+      date: '2012-02-27'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Καθαρά Δευτέρα"
+  - given:
+      date: '2011-12-25'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Χριστούγεννα"
+  - given:
+      date: '2011-12-26'
+      regions: ["cy"]
+      options: ["informal"]
+    expect:
+      name: "Δεύτερη ημέρα των Χριστουγέννων"

doc/SYNTAX.md

@@ -114,19 +114,16 @@ Then the holiday will be returned. This is especially useful for holidays like "
 
 ### Year ranges
 
-Certain holidays in various countries are only in effect during specific year ranges. A few examples of this are:
+Certain holidays in various countries are only in effect during specific year ranges. For example, a new holiday might come into effect that is only valid after a specific year (say, 2017). After is inclusive, if you put after: 2017 it will apply on 2017 and after.
 
-* A new holiday that starts in 2017 and continues into the future
-* An existing holiday that has been cancelled so that the final year in effect is 2019
-* A historical holiday that was only in effect from 2002 through 2006
+To address this we have the ability to specify these 'year ranges' in the definition. The gem will then only return a match on a date that adheres to these rules.
 
-To address these kinds of scenarios we have the ability to specify 'year ranges' for individual holiday definitions. There are a total of four selectors that can be specified. All must be specified in terms of 'years'. Only one selector can be used at a time.
+There are a total of four selectors that can be specified. All must be specified in terms of 'years'.
 
-#### `until`
+#### `before`
 
-The 'until' selector will only return a match if the supplied date takes place in the same year as the holiday or earlier.
-
-A single integer representing a year *must* be supplied. An array of values will result in an error.
+The 'before' selector will only find a match if the supplied date takes place
+before or equal to the holiday.
 
 Example:
 

es.yaml

@@ -33,6 +33,8 @@ months:
     regions: [es]
     mday: 1
     observed: to_monday_if_sunday(date)
+    year_ranges:
+      - before: 2022
   - name: Día de Reyes
     regions: [es]
     mday: 6