holidays 7.1.0 → 8.0.0

data/lib/holidays/definition/repository/holidays_by_month.rb

@@ -41,7 +41,15 @@ module Holidays
         private
 
         def definition_exists?(existing_def, target_def)
-          existing_def[:name] == target_def[:name] && existing_def[:wday] == target_def[:wday] && existing_def[:mday] == target_def[:mday] && existing_def[:week] == target_def[:week] && existing_def[:function] == target_def[:function] && existing_def[:type] == target_def[:type] && existing_def[:observed] == target_def[:observed] && existing_def[:year_ranges] == target_def[:year_ranges]
+          existing_def[:name] == target_def[:name] &&
+          existing_def[:wday] == target_def[:wday] &&
+          existing_def[:mday] == target_def[:mday] &&
+          existing_def[:week] == target_def[:week] &&
+          existing_def[:function] == target_def[:function] &&
+          existing_def[:function_modifier] == target_def[:function_modifier] &&
+          existing_def[:type] == target_def[:type] &&
+          existing_def[:observed] == target_def[:observed] &&
+          existing_def[:year_ranges] == target_def[:year_ranges]
         end
       end
     end

data/lib/holidays/finder/context/search.rb

@@ -24,39 +24,11 @@ module Holidays
                   next unless @rules[:year_range].call(year, h[:year_ranges])
                 end
 
-                current_month = month
-                current_day = h[:mday]
-
-                if h[:function]
-                  result = @custom_method_processor.call(
-                    build_custom_method_input(year, current_month, current_day, h[:regions]),
-                    h[:function], h[:function_arguments], h[:function_modifier],
-                  )
-
-                  #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
-                  if result
-                    current_month = result.month
-                    current_day = result.mday
-                  else
-                    current_month = nil
-                    current_day = nil
-                  end
-                else
-                  current_day = h[:mday] || @day_of_month_calculator.call(year, current_month, h[:week], h[:wday])
-                end
-
-                # Silently skip bad mdays
-                #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
-                begin
-                  date = Date.civil(year, current_month, current_day)
-                rescue; next; end
+                date = build_date(year, month, h)
+                next unless date
 
                 if observed_set?(options) && h[:observed]
-                  date = @custom_method_processor.call(
-                    build_custom_method_input(date.year, date.month, date.day, regions),
-                    h[:observed],
-                    [:date],
-                  )
+                  date = build_observed_date(date, regions, h)
                 end
 
                 holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
@@ -93,6 +65,29 @@ module Holidays
           options && options.include?(:observed) == true
         end
 
+        def build_date(year, month, h)
+          if h[:function]
+            holiday = custom_holiday(year, month, h)
+            #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
+            current_month = holiday&.month
+            current_day = holiday&.mday
+          else
+            current_month = month
+            current_day = h[:mday] || @day_of_month_calculator.call(year, month, h[:week], h[:wday])
+          end
+
+          # Silently skip bad mdays
+          #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
+          Date.civil(year, current_month, current_day) rescue nil
+        end
+
+        def custom_holiday(year, month, h)
+          @custom_method_processor.call(
+            build_custom_method_input(year, month, h[:mday], h[:regions]),
+            h[:function], h[:function_arguments], h[:function_modifier],
+          )
+        end
+
         def build_custom_method_input(year, month, day, regions)
           {
             year: year,
@@ -101,6 +96,14 @@ module Holidays
             region: regions.first, #FIXME This isn't ideal but will work for our current use case...
           }
         end
+
+        def build_observed_date(date, regions, h)
+          @custom_method_processor.call(
+            build_custom_method_input(date.year, date.month, date.day, regions),
+            h[:observed],
+            [:date],
+          )
+        end
       end
     end
   end

data/lib/holidays/finder/rules/year_range.rb

@@ -1,49 +1,30 @@
-# Please note that only one condition needs to match in order for `call` to return `true.
-# See the test file for this class for specific examples.
 module Holidays
   module Finder
     module Rules
       class YearRange
         class << self
