holidays 6.4.0 → 8.6.0

data/lib/generated_definitions/us.rb

@@ -2,17 +2,17 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: definitions/us.yaml, definitions/north_america_informal.yaml
+  # Definitions loaded: definitions/us.yaml, definitions/northamericainformal.yaml
   #
   # All the definitions are available at https://github.com/holidays/holidays
   module US # :nodoc:
     def self.defined_regions
-      [:us_fl, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_il, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_al, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_mt, :us_nm, :us_ny, :us_oh, :us_pa, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :ca]
+      [:us_fl, :us_la, :us, :us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn, :us_ms, :us_id, :us_ar, :us_tx, :us_dc, :us_md, :us_va, :us_vt, :us_ak, :us_ca, :us_me, :us_ma, :us_al, :us_ga, :us_ne, :us_mo, :us_sc, :us_wv, :us_vi, :us_ut, :us_ri, :us_az, :us_co, :us_il, :us_mt, :us_nm, :us_ny, :us_oh, :us_pa, :us_mi, :us_mn, :us_nv, :us_or, :us_sd, :us_wa, :us_wi, :us_wy, :us_ia, :us_ks, :us_nh, :us_ok, :ca]
     end
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Shrove Tuesday", :regions => [:us_fl]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Shrove Tuesday", :regions => [:us_fl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Mardi Gras Day", :regions => [:us_la]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Good Friday", :regions => [:us]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:us_ct, :us_de, :us_gu, :us_hi, :us_in, :us_ky, :us_la, :us_nj, :us_nc, :us_nd, :us_pr, :us_tn]},
@@ -28,14 +28,13 @@ module Holidays
       2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]},
             {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
             {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
-      3 => [{:wday => 1, :week => 1, :name => "Casimir Pulaski Day", :regions => [:us_il]},
-            {:wday => 2, :week => 1, :name => "Town Meeting Day", :regions => [:us_vt]},
+      3 => [{:wday => 2, :week => 1, :name => "Town Meeting Day", :regions => [:us_vt]},
             {:mday => 2, :name => "Texas Independence Day", :regions => [:us_tx]},
             {:mday => 26, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Prince Jonah Kuhio Kalanianaole Day", :regions => [:us_hi]},
             {:wday => 1, :week => -1, :name => "Seward's Day", :regions => [:us_ak]},
             {:mday => 31, :name => "César Chávez Day", :regions => [:us_ca]},
             {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
-      4 => [{:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc, :us_ca]},
+      4 => [{:mday => 16, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Emancipation Day", :regions => [:us_dc]},
             {:wday => 1, :week => 3, :name => "Patriots' Day", :regions => [:us_me, :us_ma]},
             {:mday => 21, :name => "San Jacinto Day", :regions => [:us_tx]},
             {:wday => 1, :week => -1, :name => "Confederate Memorial Day", :regions => [:us_al, :us_ms]},
@@ -52,6 +51,7 @@ module Holidays
       6 => [{:wday => 1, :week => 1, :name => "Jefferson Davis' Birthday", :regions => [:us_al]},
             {:mday => 3, :name => "Birthday of Jefferson Davis", :regions => [:us_fl]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "King Kamehameha I Day", :regions => [:us_hi]},
+            {:mday => 19, :year_ranges => { :from => 2021 },:observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Juneteenth National Independence Day", :regions => [:us]},
             {:mday => 19, :name => "Emancipation Day in Texas", :regions => [:us_tx]},
             {:mday => 20, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "West Virginia Day", :regions => [:us_wv]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
@@ -71,7 +71,7 @@ module Holidays
             {:mday => 18, :name => "Alaska Day", :regions => [:us_ak]},
             {:wday => 5, :week => -1, :name => "Nevada Day", :regions => [:us_nv]},
             {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
-      11 => [{:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
+      11 => [{:function => "election_day(year)", :function_arguments => [:year], :name => "Election Day", :regions => [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri]},
             {:mday => 11, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Veterans Day", :regions => [:us]},
             {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]},
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Family Day", :regions => [:us_nv]},
@@ -82,7 +82,7 @@ module Holidays
             {:function => "day_after_thanksgiving(year)", :function_arguments => [:year], :name => "Day after Thanksgiving (Black Friday)", :regions => [:us_ca, :us_de, :us_fl, :us_ia, :us_il, :us_ks, :us_ky, :us_me, :us_mi, :us_mn, :us_ms, :us_ne, :us_nh, :us_nc, :us_pa, :us_sc, :us_ok, :us_tn, :us_tx, :us_va, :us_wa, :us_wv]}],
       12 => [{:mday => 24, :name => "Christmas Eve", :regions => [:us_ar, :us_mi, :us_nc, :us_sc, :us_tx, :us_wi]},
             {:mday => 24, :function => "christmas_eve_holiday(date)", :function_arguments => [:date], :name => "Christmas Eve (Holiday)", :regions => [:us_mi, :us_sc, :us_va]},
-            {:mday => 25, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
+            {:mday => 25, :observed => "to_weekday_if_weekend(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:us]},
             {:mday => 26, :name => "Day after Christmas", :regions => [:us_ar, :us_nc, :us_ok, :us_sc, :us_tn, :us_tx]},
             {:mday => 31, :name => "New Year's Eve", :regions => [:us_mi, :us_wi]}]
       }
@@ -90,7 +90,7 @@ module Holidays
 
     def self.custom_methods
       {
-        "christmas_eve_holiday(date)" => Proc.new { |date|
+          "christmas_eve_holiday(date)" => Proc.new { |date|
 beginning_of_month = Date.civil(date.year, date.month, 1)
 (date.saturday? || date.sunday?) ? date.downto(beginning_of_month).find {|d| d if d.wday == 5} : date
 },

data/lib/generated_definitions/ve.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Lunes Carnaval", :regions => [:ve]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -48, :name => "Lunes Carnaval", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -47, :name => "Martes Carnaval", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Jueves Santo", :regions => [:ve]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:ve]}],
@@ -29,7 +29,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/vi.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              1 => [{:mday => 1, :name => "Tết dương lịch", :regions => [:vi]}],
+                1 => [{:mday => 1, :name => "Tết dương lịch", :regions => [:vi]}],
       3 => [{:mday => 10, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "Giỗ tổ Hùng Vương", :regions => [:vi]}],
       4 => [{:mday => 30, :name => "Ngày Giải phóng miền Nam, thống nhất đất nước", :regions => [:vi]}],
       5 => [{:mday => 1, :name => "Ngày Quốc tế Lao động", :regions => [:vi]}],
@@ -22,7 +22,7 @@ module Holidays
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/generated_definitions/za.rb

@@ -12,7 +12,7 @@ module Holidays
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:za]},
+                0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:za]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Family Day", :regions => [:za]}],
       1 => [{:mday => 1, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:za]}],
       3 => [{:mday => 21, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Human Rights Day", :regions => [:za]}],
@@ -23,13 +23,13 @@ module Holidays
       9 => [{:mday => 24, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Heritage Day", :regions => [:za]}],
       12 => [{:mday => 16, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Day of Reconciliation", :regions => [:za]},
             {:mday => 25, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Christmas Day", :regions => [:za]},
-            {:mday => 26, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "Day of Goodwill", :regions => [:za]}]
+            {:mday => 26, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Day of Goodwill", :regions => [:za]}]
       }
     end
 
     def self.custom_methods
       {
-        
+          
       }
     end
   end

data/lib/holidays/core_extensions/time.rb

@@ -4,7 +4,7 @@ module Holidays
       def self.included(base)
         base.extend ClassMethods
       end
-     
+
       module ClassMethods
         COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
@@ -17,7 +17,7 @@ module Holidays
             COMMON_YEAR_DAYS_IN_MONTH[month]
           end
         end
-      end 
+      end
     end
   end
-end
+end

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/context/load.rb

@@ -14,7 +14,7 @@ module Holidays
           target_region_module = Module.const_get("Holidays").const_get(region.upcase)
 
           @definition_merger.call(
-            target_region_module.defined_regions,
+            region,
             target_region_module.holidays_by_month,
             target_region_module.custom_methods,
           )

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,6 +2,10 @@ module Holidays
   module Definition
     module Generator
       class Regions
+        # 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
+
         def call(regions)
           validate!(regions)
 
@@ -37,8 +41,9 @@ EOF
           lookup = {}
 
           regions.each do |region, subregions|
-            subregions.each do |s|
-              lookup[s] = region unless lookup.has_key?(s)
+            subregions.each do |subregion|
+              parent_region = NORTH_AMERICA_REGIONS.include?(subregion) ? subregion : region
+              lookup[subregion] = parent_region unless lookup.has_key?(subregion)
             end
           end
 

data/lib/holidays/definition/parser/custom_method.rb

@@ -21,7 +21,7 @@ module Holidays
             custom_methods[method_key(name, arguments)] = Entity::CustomMethod.new({
               name: name,
               arguments: arguments,
-              source: pieces["source"],
+              source: pieces["ruby"],
             })
           end
 
@@ -36,7 +36,7 @@ module Holidays
               {
                 :name => name,
                 :arguments => pieces["arguments"],
-                :source => pieces["source"]
+                :source => pieces["ruby"]
               }
             )
           end

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

@@ -8,6 +8,7 @@ module Holidays
 
         def cache_between(start_date, end_date, cache_data, options)
           raise ArgumentError unless cache_data
+          raise ArgumentError unless start_date && end_date
 
           @cache_range[options] = start_date..end_date
           @cache[options] = cache_data.group_by { |holiday| holiday[:date] }
@@ -15,7 +16,7 @@ module Holidays
 
         def find(start_date, end_date, options)
           return nil unless in_cache_range?(start_date, end_date, options)
-          
+
           if start_date == end_date
             @cache[options].fetch(start_date, [])
           else

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/between.rb

@@ -14,15 +14,14 @@ module Holidays
           regions, observed, informal = @options_parser.call(options)
           dates_driver = @dates_driver_builder.call(start_date, end_date)
 
-          holidays = []
-
           #FIXME Why are we calling the options_parser to convert the observed/informal
           # symbols to bool and then...converting them back? O_o
           opts = gather_options(observed, informal)
 
-          holidays = @definition_search.call(dates_driver, regions, opts)
-          holidays = holidays.select{|holiday|holiday[:date].between?(start_date, end_date)}
-          holidays.sort{|a, b| a[:date] <=> b[:date] }
+          @definition_search
+            .call(dates_driver, regions, opts)
+            .select { |holiday| holiday[:date].between?(start_date, end_date) }
+            .sort_by { |a| a[:date] }
         end
 
         private
@@ -35,8 +34,8 @@ module Holidays
         def gather_options(observed, informal)
           opts = []
 
-          opts << :observed if observed == true
-          opts << :informal if informal == true
+          opts << :observed if observed
+          opts << :informal if informal
 
           opts
         end

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

@@ -11,20 +11,14 @@ module Holidays
         def call(start_date, end_date)
           dates_driver = {}
 
-          (start_date..end_date).map{|current_date|build(dates_driver, current_date)}
+          (start_date..end_date).each do |date|
+            dates_driver[date.year] = [] unless dates_driver[date.year]
+            dates_driver[date.year] << date.month
+            dates_driver = add_border_months(date, dates_driver)
+          end
           clean(dates_driver)
         end
 
-        #FIXME Why is the date_driver set to optional as the first param? That's
-        # just plain wrong...
-        def build(dates_driver = {}, date)
-          raise ArgumentError unless dates_driver
-          raise ArgumentError unless date
-          dates_driver[date.year] = [] unless dates_driver[date.year]
-          dates_driver[date.year] << date.month
-          dates_driver = add_border_months(date, dates_driver)
-        end
-
         private
 
         # As part of https://github.com/holidays/holidays/issues/146 I am returning

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

@@ -14,7 +14,6 @@ module Holidays
           regions, observed, informal = @options_parser.call(options)
 
           holidays = []
-          ret_holidays = []
           opts = gather_options(observed, informal)
 
           # This could be smarter but I don't have any evidence that just checking for
@@ -22,17 +21,18 @@ module Holidays
           # smarter here to check in smaller increments.
           dates_driver = @dates_driver_builder.call(from_date, from_date >> 12)
 
-          ret_holidays = @definition_search.call(dates_driver, regions, opts)
-
-          ret_holidays.sort{|a, b| a[:date] <=> b[:date] }.each do |holiday|
-            if holiday[:date] >= from_date
-              holidays << holiday
-              holidays_count -= 1
-              break if holidays_count == 0
+          @definition_search
+            .call(dates_driver, regions, opts)
+            .sort_by { |a| a[:date] }
+            .each do |holiday|
+              if holiday[:date] >= from_date
+                holidays << holiday
+                holidays_count -= 1
+                break if holidays_count == 0
+              end
             end
-          end
 
-          holidays.sort{|a, b| a[:date] <=> b[:date] }
+          holidays.sort_by { |a| a[:date] }
         end
 
         private
@@ -46,8 +46,8 @@ module Holidays
         def gather_options(observed, informal)
           opts = []
 
-          opts << :observed if observed == true
-          opts << :informal if informal == true
+          opts << :observed if observed
+          opts << :informal if informal
 
           opts
         end

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

@@ -42,12 +42,6 @@ module Holidays
 
           loaded_regions = []
 
-          #FIXME I don't know what this means or why we have it! I'm reluctant to remove it
-          # at this time without understanding more. -PP 2017/3/29
-          #
-          # special case for north_america/US cross-linking
-          load_region!(:north_america) if regions.include?(:us)
-
           if regions.include?(:any)
             @regions_repo.all_generated.each do |r|
               if @regions_repo.loaded?(r)