holidays 6.6.1 → 8.7.1

data/lib/holidays/definition/context/generator.rb

@@ -11,12 +11,13 @@ module Holidays
   module Definition
     module Context
       class Generator
-        def initialize(custom_method_parser, custom_method_source_decorator, custom_methods_repository, test_parser, test_source_generator)
+        def initialize(custom_method_parser, custom_method_source_decorator, custom_methods_repository, test_parser, test_source_generator, module_source_generator)
           @custom_method_parser = custom_method_parser
           @custom_method_source_decorator = custom_method_source_decorator
           @custom_methods_repository = custom_methods_repository
           @test_parser = test_parser
           @test_source_generator = test_source_generator
+          @module_source_generator = module_source_generator
         end
 
         def parse_definition_files(files)
@@ -66,7 +67,7 @@ module Holidays
             custom_method_string << @custom_method_source_decorator.call(code) + ",\n\n"
           end
 
-          module_src = generate_module_src(module_name, files, regions, month_strings, custom_method_string)
+          module_src = @module_source_generator.call(module_name, files, regions, month_strings, custom_method_string)
           test_src = @test_source_generator.call(module_name, files, tests)
 
           return module_src, test_src || ''
@@ -86,16 +87,27 @@ module Holidays
                 rule = {}
 
                 definition.each do |key, val|
+                  # Ruby 2.4 doesn't have the `transform_keys` method. Once we drop 2.4 support we can
+                  # use `val.transform_keys!(&:to_sym) if val.is_a?(Hash)` instead of this `if` statement.
+                  if val.is_a?(Hash)
+                    val = val.keys.each_with_object({}) do |k, result|
+                      result[k.to_sym] = val[k]
+                    end
+                  end
+
                   rule[key.to_sym] = val
                 end
 
-                rule[:regions] = rule[:regions].collect { |r| r.to_sym }
-                regions << rule[:regions]
+                if rule[:year_ranges] && rule[:year_ranges].key?(:between)
+                  start_year = rule[:year_ranges][:between]["start"].to_i
+                  end_year = rule[:year_ranges][:between]["end"].to_i
 
-                if rule[:year_ranges]
-                  rule[:year_ranges] = clean_year_ranges(rule[:year_ranges])
+                  rule[:year_ranges][:between] = Range.new(start_year, end_year)
                 end
 
+                rule[:regions] = rule[:regions].collect { |r| r.to_sym }
+                regions << rule[:regions]
+
                 exists = false
                 rules_by_month[month].each do |ex|
                   if ex[:name] == rule[:name] and ex[:wday] == rule[:wday] and ex[:mday] == rule[:mday] and ex[:week] == rule[:week] and ex[:type] == rule[:type] and ex[:function] == rule[:function] and ex[:observed] == rule[:observed] and ex[:year_ranges] == rule[:year_ranges]
@@ -120,23 +132,6 @@ module Holidays
           [regions, rules_by_month]
         end
 
-        # In this case we end up parsing a range as "2006..2008" a string. This is codifying
-        # what we already do...today we parse as a string but when writing out to our final
-        # generated files it comes out as a range that Ruby interprets. This just puts it in stone
-        # what we want to do.
-        def clean_year_ranges(year_ranges)
-          year_ranges.collect do |year_range|
-            if year_range["between"]
-              range = year_range["between"]
-              if range.is_a?(String)
-                year_range["between"] = Range.new(*range.split("..").map(&:to_i))
-              end
-            end
-
-            year_range
-          end
-        end
-
         #FIXME This should really be split out and tested with its own unit tests.
         def generate_month_definition_strings(rules_by_month, parsed_custom_methods)
           month_strings = []
@@ -169,19 +164,11 @@ module Holidays
                 string << ":wday => #{rule[:wday]}, :week => #{rule[:week]}, "
               end
 
-              #FIXME I think this should be split out into its own file.
-              if rule[:year_ranges] && rule[:year_ranges].kind_of?(Array)
-                year_string = " :year_ranges => ["
-                len = rule[:year_ranges].length
-                rule[:year_ranges].each_with_index do |year,index|
-                  year_string << "{:#{year.keys.first} => #{year.values.first}}"
-                  if len == index + 1
-                    year_string << "],"
-                  else
-                    year_string << ","
-                  end
-                end
-                string << year_string
+              if rule[:year_ranges] && rule[:year_ranges].is_a?(Hash)
+                selector = rule[:year_ranges].keys.first
+                value = rule[:year_ranges][selector]
+
+                string << ":year_ranges => { :#{selector} => #{value} },"
               end
 
               if rule[:observed]
@@ -216,40 +203,6 @@ module Holidays
             method.arguments.collect { |arg| arg.to_sym }
           end
         end