-          BEFORE = :before
-          AFTER = :after
+          UNTIL = :until
+          FROM = :from
           LIMITED = :limited
           BETWEEN = :between
 
-          #TODO Can we just accept symbols here? Why accept strings?
-          VALID_OPERATORS = [
-            BEFORE, BEFORE.to_s,
-            AFTER, AFTER.to_s,
-            LIMITED, LIMITED.to_s,
-            BETWEEN, BETWEEN.to_s
-          ]
-
-          def call(target_year, year_range_definitions)
-            validate!(target_year, year_range_definitions)
-
-            matched = false
-            year_range_definitions.each do |range_defs|
-              next unless range_defs.is_a?(Hash) && range_defs.length == 1
-
-              operator = range_defs.keys.first
-              year_range = range_defs.values.first
-
-              case operator
-              when BEFORE, BEFORE.to_s
-                matched = target_year <= year_range
-              when AFTER, AFTER.to_s
-                matched = target_year >= year_range
-              when LIMITED, LIMITED.to_s
-                if year_range.is_a?(Array)
-                  matched = year_range.include?(target_year)
-                else
-                  matched = year_range == target_year
-                end
-              when BETWEEN, BETWEEN.to_s
-                matched = year_range.cover?(target_year)
-              end
-
-              break if matched == true
+          def call(target_year, year_range_defs)
+            validate!(target_year, year_range_defs)
+
+            operator = year_range_defs.keys.first
+            rule_value = year_range_defs[operator]
+
+            case operator
+            when UNTIL
+              matched = target_year <= rule_value
+            when FROM
+              matched = target_year >= rule_value
+            when LIMITED
+              matched = rule_value.include?(target_year)
+            when BETWEEN
+              matched = rule_value.cover?(target_year)
+            else
+              matched = false
             end
 
             matched
@@ -54,25 +35,20 @@ module Holidays
           def validate!(target_year, year_ranges)
             raise ArgumentError.new("target_year must be a number") unless target_year.is_a?(Integer)
             raise ArgumentError.new("year_ranges cannot be missing") if year_ranges.nil? || year_ranges.empty?
+            raise ArgumentError.new("year_ranges must contain a hash with a single operator") unless year_ranges.is_a?(Hash) && year_ranges.size == 1
 
-            year_ranges.each do |range|
-              raise ArgumentError.new("year_ranges must include only hashes") unless range.is_a?(Hash)
-              raise ArgumentError.new("year_ranges cannot include empty hashes") if range.empty?
-              raise ArgumentError.new("year_ranges entries can only include one operator") unless range.count == 1
-
-              operator = range.keys.first
-              range = range.values.first
+            operator = year_ranges.keys.first
+            value = year_ranges[operator]
 
-              raise ArgumentError.new("Invalid operator found: '#{operator}'") unless VALID_OPERATORS.include?(operator)
+            raise ArgumentError.new("Invalid operator found: '#{operator}'") unless [UNTIL, FROM, LIMITED, BETWEEN].include?(operator)
 
-              case operator
-              when BEFORE, BEFORE.to_s, AFTER, AFTER.to_s
-                raise ArgumentError.new(":before and :after operator value must be a number, received: '#{range}'") unless range.is_a?(Integer)
-              when LIMITED, LIMITED.to_s
-                raise ArgumentError.new(":limited operator value must be an array, received: '#{range}'") unless range.is_a?(Array) || range.is_a?(Integer)
-              when BETWEEN, BETWEEN.to_s
-                raise ArgumentError.new(":between operator value must be a range, received: '#{range}'") unless range.is_a?(Range)
-              end
+            case operator
+            when UNTIL, FROM
+              raise ArgumentError.new("#{UNTIL} and #{FROM} operator value must be a number, received: '#{value}'") unless value.is_a?(Integer)
+            when LIMITED
+              raise ArgumentError.new(":limited operator value must be an array containing at least one integer value, received: '#{value}'") unless value.is_a?(Array) && value.size >= 1 && value.all? { |v| v.is_a?(Integer) }
+            when BETWEEN
+              raise ArgumentError.new(":between operator value must be a range, received: '#{value}'") unless value.is_a?(Range)
             end
           end
         end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '7.1.0'
