holidays 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf9f996b85b5c11645266f2604847ceddf8d4a3
-  data.tar.gz: 1c37b24104b546431ba477bf22ed8ac35a622c5f
+  metadata.gz: c74b677a9819268733c692afe11958c2cf1ccaed
+  data.tar.gz: faedba7eb3f149f92de77ddb7ec567cc708a2485
 SHA512:
-  metadata.gz: 4d782ce1901f6e8efab46412277d807d310e88881f87a283ef9a5e94108a2dcbc9d13f25f1c30927024cc0c24263fee77514ce8d73113c6130c0290cd978593a
-  data.tar.gz: 9e23cb50fdaa0889020463b8e104726922300f07d0536ca3d0ab39b1838756082fdfcc1e48552d6fba787424ef46383f6151e66b69da21a39eeec44ef1b4dbf2
+  metadata.gz: 7530fa6ee86e2c3fe1136eac771c0d307d89cdb4e870c7fc2f4de8d14af8a967055c1c75ee6299a3e0f6238f3c50ea832c6db715c854a1a09814e32bdd397276
+  data.tar.gz: 9a608809435239e4ae5a7b7d6f97e3ae085afdd40eac49808b9947287f404442af265bd529508b3c1dfeae3b5f90c209fe967d78615de28906a327dd4222ee26

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 4.2.0
+
+* BUGFIX Issue-194: correctly calculate `next_holidays` if next holiday is far in the future
+* Give dutch holidays their proper names (https://github.com/Qqwy)
+
 ## 4.1.0
 
 * Issue-161: correctly report St Andrews Day as informal 2006 and earlier in `gb_sct`

data/definitions/nl.yaml

@@ -11,10 +11,10 @@ months:
     function: easter(year)
     function_modifier: -2
     type: informal
-  - name: Eerste Pasen
+  - name: Eerste Paasdag
     regions: [nl]
     function: easter(year)
-  - name: Tweede Pasen
+  - name: Tweede Paasdag
     regions: [nl]
     function: easter(year)
     function_modifier: 1
@@ -22,16 +22,16 @@ months:
     regions: [nl]
     function: easter(year)
     function_modifier: 39
-  - name: Eerste Pinksteren
+  - name: Eerste Pinksterdag
     regions: [nl]
     function: easter(year)
     function_modifier: 49
-  - name: Tweede Pinksteren
+  - name: Tweede Pinksterdag
     regions: [nl]
     function: easter(year)
     function_modifier: 50
   1:
-  - name: Nieuwjaar
+  - name: Nieuwjaarsdag
     regions: [nl]
     mday: 1
   4:
@@ -51,23 +51,23 @@ months:
     regions: [nl]
     mday: 5
     type: informal
-  - name: Eerste Kerstmis
+  - name: Eerste Kerstdag
     regions: [nl]
     mday: 25
-  - name: Tweede Kerstmis
+  - name: Tweede Kerstdag
     regions: [nl]
     mday: 26
 tests: |
-    {Date.civil(2008,1,1) => 'Nieuwjaar',
+    {Date.civil(2008,1,1) => 'Nieuwjaarsdag',
      Date.civil(2008,3,21) => 'Goede Vrijdag',
-     Date.civil(2008,3,23) => 'Eerste Pasen',
-     Date.civil(2008,3,24) => 'Tweede Pasen',
+     Date.civil(2008,3,23) => 'Eerste Paasdag',
+     Date.civil(2008,3,24) => 'Tweede Paasdag',
      Date.civil(2008,4,27) => 'Koningsdag',
      Date.civil(2008,5,1) => 'Hemelvaartsdag', # Ascension, Easter+39
      Date.civil(2008,5,5) => 'Bevrijdingsdag',
-     Date.civil(2008,5,11) => 'Eerste Pinksteren', # Pentecost, Easter+49
-     Date.civil(2008,5,12) => 'Tweede Pinksteren', # Pentecost, Easter+50
-     Date.civil(2008,12,25) => 'Eerste Kerstmis',
-     Date.civil(2008,12,26) => 'Tweede Kerstmis'}.each do |date, name|
+     Date.civil(2008,5,11) => 'Eerste Pinksterdag', # Pentecost, Easter+49
+     Date.civil(2008,5,12) => 'Tweede Pinksterdag', # Pentecost, Easter+50
+     Date.civil(2008,12,25) => 'Eerste Kerstdag',
+     Date.civil(2008,12,26) => 'Tweede Kerstdag'}.each do |date, name|
       assert_equal name, (Holidays.on(date, :nl, :informal)[0] || {})[:name]
     end

data/lib/generated_definitions/europe.rb

@@ -107,11 +107,11 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :name => "Šv. Velykos", :regions => [:lt]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Antroji Velykų diena", :regions => [:lt]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Goede Vrijdag", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :name => "Eerste Pasen", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Tweede Pasen", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :name => "Eerste Paasdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Tweede Paasdag", :regions => [:nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Hemelvaartsdag", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Eerste Pinksteren", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Tweede Pinksteren", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Eerste Pinksterdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Tweede Pinksterdag", :regions => [:nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -49, :type => :informal, :name => "Fastelavn", :regions => [:no]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -7, :name => "Palmesøndag", :regions => [:no]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -3, :name => "Skjærtorsdag", :regions => [:no]},
@@ -181,7 +181,7 @@ module Holidays
             {:mday => 1, :name => "Neujahrstag", :regions => [:li]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:li]},
             {:mday => 1, :name => "Naujieji metai", :regions => [:lt]},
