business 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1431e1fe213a16dbbf8dbf725fb5efcf034835cf
-  data.tar.gz: 1795c1836084a2c2b5730b1caa7f96641d86185a
+SHA256:
+  metadata.gz: 2ce183fd075a28db58cdae3a9f4c1815544866a171f7ef452b2600a9e33d4a2f
+  data.tar.gz: 96e32b1777a865e52aa54c2b795ddb0402bbcc68baf4d0419aedb3046c34c354
 SHA512:
-  metadata.gz: ba2842e349db5f8195eea673a95cc3d9d47a9f85d9b0168e80179421030895ef0cfbe4848f98d80defc3e70ef19fa91fc3fa14e355982035c6d5520d05c205bd
-  data.tar.gz: f7a0973d56bdec053c85ee06874175b3ddaed412597079cd34dc48164403d143584f0bc2a9e155af44038719910b0134afa90e6e746836816a6b53b480b67c56
+  metadata.gz: fe6c860087c55a924c49eca49306b20971bccca378b4da72f62b24c13179bb6e9c08cee1d3ec821dd9ea034b6a3169d926b352ff4ec355a1b002e2919fb5637e
+  data.tar.gz: 0d45896c08651c3af203cfd331dbe449e62edf00c45e2bc0487aa0d805408f8b4726ed1ed96cc9bbe21f839bcbac7ac35cbf7de4df927a9cb70c02cdc03ca1c7

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+ruby-2.5.1

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.5.1
+  - 2.4.3
+  - 2.3.7
+  - 2.2.10
   - 2.1.10
 
 sudo: false

data/CHANGELOG.md

@@ -1,7 +1,23 @@
+## 1.13.0 - April 17, 2018
+
+- Add support for specifying `extra_working_dates` (special dates that are "working days",
+  even though they are not one of the specified days, for example weekend dates
+  that are considered to be working days)
+
+## 1.12.0 - April 3, 2018
+
+- Add Betalingservice & BECS calendars up until 2020
+
 ## 1.11.1 - December 20, 2017
 
 - Add 2017-2018 BECS holiday definitions
 
+## 1.11.0 - December 13, 2017
+
+- Handle properly calendar initialization by Date objects (not strings),
+  coming from both YAML config and initialize().
+
+
 ## 1.10.0 - September 20, 2017
 
 - Add 2018-2019 Betalingsservice holiday definitions

data/README.md

@@ -22,11 +22,13 @@ days, and which days are holidays.
 ```ruby
 calendar = Business::Calendar.new(
   working_days: %w( mon tue wed thu fri ),
-  holidays: ["01/01/2014", "03/01/2014"]
+  holidays: ["01/01/2014", "03/01/2014"]    # array items are either parseable date strings, or real Date objects
 )
 ```
 
-A few calendar configs are bundled with the gem (see lib/business/data for
+`extra_working_dates` key makes the calendar to consider a weekend day as a working day.
+
+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.
@@ -36,11 +38,24 @@ calendar = Business::Calendar.load("weekdays")
 calendar = Business::Calendar.load_cached("weekdays")
 ```
 
+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.
+
+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).
+
+```yaml
+holidays:
+  - 2017-01-08  # Same as January 8th, 2017
+```
+
 ### Checking for business days
 
 To check whether a given date is a business day (falls on one of the specified
-working days, and is not a holiday), use the `business_day?` method on
-`Calendar`.
+working days or working dates, and is not a holiday), use the `business_day?`
+method on `Calendar`.
 
 ```ruby
 calendar.business_day?(Date.parse("Monday, 9 June 2014"))

data/lib/business/calendar.rb

@@ -19,13 +19,14 @@ module Business
       raise "No such calendar '#{calendar}'" unless directory
 
       yaml = YAML.load_file(File.join(directory, "#{calendar}.yml"))
-      valid_keys = ['holidays', 'working_days']
+      valid_keys = %w(holidays working_days extra_working_dates)
 
       unless (yaml.keys - valid_keys).empty?
         raise "Only valid keys are: #{valid_keys.join(', ')}"
       end
-      
-      self.new(holidays: yaml['holidays'], working_days: yaml['working_days'])
+
+      self.new(holidays: yaml['holidays'], working_days: yaml['working_days'],
+               extra_working_dates: yaml['extra_working_dates'])
     end
 
     @lock = Mutex.new
@@ -41,9 +42,10 @@ module Business
 
     DAY_NAMES = %( mon tue wed thu fri sat sun )
 
-    attr_reader :working_days, :holidays
+    attr_reader :holidays, :working_days, :extra_working_dates
 
     def initialize(config)
+      set_extra_working_dates(config[:extra_working_dates])
       set_working_days(config[:working_days])
       set_holidays(config[:holidays])
     end
@@ -52,6 +54,7 @@ module Business
     # 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
@@ -167,11 +170,24 @@ 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 }
+      return if (extra_working_dates_names & @working_days).none?
+      raise ArgumentError, 'Extra working dates cannot be on working days'
+    end
+
+    def parse_dates(dates)
+      (dates || []).map { |date| date.is_a?(Date) ? date : Date.parse(date) }
     end
 
     # Internal method for assigning holidays from a calendar config.
     def set_holidays(holidays)
-      @holidays = (holidays || []).map { |holiday| Date.parse(holiday) }
+      @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)
+      @extra_working_dates = parse_dates(extra_working_dates)
     end
 
     # If no working days are provided in the calendar config, these are used.
@@ -180,4 +196,3 @@ module Business
     end
   end
 end
-

data/lib/business/version.rb

@@ -1,3 +1,3 @@
 module Business
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/spec/calendar_spec.rb

@@ -56,7 +56,7 @@ describe Business::Calendar do
 
     context "when given a calendar that has invalid keys" do
       subject { Business::Calendar.load("invalid-keys") }
-      specify { expect { subject }.to raise_error("Only valid keys are: holidays, working_days") }
+      specify { expect { subject }.to raise_error("Only valid keys are: holidays, working_days, extra_working_dates") }
     end
 
     context "when given real business data" do
@@ -72,6 +72,19 @@ describe Business::Calendar do
     end
   end
 
+  describe "bundled calendars" do
+    calendars = Dir.glob("../lib/business/data*.yml")
+                   .map { |f| File.basename(f, ".yml") }
+
+    calendars.each do |calendar|
+      describe calendar do
+        it "should load without issues" do
+          expect { Business::Calendar.load(calendar) }.not_to raise_error
+        end
+      end
+    end
+  end
+
   describe "#set_working_days" do
     let(:calendar) { Business::Calendar.new({}) }
     let(:working_days) { [] }
@@ -128,13 +141,60 @@ describe Business::Calendar do
     end
   end
 
+  describe "#set_extra_working_dates" do
+    let(:calendar) { Business::Calendar.new({}) }
+    let(:extra_working_dates) { [] }
+    before { calendar.set_extra_working_dates(extra_working_dates) }
+    subject { calendar.extra_working_dates }
+
+    context "when given valid business days" do
+      let(:extra_working_dates) { ["1st Jan, 2013"] }
+
+      it { is_expected.not_to be_empty }
+
+      it "converts them to Date objects" do
+        subject.each { |h| expect(h).to be_a Date }
+      end
+    end
+
+    context "when given nil" do
+      let(:holidays) { nil }
+      it { is_expected.to be_empty }
+    end
+  end
+
+  context "when holiday is also a working date" do
+    subject do
+      Business::Calendar.new(holidays: ["2018-01-06"],
+                             extra_working_dates: ["2018-01-06"])
+    end
+
+    it do
+      expect { subject }.to raise_error(ArgumentError)
+        .with_message('Holidays cannot be extra working dates')
+    end
+  end
+
+  context "when working date on working day" do
+    subject do
+      Business::Calendar.new(working_days: ["mon"],
+                             extra_working_dates: ["Monday 26th Mar, 2018"])
+    end
+
+    it do
+      expect { subject }.to raise_error(ArgumentError)
+        .with_message('Extra working dates cannot be on working days')
+    end
+  end
+
   # A set of examples that are supposed to work when given Date and Time
   # objects. The implementation slightly differs, so i's worth running the
   # tests for both Date *and* Time.
   shared_examples "common" do
     describe "#business_day?" do
       let(:calendar) do
-        Business::Calendar.new(holidays: ["9am, Tuesday 1st Jan, 2013"])
+        Business::Calendar.new(holidays: ["9am, Tuesday 1st Jan, 2013"],
+                               extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
       end
       subject { calendar.business_day?(day) }
 
@@ -152,6 +212,11 @@ describe Business::Calendar do
         let(:day) { date_class.parse("9am, Tuesday 1st Jan, 2013") }
         it { is_expected.to be_falsey }
       end
+
+      context "when given a non-business day that is a working date" do
+        let(:day) { date_class.parse("9am, Sunday 6th Jan, 2013") }
+        it { is_expected.to be_truthy }
+      end
     end
 
     describe "#roll_forward" do
@@ -251,8 +316,10 @@ describe Business::Calendar do
     end
 
     describe "#add_business_days" do
+      let(:extra_working_dates) { [] }
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"])
+        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"],
+                               extra_working_dates: extra_working_dates)
       end
       let(:delta) { 2 }
       subject { calendar.add_business_days(date, delta) }
@@ -268,6 +335,12 @@ describe Business::Calendar do
           it { is_expected.to eq(date + (delta + 2) * day_interval) }
         end
 
+        context "and a period that includes a working date weekend" do
+          let(:extra_working_dates) { ["Sunday 6th Jan, 2013"] }
+          let(:date) { date_class.parse("Friday 4th Jan, 2013") }
+          it { is_expected.to eq(date + (delta + 1) * day_interval) }
+        end
+
         context "and a period that includes a holiday day" do
           let(:date) { date_class.parse("Monday 31st Dec, 2012") }
           it { is_expected.to eq(date + (delta + 1) * day_interval) }
@@ -281,8 +354,10 @@ describe Business::Calendar do
     end
 
     describe "#subtract_business_days" do
+      let(:extra_working_dates) { [] }
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Thursday 3rd Jan, 2013"])
+        Business::Calendar.new(holidays: ["Thursday 3rd Jan, 2013"],
+                               extra_working_dates: extra_working_dates)
       end
       let(:delta) { 2 }
       subject { calendar.subtract_business_days(date, delta) }
@@ -298,6 +373,12 @@ describe Business::Calendar do
           it { is_expected.to eq(date - (delta + 2) * day_interval) }
         end
 
+        context "and a period that includes a working date weekend" do
+          let(:extra_working_dates) { ["Saturday 29th Dec, 2012"] }
+          let(:date) { date_class.parse("Monday 31st Dec, 2012") }
+          it { is_expected.to eq(date - (delta + 1) * day_interval) }
+        end
+
         context "and a period that includes a holiday day" do
           let(:date) { date_class.parse("Friday 4th Jan, 2013") }
           it { is_expected.to eq(date - (delta + 1) * day_interval) }
@@ -312,146 +393,361 @@ describe Business::Calendar do
 
     describe "#business_days_between" do
       let(:holidays) do
-        ["Thu 12/6/2014", "Wed 18/6/2014", "Fri 20/6/2014", "Sun 22/6/2014"]
+        ["Wed 27/5/2014", "Thu 12/6/2014", "Wed 18/6/2014", "Fri 20/6/2014",
+         "Sun 22/6/2014", "Fri 27/6/2014", "Thu 3/7/2014"]
+      end
+      let(:extra_working_dates) do
+        ["Sun 1/6/2014", "Sat 28/6/2014", "Sat 5/7/2014"]
+      end
+      let(:calendar) do
+        Business::Calendar.new(holidays: holidays, extra_working_dates: extra_working_dates)
+      end
+      subject do
+        calendar.business_days_between(date_class.parse(date_1),
+                                       date_class.parse(date_2))
       end
-      let(:calendar) { Business::Calendar.new(holidays: holidays) }
-      subject { calendar.business_days_between(date_1, date_2) }
-
 
       context "starting on a business day" do
-        let(:date_1) { date_class.parse("Mon 2/6/2014") }
+        let(:date_1) { "Mon 2/6/2014" }
 
         context "ending on a business day" do
           context "including only business days" do
-            let(:date_2) { date_class.parse("Thu 5/6/2014") }
+            let(:date_2) { "Thu 5/6/2014" }
             it { is_expected.to eq(3) }
           end
 
           context "including only business days & weekend days" do
-            let(:date_2) { date_class.parse("Mon 9/6/2014") }
+            let(:date_2) { "Mon 9/6/2014" }
             it { is_expected.to eq(5) }
           end
 
+          context "including only business days, weekend days & working date" do
+            let(:date_1) { "Thu 29/5/2014" }
+            let(:date_2) { "The 3/6/2014" }
+            it { is_expected.to eql(4) }
+          end
+
           context "including only business days & holidays" do
-            let(:date_1) { date_class.parse("Mon 9/6/2014") }
-            let(:date_2) { date_class.parse("Fri 13/6/2014") }
+            let(:date_1) { "Mon 9/6/2014" }
+            let(:date_2) { "Fri 13/6/2014" }
             it { is_expected.to eq(3) }
           end
 
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Fri 13/6/2014") }
+            let(:date_2) { "Fri 13/6/2014" }
             it { is_expected.to eq(8) }
           end
+
+          context "including business, weekend, hoilday days & working date" do
+            let(:date_1) { "Thu 26/6/2014" }
+            let(:date_2) { "The 1/7/2014" }
+            it { is_expected.to eql(3) }
+          end
         end
 
         context "ending on a weekend day" do
           context "including only business days & weekend days" do
-            let(:date_2) { date_class.parse("Sun 8/6/2014") }
+            let(:date_2) { "Sun 8/6/2014" }
             it { is_expected.to eq(5) }
           end
 
+          context "including business & weekend days & working date" do
+            let(:date_1) { "Thu 29/5/2014" }
+            let(:date_2) { "Sun 3/6/2014" }
+            it { is_expected.to eq(4) }
+          end
+
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Sat 14/6/2014") }
+            let(:date_2) { "Sat 14/6/2014" }
             it { is_expected.to eq(9) }
           end
+
+          context "including business, weekend & holiday days & working date" do
+            let(:date_1) { "Thu 26/6/2014" }
+            let(:date_2) { "Tue 2/7/2014" }
+            it { is_expected.to eq(4) }
+          end
         end
 
         context "ending on a holiday" do
           context "including only business days & holidays" do
-            let(:date_1) { date_class.parse("Mon 9/6/2014") }
-            let(:date_2) { date_class.parse("Thu 12/6/2014") }
+            let(:date_1) { "Mon 9/6/2014" }
+            let(:date_2) { "Thu 12/6/2014" }
             it { is_expected.to eq(3) }
           end
 
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Thu 12/6/2014") }
+            let(:date_2) { "Thu 12/6/2014" }
+            it { is_expected.to eq(8) }
+          end
+
+          context 'including business, weekend, holiday days & business date' do
+            let(:date_1) { "Wed 28/5/2014" }
+            let(:date_2) { "Thu 12/6/2014" }
+            it { is_expected.to eq(11) }
+          end
+        end
+
+        context "ending on a working date" do
+          let(:date_1) { "Fri 4/7/2014" }
+
+          context "including only business days & working date" do
+            let(:date_2) { "Sat 5/7/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including business, weekend days & working date" do
+            let(:date_2) { "Tue 8/7/2014" }
+            it { is_expected.to eq(3) }
+          end
+
+          context "including business, weekend days, holidays & working date" do
+            let(:date_1) { "Wed 25/6/2014" }
+            let(:date_2) { "Tue 8/7/2014" }
             it { is_expected.to eq(8) }
           end
         end
       end
 
       context "starting on a weekend" do
-        let(:date_1) { date_class.parse("Sat 7/6/2014") }
+        let(:date_1) { "Sat 7/6/2014" }
 
         context "ending on a business day" do
 
           context "including only business days & weekend days" do
-            let(:date_2) { date_class.parse("Mon 9/6/2014") }
+            let(:date_2) { "Mon 9/6/2014" }
             it { is_expected.to eq(0) }
           end
 
+          context "including business, weekend days & working date" do
+            let(:date_1) { "Sat 31/5/2014" }
+            let(:date_2) { "Tue 3/6/2014" }
+            it { is_expected.to eq(2) }
+          end
+
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Fri 13/6/2014") }
+            let(:date_2) { "Fri 13/6/2014" }
             it { is_expected.to eq(3) }
           end
+
+          context "including business, weekend, holilday days & working date" do
+            let(:date_1) { "Sat 31/5/2014" }
+            let(:date_2) { "Fri 13/6/2014" }
+            it { is_expected.to eq(8) }
+          end
         end
 
         context "ending on a weekend day" do
           context "including only business days & weekend days" do
-            let(:date_2) { date_class.parse("Sun 8/6/2014") }
+            let(:date_2) { "Sun 8/6/2014" }
             it { is_expected.to eq(0) }
           end
 
+          context "including business, weekend days & working date" do
+            let(:date_1) { "Sat 31/5/2014" }
+            let(:date_2) { "Sun 8/6/2014" }
+            it { is_expected.to eql(5) }
+          end
+
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Sat 14/6/2014") }
+            let(:date_2) { "Sat 14/6/2014" }
             it { is_expected.to eq(4) }
           end
+
+          context "including business, weekend, holiday days & working date" do
+            let(:date_1) { "Sat 31/5/2014" }
+            let(:date_2) { "Sun 14/6/2014" }
+            it { is_expected.to eql(9) }
+          end
         end
 
         context "ending on a holiday" do
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Thu 12/6/2014") }
+            let(:date_2) { "Thu 12/6/2014" }
+            it { is_expected.to eq(3) }
+          end
+
+          context "including business, weekend days & working date" do
+            let(:date_1) { "Sat 31/5/2014" }
+            let(:date_2) { "Thu 12/6/2014" }
+            it { is_expected.to eq(8) }
+          end
+        end
+
+        context "ending on a working date" do
+          let(:date_1) { "Sat 31/5/2014" }
+
+          context "including only weekend days & working date" do
+            let(:date_2) { "Sat 2/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including business, weekend days & working date" do
+            let(:date_2) { "Tue 4/6/2014" }
             it { is_expected.to eq(3) }
           end
+
+          context "including business, weekend days, holidays & working date" do
+            let(:date_2) { "Tue 13/6/2014" }
+            it { is_expected.to eq(8) }
+          end
         end
       end
 
       context "starting on a holiday" do
-        let(:date_1) { date_class.parse("Thu 12/6/2014") }
+        let(:date_1) { "Thu 12/6/2014" }
 
         context "ending on a business day" do
 
           context "including only business days & holidays" do
-            let(:date_2) { date_class.parse("Fri 13/6/2014") }
+            let(:date_2) { "Fri 13/6/2014" }
             it { is_expected.to eq(0) }
           end
 
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Thu 19/6/2014") }
+            let(:date_2) { "Thu 19/6/2014" }
             it { is_expected.to eq(3) }
           end
+
+          context "including business, weekend days, holidays & working date" do
+            let(:date_1) { "Fri 27/6/2014" }
+            let(:date_2) { "Tue 1/7/2014" }
+            it { is_expected.to eq(2) }
+          end
         end
 
         context "ending on a weekend day" do
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Sun 15/6/2014") }
+            let(:date_2) { "Sun 15/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including business, weekend days, holidays & working date" do
+            let(:date_1) { "Fri 27/6/2014" }
+            let(:date_2) { "Sun 29/6/2014" }
             it { is_expected.to eq(1) }
           end
         end
 
         context "ending on a holiday" do
           context "including only business days & holidays" do
-            let(:date_1) { date_class.parse("Wed 18/6/2014") }
-            let(:date_2) { date_class.parse("Fri 20/6/2014") }
+            let(:date_1) { "Wed 18/6/2014" }
+            let(:date_2) { "Fri 20/6/2014" }
             it { is_expected.to eq(1) }
           end
 
           context "including business, weekend days, and holidays" do
-            let(:date_2) { date_class.parse("Wed 18/6/2014") }
+            let(:date_2) { "Wed 18/6/2014" }
+            it { is_expected.to eq(3) }
+          end
+
+          context "including business/weekend days, holidays & working date" do
+            let(:date_1) { "27/5/2014" }
+            let(:date_2) { "Thu 12/6/2014" }
+            it { is_expected.to eq(11) }
+          end
+        end
+
+        context "ending on a working date" do
+          let(:date_1) { "Sat 27/6/2014" }
+
+          context "including only holiday & working date" do
+            let(:date_2) { "Sat 29/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including holiday, weekend days & working date" do
+            let(:date_2) { "Tue 30/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including business, weekend days, holidays & working date" do
+            let(:date_2) { "Tue 2/7/2014" }
             it { is_expected.to eq(3) }
           end
         end
       end
 
+      context 'starting on a working date' do
+        let(:date_1) { "Sun 1/6/2014" }
+
+        context "ending on a working day" do
+          context "including only working date & working day" do
+            let(:date_2) { "Wed 4/6/2014" }
+            it { is_expected.to eq(3) }
+          end
+
+          context "including working date, working & weekend days" do
+            let(:date_2) { "Tue 10/6/2014" }
+            it { is_expected.to eq(6) }
+          end
+
+          context "including working date, working & weekend days & holiday" do
+            let(:date_2) { "Tue 13/6/2014" }
+            it { is_expected.to eq(8) }
+          end
+        end
+
+        context "ending on a weekend day" do
+          let(:date_1) { "Sat 28/6/2014" }
+
+          context "including only working date & weekend day" do
+            let(:date_2) { "Sun 29/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including working date, weekend & working days" do
+            let(:date_1) { "Sat 5/7/2014" }
+            let(:date_2) { "Wed 9/7/2014" }
+            it { is_expected.to eq(3) }
+          end
+
+          context "including working date, weekend & working days & holiday" do
+            let(:date_2) { "Fri 4/7/2014" }
+            it { is_expected.to eq(4) }
+          end
+        end
+
+        context "ending on a holiday" do
+          let(:date_1) { "Sat 28/6/2014" }
+
+          context "including only working date & holiday" do
+            let(:holidays) { ["Mon 2/6/2014"] }
+            let(:date_1) { "Sun 1/6/2014" }
+            let(:date_2) { "Mon 2/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including working date, holiday & weekend day" do
+            let(:holidays) { ["Mon 30/6/2014"] }
+            let(:date_2) { "Mon 30/6/2014" }
+            it { is_expected.to eq(1) }
+          end
+
+          context "including working date, holiday, weekend & working days" do
+            let(:date_2) { "Thu 3/7/2014" }
+            it { is_expected.to eq(4) }
+          end
+        end
+
+        context "ending on a working date" do
+          context "including working dates, weekend & working days" do
+            let(:date_1) { "Sat 28/6/2014" }
+            let(:date_2) { "Sat 5/7/2014" }
+            it { is_expected.to eq(4) }
+          end
+        end
+      end
+
       context "if a calendar has a holiday on a non-working (weekend) day" do
         context "for a range less than a week long" do
-          let(:date_1) { date_class.parse("Thu 19/6/2014") }
-          let(:date_2) { date_class.parse("Tue 24/6/2014") }
+          let(:date_1) { "Thu 19/6/2014" }
+          let(:date_2) { "Tue 24/6/2014" }
           it { is_expected.to eq(2) }
         end
         context "for a range more than a week long" do
-          let(:date_1) { date_class.parse("Mon 16/6/2014") }
-          let(:date_2) { date_class.parse("Tue 24/6/2014") }
+          let(:date_1) { "Mon 16/6/2014" }
+          let(:date_2) { "Tue 24/6/2014" }
           it { is_expected.to eq(4) }
         end
       end
@@ -479,4 +775,3 @@ describe Business::Calendar do
     it_behaves_like "common"
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Date calculations based on business calendars