+  VERSION = '8.0.0'
 end

data/test/coverage_report.rb

@@ -1,8 +1,26 @@
 require 'simplecov'
 
-SimpleCov.minimum_coverage 99
+# For reasons I don't understand jruby implementations report lower coverage
+# than other ruby versions. Ruby 2.5.3, for instance, is at 92%.
+#
+# We set the floor based on jruby so that all automated tests pass on Travis CI.
+SimpleCov.minimum_coverage 89
+
+SimpleCov.add_filter [
+  # Apparently simplecov doesn't automatically filter 'spec' or 'test' so we
+  # have to do it manually.
+  'test',
+
+  # Only filtered because I tend to not see value in testing factories.
+  'lib/holidays/factory/',
+
+  # jruby coverage flips out here and doesn't count much of the large date
+  # arrays used by this class. This results in an extremely low reported
+  # coverage for this specific file but only in jruby, not other ruby versions.
+  # Since it obliterates coverage percentages I'll filter it until I can come
+  # up with a solution.
+  'lib/holidays/date_calculator/lunar_date.rb',
+]
+
 SimpleCov.coverage_dir 'reports/coverage'
-SimpleCov.start do
-  add_filter 'lib/generated_definitions/'
-  add_filter 'lib/holidays/factory/'
-end
+SimpleCov.start

data/test/data/test_custom_year_range_holiday_defs.yaml

@@ -4,28 +4,24 @@ months:
     regions: [custom_year_range_file]
     mday: 1
     year_ranges:
-      - after: 2016
+      from: 2016
   - name: before_year
     regions: [custom_year_range_file]
     mday: 2
     year_ranges:
-      - before: 2017
+      until: 2017
   - name: between_year
     regions: [custom_year_range_file]
     mday: 3
     year_ranges:
-      - between: 2016..2018
+      between:
+        start: 2016
+        end: 2018
   - name: limited_year
     regions: [custom_year_range_file]
     mday: 4
     year_ranges:
-      - limited: [2016,2018,2019]
-  - name: multiple_conditions
-    regions: [custom_year_range_file]
-    mday: 5
-    year_ranges:
-      - before: 2015
-      - after: 2017
+      limited: [2016,2018,2019]
 
 tests:
   - given:

data/test/data/test_multiple_regions_with_conflicts_region_1.yaml

@@ -0,0 +1,38 @@
+months:
+  0:
+  - name: With Function Modifier
+    regions: [multiple_with_conflict_1]
+    function: easter(year)
+    function_modifier: 60
+  - name: With Function Only Different Function Name
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_1(year)
+  - name: With Function Only Same Function Name
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_identical_name_between_regions(year)
+  - name: With Function Only Same Function Name - Region 1
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_identical_name_between_regions_but_different_holiday_names(year)
+  1:
+  - name: New Year's Day
+    regions: [multiple_with_conflict_1]
+    mday: 1
+    observed: to_monday_if_weekend(date)
+  10:
+  - name: Testing Conflict Month 10
+    regions: [multiple_with_conflict_1]
+    mday: 5
+
+methods:
+  conflict_custom_method_1:
+    arguments: year
+    ruby: |
+      Date.civil(year, 8, 1)
+  conflict_custom_method_identical_name_between_regions:
+    arguments: year
+    ruby: |
+      Date.civil(year, 9, 1)
+  conflict_custom_method_identical_name_between_regions_but_different_holiday_names:
+    arguments: year
+    ruby: |
+      Date.civil(year, 9, 15)

data/test/data/test_multiple_regions_with_conflicts_region_2.yaml