-            {:mday => 1, :name => "Nieuwjaar", :regions => [:nl]},
+            {:mday => 1, :name => "Nieuwjaarsdag", :regions => [:nl]},
             {:mday => 1, :name => "Nyttårsdag", :regions => [:no]},
             {:mday => 1, :name => "Nowy Rok", :regions => [:pl]},
             {:function => "pl_trzech_kroli(year)", :function_arguments => [:year], :name => "Objawienie Pańskie (święto Trzech Króli)", :regions => [:pl]},
@@ -365,8 +365,8 @@ module Holidays
             {:mday => 25, :name => "Šv. Kalėdos", :regions => [:lt]},
             {:mday => 26, :name => "Antroji Kalėdų diena", :regions => [:lt]},
             {:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
-            {:mday => 25, :name => "Eerste Kerstmis", :regions => [:nl]},
-            {:mday => 26, :name => "Tweede Kerstmis", :regions => [:nl]},
+            {:mday => 25, :name => "Eerste Kerstdag", :regions => [:nl]},
+            {:mday => 26, :name => "Tweede Kerstdag", :regions => [:nl]},
             {:mday => 24, :type => :informal, :name => "Julaften", :regions => [:no]},
             {:mday => 25, :name => "1. juledag", :regions => [:no]},
             {:mday => 26, :name => "2. juledag", :regions => [:no]},

data/lib/generated_definitions/nl.rb

@@ -19,18 +19,18 @@ module Holidays
     def self.holidays_by_month
       {
               0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :type => :informal, :name => "Goede Vrijdag", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :name => "Eerste Pasen", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Tweede Pasen", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :name => "Eerste Paasdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Tweede Paasdag", :regions => [:nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Hemelvaartsdag", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Eerste Pinksteren", :regions => [:nl]},
-            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Tweede Pinksteren", :regions => [:nl]}],
-      1 => [{:mday => 1, :name => "Nieuwjaar", :regions => [:nl]}],
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Eerste Pinksterdag", :regions => [:nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Tweede Pinksterdag", :regions => [:nl]}],
+      1 => [{:mday => 1, :name => "Nieuwjaarsdag", :regions => [:nl]}],
       4 => [{:mday => 27, :name => "Koningsdag", :regions => [:nl]}],
       5 => [{:mday => 4, :type => :informal, :name => "Dodenherdenking", :regions => [:nl]},
             {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}],
       12 => [{:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
-            {:mday => 25, :name => "Eerste Kerstmis", :regions => [:nl]},
-            {:mday => 26, :name => "Tweede Kerstmis", :regions => [:nl]}]
+            {:mday => 25, :name => "Eerste Kerstdag", :regions => [:nl]},
+            {:mday => 26, :name => "Tweede Kerstdag", :regions => [:nl]}]
       }
     end
 

data/lib/holidays.rb

@@ -151,7 +151,11 @@ module Holidays
 
       from_date = get_date(from_date)
       regions, observed, informal = OptionFactory.parse_options.call(options)
-      date_driver_hash = UseCaseFactory.dates_driver_builder.build(from_date)
+
+      # This could be smarter but I don't have any evidence that just checking for
+      # the next 12 months will cause us issues. If it does we can implement something
+      # smarter here to check in smaller increments.
+      date_driver_hash = UseCaseFactory.dates_driver_builder.call(from_date, from_date >> 12)
 
       UseCaseFactory.next_holiday.call(holidays_count, from_date, date_driver_hash, regions, observed, informal)
     end

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

@@ -15,6 +15,8 @@ module Holidays
           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

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

data/test/defs/test_defs_europe.rb

@@ -514,17 +514,17 @@ end
 end
 
 
