holidays 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788dbb02897d92ddba5782a595ff549ae9b90478
-  data.tar.gz: a6bf5489300f2232fc4f780e1c7da23b26ba4a5c
+  metadata.gz: 3852430b8d0648a9edb909978956281a492d8f47
+  data.tar.gz: 244d3cc90b484b97203f2d7d0a3a411468c17e45
 SHA512:
-  metadata.gz: e9cfa0dde1527587bf9a6e97f6e9f21c1d630054246153f043ff2f8e1988e4d9c1af5e58356a4500087a7d2701c1e8a7d7b9647e429de8194d964ce8ad79d652
-  data.tar.gz: f5a2656bfddff46697837e710284879c778e7d9c37c86759f71aadabcb2999a3f169c676c81779550d435bc49d27f3a6e93a29d1ecb11d16def719ff97035d19
+  metadata.gz: e2d48c3c411f93089b914e45231d945aed026433eba045df26f4fc3b1895264da797bb411f0a8e29350c1a4509208a1ba75709580f5f28fad791e0e3009e6247
+  data.tar.gz: 1a2fab7e55971301d758baf7bd7ae0d39de0245c54018acd9086966b15d60e53a77c6e9e42ceabc7988c30b1f51518cf204c6296e7ab3c734b2a29703a930cf8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 6.1.0
+
+* Update to [v2.1.1 definitions](https://github.com/holidays/definitions/releases/tag/v2.1.1). Please see the changelog for
+  the definitions for details.
+
 ## 6.0.0
 
 * Remove support for ruby 2.1.0 since it is [no longer officially supported](https://www.ruby-lang.org/en/news/2017/04/01/support-of-ruby-2-1-has-ended/). This is the cause of the major

data/README.md

@@ -12,7 +12,7 @@ To install the gem from RubyGems:
 
     gem install holidays
 
-The Holidays gem is tested on Ruby 2.1.0, 2.2.0, 2.3.0, 2.4.0 and JRuby.
+The Holidays gem is tested on Ruby 2.2.0, 2.3.0, 2.4.0 and JRuby.
 
 This gem follows [semantic versioning](http://semver.org/). The only methods covered by this guarantee are under the
 `Holidays` namespace specifically. Anything that is not a method off of `Holidays` or the core extension is not covered by

data/lib/generated_definitions/ca.rb

@@ -41,7 +41,7 @@ module Holidays
             {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}],
       8 => [{:wday => 1, :week => 1, :name => "B.C. Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]},
-            {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]},
+            {:wday => 1, :week => 1, :type => :informal, :name => "Heritage Day", :regions => [:ca_ab]},
             {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_nt, :ca_nu, :ca_pe]},
             {:wday => 1, :week => 1, :type => :informal, :name => "Civic Holiday", :regions => [:ca_on]},

data/lib/generated_definitions/cl.rb

@@ -13,17 +13,19 @@ module Holidays
     def self.holidays_by_month
       {
               0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Viernes Santo", :regions => [:cl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Sábado Santo", :regions => [:cl]}],
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Sábado Santo", :regions => [:cl]},
+            {:function => "st_peter_st_paul_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2000}],:name => "San Pedro y San Pablo", :regions => [:cl]},
+            {:function => "other_churches_day_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2008}],:name => "Día de las Iglesias Evangélicas y Protestantes", :regions => [:cl]}],
       1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:cl]}],
       5 => [{:mday => 1, :name => "Día del Trabajo", :regions => [:cl]},
             {:mday => 21, :name => "Día de las Glorias Navales", :regions => [:cl]}],
-      6 => [{:mday => 29, :name => "San Pedro y San Pablo", :regions => [:cl]}],
+      6 => [{:mday => 29,  :year_ranges => [{:before => 1999}],:name => "San Pedro y San Pablo", :regions => [:cl]}],
       7 => [{:mday => 16, :name => "Día de la Virgen del Carmen", :regions => [:cl]}],
       8 => [{:mday => 15, :name => "Asunción de la Virgen", :regions => [:cl]}],
       9 => [{:mday => 18, :name => "Independencia Nacional", :regions => [:cl]},
             {:mday => 19, :name => "Día de las Glorias del Ejército", :regions => [:cl]}],
-      10 => [{:mday => 12, :name => "Encuentro de Dos Mundos", :regions => [:cl]},
-            {:mday => 31, :name => "Día de las Iglesias Evangélicas y Protestantes", :regions => [:cl]}],
+      10 => [{:mday => 12,  :year_ranges => [{:before => 1999}],:name => "Encuentro de Dos Mundos", :regions => [:cl]},
+            {:function => "columbus_day_cl(year)", :function_arguments => [:year],  :year_ranges => [{:after => 2000}],:name => "Encuentro de Dos Mundos", :regions => [:cl]}],
       11 => [{:mday => 1, :name => "Día de Todos los Santos", :regions => [:cl]}],
       12 => [{:mday => 8, :name => "Inmaculada Concepción de María", :regions => [:cl]},
             {:mday => 25, :name => "Navidad", :regions => [:cl]}]
@@ -32,7 +34,40 @@ module Holidays
 
     def self.custom_methods
       {
-        
+        "st_peter_st_paul_cl(year)" => Proc.new { |year|
+date = Date.civil(year, 6, 29)
+if [2,3,4].include?(date.wday)
+  date -= (date.wday - 1)
+elsif date.wday == 5
+  date += 3
+end
+
+date
+},
+
+"columbus_day_cl(year)" => Proc.new { |year|
+date = Date.civil(year, 10, 12)
+if [2,3,4].include?(date.wday)
+  date -= (date.wday - 1)
+elsif date.wday == 5
+  date += 3
+end
+
+date
+},
+
+"other_churches_day_cl(year)" => Proc.new { |year|
+date = Date.civil(year, 10, 31)
+if date.wday == 2
+  date -= 4
+elsif date.wday == 3
+  date += 2
+end
+
+date
+},
+
+
       }
     end
   end

data/lib/generated_definitions/kr.rb

@@ -20,12 +20,14 @@ module Holidays
       5 => [{:mday => 5, :name => "어린이날", :regions => [:kr]}],
       6 => [{:mday => 6, :name => "현충일", :regions => [:kr]}],
       7 => [{:mday => 17, :type => :informal, :name => "제헌절", :regions => [:kr]}],
-      8 => [{:mday => 15, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "추석", :regions => [:kr]},
+      8 => [{:mday => 14, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "추석 연휴", :regions => [:kr]},
+            {:mday => 15, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "추석", :regions => [:kr]},
+            {:mday => 16, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "추석 연휴", :regions => [:kr]},
             {:mday => 15, :name => "광복절", :regions => [:kr]}],
       10 => [{:mday => 3, :name => "개천절", :regions => [:kr]},
             {:mday => 9, :name => "한글날", :regions => [:kr]}],
       12 => [{:mday => 25, :name => "크리스마스", :regions => [:kr]},
-            {:mday => 29, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "설날 연휴", :regions => [:kr]}]
+            {:mday => 30, :function => "lunar_to_solar(year, month, day, region)", :function_arguments => [:year, :month, :day, :region], :name => "설날 연휴", :regions => [:kr]}]
       }
     end
 

data/lib/generated_definitions/north_america.rb

@@ -83,7 +83,7 @@ module Holidays
             {:mday => 24, :name => "Pioneer Day", :regions => [:us_ut]}],
       8 => [{:wday => 1, :week => 1, :name => "B.C. Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]},
-            {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]},
+            {:wday => 1, :week => 1, :type => :informal, :name => "Heritage Day", :regions => [:ca_ab]},
             {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_nt, :ca_nu, :ca_pe]},
             {:wday => 1, :week => 1, :type => :informal, :name => "Civic Holiday", :regions => [:ca_on]},

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

data/test/defs/test_defs_ca.rb