@@ -0,0 +1,38 @@
+months:
+  0:
+  - name: With Function Modifier
+    regions: [multiple_with_conflict_2]
+    function: easter(year)
+    function_modifier: 64
+  - name: With Function Only Different Function Name
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_2(year)
+  - name: With Function Only Same Function Name
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_identical_name_between_regions(year)
+  - name: With Function Only Same Function Name - Region 2
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_identical_name_between_regions_but_different_holiday_names(year)
+  1:
+  - name: New Year's Day
+    regions: [multiple_with_conflict_2]
+    mday: 1
+    observed: to_tuesday_if_sunday_or_monday_if_saturday(date)
+  10:
+  - name: Testing Conflict Month 10
+    regions: [multiple_with_conflict_2]
+    mday: 7
+
+methods:
+  conflict_custom_method_2:
+    arguments: year
+    ruby: |
+      Date.civil(year, 12, 1)
+  conflict_custom_method_identical_name_between_regions:
+    arguments: year
+    ruby: |
+      Date.civil(year, 11, 1)
+  conflict_custom_method_identical_name_between_regions_but_different_holiday_names:
+    arguments: year
+    ruby: |
+      Date.civil(year, 11, 15)

data/test/defs/test_defs_ca.rb

@@ -201,12 +201,24 @@ assert_equal "Remembrance Day", (Holidays.on(Date.civil(2017, 11, 13), [:ca_ab,
 
     assert_equal "Canada Day", (Holidays.on(Date.civil(2017, 7, 3), [:ca], [:observed])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 27), [:ca], [:observed])[0] || {})[:name]
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 25), [:ca])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2018, 12, 25), [:ca])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 25), [:ca])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2022, 12, 25), [:ca], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 24), [:ca], [:observed])[0] || {})[:name]
 
     assert_equal "Christmas Day", (Holidays.on(Date.civil(2012, 12, 25), [:ca], [:observed])[0] || {})[:name]
 
     assert_equal "Christmas Day", (Holidays.on(Date.civil(2016, 12, 26), [:ca], [:observed])[0] || {})[:name]
 
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 24), [:ca], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 26), [:ca], [:observed])[0] || {})[:name]
+
     assert_equal "Boxing Day", (Holidays.on(Date.civil(2010, 12, 28), [:ca_on], [:observed])[0] || {})[:name]
 assert_equal "Boxing Day", (Holidays.on(Date.civil(2012, 12, 26), [:ca_on], [:observed])[0] || {})[:name]
 assert_equal "Boxing Day", (Holidays.on(Date.civil(2015, 12, 28), [:ca_on], [:observed])[0] || {})[:name]

data/test/defs/test_defs_co.rb

@@ -45,11 +45,11 @@ class CoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de la Ascensión", (Holidays.on(Date.civil(2017, 5, 29), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 19), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 23), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 26), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 30), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 15), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 19), [:co])[0] || {})[:name]
 
     assert_equal "Sagrado Corazón", (Holidays.on(Date.civil(2014, 6, 30), [:co])[0] || {})[:name]
 

data/test/defs/test_defs_europe.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: definitions/at.yaml, definitions/be_fr.yaml, definitions/be_nl.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml, definitions/ua.yaml
+# Definitions loaded: definitions/at.yaml, definitions/be_fr.yaml, definitions/be_nl.yaml, definitions/ch.yaml, definitions/cz.yaml, definitions/dk.yaml, definitions/de.yaml, definitions/el.yaml, definitions/es.yaml, definitions/fr.yaml, definitions/gb.yaml, definitions/hr.yaml, definitions/hu.yaml, definitions/ie.yaml, definitions/is.yaml, definitions/it.yaml, definitions/li.yaml, definitions/lt.yaml, definitions/lv.yaml, definitions/nl.yaml, definitions/no.yaml, definitions/pl.yaml, definitions/pt.yaml, definitions/ro.yaml, definitions/sk.yaml, definitions/si.yaml, definitions/bg.yaml, definitions/ua.yaml
 class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_europe
