holidays 7.1.0 → 8.0.0

data/test/holidays/finder/rules/test_year_range.rb

@@ -5,7 +5,7 @@ require 'holidays/finder/rules/year_range'
 class FinderRulesYearRangeTests < Test::Unit::TestCase
   def setup
     @year = 2015
-    @year_ranges = [{between: 1996..2002}]
+    @year_ranges = {between: 1996..2002}
     @subject = Holidays::Finder::Rules::YearRange
   end
 
@@ -29,13 +29,13 @@ class FinderRulesYearRangeTests < Test::Unit::TestCase
   end
 
   def test_returns_error_if_year_ranges_contains_only_non_hash
-    @year_ranges = [:test]
+    @year_ranges = :test
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_error_if_year_ranges_contains_only_empty_hashes
+  def test_returns_error_if_year_ranges_is_empty
     @year_ranges = [{}, {}]
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
@@ -43,128 +43,124 @@ class FinderRulesYearRangeTests < Test::Unit::TestCase
   end
 
   def test_returns_error_if_year_range_contains_a_hash_with_multiple_entries
-    @year_ranges = [{:between => 1996..2002, :after => 2002}]
+    @year_ranges = {:between => 1996..2002, :after => 2002}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
   def test_returns_error_if_year_range_contains_unrecognized_operator
-    @year_ranges = [{:what => 2002}]
+    @year_ranges = {:what => 2002}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_error_if_before_operator_and_value_is_not_a_number
-    @year_ranges = [{before: "bad"}]
+  def test_returns_error_if_until_operator_and_value_is_not_a_number
+    @year_ranges = {until: "bad"}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_true_if_before_operator_and_target_is_before
-    @year_ranges = [{before: 2000}]
+  def test_returns_true_if_until_operator_and_target_is_until
+    @year_ranges = {until: 2000}
     assert_equal(true, @subject.call(1999, @year_ranges))
   end
 
-  def test_returns_true_if_before_operator_and_target_is_equal
-    @year_ranges = [{before: 2000}]
+  def test_returns_true_if_until_operator_and_target_is_equal
+    @year_ranges = {until: 2000}
     assert_equal(true, @subject.call(2000, @year_ranges))
   end
 
-  def test_returns_false_if_before_operator_and_target_is_after
-    @year_ranges = [{before: 2000}]
+  def test_returns_false_if_until_operator_and_target_is_after
+    @year_ranges = {until: 2000}
     assert_equal(false, @subject.call(2001, @year_ranges))
   end
 
-  def test_returns_error_if_after_operator_with_bad_value
-    @year_ranges = [{after: "bad"}]
+  def test_returns_error_if_from_operator_with_bad_value
+    @year_ranges = {from: "bad"}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
-  def test_returns_false_if_after_operator_and_target_is_before
-    @year_ranges = [{after: 2000}]
+  def test_returns_false_if_from_operator_and_target_is_before
+    @year_ranges = {from: 2000}
     assert_equal(false, @subject.call(1999, @year_ranges))
   end
 
-  def test_returns_true_if_after_operator_and_target_is_equal
-    @year_ranges = [{after: 2000}]
+  def test_returns_true_if_from_operator_and_target_is_equal
+    @year_ranges = {from: 2000}
     assert_equal(true, @subject.call(2000, @year_ranges))
   end
 
-  def test_returns_true_if_after_operator_and_target_is_after
-    @year_ranges = [{after: 2000}]
+  def test_returns_true_if_from_operator_and_target_is_after
+    @year_ranges = {from: 2000}
     assert_equal(true, @subject.call(2001, @year_ranges))
   end
 
   def test_returns_error_if_limited_operator_and_bad_value
-    @year_ranges = [{limited: "bad"}]
+    @year_ranges = {limited: "bad"}
+    assert_raises ArgumentError do
+      @subject.call(@year, @year_ranges)
+    end
+  end
+
+  def test_returns_error_if_limited_operator_with_empty_array
+    @year_ranges = {limited: []}
+    assert_raises ArgumentError do
+      @subject.call(@year, @year_ranges)
+    end
+  end
+
+  def test_returns_error_if_limited_operator_with_array_containing_non_integer_value
+    @year_ranges = {limited: ["bad"]}
     assert_raises ArgumentError do
       @subject.call(@year, @year_ranges)
     end
   end
 
   def test_returns_true_if_limited_operator_and_value_is_number_that_matches_target
-    @year_ranges = [{limited: 2002}]
+    @year_ranges = {limited: [2002]}
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_false_if_limited_operator_and_target_is_not_included
-    @year_ranges = [{limited: [1998,2000]}]
+    @year_ranges = {limited: [1998,2000]}
     assert_equal(false, @subject.call(1997, @year_ranges))
     assert_equal(false, @subject.call(1999, @year_ranges))
     assert_equal(false, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_true_if_limited_operator_and_target_is_included
-    @year_ranges = [{limited: [1998, 2000, 2002]}]
+    @year_ranges = {limited: [1998, 2000, 2002]}
     assert_equal(true, @subject.call(1998, @year_ranges))
     assert_equal(true, @subject.call(2000, @year_ranges))
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_error_if_between_operator_and_value_not_a_range
-    @year_ranges = [{between: 2000}]
+    @year_ranges = {between: 2000}
     assert_raises ArgumentError do
       @subject.call(2003, @year_ranges)
     end
   end
 
   def test_returns_false_if_between_operator_and_target_is_before
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(false, @subject.call(1997, @year_ranges))
   end
 
   def test_returns_true_if_between_operator_and_target_is_covered
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(true, @subject.call(1998, @year_ranges))
     assert_equal(true, @subject.call(2000, @year_ranges))
     assert_equal(true, @subject.call(2002, @year_ranges))
   end
 
   def test_returns_false_if_between_operator_and_target_is_after
-    @year_ranges = [{between: 1998..2002}]
+    @year_ranges = {between: 1998..2002}
     assert_equal(false, @subject.call(2003, @year_ranges))
   end
-
-  def test_returns_false_multiple_nonmatching_operators
-    @year_ranges = [{between: 1998..2002}, {:after => 2005}]
-    assert_equal(false, @subject.call(2003, @year_ranges))
-
-    @year_ranges = [{before: 1995}, {:limited => [1990, 1991, 1992]}]
-    assert_equal(false, @subject.call(1996, @year_ranges))
-  end
-
-  def test_returns_true_multiple_operators_all_matching
-    @year_ranges = [{between: 1998..2002}, {:limited=> [2000, 2001]}]
-    assert_equal(true, @subject.call(2001, @year_ranges))
-  end
-
-  def test_returns_true_if_multiple_operators_and_only_one_matches
-    @year_ranges = [{before: 2015}, {:after=> 2017}]
-    assert_equal(true, @subject.call(2001, @year_ranges))
-  end
 end

data/test/integration/test_available_regions.rb

@@ -18,6 +18,6 @@ class AvailableRegionsTests < Test::Unit::TestCase
   # This test might fail if we add new regions. Since this is an integration test
   # I am fine with that!
   def test_available_regions_returns_correct_number_of_regions
-    assert_equal 244, Holidays.available_regions.count
+    assert_equal 256, Holidays.available_regions.count
   end
 end

data/test/integration/test_custom_year_range_holidays.rb

@@ -32,11 +32,4 @@ class CustomYearRangeHolidaysTest < Test::Unit::TestCase
     assert_not_equal [], Holidays.on(Date.civil(2019,6,4), :custom_year_range_file)
     assert_equal [], Holidays.on(Date.civil(2020,6,4), :custom_year_range_file)
   end
-
-  def test_multiple_condition
-    Holidays.load_custom('test/data/test_custom_year_range_holiday_defs.yaml')
-    assert_not_equal [], Holidays.on(Date.civil(2015,6,5), :custom_year_range_file)
-    assert_equal [], Holidays.on(Date.civil(2016,6,5), :custom_year_range_file)
-    assert_not_equal [], Holidays.on(Date.civil(2017,6,5), :custom_year_range_file)
-  end
 end

data/test/integration/test_holidays.rb

@@ -266,6 +266,6 @@ class HolidaysTests < Test::Unit::TestCase
 
   def test_load_all
     Holidays.load_all
-    assert_equal 244, Holidays.available_regions.count
+    assert_equal 256, Holidays.available_regions.count
   end
 end

data/test/integration/test_holidays_between.rb

@@ -41,6 +41,16 @@ class HolidaysBetweenTests < Test::Unit::TestCase
     end
   end
 
+  def test_between_raises_error_if_end_date_is_before_start_date
+    assert_raise ArgumentError do
+      @subject.call(Date.civil(2019, 2, 1), Date.civil(2019, 1, 1), :us)
+    end
+
+    assert_raise ArgumentError do
+      @subject.call(Date.civil(2008,7,2), Date.civil(2000,7,2), :ca)
+    end
+  end
+
   def test_cached_holidays_are_returned_if_present
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 31)