@@ -111,7 +111,7 @@ assert_equal "Victoria Day", (Holidays.on(Date.civil(2008, 5, 19), [:ca_ab, :ca_
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ns])[0] || {})[:name]
 
@@ -131,7 +131,7 @@ assert_equal "Civic Holiday", (Holidays.on(Date.civil(2015, 8, 3), [:ca_on], [:i
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ns])[0] || {})[:name]
 
@@ -147,7 +147,7 @@ assert_equal "Civic Holiday", (Holidays.on(Date.civil(2015, 8, 3), [:ca_on], [:i
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ns])[0] || {})[:name]
 

data/test/defs/test_defs_cl.rb

@@ -37,7 +37,13 @@ class ClDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de las Glorias Navales", (Holidays.on(Date.civil(2014, 5, 21), [:cl], [:informal])[0] || {})[:name]
 
-    assert_equal "San Pedro y San Pablo", (Holidays.on(Date.civil(2014, 6, 29), [:cl], [:informal])[0] || {})[:name]
+    assert_equal "San Pedro y San Pablo", (Holidays.on(Date.civil(1999, 6, 29), [:cl], [:informal])[0] || {})[:name]
+
+    assert_equal "San Pedro y San Pablo", (Holidays.on(Date.civil(2000, 6, 26), [:cl], [:informal])[0] || {})[:name]
+
+    assert_equal "San Pedro y San Pablo", (Holidays.on(Date.civil(2017, 6, 26), [:cl], [:informal])[0] || {})[:name]
+
+    assert_equal "San Pedro y San Pablo", (Holidays.on(Date.civil(2018, 7, 2), [:cl], [:informal])[0] || {})[:name]
 
     assert_equal "Día de la Virgen del Carmen", (Holidays.on(Date.civil(2014, 7, 16), [:cl], [:informal])[0] || {})[:name]
 
@@ -47,9 +53,11 @@ class ClDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de las Glorias del Ejército", (Holidays.on(Date.civil(2014, 9, 19), [:cl], [:informal])[0] || {})[:name]
 
-    assert_equal "Encuentro de Dos Mundos", (Holidays.on(Date.civil(2014, 10, 12), [:cl], [:informal])[0] || {})[:name]
+    assert_equal "Encuentro de Dos Mundos", (Holidays.on(Date.civil(1999, 10, 12), [:cl], [:informal])[0] || {})[:name]
+
+    assert_equal "Encuentro de Dos Mundos", (Holidays.on(Date.civil(2017, 10, 9), [:cl], [:informal])[0] || {})[:name]
 
-    assert_equal "Día de las Iglesias Evangélicas y Protestantes", (Holidays.on(Date.civil(2014, 10, 31), [:cl], [:informal])[0] || {})[:name]
+    assert_equal "Día de las Iglesias Evangélicas y Protestantes", (Holidays.on(Date.civil(2017, 10, 27), [:cl], [:informal])[0] || {})[:name]
 
     assert_equal "Día de Todos los Santos", (Holidays.on(Date.civil(2014, 11, 1), [:cl], [:informal])[0] || {})[:name]
 

data/test/defs/test_defs_north_america.rb

@@ -111,7 +111,7 @@ assert_equal "Victoria Day", (Holidays.on(Date.civil(2008, 5, 19), [:ca_ab, :ca_
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2013, 8, 5), [:ca_ns])[0] || {})[:name]
 
@@ -131,7 +131,7 @@ assert_equal "Civic Holiday", (Holidays.on(Date.civil(2015, 8, 3), [:ca_on], [:i
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2014, 8, 4), [:ca_ns])[0] || {})[:name]
 
@@ -147,7 +147,7 @@ assert_equal "Civic Holiday", (Holidays.on(Date.civil(2015, 8, 3), [:ca_on], [:i
 
     assert_equal "Saskatchewan Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_sk])[0] || {})[:name]
 
-    assert_equal "Heritage Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ab])[0] || {})[:name]
+    assert_equal "Heritage Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ab], [:informal])[0] || {})[:name]
 
     assert_equal "Natal Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_ns])[0] || {})[:name]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler