business 1.17.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269d15c8779ee827afd572090f68bdcacd07a2e370403b39eb2f57b7198d60ed
-  data.tar.gz: 0ba04f3d70c319474a8f71d8f8f8930da4ad1ba7bf55943146a61f2104f26450
+  metadata.gz: 9a053f4e9b8b8fa5ed407b58d1e81155dac75f1f0c305410403011c608c69c60
+  data.tar.gz: 90cd733d6991516ae8c438824e669850d554147fbb47172f1c4f0dd0bdd44e37
 SHA512:
-  metadata.gz: c096b7e12f640b5dec2a8477d4a67e08f1e36a89efeeb38e12ef9c1f31c5e10bd0d5bc3ef09a918f476e5b3da4cb46f195bf2e0f761ebe50a52a318c6fcc2bc5
-  data.tar.gz: 34e96d59c5863db36b3ac58f26c5c744c44507ab463e8897fbd2213787ba27ade73363a7da5e9761c85a3f23d55718d0a1a61c08176024533a563e03fe1eb409
+  metadata.gz: f09af74f16a84326d8b193f219b1d4de9362c618d197977e4c887df49a34e73d9ad3db154cfe7606fa43b3017b4448175ac37e598ea497e8f508888cf3a2bdb2
+  data.tar.gz: 9dc9a98ae02f7cb056af0bd710ac754594931c796d934b18695fafec5caecf1d7e4f107966863bc46d11e71e576b214cb774fd1a19dbe1d8c024483e55e27503

data/.circleci/config.yml

@@ -0,0 +1,37 @@
+version: 2.1
+
+jobs:
+  test:
+    docker:
+      - image: circleci/ruby:<< parameters.ruby-version >>
+    parameters:
+      ruby-version:
+        type: string
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - bundle-v1-<< parameters.ruby-version >>-{{ checksum "business.gemspec" }}
+            - bundle-v1-<< parameters.ruby-version >>-
+      - run:
+          name: Install dependencies
+          command: bundle install --clean --no-cache --path vendor/bundle --jobs=4 --retry=3
+      - save_cache:
+          key: bundle-v1-<< parameters.ruby-version >>-{{ checksum "business.gemspec" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Run tests
+          command: bundle exec rspec
+      - run:
+          name: Run rubocop
+          command: bundle exec rubocop --parallel --extra-details --display-style-guide
+
+workflows:
+  default:
+    jobs:
+      - test:
+          name: Ruby << matrix.ruby-version >>
+          matrix:
+            parameters:
+              ruby-version: ["2.4.9", "2.5.8", "2.6.6", "2.7.1"]

data/.rubocop.yml

@@ -0,0 +1,13 @@
+inherit_gem:
+  gc_ruboconfig: rubocop.yml
+
+RSpec/NestedGroups:
+  Exclude:
+    - spec/business/calendar_spec.rb
+
+# Disabled as API uses set_holidays etc
+Naming/AccessorMethodName:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+2.7.1

data/CHANGELOG.md

@@ -1,4 +1,32 @@
-## 1.17.0 - September 2, 2019
+## 2.2.0 - March 4, 2021
+
+- Add `Business::Calendar#name` - thanks @mattmcf!
+
+## 2.1.0 - June 8, 2020
+
+- Add seperate `working_day?` and `holiday?` methods to the calendar
+
+## 2.0.0 - May 4, 2020
+
+🚨 **BREAKING CHANGES** 🚨
+
+For more on the breaking changes that have been introduced in v2.0.0 please [see the readme](README.md#v200-breaking-changes).
+
+- Remove bundled calendars see [this pr](https://github.com/gocardless/business/pull/54) for more context. If you need to use any of the previously bundled calendars, [see here](https://github.com/gocardless/business/tree/b12c186ca6fd4ffdac85175742ff7e4d0a705ef4/lib/business/data)
+- `Business::Calendar.load_paths=` is now required
+
+## 1.18.0 - April 30, 2020
+
+### Note we have dropped support for Ruby < 2.4.x
+
+- Correct Danish public holidays
+
+## 1.17.1 - November 19, 2019
+
+- Change May Bank Holiday 2020 for UK (Bacs) - this was moved to the 8th.
+- Add 2020 holidays for PAD.
+
+## 1.17.0 - October 30, 2019
 
 - Add holiday calendar for France (Target(SEPA) + French bank holidays)
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,61 +1,128 @@
 # Business
 
 [![Gem version](https://badge.fury.io/rb/business.svg)](http://badge.fury.io/rb/business)
-[![Build status](https://travis-ci.org/gocardless/business.svg?branch=master)](https://travis-ci.org/gocardless/business)
+[![CircleCI](https://circleci.com/gh/gocardless/business.svg?style=svg)](https://circleci.com/gh/gocardless/business)
 
 Date calculations based on business calendars.
 
-## Documentation
+- [v2.0.0 breaking changes](#v200-breaking-changes)
+- [Getting Started](#getting-started)
+  - [Creating a calendar](#creating-a-calendar)
+  - [Using a calendar file](#use-a-calendar-file)
+- [Checking for business days](#checking-for-business-days)
+- [Business day arithmetic](#business-day-arithmetic)
+- [But other libraries already do this](#but-other-libraries-already-do-this)
+- [License & Contributing](#license--contributing)
 
-To get business, simply:
+## v2.0.0 breaking changes
+
+We have removed the bundled calendars as of version 2.0.0, if you need the calendars that were included:
+
+- Download the calendars you wish to use from [v1.18.0](https://github.com/gocardless/business/tree/b12c186ca6fd4ffdac85175742ff7e4d0a705ef4/lib/business/data)
+- Place them in a suitable directory in your project, typically `lib/calendars`
+-  Add this directory path to your instance of `Business::Calendar` using the `load_paths` method.dd the directory to where you placed the yml files before you load the calendar
+
+```ruby
+Business::Calendar.load_paths = ["lib/calendars"] # your_project/lib/calendars/ contains bacs.yml
+Business::Calendar.load("bacs")
+```
+
+If you wish to stay on the last version that contained bundled calendars, pin `business` to `v1.18.0`
+
+```ruby
+# Gemfile
+gem "business", "v1.18.0"
+```
+
+## Getting started
+
+To install business, simply:
 
 ```bash
-$ gem install business
+gem install business
 ```
 
-### Getting started
+If you are using a Gemfile:
 
-Get started with business by creating an instance of the calendar class,
-passing in a hash that specifies with days of the week are considered working
-days, and which days are holidays.
+```ruby
+gem "business", "~> 2.0"
+```
+
+### Creating a calendar
+
+Get started with business by creating an instance of the calendar class, that accepts a hash that specifies which days of the week are considered working days, which days are holidays and which are extra working dates.
 
 ```ruby
 calendar = Business::Calendar.new(
   working_days: %w( mon tue wed thu fri ),
   holidays: ["01/01/2014", "03/01/2014"]    # array items are either parseable date strings, or real Date objects
+  extra_working_dates: [nil], # Makes the calendar to consider a weekend day as a working day.
 )
 ```
 
-`extra_working_dates` key makes the calendar to consider a weekend day as a working day.
+### Use a calendar file
 
-A few calendar configs are bundled with the gem (see [lib/business/data]((lib/business/data)) for
-details). Load them by calling the `load` class method on `Calendar`. The
-`load_cached` variant of this method caches the calendars by name after loading
-them, to avoid reading and parsing the config file multiple times.
+Defining a calendar as a Ruby object may not be convenient, so we provide a way of defining these calendars as YAML. Below we will walk through the necessary [steps](#example-calendar) to build your first calendar. All keys are optional and will default to the following:
 
-```ruby
-calendar = Business::Calendar.load("weekdays")
-calendar = Business::Calendar.load_cached("weekdays")
-```
+Note: Elements of `holidays` and `extra_working_dates` may be either strings that `Date.parse()` [can understand](https://ruby-doc.org/stdlib-2.7.1/libdoc/date/rdoc/Date.html#method-c-parse), or `YYYY-MM-DD` (which is considered as a Date by Ruby YAML itself)[https://github.com/ruby/psych/blob/6ec6e475e8afcf7868b0407fc08014aed886ecf1/lib/psych/scalar_scanner.rb#L60].
+
+#### YAML file Structure
 
-If `working_days` is missing, then common default is used (mon-fri).
-If `holidays` is missing, "no holidays" assumed.
-If `extra_working_dates` is missing, then no changes in `working_days` will happen.
+```yml
+working_days: # Optional, default [Monday-Friday]
+  -
+holidays: # Optional, default: []  ie: "no holidays" assumed
+  -
+extra_working_dates: # Optional, default: [], ie: no changes in `working_days` will happen
+  -
+```
 
-Elements of `holidays` and `extra_working_dates` may be
-eiter strings that `Date.parse()` can understand,
-or YYYY-MM-DD (which is considered as a Date by Ruby YAML itself).
+#### Example calendar
 
 ```yaml
+# lib/calendars/my_calendar.yml
+working_days:
+  - Monday
+  - Wednesday
+  - Friday
 holidays:
-  - 2017-01-08  # Same as January 8th, 2017
+  - 1st April 2020
+  - 2021-04-01
+extra_working_dates:
+  - 9th March 2020 # A Saturday
+```
+
+Ensure the calendar file is saved to a directory that will hold all your calendars, typically `lib/calendars`, then add this directory to your instance of `Business::Calendar` using the `load_paths` method before you call your calendar.
+
+`load_paths` also accepts an array of plain Ruby hashes with the format:
+
+```ruby
+  { "calendar_name" => { "working_days" => [] }
+```
+
+#### Example loading both a path and ruby hashes
+
+```ruby
+Business::Calendar.load_paths = [
+  "lib/calendars",
+  { "foo_calendar" => { "working_days" => ["monday"] } },
+  { "bar_calendar" => { "working_days" => ["sunday"] } },
+]
+```
+
+Now you can load the calendar by calling the `Business::Calendar.load(calendar_name)`. In order to avoid parsing the calendar file multiple times, there is a `Business::Calendar.load_cached(calendar_name)` method that caches the calendars by name after loading them.
+
+```ruby
+calendar = Business::Calendar.load("my_calendar") # lib/calendars/my_calendar.yml
+calendar = Business::Calendar.load("foo_calendar")
+# or
+calendar = Business::Calendar.load_cached("my_calendar")
+calendar = Business::Calendar.load_cached("foo_calendar")
 ```
 
-### Checking for business days
+## Checking for business days
 
-To check whether a given date is a business day (falls on one of the specified
-working days or working dates, and is not a holiday), use the `business_day?`
-method on `Calendar`.
+To check whether a given date is a business day (falls on one of the specified working days or working dates, and is not a holiday), use the `business_day?` method on `Business::Calendar`.
 
 ```ruby
 calendar.business_day?(Date.parse("Monday, 9 June 2014"))
@@ -64,21 +131,23 @@ calendar.business_day?(Date.parse("Sunday, 8 June 2014"))
 # => false
 ```
 
-### Custom calendars
-
-To use a calendar you've written yourself, you need to add the directory it's
-stored in as an additional calendar load path:
+More specifically you can check if a given `business_day?` is either a `working_day?` or a `holiday?` using methods on `Business::Calendar`.
 
 ```ruby
-Business::Calendar.additional_load_paths = ['path/to/your/calendar/directory']
+# Assuming "Monday, 9 June 2014" is a holiday
+calendar.working_day?(Date.parse("Monday, 9 June 2014"))
+# => true
+calendar.holiday?(Date.parse("Monday, 9 June 2014"))
+# => true
+# Monday is a working day, but we have a holiday so it's not
+# a business day
+calendar.business_day?(Date.parse("Monday, 9 June 2014"))
+# => false
 ```
 
-You can then load the calendar as normal.
+## Business day arithmetic
 
-### Business day arithmetic
-
-The `add_business_days` and `subtract_business_days` are used to perform
-business day arithmetic on dates.
+The `add_business_days` and `subtract_business_days` are used to perform business day arithmetic on dates.
 
 ```ruby
 date = Date.parse("Thursday, 12 June 2014")
@@ -88,10 +157,7 @@ calendar.subtract_business_days(date, 4).strftime("%A, %d %B %Y")
 # => "Friday, 06 June 2014"
 ```
 
-The `roll_forward` and `roll_backward` methods snap a date to a nearby business
-day. If provided with a business day, they will return that date. Otherwise,
-they will advance (forward for `roll_forward` and backward for `roll_backward`)
-until a business day is found.
+The `roll_forward` and `roll_backward` methods snap a date to a nearby business day. If provided with a business day, they will return that date. Otherwise, they will advance (forward for `roll_forward` and backward for `roll_backward`) until a business day is found.
 
 ```ruby
 date = Date.parse("Saturday, 14 June 2014")
@@ -101,10 +167,7 @@ calendar.roll_backward(date).strftime("%A, %d %B %Y")
 # => "Friday, 13 June 2014"
 ```
 
-To count the number of business days between two dates, pass the dates to
-`business_days_between`. This method counts from start of the first date to
-start of the second date. So, assuming no holidays, there would be two business
-days between a Monday and a Wednesday.
+To count the number of business days between two dates, pass the dates to `business_days_between`. This method counts from start of the first date to start of the second date. So, assuming no holidays, there would be two business days between a Monday and a Wednesday.
 
 ```ruby
 date = Date.parse("Saturday, 14 June 2014")
@@ -112,39 +175,19 @@ calendar.business_days_between(date, date + 7)
 # => 5
 ```
 
-### Included Calendars
-
-We include some calendar data with this Gem but give no guarantees of its
-accuracy.
-The calendars that we include are:
-
-* Bacs
-* Bankgirot
-* BECS (Australia)
-* BECSNZ (New Zealand)
-* PAD (Canada)
-* Betalingsservice
-* Target (SEPA)
-* TargetFrance (SEPA + French bank holidays)
-
 ## But other libraries already do this
 
-Another gem, [business_time](https://github.com/bokmann/business_time), also
-exists for this purpose. We previously used business_time, but encountered
-several issues that prompted us to start business.
+Another gem, [business_time](https://github.com/bokmann/business_time), also exists for this purpose. We previously used business_time, but encountered several issues that prompted us to start business.
+
+Firstly, business_time works by monkey-patching `Date`, `Time`, and `FixNum`. While this enables syntax like `Time.now + 1.business_day`, it means that all configuration has to be global. GoCardless handles payments across several geographies, so being able to work with multiple working-day calendars is
+essential for us. Business provides a simple `Calendar` class, that is initialized with a configuration that specifies which days of the week are considered to be working days, and which dates are holidays.
 
-Firstly, business_time works by monkey-patching `Date`, `Time`, and `FixNum`.
-While this enables syntax like `Time.now + 1.business_day`, it means that all
-configuration has to be global. GoCardless handles payments across several
-geographies, so being able to work with multiple working-day calendars is
-essential for us. Business provides a simple `Calendar` class, that is
-initialized with a configuration that specifies which days of the week are
-considered to be working days, and which dates are holidays.
+Secondly, business_time supports calculations on times as well as dates. For our purposes, date-based calculations are sufficient. Supporting time-based calculations as well makes the code significantly more complex. We chose to avoid this extra complexity by sticking solely to date-based mathematics.
 
-Secondly, business_time supports calculations on times as well as dates. For
-our purposes, date-based calculations are sufficient. Supporting time-based
-calculations as well makes the code significantly more complex. We chose to
-avoid this extra complexity by sticking solely to date-based mathematics.
+<p align="center"><img src="http://3.bp.blogspot.com/-aq4iOz2OZzs/Ty8xaQwMhtI/AAAAAAAABrM/-vn4tcRA9-4/s1600/daily-morning-awesomeness-243.jpeg" alt="I'm late for business" width="250"/></p>
 
+## License & Contributing
+- business is available as open source under the terms of the [MIT License](LICENSE).
+- Bug reports and pull requests are welcome on GitHub at https://github.com/gocardless/business.
 
-![I'm late for business](http://3.bp.blogspot.com/-aq4iOz2OZzs/Ty8xaQwMhtI/AAAAAAAABrM/-vn4tcRA9-4/s1600/daily-morning-awesomeness-243.jpeg)
+GoCardless ♥ open source. If you do too, come [join us](https://gocardless.com/about/jobs).

data/business.gemspec

@@ -1,22 +1,27 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'business/version'
+require "business/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "business"
   spec.version       = Business::VERSION
   spec.authors       = ["Harry Marr"]
   spec.email         = ["developers@gocardless.com"]
-  spec.summary       = %q{Date calculations based on business calendars}
-  spec.description   = %q{Date calculations based on business calendars}
+  spec.summary       = "Date calculations based on business calendars"
+  spec.description   = "Date calculations based on business calendars"
   spec.homepage      = "https://github.com/gocardless/business"
   spec.licenses      = ["MIT"]
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "gc_ruboconfig", "~> 2.24.0"
   spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
+  spec.add_development_dependency "rubocop", "~> 1.10.0"
 end

data/lib/business.rb

@@ -1 +1,3 @@
-require 'business/calendar'
+# frozen_string_literal: true
+
+require "business/calendar"

data/lib/business/calendar.rb

@@ -1,63 +1,90 @@
-require 'yaml'
+# frozen_string_literal: true
+
+require "yaml"
+require "date"
 
 module Business
   class Calendar
+    VALID_KEYS = %w[holidays working_days extra_working_dates].freeze
+
     class << self
-      attr_accessor :additional_load_paths
+      attr_accessor :load_paths
     end
 
     def self.calendar_directories
-      directories = @additional_load_paths || []
-      directories + [File.join(File.dirname(__FILE__), 'data')]
+      @load_paths
     end
     private_class_method :calendar_directories
 
-    def self.load(calendar)
-      directory = calendar_directories.find do |dir|
-        File.exists?(File.join(dir, "#{calendar}.yml"))
+    # rubocop:disable Metrics/MethodLength
+    def self.load(calendar_name)
+      data = find_calendar_data(calendar_name)
+      raise "No such calendar '#{calendar_name}'" unless data
+
+      unless (data.keys - VALID_KEYS).empty?
+        raise "Only valid keys are: #{VALID_KEYS.join(', ')}"
       end
-      raise "No such calendar '#{calendar}'" unless directory
 
-      yaml = YAML.load_file(File.join(directory, "#{calendar}.yml"))
-      valid_keys = %w(holidays working_days extra_working_dates)
+      new(
+        name: calendar_name,
+        holidays: data["holidays"],
+        working_days: data["working_days"],
+        extra_working_dates: data["extra_working_dates"],
+      )
+    end
+    # rubocop:enable Metrics/MethodLength
 
-      unless (yaml.keys - valid_keys).empty?
-        raise "Only valid keys are: #{valid_keys.join(', ')}"
-      end
+    def self.find_calendar_data(calendar_name)
+      calendar_directories.detect do |path|
+        if path.is_a?(Hash)
+          break path[calendar_name] if path[calendar_name]
+        else
+          next unless File.exist?(File.join(path, "#{calendar_name}.yml"))
 
-      self.new(holidays: yaml['holidays'], working_days: yaml['working_days'],
-               extra_working_dates: yaml['extra_working_dates'])
+          break YAML.load_file(File.join(path, "#{calendar_name}.yml"))
+        end
+      end
     end
 
     @lock = Mutex.new
     def self.load_cached(calendar)
       @lock.synchronize do
-        @cache ||= { }
-        unless @cache.include?(calendar)
-          @cache[calendar] = self.load(calendar)
-        end
+        @cache ||= {}
+        @cache[calendar] = self.load(calendar) unless @cache.include?(calendar)
         @cache[calendar]
       end
     end
 
     DAY_NAMES = %( mon tue wed thu fri sat sun )
 
-    attr_reader :holidays, :working_days, :extra_working_dates
+    attr_reader :name, :holidays, :working_days, :extra_working_dates
+
+    def initialize(name:, extra_working_dates: nil, working_days: nil, holidays: nil)
+      @name = name
+      set_extra_working_dates(extra_working_dates)
+      set_working_days(working_days)
+      set_holidays(holidays)
 
-    def initialize(config)
-      set_extra_working_dates(config[:extra_working_dates])
-      set_working_days(config[:working_days])
-      set_holidays(config[:holidays])
+      unless (@holidays & @extra_working_dates).none?
+        raise ArgumentError, "Holidays cannot be extra working dates"
+      end
     end
 
     # Return true if the date given is a business day (typically that means a
     # non-weekend day) and not a holiday.
     def business_day?(date)
       date = date.to_date
-      return true if extra_working_dates.include?(date)
-      return false unless working_days.include?(date.strftime('%a').downcase)
-      return false if holidays.include?(date)
-      true
+      working_day?(date) && !holiday?(date)
+    end
+
+    def working_day?(date)
+      date = date.to_date
+      extra_working_dates.include?(date) ||
+        working_days.include?(date.strftime("%a").downcase)
+    end
+
+    def holiday?(date)
+      holidays.include?(date.to_date)
     end
 
     # Roll forward to the next business day. If the date given is a business
@@ -79,19 +106,19 @@ module Business
     # Roll forward to the next business day regardless of whether the given
     # date is a business day or not.
     def next_business_day(date)
-      begin
+      loop do
         date += day_interval_for(date)
-      end until business_day?(date)
-      date
+        break date if business_day?(date)
+      end
     end
 
     # Roll backward to the previous business day regardless of whether the given
     # date is a business day or not.
     def previous_business_day(date)
-      begin
+      loop do
         date -= day_interval_for(date)
-      end until business_day?(date)
-      date
+        break date if business_day?(date)
+      end
     end
 
     # Add a number of business days to a date. If a non-business day is given,
@@ -102,9 +129,10 @@ module Business
     def add_business_days(date, delta)
       date = roll_forward(date)
       delta.times do
-        begin
+        loop do
           date += day_interval_for(date)
-        end until business_day?(date)
+          break date if business_day?(date)
+        end
       end
       date
     end
@@ -117,9 +145,10 @@ module Business
     def subtract_business_days(date, delta)
       date = roll_backward(date)
       delta.times do
-        begin
+        loop do
           date -= day_interval_for(date)
-        end until business_day?(date)
+          break date if business_day?(date)
+        end
       end
       date
     end
@@ -127,8 +156,11 @@ module Business
     # Count the number of business days between two dates.
     # This method counts from start of date1 to start of date2. So,
     # business_days_between(mon, weds) = 2 (assuming no holidays)
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def business_days_between(date1, date2)
-      date1, date2 = date1.to_date, date2.to_date
+      date1 = date1.to_date
+      date2 = date2.to_date
 
       # To optimise this method we split the range into full weeks and a
       # remaining period.
@@ -150,14 +182,16 @@ module Business
       num_biz_days -= holidays.count do |holiday|
         in_range = full_weeks_range.cover?(holiday)
         # Only pick a holiday if its on a working day (e.g., not a weekend)
-        on_biz_day = working_days.include?(holiday.strftime('%a').downcase)
+        on_biz_day = working_days.include?(holiday.strftime("%a").downcase)
         in_range && on_biz_day
       end
 
-      remaining_range = (date2-remaining_days...date2)
+      remaining_range = (date2 - remaining_days...date2)
       # Loop through each day in remaining_range and count if a business day
       num_biz_days + remaining_range.count { |a| business_day?(a) }
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     def day_interval_for(date)
       date.is_a?(Date) ? 1 : 3600 * 24
@@ -170,9 +204,12 @@ module Business
           raise "Invalid day #{day}" unless DAY_NAMES.include?(normalised_day)
         end
       end
-      extra_working_dates_names = @extra_working_dates.map { |d| d.strftime("%a").downcase }
+      extra_working_dates_names = @extra_working_dates.map do |d|
+        d.strftime("%a").downcase
+      end
       return if (extra_working_dates_names & @working_days).none?
-      raise ArgumentError, 'Extra working dates cannot be on working days'
+
+      raise ArgumentError, "Extra working dates cannot be on working days"
     end
 
     def parse_dates(dates)
@@ -182,8 +219,6 @@ module Business
     # Internal method for assigning holidays from a calendar config.
     def set_holidays(holidays)
       @holidays = parse_dates(holidays)
-      return if (@holidays & @extra_working_dates).none?
-      raise ArgumentError, 'Holidays cannot be extra working dates'
     end
 
     def set_extra_working_dates(extra_working_dates)
@@ -192,7 +227,7 @@ module Business
 
     # If no working days are provided in the calendar config, these are used.
     def default_working_days
-      %w( mon tue wed thu fri )
+      %w[mon tue wed thu fri]
     end
   end
 end