holidays 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ac53801a7e5df310c955e2d14eff378b5486e7f6b8e6e55c2f2f680c3bc68f
-  data.tar.gz: 249638ac1590932582342b2f6d39eaffca6d408f275420711916d94dce1eadbc
+  metadata.gz: 844c8c66842896fceda5b386a64bcfd8d03d51781ebc328bc246ecdc6e41effc
+  data.tar.gz: 341f07eb7869fa24a501b1cc3380d36dc7a84fba5f3d70a3d821c53c560db416
 SHA512:
-  metadata.gz: 6a53bd90098905e561558ccc5c1adc42a40bbf19647ff70bb5cf846ffa7350cf6ef7958d251e8d6644d0e0ba5d3ef48a5c3fd008fb6c159b82df948a33fb72c5
-  data.tar.gz: dc023803f7dea3acb449e58c4756b3408586f92b9f83620af72f9c84f712cbec50383198ff455ad97dfc151d1bf7f6e97d40a542dfab014000acace307bd0551
+  metadata.gz: 937db688aa9a3eb0b0bd928041eadbfc30b97cf0ffe92f2ee92bf92b160dc44fff196c6c3c84deb5a7cd3bfc8dbdaa2d4d2fb1a91dab83b59da726b7912f43bd
+  data.tar.gz: ba21c5e8ef10aa1507385c4cb62e531b9e9dc685190aa67dcd84753963726498828a4b46a9fabc2d4f090a1782bdcfa5325f0f1069214f383819d882d5b6e379

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 6.6.1
+
+* Fixes `any_holidays_during_work_week?` so that it actually does what it says it does [issue-264](https://github.com/holidays/holidays/issues/264)
+
 ## 6.6.0
 
 * Update to [v3.0.0 definitions](https://github.com/holidays/definitions/releases/tag/v3.0.0). This required updates to the custom method parser but no behavior changes.

data/README.md

@@ -1,21 +1,31 @@
 # Ruby Holidays Gem [![Build Status](https://travis-ci.org/holidays/holidays.svg?branch=master)](https://travis-ci.org/holidays/holidays)
 
-A set of functions to deal with holidays in Ruby.
+Functionality to deal with holidays in Ruby.
 
-Extends Ruby's built-in Date class and supports custom holiday definition lists.
+Extends Ruby's built-in Date and Time classes and supports custom holiday definition lists.
 
 ## Installation
 
-To install the gem from RubyGems:
+```
+gem install holidays
+```
 
-    gem install holidays
+## Tested versions
 
-This gem is tested with the following ruby versions: 2.2.0, 2.3.0, 2.4.0, 2.5.0, JRuby
+This gem is tested with the following ruby versions:
+
+  * 2.2.0
+  * 2.3.0,
+  * 2.4.0
+  * 2.5.0
+  * JRuby 9.0.5.0
+
+## Semver
 
 This gem follows [semantic versioning](http://semver.org/). The guarantee specifically covers:
 
- * methods in the topmost `Holidays` namespace e.g. `Holidays.<method>`
- * the [core extension](#extending-rubys-date-and-time-classes)
+ * methods in the top-most `Holidays` namespace e.g. `Holidays.<method>`
+ * the [core extensions](#extending-rubys-date-and-time-classes)
 
 Please note that we consider definition changes to be 'minor' bumps, meaning they are backwards compatible with your code but might give different holiday results!
 
@@ -23,159 +33,287 @@ Please note that we consider definition changes to be 'minor' bumps, meaning the
 
 Time zones are ignored.  This library assumes that all dates are within the same time zone.
 
-### Using the Holidays class
+## Usage
 
-Get all holidays on April 25, 2008 in Australia.
+This gem offers multiple ways to check for holidays for a variety of scenarios.
 
-    date = Date.civil(2008,4,25)
+#### Checking a specific date
 
-    Holidays.on(date, :au)
-    => [{:name => 'ANZAC Day',...}]
+Get all holidays on April 25, 2008 in Australia:
 
-Get holidays that are observed on July 2, 2007 in British Columbia, Canada.
+```
+Holidays.on(Date.civil(2008, 4, 25), :au)
+=> [{:name => 'ANZAC Day',...}]
+```
 
-    date = Date.civil(2007,7,2)
+You can check multiple regions in a single call:
 
-    Holidays.on(date, :ca_bc, :observed)
-    => [{:name => 'Canada Day',...}]
+```
+Holidays.on(Date.civil(2008, 1, 1), :us, :fr)
+=> [{:name=>"New Year's Day", :regions=>[:us],...},
+    {:name=>"Jour de l'an", :regions=>[:fr],...}]
+```
 
-Get all holidays in July, 2008 in Canada and the US.
+You can leave off 'regions' to get holidays for any region in our [definitions](https://github.com/holidays/definitions):
 
-    from = Date.civil(2008,7,1)
-    to = Date.civil(2008,7,31)
+```
+ Holidays.on(Date.civil(2007, 4, 25))
+=> [{:name=>"ANZAC Day", :regions=>[:au],...},
+    {:name=>"Festa della Liberazione", :regions=>[:it],...},
+    {:name=>"Dia da Liberdade", :regions=>[:pt],...}
+    ...
+   ]
+```
 
-    Holidays.between(from, to, :ca, :us)
-    => [{:name => 'Canada Day',...}
-        {:name => 'Independence Day',...}]
+#### Checking a date range
 
-Get all US Federal holidays between 2018 and 2019.
+Get all holidays during the month of July 2008 in Canada and the US:
 
-    from = Date.civil(2018,1,1)
-    to = Date.civil(2019,12,31)
+```
+from = Date.civil(2008,7,1)
+to = Date.civil(2008,7,31)
 
-    Holidays.between(from, to, :federal_reserve, :observed)
-    => [{:name => "New Year's Day"....}
-        {:name => "Birthday of Martin Luther King, Jr"....}]
+Holidays.between(from, to, :ca, :us)
+=> [{:name => 'Canada Day',...}
+    {:name => 'Independence Day',...}]
+```
 
-Get informal holidays in February.
+#### Check for 'informal' holidays
 
-    from = Date.civil(2008,2,1)
-    to = Date.civil(2008,2,15)
+You can pass the 'informal' flag to include holidays specified as informal in your results. See [here](https://github.com/holidays/definitions/blob/master/doc/SYNTAX.md#formalinformal) for information on what constitutes 'informal' vs 'formal'.
 
-    Holidays.between(from, to, :informal)
-    => [{:name => 'Valentine\'s Day',...}]
+By default this flag is turned off, meaning no informal holidays will be returned.
 
-Return all available regions:
+Get Valentine's Day in the US:
+
+```
+Holidays.on(Date.new(2018, 2, 14), :us, :informal)
+=> [{:name=>"Valentine's Day",...}]
+```
+
+Leaving off 'informal' will mean that Valentine's Day is not returned:
+
+```
+Holidays.on(Date.new(2018, 2, 14), :us)
+=> []
+```
+
+Get informal holidays during the month of February 2008 for any region:
+
+```
+from = Date.civil(2008,2,1)
+to = Date.civil(2008,2,15)
+
+Holidays.between(from, to, :informal)
+=> [{:name => 'Valentine\'s Day',...}]
+```
+
+#### Check for 'observed' holidays
+
+You can pass the 'observed' flag to include holidays that are observed on different days than they actually occur. See [here](https://github.com/holidays/definitions/blob/master/doc/SYNTAX.md#observed) for further explanation of 'observed'.
+
+By default this flag is turned off, meaning no observed logic will be applied.
+
+Get holidays that are observed on Monday July 2, 2007 in British Columbia, Canada:
+
+```
+Holidays.on(Date.civil(2007, 7, 2), :ca_bc, :observed)
+=> [{:name => 'Canada Day',...}]
+```
+
+Leaving off the 'observed' flag will mean that 'Canada Day' is not returned since it actually falls on Sunday July 1:
 
-    Holidays.available_regions
-    => [:ar, :at, ..., :sg] # this will be a big array
+```
+Holidays.on(Date.civil(2007, 7, 2), :ca_bc)
+=> []
+Holidays.on(Date.civil(2007, 7, 1), :ca_bc)
+=> [{:name=>"Canada Day", :regions=>[:ca],...}]
+```
 
-To check if there are any holidays taking place during a specified work week:
+Get all observed US Federal holidays between 2018 and 2019:
 
-    Holidays.any_holidays_during_work_week?(Date.civil(2016, 1, 1))
-    => true
+```
+from = Date.civil(2018,1,1)
+to = Date.civil(2019,12,31)
 
-To find and return the next holidays occurring from date, inclusively:
+Holidays.between(from, to, :federal_reserve, :observed)
+=> [{:name => "New Year's Day"....}
+    {:name => "Birthday of Martin Luther King, Jr"....}]
+```
 
-    Holidays.next_holidays(3, [:us, :informal], Date.civil(2016, 2, 23))
-    => [{:name => "St. Patrick's Day",...}, {:name => "Good Friday",...}, {:name => "Easter Sunday",...}]
+#### Check whether any holidays occur during work week
 
-Will default to `Date.today` if no date is provided.
+Check if there are any holidays taking place during a specified work week. 'Work week' is defined as the period of Monday through Friday of the week specified by the date.
 
-To find all holidays occuring from date to end of year, inclusively:
+Check whether a holiday falls during first week of the year for any region:
 
-    Holidays.year_holidays([:ca_on], Date.civil(2016, 2, 23))
-    => [{:name=>"Good Friday",...},
-        {name=>"Easter Sunday",...},
-        {:name=>"Victoria Day",...},
-        {:name=>"Canada Day",...},
-        {:name=>"Civic Holiday",...},
-        {:name=>"Labour Day",...},
-        {:name=>"Thanksgiving",...},
-        {:name=>"Remembrance Day",...},
-        {:name=>"Christmas Day",...},
-        {:name=>"Boxing Day",...}]
+```
+Holidays.any_holidays_during_work_week?(Date.civil(2016, 1, 1))
+=> true
+```
 
-Will default to `Date.today` if no date is provided.
+You can also pass in `informal` or `observed`:
 
-### Loading Custom Definitions on the fly
+```
+# Returns true since Valentine's Day falls on a Wednesday
+holidays.any_holidays_during_work_week?(date.civil(2018, 2, 14), :us, :informal)
+=> true
+# Returns false if you don't specify informal
+irb(main):006:0> Holidays.any_holidays_during_work_week?(Date.civil(2018, 2, 14), :us)
+=> false
+# Returns true since Veteran's Day is observed on Monday November 12, 2018
+holidays.any_holidays_during_work_week?(date.civil(2018, 11, 12), :us, :observed)
+=> true
+# Returns false if you don't specify observed since the actual holiday is on Sunday November 11th 2018
+irb(main):005:0> Holidays.any_holidays_during_work_week?(Date.civil(2018, 11, 12), :us)
+=> false
+```
 
-Load custom definitions file on the fly and use them immediately.
+#### Find the next holiday(s) that will occur from a specific date
 
-Load custom 'Company Founding' holiday on June 1st:
+Get the next holidays occurring from February 23, 2016 for the US:
 
-    Holidays.load_custom('/home/user/holiday_definitions/custom_holidays.yaml')
+```
+Holidays.next_holidays(3, [:us, :informal], Date.civil(2016, 2, 23))
+=> [{:name => "St. Patrick's Day",...}, {:name => "Good Friday",...}, {:name => "Easter Sunday",...}]
+```
 
-    date = Date.civil(2013,6,1)
+You can specify the number of holidays to return. This method will default to `Date.today` if no date is provided.
 
-    Holidays.on(date, :my_custom_region)
-      => [{:name => 'Company Founding',...}]
+#### Find all holidays occuring starting from a specific date to the end of the year
 
-Custom definition files must match the format of the existing definition YAML files location in the 'definitions' directory.
+Get all holidays starting from February 23, 2016 to end of year in the US:
 
-Multiple files can also be passed:
+```
+Holidays.year_holidays([:ca_on], Date.civil(2016, 2, 23))
+=> [{:name=>"Good Friday",...},
+    {name=>"Easter Sunday",...},
+    {:name=>"Victoria Day",...},
+    {:name=>"Canada Day",...},
+    {:name=>"Civic Holiday",...},
+    {:name=>"Labour Day",...},
+    {:name=>"Thanksgiving",...},
+    {:name=>"Remembrance Day",...},
+    {:name=>"Christmas Day",...},
+    {:name=>"Boxing Day",...}]
+```
 
-    Holidays.load_custom('/home/user/holidays/custom_holidays1.yaml', '/home/user/holidays/custom_holidays2.yaml')
+This method will default to `Date.today` if no date is provided.
 
-### Extending Ruby's Date and Time classes
+#### Return all available regions
+
+Return all available regions:
+
+```
+Holidays.available_regions
+=> [:ar, :at, ..., :sg] # this will be a big array
+```
+
+## Loading Custom Definitions on the fly
+
+In addition to the [provided definitions](https://github.com/holidays/definitions) you can load custom definitions file on the fly and use them immediately.
+
+To load custom 'Company Founding' holiday on June 1st:
+
+```
+Holidays.load_custom('/home/user/holiday_definitions/custom_holidays.yaml')
+Holidays.on(Date.civil(2013, 6, 1), :my_custom_region)
+  => [{:name => 'Company Founding',...}]
+```
+
+Custom definition files must match the [syntax of the existing definition files](https://github.com/holidays/definitions/blob/master/doc/SYNTAX.md).
+
+Multiple files can be loaded at the same time:
+
+```
+Holidays.load_custom('/home/user/holidays/custom_holidays1.yaml', '/home/user/holidays/custom_holidays2.yaml')
+```
+
+## Extending Ruby's Date and Time classes
+
+### Date
 
 To extend the 'Date' class:
 
-    require 'holidays/core_extensions/date'
-    class Date
-      include Holidays::CoreExtensions::Date
-    end
+```
+require 'holidays/core_extensions/date'
+class Date
+  include Holidays::CoreExtensions::Date
+end
+```
 
 Now you can check which holidays occur in Iceland on January 1, 2008:
 
-    d = Date.civil(2008,7,1)
+```
+d = Date.civil(2008,7,1)
 
-    d.holidays(:is)
-    => [{:name => 'Nýársdagur'}...]
+d.holidays(:is)
+=> [{:name => 'Nýársdagur'}...]
+```
 
 Or lookup Canada Day in different regions:
 
-    d = Date.civil(2008,7,1)
+```
+d = Date.civil(2008,7,1)
 
-    d.holiday?(:ca) # Canada
-    => true
+d.holiday?(:ca) # Canada
+=> true
 
-    d.holiday?(:ca_bc) # British Columbia, Canada
-    => true
+d.holiday?(:ca_bc) # British Columbia, Canada
+=> true
 
-    d.holiday?(:fr) # France
-    => false
+d.holiday?(:fr) # France
+=> false
+```
 
 Or return the new date based on the options:
 
-    d = Date.civil(2008,7,1)
-    d.change(:year => 2016, :month => 1, :day => 1)
-    => #<Date: 2016-01-01 ((2457389j,0s,0n),+0s,2299161j)>
+```
+d = Date.civil(2008,7,1)
+d.change(:year => 2016, :month => 1, :day => 1)
+=> #<Date: 2016-01-01 ((2457389j,0s,0n),+0s,2299161j)>
+```
 
 Or you can calculate the day of the month:
 
-    Date.calculate_mday(2015, 4, :first, 2)
-    => 7
+```
+Date.calculate_mday(2015, 4, :first, 2)
+=> 7
+```
+
+### Time
+
+```
+require 'holidays/core_extensions/time'
+class Time
+  include Holidays::CoreExtensions::Time
+end
+```
 
-Or find end of month for given date (requires 'Time' extensions as well):
+Find end of month for given date:
 
-    d = Date.civil(2016,8,1)
-    d.end_of_month
-    => #<Date: 2016-08-31 ((2457632j,0s,0n),+0s,2299161j)>
+```
+d = Date.civil(2016,8,1)
+d.end_of_month
+=> #<Date: 2016-08-31 ((2457632j,0s,0n),+0s,2299161j)>
+```
 
-### Caching Holiday Lookups
+## Caching Holiday Lookups
 
-If you are checking holidays regularly you can cache your results for improved performance. Run this before looking up a holiday (eg. in an initializer):
+If you are checking holidays regularly you can cache your results for improved performance. Run this before looking up a holiday (e.g. in an initializer):
 
-    Holidays.cache_between(Time.now, 2.years.from_now, :ca, :us, :observed)
+```
+YEAR = 365 * 24 * 60 * 60
+Holidays.cache_between(Time.now, Time.now + 2 * YEAR, :ca, :us, :observed)
+```
 
 Holidays for the regions specified within the dates specified will be pre-calculated and stored in-memory. Future lookups will be much faster.
 
-### How to contribute
+## How to contribute
 
 See our [contribution guidelines](doc/CONTRIBUTING.md) for information on how to help out!
 
-### Credits and code
+## Credits and code
 
 * Started by [@alexdunae](http://github.com/alexdunae) 2007-2012
 * Maintained by [@hahahana](https://github.com/hahahana), 2013

data/holidays.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
   gem.required_ruby_version = '~> 2.2'
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rake', '~> 12.0'
+  gem.add_development_dependency 'bundler', '~> 1.16'
+  gem.add_development_dependency 'rake', '~> 12'
   gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'test-unit', '~> 3.2'
   gem.add_development_dependency 'mocha', '~> 1.7'

data/lib/generated_definitions/ch.rb

@@ -19,7 +19,7 @@ module Holidays
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_zg, :ch_fr, :ch_so, :ch_ai, :ch_ag, :ch_ti, :ch_vs, :ch_ne, :ch_ju]},
             {:function => "ch_vd_lundi_du_jeune_federal(year)", :function_arguments => [:year], :name => "Lundi du Jeûne fédéral", :regions => [:ch_vd]},
             {:function => "ch_ge_jeune_genevois(year)", :function_arguments => [:year], :name => "Jeûne genevois", :regions => [:ch_ge]}],
-      1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_vd, :ch_vs, :ch_ne, :ch_ge, :ch_ju, :ch_ti]},
+      1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:ch]},
             {:mday => 2, :name => "Berchtoldstag", :regions => [:ch_zh, :ch_be, :ch_lu, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_sh, :ch_sg, :ch_ag, :ch_tg, :ch_vd, :ch_vs, :ch_ne, :ch_ju]},
             {:mday => 6, :name => "Dreikönigstag", :regions => [:ch_ur, :ch_sz, :ch_ti]}],
       3 => [{:mday => 1, :name => "Instauration de la République", :regions => [:ch_ne]},

data/lib/generated_definitions/europe.rb

@@ -151,7 +151,7 @@ module Holidays
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]},
             {:mday => 1, :name => "Jour de l'an", :regions => [:be_fr]},
             {:mday => 1, :name => "Nieuwjaar", :regions => [:be_nl]},
-            {:mday => 1, :name => "Neujahrstag", :regions => [:ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_vd, :ch_vs, :ch_ne, :ch_ge, :ch_ju, :ch_ti]},
+            {:mday => 1, :name => "Neujahrstag", :regions => [:ch]},
             {:mday => 2, :name => "Berchtoldstag", :regions => [:ch_zh, :ch_be, :ch_lu, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_sh, :ch_sg, :ch_ag, :ch_tg, :ch_vd, :ch_vs, :ch_ne, :ch_ju]},
             {:mday => 6, :name => "Dreikönigstag", :regions => [:ch_ur, :ch_sz, :ch_ti]},
             {:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]},

data/lib/holidays.rb

@@ -19,13 +19,12 @@ module Holidays
 
   class << self
     def any_holidays_during_work_week?(date, *options)
-      days_to_monday = date.wday - 1
-      days_to_friday = 5 - date.wday
-      start_date = date - days_to_monday
-      end_date = date + days_to_friday
-      options += [:observed] unless options.include?(:no_observed)
-      options.delete(:no_observed)
-      between(start_date, end_date, options).empty?
+      monday = date - (date.wday - 1)
+      friday = date + (5 - date.wday)
+
+      holidays = between(monday, friday, *options)
+
+      holidays && holidays.count > 0
     end
 
     def on(date, *options)
@@ -48,6 +47,9 @@ module Holidays
       Factory::Finder.between.call(start_date, end_date, options)
     end
 
+    #FIXME All other methods start with a date and require a date. For the next
+    #      major version bump we should take the opportunity to change this
+    #      signature to match, e.g. next_holidays(from_date, count, options)
     def next_holidays(holidays_count, options, from_date = Date.today)
       raise ArgumentError unless holidays_count
       raise ArgumentError if options.empty?
@@ -61,6 +63,9 @@ module Holidays
       Factory::Finder.next_holiday.call(holidays_count, from_date, options)
     end
 
+    #FIXME All other methods start with a date and require a date. For the next
+    #      major version bump we should take the opportunity to change this
+    #      signature to match, e.g. year_holidays(from_date, options)
     def year_holidays(options, from_date = Date.today)
       raise ArgumentError if options.empty?
       raise ArgumentError unless options.is_a?(Array)

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

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '6.6.0'
+  VERSION = '6.6.1'
 end

data/test/defs/test_defs_ch.rb

@@ -7,6 +7,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ChDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ch
+    assert_equal "Neujahrstag", (Holidays.on(Date.civil(2018, 1, 1), [:ch])[0] || {})[:name]
+
     assert_equal "Bundesfeiertag", (Holidays.on(Date.civil(2012, 8, 1), [:ch])[0] || {})[:name]
 
     assert_equal "Weihnachten", (Holidays.on(Date.civil(2012, 12, 25), [:ch])[0] || {})[:name]

data/test/defs/test_defs_europe.rb

@@ -95,6 +95,8 @@ class EuropeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Pinkstermaandag", (Holidays.on(Date.civil(2017, 6, 5), [:be_nl])[0] || {})[:name]
 
+    assert_equal "Neujahrstag", (Holidays.on(Date.civil(2018, 1, 1), [:ch])[0] || {})[:name]
+
     assert_equal "Bundesfeiertag", (Holidays.on(Date.civil(2012, 8, 1), [:ch])[0] || {})[:name]
 
     assert_equal "Weihnachten", (Holidays.on(Date.civil(2012, 12, 25), [:ch])[0] || {})[:name]

data/test/integration/test_any_holidays_during_work_week.rb

@@ -0,0 +1,90 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+class AnyHolidaysDuringWorkWeekTests < Test::Unit::TestCase
+  def subject
+    Holidays.method(:any_holidays_during_work_week?)
+  end
+
+  def test_returns_true_when_single_holiday_exists_during_week
+    assert subject.call(Date.new(2018, 1, 1), :us)
+  end
+
+  def test_returns_true_when_multiple_holidays_exist_during_week
+    assert subject.call(Date.new(2018, 12, 26), :gb)
+  end
+
+  def test_returns_true_if_informal_flag_set_and_informal_holiday_exists_during_week
+    assert subject.call(Date.new(2018, 10, 31), :us, :informal)
+  end
+
+  def test_returns_true_when_no_region_specified_and_single_holiday_exists_during_week
+    assert subject.call(Date.new(2018, 1, 1))
+  end
+
+  def test_returns_true_if_both_informal_and_observed_flags_set_and_informal_holiday_observed_during_week
+    assert subject.call(Date.new(2008, 11, 30), :gb_sct, :informal, :observed)
+  end
+
+  def test_returns_true_when_observed_flag_set_and_holiday_is_observed_during_week
+    assert subject.call(Date.new(2012,9,5), :us, :observed)
+  end
+
+  def test_returns_true_when_observed_flag_set_and_holiday_is_observed_on_monday
+    assert subject.call(Date.new(2018,11,12), :us, :observed)
+  end
+
+  def test_returns_true_with_multiple_regions_and_holiday_occurs_during_week
+    assert subject.call(Date.new(2018,1,1), [:us, :gb])
+  end
+
+  def test_returns_true_when_observed_flag_set_and_holiday_on_saturday_but_observed_on_friday
+    assert subject.call(Date.new(2018,7,3), [:us], :observed)
+  end
+
+  def test_returns_false_when_no_holiday_exists_during_week
+    assert_equal false, subject.call(Date.new(2018,7,30), :us)
+  end
+
+  def test_returns_false_when_holiday_on_sunday
+    assert_equal false, subject.call(Date.new(2018,11,11), :us)
+  end
+
+  def test_returns_false_when_holiday_on_saturday
+    assert_equal false, subject.call(Date.new(2017,11,11), :us)
+  end
+
+  def test_returns_false_when_observed_flag_not_set_and_holiday_occurs_on_sunday_but_observed_on_monday
+    assert_equal false, subject.call(Date.new(2017,1,1), :us)
+  end
+
+  def test_returns_false_if_informal_and_observed_flags_both_set_and_no_holiday_exists_during_week
+    assert_equal false, subject.call(Date.new(2018,7,30), :us, :informal, :observed)
+  end
+
+  def test_returns_false_when_informal_flag_set_and_informal_holiday_occurs_on_weekend
+    assert_equal false, subject.call(Date.new(2018,4,14), :us, :informal)
+  end
+
+  def test_returns_false_when_informal_flag_set_but_observed_is_not_and_informal_holiday_is_observed_on_monday
+    assert_equal false, subject.call(Date.new(2008, 11, 30), :gb_sct, :informal)
+  end
+
+  def test_verify_count_of_weeks_without_any_holidays_for_2012
+    weeks_in_2012 = Date.commercial(2013, -1).cweek
+    holidays_in_2012 = weeks_in_2012.times.count { |week| subject.call(Date.commercial(2012,week+1), :us) == false }
+    assert_equal 45, holidays_in_2012
+  end
+
+  def test_returns_true_for_new_years_in_any_region
+    assert subject.call(Date.civil(2016, 1, 1))
+  end
+
+  # These are in response to https://github.com/holidays/holidays/issues/264, just to be completely sure it's fixed.
+  def returns_true_for_various_holidays_in_poland
+    assert subject.call(Date.civil(2018, 1, 1), :pl)
+    assert subject.call(Date.civil(2018, 1, 2), :pl)
+    assert subject.call(Date.civil(2018, 5, 2), :pl)
+    assert subject.call(Date.civil(2018, 5, 3), :pl)
+    assert subject.call(Date.today, Date.today + 365*2, :pl, :observed)
+  end
+end

data/test/integration/test_holidays.rb

@@ -20,30 +20,6 @@ class HolidaysTests < Test::Unit::TestCase
     assert_equal 0, holidays.length
   end
 
-  def test_any_holidays_during_work_week
-    ## Full weeks:
-    # Try with a Monday
-    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,23), :us)
-    # Try with a Wednesday
-    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,25), :us)
-    # Try Sunday on a week going into a new month
-    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,29), :us)
-    # Try Wednesday on a week going into a new month
-    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,2,1), :us)
-
-    ## Weeks with holidays:
-    # New Year's 2012 (on Sunday, observed Monday). Test from a Wednesday.
-    assert_equal(false, Holidays.any_holidays_during_work_week?(Date.civil(2012,1,4), :us))
-    # Ignore observed holidays with :no_observed
-    assert Holidays.any_holidays_during_work_week?(Date.civil(2012,1,4), :us, :no_observed)
-    # Labor Day 2012 should be Sept 3
-    assert_equal(false, Holidays.any_holidays_during_work_week?(Date.civil(2012,9,5), :us))
-    # Should be 10 non-full weeks in the year (in the US)
-    weeks_in_2012 = Date.commercial(2013, -1).cweek
-    holidays_in_2012 = weeks_in_2012.times.count { |week| Holidays.any_holidays_during_work_week?(Date.commercial(2012,week+1), :us) == false }
-    assert_equal 9, holidays_in_2012
-  end
-
   def test_requires_valid_regions
     assert_raises Holidays::InvalidRegion do
       Holidays.on(Date.civil(2008,1,1), :xx)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Alex Dunae
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -348,6 +348,7 @@ files:
 - test/holidays/finder/rules/test_year_range.rb
 - test/integration/README.md
 - test/integration/test_all_regions.rb
+- test/integration/test_any_holidays_during_work_week.rb
 - test/integration/test_available_regions.rb
 - test/integration/test_custom_holidays.rb
 - test/integration/test_custom_informal_holidays.rb
@@ -497,6 +498,7 @@ test_files:
 - test/holidays/finder/rules/test_year_range.rb
 - test/integration/README.md
 - test/integration/test_all_regions.rb
+- test/integration/test_any_holidays_during_work_week.rb
 - test/integration/test_available_regions.rb
 - test/integration/test_custom_holidays.rb
 - test/integration/test_custom_informal_holidays.rb