@@ -593,15 +593,15 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "1848/49-es forradalom és szabadságharc ünnepe", (Holidays.on(Date.civil(2012, 3, 15), [:hu], [:informal])[0] || {})[:name]
 
-    assert_equal "Húsvét hétfő", (Holidays.on(Date.civil(2011, 4, 25), [:hu], [:informal])[0] || {})[:name]
+    assert_equal "Húsvéthétfő", (Holidays.on(Date.civil(2011, 4, 25), [:hu], [:informal])[0] || {})[:name]
 
-    assert_equal "Húsvét hétfő", (Holidays.on(Date.civil(2012, 4, 9), [:hu], [:informal])[0] || {})[:name]
+    assert_equal "Húsvéthétfő", (Holidays.on(Date.civil(2012, 4, 9), [:hu], [:informal])[0] || {})[:name]
 
     assert_equal "A munka ünnepe", (Holidays.on(Date.civil(2012, 5, 1), [:hu], [:informal])[0] || {})[:name]
 
-    assert_equal "Pünkösd hétfő", (Holidays.on(Date.civil(2011, 6, 13), [:hu], [:informal])[0] || {})[:name]
+    assert_equal "Pünkösdhétfő", (Holidays.on(Date.civil(2011, 6, 13), [:hu], [:informal])[0] || {})[:name]
 
-    assert_equal "Pünkösd hétfő", (Holidays.on(Date.civil(2012, 5, 28), [:hu], [:informal])[0] || {})[:name]
+    assert_equal "Pünkösdhétfő", (Holidays.on(Date.civil(2012, 5, 28), [:hu], [:informal])[0] || {})[:name]
 
     assert_equal "Az államalapítás ünnepe", (Holidays.on(Date.civil(2012, 8, 20), [:hu], [:informal])[0] || {})[:name]
 
@@ -615,6 +615,14 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_nil (Holidays.on(Date.civil(2012, 3, 14), [:hu])[0] || {})[:name]
 
+    assert_equal "Húsvéthétfő", (Holidays.on(Date.civil(2016, 3, 28), [:hu])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 3, 25), [:hu])[0] || {})[:name]
+
+    assert_equal "Húsvéthétfő", (Holidays.on(Date.civil(2017, 4, 17), [:hu])[0] || {})[:name]
+
+    assert_equal "Nagypéntek", (Holidays.on(Date.civil(2017, 4, 14), [:hu])[0] || {})[:name]
+
     assert_equal "New Year's Day", (Holidays.on(Date.civil(2008, 1, 1), [:ie])[0] || {})[:name]
 
     assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2008, 3, 17), [:ie])[0] || {})[:name]
@@ -707,14 +715,34 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Festa della Liberazione", (Holidays.on(Date.civil(2007, 4, 25), [:it], [:informal])[0] || {})[:name]
 
+    assert_equal "Festa di San Liberale", (Holidays.on(Date.civil(2019, 4, 27), [:it_tv], [:informal])[0] || {})[:name]
+
     assert_equal "Festa dei Lavoratori", (Holidays.on(Date.civil(2007, 5, 1), [:it], [:informal])[0] || {})[:name]
 
+    assert_equal "Festa di San Zeno", (Holidays.on(Date.civil(2019, 5, 21), [:it_vr], [:informal])[0] || {})[:name]
+
     assert_equal "Festa della Repubblica", (Holidays.on(Date.civil(2007, 6, 2), [:it], [:informal])[0] || {})[:name]
 
+    assert_equal "Festa di Sant'Antonio di Padova", (Holidays.on(Date.civil(2019, 6, 13), [:it_pd], [:informal])[0] || {})[:name]
+
+    assert_equal "Festa di San Giovanni Battista", (Holidays.on(Date.civil(2019, 6, 24), [:it_fi, :it_ge, :it_to], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2019, 6, 24), [:it])[0] || {})[:name]
+
+    assert_equal "Festa di San Pietro e Paolo", (Holidays.on(Date.civil(2019, 6, 29), [:it_rm], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2019, 6, 29), [:it])[0] || {})[:name]
+
     assert_equal "Assunzione", (Holidays.on(Date.civil(2007, 8, 15), [:it], [:informal])[0] || {})[:name]
 
+    assert_equal "Festa della Madonna di Monte Berico", (Holidays.on(Date.civil(2019, 9, 8), [:it_vi], [:informal])[0] || {})[:name]
+
     assert_equal "Ognissanti", (Holidays.on(Date.civil(2007, 11, 1), [:it], [:informal])[0] || {})[:name]
 
+    assert_equal "Festa di San Martino", (Holidays.on(Date.civil(2019, 11, 11), [:it_bl], [:informal])[0] || {})[:name]
+
+    assert_equal "Festa di San Bellino", (Holidays.on(Date.civil(2019, 11, 26), [:it_ro], [:informal])[0] || {})[:name]
+
     assert_equal "Immacolata Concezione", (Holidays.on(Date.civil(2007, 12, 8), [:it], [:informal])[0] || {})[:name]
 
     assert_equal "Natale", (Holidays.on(Date.civil(2007, 12, 25), [:it], [:informal])[0] || {})[:name]
@@ -797,6 +825,85 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Antroji Kalėdų diena", (Holidays.on(Date.civil(2012, 12, 26), [:lt])[0] || {})[:name]
 
+    assert_equal "Jaungada diena", (Holidays.on(Date.civil(2018, 1, 1), [:lv])[0] || {})[:name]
+assert_equal "Jaungada diena", (Holidays.on(Date.civil(2019, 1, 1), [:lv])[0] || {})[:name]
+assert_equal "Jaungada diena", (Holidays.on(Date.civil(2029, 1, 1), [:lv])[0] || {})[:name]
+
+    assert_equal "Lielā Piektdiena", (Holidays.on(Date.civil(2018, 3, 30), [:lv])[0] || {})[:name]
+assert_equal "Lielā Piektdiena", (Holidays.on(Date.civil(2019, 4, 19), [:lv])[0] || {})[:name]
+assert_equal "Lielā Piektdiena", (Holidays.on(Date.civil(2039, 4, 8), [:lv])[0] || {})[:name]
+
+    assert_equal "Pirmās Lieldienas", (Holidays.on(Date.civil(2018, 4, 1), [:lv])[0] || {})[:name]
+assert_equal "Pirmās Lieldienas", (Holidays.on(Date.civil(2019, 4, 21), [:lv])[0] || {})[:name]
+assert_equal "Pirmās Lieldienas", (Holidays.on(Date.civil(2039, 4, 10), [:lv])[0] || {})[:name]
+
+    assert_equal "Otrās Lieldienas", (Holidays.on(Date.civil(2018, 4, 2), [:lv])[0] || {})[:name]
+assert_equal "Otrās Lieldienas", (Holidays.on(Date.civil(2019, 4, 22), [:lv])[0] || {})[:name]
+assert_equal "Otrās Lieldienas", (Holidays.on(Date.civil(2039, 4, 11), [:lv])[0] || {})[:name]
+
+    assert_equal "Darba svētki, Latvijas Republikas Satversmes sapulces sasaukšanas diena", (Holidays.on(Date.civil(2018, 5, 1), [:lv])[0] || {})[:name]
+assert_equal "Darba svētki, Latvijas Republikas Satversmes sapulces sasaukšanas diena", (Holidays.on(Date.civil(2019, 5, 1), [:lv])[0] || {})[:name]
+assert_equal "Darba svētki, Latvijas Republikas Satversmes sapulces sasaukšanas diena", (Holidays.on(Date.civil(2029, 5, 1), [:lv])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Neatkarības atjaunošanas diena", (Holidays.on(Date.civil(2018, 5, 4), [:lv])[0] || {})[:name]
+assert_equal "Latvijas Republikas Neatkarības atjaunošanas diena", (Holidays.on(Date.civil(2019, 5, 4), [:lv])[0] || {})[:name]
+assert_equal "Latvijas Republikas Neatkarības atjaunošanas diena", (Holidays.on(Date.civil(2020, 5, 4), [:lv])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Neatkarības atjaunošanas diena", (Holidays.on(Date.civil(2019, 5, 6), [:lv], [:observed])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Neatkarības atjaunošanas diena", (Holidays.on(Date.civil(2020, 5, 4), [:lv], [:observed])[0] || {})[:name]
+
+    assert_equal "Mātes diena", (Holidays.on(Date.civil(2019, 5, 12), [:lv])[0] || {})[:name]
+assert_equal "Mātes diena", (Holidays.on(Date.civil(2020, 5, 10), [:lv])[0] || {})[:name]
+assert_equal "Mātes diena", (Holidays.on(Date.civil(2029, 5, 13), [:lv])[0] || {})[:name]
+
+    assert_equal "Vasarsvētki", (Holidays.on(Date.civil(2019, 6, 9), [:lv])[0] || {})[:name]
+assert_equal "Vasarsvētki", (Holidays.on(Date.civil(2020, 5, 31), [:lv])[0] || {})[:name]
+assert_equal "Vasarsvētki", (Holidays.on(Date.civil(2029, 5, 20), [:lv])[0] || {})[:name]
+
+    assert_equal "Līgo diena", (Holidays.on(Date.civil(2019, 6, 23), [:lv])[0] || {})[:name]
+assert_equal "Līgo diena", (Holidays.on(Date.civil(2020, 6, 23), [:lv])[0] || {})[:name]
+assert_equal "Līgo diena", (Holidays.on(Date.civil(2029, 6, 23), [:lv])[0] || {})[:name]
+
+    assert_equal "Jāņu diena", (Holidays.on(Date.civil(2019, 6, 24), [:lv])[0] || {})[:name]
+assert_equal "Jāņu diena", (Holidays.on(Date.civil(2020, 6, 24), [:lv])[0] || {})[:name]
+assert_equal "Jāņu diena", (Holidays.on(Date.civil(2029, 6, 24), [:lv])[0] || {})[:name]
+
+    assert_equal "Vispārējo latviešu Dziesmu un deju svētku noslēguma diena", (Holidays.on(Date.civil(2018, 7, 8), [:lv])[0] || {})[:name]
+
+    assert_equal "Vispārējo latviešu Dziesmu un deju svētku noslēguma diena", (Holidays.on(Date.civil(2018, 7, 9), [:lv], [:observed])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2019, 7, 8), [:lv])[0] || {})[:name]
+assert_nil (Holidays.on(Date.civil(2019, 7, 9), [:lv])[0] || {})[:name]
+
+    assert_equal "Viņa Svētības pāvesta Franciska pastorālās vizītes Latvijā diena", (Holidays.on(Date.civil(2018, 9, 24), [:lv])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2019, 9, 24), [:lv])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Proklamēšanas diena", (Holidays.on(Date.civil(2019, 11, 18), [:lv])[0] || {})[:name]
+assert_equal "Latvijas Republikas Proklamēšanas diena", (Holidays.on(Date.civil(2020, 11, 18), [:lv])[0] || {})[:name]
+assert_equal "Latvijas Republikas Proklamēšanas diena", (Holidays.on(Date.civil(2029, 11, 18), [:lv])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Proklamēšanas diena", (Holidays.on(Date.civil(2020, 11, 18), [:lv], [:observed])[0] || {})[:name]
+
+    assert_equal "Latvijas Republikas Proklamēšanas diena", (Holidays.on(Date.civil(2029, 11, 19), [:lv], [:observed])[0] || {})[:name]
+
+    assert_equal "Ziemassvētku vakars", (Holidays.on(Date.civil(2019, 12, 24), [:lv])[0] || {})[:name]
+assert_equal "Ziemassvētku vakars", (Holidays.on(Date.civil(2020, 12, 24), [:lv])[0] || {})[:name]
+assert_equal "Ziemassvētku vakars", (Holidays.on(Date.civil(2029, 12, 24), [:lv])[0] || {})[:name]
+
+    assert_equal "Pirmie Ziemassvētki", (Holidays.on(Date.civil(2019, 12, 25), [:lv])[0] || {})[:name]
+assert_equal "Pirmie Ziemassvētki", (Holidays.on(Date.civil(2020, 12, 25), [:lv])[0] || {})[:name]
+assert_equal "Pirmie Ziemassvētki", (Holidays.on(Date.civil(2029, 12, 25), [:lv])[0] || {})[:name]
+
+    assert_equal "Otrie Ziemassvētki", (Holidays.on(Date.civil(2019, 12, 26), [:lv])[0] || {})[:name]
+assert_equal "Otrie Ziemassvētki", (Holidays.on(Date.civil(2020, 12, 26), [:lv])[0] || {})[:name]
+assert_equal "Otrie Ziemassvētki", (Holidays.on(Date.civil(2029, 12, 26), [:lv])[0] || {})[:name]
+
+    assert_equal "Vecgada diena", (Holidays.on(Date.civil(2019, 12, 31), [:lv])[0] || {})[:name]
+assert_equal "Vecgada diena", (Holidays.on(Date.civil(2020, 12, 31), [:lv])[0] || {})[:name]
+assert_equal "Vecgada diena", (Holidays.on(Date.civil(2029, 12, 31), [:lv])[0] || {})[:name]
+
     assert_equal "Nieuwjaarsdag", (Holidays.on(Date.civil(2008, 1, 1), [:nl], [:informal])[0] || {})[:name]
 
     assert_equal "Goede Vrijdag", (Holidays.on(Date.civil(2008, 3, 21), [:nl], [:informal])[0] || {})[:name]
@@ -1103,6 +1210,12 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Natal", (Holidays.on(Date.civil(2008, 12, 25), [:pt], [:informal])[0] || {})[:name]
 
+    assert_nil (Holidays.on(Date.civil(2017, 4, 14), [:ro])[0] || {})[:name]
+
+    assert_equal "Paștele - Vinerea Mare", (Holidays.on(Date.civil(2018, 4, 6), [:ro], [:informal])[0] || {})[:name]
+
+    assert_equal "Paștele - Vinerea Mare", (Holidays.on(Date.civil(2019, 4, 26), [:ro], [:informal])[0] || {})[:name]
+
     assert_equal "Paștele - duminică", (Holidays.on(Date.civil(1961, 4, 9), [:ro], [:informal])[0] || {})[:name]
 
     assert_equal "Paștele - luni", (Holidays.on(Date.civil(1961, 4, 10), [:ro], [:informal])[0] || {})[:name]
@@ -1129,8 +1242,16 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Anul nou", (Holidays.on(Date.civil(2014, 1, 2), [:ro], [:informal])[0] || {})[:name]
 
+    assert_equal "Unirea Principatelor Române", (Holidays.on(Date.civil(2017, 1, 24), [:ro], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 1, 24), [:ro])[0] || {})[:name]
+
     assert_equal "Ziua muncii", (Holidays.on(Date.civil(2009, 5, 1), [:ro], [:informal])[0] || {})[:name]
 
+    assert_equal "Ziua Copilului", (Holidays.on(Date.civil(2017, 6, 1), [:ro], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 6, 1), [:ro])[0] || {})[:name]
+
     assert_equal "Adormirea Maicii Domnului", (Holidays.on(Date.civil(2012, 8, 15), [:ro], [:informal])[0] || {})[:name]
 
     assert_equal "Sfântul Apostol Andrei", (Holidays.on(Date.civil(2013, 11, 30), [:ro], [:informal])[0] || {})[:name]