data/test/integration/test_multiple_regions_with_conflict.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# See https://github.com/holidays/holidays/issues/344 for more info on why
+# these tests exist.
+class MultipleRegionsWithConflictsTests < Test::Unit::TestCase
+
+  def test_corpus_christi_returns_correctly_for_co_even_if_br_is_loaded_first
+    result = Holidays.on(Date.new(2014, 6, 19), :br)
+    assert_equal 1, result.count
+    assert_equal 'Corpus Christi', result.first[:name]
+
+    result = Holidays.on(Date.new(2014, 6, 23), :co)
+    assert_equal 1, result.count
+    assert_equal 'Corpus Christi', result.first[:name]
+  end
+
+  def test_custom_loaded_region_returns_correct_value_with_function_modifier_conflict_even_if_conflict_definition_is_loaded_first
+    Holidays.load_custom('test/data/test_multiple_regions_with_conflicts_region_1.yaml')
+    result = Holidays.on(Date.new(2019, 6, 20), :multiple_with_conflict_1)
+    assert_equal 1, result.count
+    assert_equal 'With Function Modifier', result.first[:name]
+
+    Holidays.load_custom('test/data/test_multiple_regions_with_conflicts_region_2.yaml')
+    result = Holidays.on(Date.new(2019, 6, 24), :multiple_with_conflict_2)
+    assert_equal 1, result.count
+    assert_equal 'With Function Modifier', result.first[:name]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,42 +59,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 description: A collection of Ruby methods to deal with statutory and other holidays.
   You deserve a holiday!
 email:
@@ -158,6 +158,7 @@ files:
 - lib/generated_definitions/li.rb
 - lib/generated_definitions/lt.rb
 - lib/generated_definitions/lu.rb
+- lib/generated_definitions/lv.rb
 - lib/generated_definitions/ma.rb
 - lib/generated_definitions/mt_en.rb
 - lib/generated_definitions/mt_mt.rb
@@ -242,6 +243,8 @@ files:
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_invalid_region.rb
 - test/data/test_multiple_custom_holiday_defs.yaml
+- test/data/test_multiple_regions_with_conflicts_region_1.yaml
+- test/data/test_multiple_regions_with_conflicts_region_2.yaml
 - test/data/test_region.rb
 - test/data/test_single_custom_holiday_defs.yaml
 - test/data/test_single_custom_holiday_with_custom_procs.yaml
@@ -284,6 +287,7 @@ files:
 - test/defs/test_defs_li.rb
 - test/defs/test_defs_lt.rb
 - test/defs/test_defs_lu.rb
+- test/defs/test_defs_lv.rb
 - test/defs/test_defs_ma.rb
 - test/defs/test_defs_mt_en.rb
 - test/defs/test_defs_mt_mt.rb
@@ -364,6 +368,7 @@ files:
 - test/integration/test_holidays.rb
 - test/integration/test_holidays_between.rb
 - test/integration/test_multiple_regions.rb
+- test/integration/test_multiple_regions_with_conflict.rb
 - test/integration/test_nonstandard_regions.rb
 - test/test_helper.rb
 homepage: https://github.com/holidays/holidays
@@ -378,15 +383,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A collection of Ruby methods to deal with statutory and other holidays.
@@ -397,6 +401,8 @@ test_files:
 - test/data/test_custom_year_range_holiday_defs.yaml
 - test/data/test_invalid_region.rb
 - test/data/test_multiple_custom_holiday_defs.yaml
+- test/data/test_multiple_regions_with_conflicts_region_1.yaml
+- test/data/test_multiple_regions_with_conflicts_region_2.yaml
 - test/data/test_region.rb
 - test/data/test_single_custom_holiday_defs.yaml
 - test/data/test_single_custom_holiday_with_custom_procs.yaml
@@ -439,6 +445,7 @@ test_files:
 - test/defs/test_defs_li.rb
 - test/defs/test_defs_lt.rb
 - test/defs/test_defs_lu.rb
+- test/defs/test_defs_lv.rb
 - test/defs/test_defs_ma.rb
 - test/defs/test_defs_mt_en.rb
 - test/defs/test_defs_mt_mt.rb
@@ -519,5 +526,6 @@ test_files:
 - test/integration/test_holidays.rb
 - test/integration/test_holidays_between.rb
 - test/integration/test_multiple_regions.rb
+- test/integration/test_multiple_regions_with_conflict.rb
 - test/integration/test_nonstandard_regions.rb
 - test/test_helper.rb