-
-        def generate_module_src(module_name, files, regions, month_strings, custom_methods)
-          module_src = ""
-
-          module_src =<<-EOM
-# encoding: utf-8
-module Holidays
-  # This file is generated by the Ruby Holidays gem.
-  #
-  # Definitions loaded: #{files.join(', ')}
-  #
-  # All the definitions are available at https://github.com/holidays/holidays
-  module #{module_name.to_s.upcase} # :nodoc:
-    def self.defined_regions
-      [:#{regions.join(', :')}]
-    end
-
-    def self.holidays_by_month
-      {
-        #{month_strings.join(",\n")}
-      }
-    end
-
-    def self.custom_methods
-      {
-        #{custom_methods}
-      }
-    end
-  end
-end
-        EOM
-
-          return module_src
-        end
       end
     end
   end

data/lib/holidays/definition/generator/module.rb

@@ -0,0 +1,54 @@
+require 'holidays/errors'
+
+module Holidays
+  module Definition
+    module Generator
+      class Module
+        def call(module_name, files, regions, month_strings, custom_methods)
+          raise ArgumentError.new("module name cannot be nil") if module_name.nil?
+          raise ArgumentError.new("module name cannot be blank") if module_name.empty?
+
+          raise ArgumentError.new("files cannot be nil") if files.nil?
+          raise ArgumentError.new("files cannot be empty") if files.empty?
+          raise ArgumentError.new("files must all be strings") unless files.all? { |f| f.is_a?(String) }
+
+          raise ArgumentError.new("regions cannot be nil") if regions.nil?
+          raise ArgumentError.new("regions cannot be empty") if regions.empty?
+
+          raise ArgumentError.new("month strings cannot be nil") if month_strings.nil?
+          raise ArgumentError.new("month strings cannot be empty") if month_strings.empty?
+
+          module_src =<<-EOM
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: #{files.join(', ')}
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module #{module_name.to_s.upcase} # :nodoc:
+    def self.defined_regions
+      [:#{regions.join(', :')}]
+    end
+
+    def self.holidays_by_month
+      {
+          #{month_strings.join(",\n")}
+      }
+    end
+
+    def self.custom_methods
+      {
+          #{custom_methods}
+      }
+    end
+  end
+end
+          EOM
+
+          module_src
+        end
+      end
+    end
+  end
+end

data/lib/holidays/definition/generator/regions.rb

@@ -2,7 +2,7 @@ module Holidays
   module Definition
     module Generator
       class Regions
-        # The "ca", "mx", and "us" holiday definitions include the "north_america_informal"
+        # The "ca", "mx", and "us" holiday definitions include the "northamericainformal"
         # holiday definitions, but that does not make these countries subregions of one another.
         NORTH_AMERICA_REGIONS = %i[ca mx us].freeze
 

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/factory/definition.rb

@@ -5,6 +5,7 @@ require 'holidays/definition/context/load'
 require 'holidays/definition/decorator/custom_method_proc'
 require 'holidays/definition/decorator/custom_method_source'
 require 'holidays/definition/decorator/test'
+require 'holidays/definition/generator/module'
 require 'holidays/definition/generator/regions'
 require 'holidays/definition/generator/test'
 require 'holidays/definition/parser/custom_method'
@@ -29,6 +30,7 @@ module Holidays
             custom_methods_repository,
             test_parser,
             test_generator,
+            module_generator,
           )
         end
 
@@ -39,6 +41,7 @@ module Holidays
             custom_methods_repository,
             test_parser,
             test_generator,
+            module_generator,
           )
         end
 
@@ -115,6 +118,10 @@ module Holidays
           )
         end
 
+        def module_generator
+          Holidays::Definition::Generator::Module.new
+        end
+
         def test_generator
           Holidays::Definition::Generator::Test.new(
             test_decorator,

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,30 @@ 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(
+            #FIXME This seems like a bug, we seem to expect the day in here in the au defs?
+            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 +97,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 = '6.6.1'
+  VERSION = '8.7.1'
 end

data/lib/holidays.rb

@@ -40,6 +40,8 @@ module Holidays
 
       start_date, end_date = get_date(start_date), get_date(end_date)
 
+      raise ArgumentError if end_date < start_date
+
       if cached_holidays = Factory::Definition.cache_repository.find(start_date, end_date, options)
         return cached_holidays
       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_ar.rb

@@ -31,21 +31,37 @@ class ArDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de la Revolución de Mayo", (Holidays.on(Date.civil(2016, 5, 25), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Día de la Bandera", (Holidays.on(Date.civil(2016, 6, 20), [:ar], [:informal])[0] || {})[:name]
+    assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2020, 6, 15), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2021, 6, 21), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Feriado puente turístico", (Holidays.on(Date.civil(2016, 7, 8), [:ar], [:informal])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2020, 6, 17), [:ar], [:informal])[0] || {})[:name]
+assert_nil (Holidays.on(Date.civil(2021, 6, 17), [:ar], [:informal])[0] || {})[:name]
+
+    assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2016, 6, 20), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 9), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 15), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2020, 8, 17), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2021, 8, 16), [:ar], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 8, 17), [:ar], [:informal])[0] || {})[:name]
+assert_nil (Holidays.on(Date.civil(2021, 8, 17), [:ar], [:informal])[0] || {})[:name]
+
+    assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 10), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2021, 10, 11), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 12), [:ar], [:informal])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2021, 10, 12), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Día de la Soberanía Nacional", (Holidays.on(Date.civil(2016, 11, 20), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Inmaculada Concepción de María", (Holidays.on(Date.civil(2016, 12, 8), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Feriado puente turístico", (Holidays.on(Date.civil(2016, 12, 9), [:ar], [:informal])[0] || {})[:name]
+    assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2016, 7, 8), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2016, 12, 9), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 5, 24), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 10, 8), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 11, 22), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Navidad", (Holidays.on(Date.civil(2016, 12, 25), [:ar], [:informal])[0] || {})[:name]