-{Date.civil(2008,1,1) => 'Nieuwjaar',
+{Date.civil(2008,1,1) => 'Nieuwjaarsdag',
  Date.civil(2008,3,21) => 'Goede Vrijdag',
- Date.civil(2008,3,23) => 'Eerste Pasen',
- Date.civil(2008,3,24) => 'Tweede Pasen',
+ Date.civil(2008,3,23) => 'Eerste Paasdag',
+ Date.civil(2008,3,24) => 'Tweede Paasdag',
  Date.civil(2008,4,27) => 'Koningsdag',
  Date.civil(2008,5,1) => 'Hemelvaartsdag', # Ascension, Easter+39
  Date.civil(2008,5,5) => 'Bevrijdingsdag',
- Date.civil(2008,5,11) => 'Eerste Pinksteren', # Pentecost, Easter+49
- Date.civil(2008,5,12) => 'Tweede Pinksteren', # Pentecost, Easter+50
- Date.civil(2008,12,25) => 'Eerste Kerstmis',
- Date.civil(2008,12,26) => 'Tweede Kerstmis'}.each do |date, name|
+ Date.civil(2008,5,11) => 'Eerste Pinksterdag', # Pentecost, Easter+49
+ Date.civil(2008,5,12) => 'Tweede Pinksterdag', # Pentecost, Easter+50
+ Date.civil(2008,12,25) => 'Eerste Kerstdag',
+ Date.civil(2008,12,26) => 'Tweede Kerstdag'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :nl, :informal)[0] || {})[:name]
 end
 

data/test/defs/test_defs_nl.rb

@@ -7,17 +7,17 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class NlDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_nl
-{Date.civil(2008,1,1) => 'Nieuwjaar',
+{Date.civil(2008,1,1) => 'Nieuwjaarsdag',
  Date.civil(2008,3,21) => 'Goede Vrijdag',
- Date.civil(2008,3,23) => 'Eerste Pasen',
- Date.civil(2008,3,24) => 'Tweede Pasen',
+ Date.civil(2008,3,23) => 'Eerste Paasdag',
+ Date.civil(2008,3,24) => 'Tweede Paasdag',
  Date.civil(2008,4,27) => 'Koningsdag',
  Date.civil(2008,5,1) => 'Hemelvaartsdag', # Ascension, Easter+39
  Date.civil(2008,5,5) => 'Bevrijdingsdag',
- Date.civil(2008,5,11) => 'Eerste Pinksteren', # Pentecost, Easter+49
- Date.civil(2008,5,12) => 'Tweede Pinksteren', # Pentecost, Easter+50
- Date.civil(2008,12,25) => 'Eerste Kerstmis',
- Date.civil(2008,12,26) => 'Tweede Kerstmis'}.each do |date, name|
+ Date.civil(2008,5,11) => 'Eerste Pinksterdag', # Pentecost, Easter+49
+ Date.civil(2008,5,12) => 'Tweede Pinksterdag', # Pentecost, Easter+50
+ Date.civil(2008,12,25) => 'Eerste Kerstdag',
+ Date.civil(2008,12,26) => 'Tweede Kerstdag'}.each do |date, name|
   assert_equal name, (Holidays.on(date, :nl, :informal)[0] || {})[:name]
 end
 

data/test/test_holidays.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
 
 require "#{Holidays::DEFINITIONS_PATH}/ca"
@@ -6,6 +7,8 @@ require "#{Holidays::DEFINITIONS_PATH}/ca"
 # defs aren't duplicated.
 require "#{Holidays::DEFINITIONS_PATH}/north_america"
 
+# These are effectively integration tests. We plan on making this explicit somehow
+# in the future.
 class HolidaysTests < Test::Unit::TestCase
   def setup
     @date = Date.civil(2008,1,1)
@@ -118,6 +121,10 @@ class HolidaysTests < Test::Unit::TestCase
     holidays = Holidays.next_holidays(2, [:any], Date.civil(2008,5,1))
     assert_equal 2, holidays.length
 
+    # Should return 1 holiday in July
+    holidays = Holidays.next_holidays(1, [:jp], Date.civil(2016, 5, 22))
+    assert_equal ['2016-07-18','海の日'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
+
     # Must Region.If there is not region, raise ArgumentError.
     assert_raises ArgumentError do
       Holidays.next_holidays(2, '', Date.civil(2008,5,1))
@@ -149,7 +156,7 @@ class HolidaysTests < Test::Unit::TestCase
   def test_sub_regions_holiday_next
     # Should return Victoria Day.
     holidays = Holidays.next_holidays(2, [:ca], Date.civil(2008,5,1))
-    assert_equal 1, holidays.length
+    assert_equal 2, holidays.length
     assert_equal ['2008-05-19','Victoria Day'] , [holidays.first[:date].to_s, holidays.first[:name].to_s]
 
     # Should return Victoria Da and National Patriotes Day.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler