business 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7aab6453e38130641098c102e0b05f1d5c40cd957710c80f3b53f4670175ce6
-  data.tar.gz: 2ae585a9a460e340db0821c755a787795e7504914af8febb247c451beb8f37f2
+  metadata.gz: 9f04f06e8df7909e07f17eb5ef5066935eea815e7139260bc1542d785f999d3b
+  data.tar.gz: 68df07bcc51b18a1406badfaeeeb78c05412d726a506be589a7bdbd139105877
 SHA512:
-  metadata.gz: ffe309242e862845535efb526d3f4ec95852bd685f026c97fdac4bcd4eec88051e47481f5d1354b98a9f34af47dd4858b417fe173b6f9498b52c226a6c491bac
-  data.tar.gz: 322e9a49e3fcec9078b6c5e1d78eb6ea0d4abc0bc47f95550cbb6069d72715c00d8c5868279bfdfc5e69776e7e85cea03fc3994441522ff7a84abb82411e867f
+  metadata.gz: 95d2bf588e43841cc35e48e416d610466a18738a777c812d7c7dff1d121d715d270247e5a2895753c3bc1742400f58e924a626dbe152e0d0ed5a9803241070d4
+  data.tar.gz: c7e583aba5f2870a3ddb0ec5e91ef6e64e03dfb5cf5de1a6d246bea345ef9cccb3304dc6d21edb3f5508ae62646b1f7dd8330578a1457b96eaf3bd46fa2a6faa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Upcoming
 
+## 3.1.0 - Sept 28, 2026
+
+- Fix `business_days_between` not counting extra working dates in full weeks #34 - thanks @anatoliliotych!
+
 # 3.0.0 - Sept 29, 2026
 
 - Removed support for Ruby 3.2 and earlier

data/README.md

@@ -46,7 +46,7 @@ calendar = Business::Calendar.new(
 
 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:
 
-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].
+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
 
@@ -139,6 +139,16 @@ calendar.subtract_business_days(date, 4).strftime("%A, %d %B %Y")
 # => "Friday, 06 June 2014"
 ```
 
+For getting the next or previous business day, instead of passing `1` to `add_business_days` or `subtract_business_days`, `next_business_day` and `previous_business_day` could be used respectively:
+
+```ruby
+date = Date.parse("Friday, 13 June 2014")
+calendar.next_business_day(date).strftime("%A, %d %B %Y")
+# => "Monday, 16 June 2014"
+calendar.previous_business_day(date).strftime("%A, %d %B %Y")
+# => "Thursday, 12 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.
 
 ```ruby

data/lib/business/calendar.rb

@@ -194,6 +194,15 @@ module Business
         in_range && on_biz_day
       end
 
+      num_biz_days += extra_working_dates.count do |extra_day|
+        in_range = full_weeks_range.cover?(extra_day)
+        # Only pick an extra working date if it's on a non-working day (e.g., a
+        # weekend) and not a holiday, as the setters bypass that validation
+        on_non_working_day =
+          !working_days.include?(extra_day.strftime("%a").downcase)
+        in_range && on_non_working_day && !holiday?(extra_day)
+      end
+
       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) }

data/lib/business/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Business
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/spec/business/calendar_spec.rb

@@ -694,7 +694,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Wed 28/5/2014" }
             let(:date_2) { "Thu 12/6/2014" }
 
-            it { is_expected.to eq(11) }
+            it { is_expected.to eq(12) }
           end
         end
 
@@ -717,7 +717,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Wed 25/6/2014" }
             let(:date_2) { "Tue 8/7/2014" }
 
-            it { is_expected.to eq(8) }
+            it { is_expected.to eq(9) }
           end
         end
       end
@@ -749,7 +749,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Sat 31/5/2014" }
             let(:date_2) { "Fri 13/6/2014" }
 
-            it { is_expected.to eq(8) }
+            it { is_expected.to eq(9) }
           end
         end
 
@@ -764,7 +764,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Sat 31/5/2014" }
             let(:date_2) { "Sun 8/6/2014" }
 
-            it { is_expected.to be(5) }
+            it { is_expected.to eq(6) }
           end
 
           context "including business, weekend days, and holidays" do
@@ -775,9 +775,9 @@ RSpec.describe Business::Calendar do
 
           context "including business, weekend, holiday days & working date" do
             let(:date_1) { "Sat 31/5/2014" }
-            let(:date_2) { "Sun 14/6/2014" }
+            let(:date_2) { "Sun 15/6/2014" }
 
-            it { is_expected.to be(9) }
+            it { is_expected.to be(10) }
           end
         end
 
@@ -792,7 +792,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Sat 31/5/2014" }
             let(:date_2) { "Thu 12/6/2014" }
 
-            it { is_expected.to eq(8) }
+            it { is_expected.to eq(9) }
           end
         end
 
@@ -812,9 +812,9 @@ RSpec.describe Business::Calendar do
           end
 
           context "including business, weekend days, holidays & working date" do
-            let(:date_2) { "Tue 13/6/2014" }
+            let(:date_2) { "Fri 13/6/2014" }
 
-            it { is_expected.to eq(8) }
+            it { is_expected.to eq(9) }
           end
         end
       end
@@ -873,10 +873,10 @@ RSpec.describe Business::Calendar do
           end
 
           context "including business/weekend days, holidays & working date" do
-            let(:date_1) { "27/5/2014" }
+            let(:date_1) { "Tue 27/5/2014" }
             let(:date_2) { "Thu 12/6/2014" }
 
-            it { is_expected.to eq(11) }
+            it { is_expected.to eq(12) }
           end
         end
 
@@ -916,13 +916,13 @@ RSpec.describe Business::Calendar do
           context "including working date, working & weekend days" do
             let(:date_2) { "Tue 10/6/2014" }
 
-            it { is_expected.to eq(6) }
+            it { is_expected.to eq(7) }
           end
 
           context "including working date, working & weekend days & holiday" do
-            let(:date_2) { "Tue 13/6/2014" }
+            let(:date_2) { "Fri 13/6/2014" }
 
-            it { is_expected.to eq(8) }
+            it { is_expected.to eq(9) }
           end
         end
 
@@ -979,7 +979,7 @@ RSpec.describe Business::Calendar do
             let(:date_1) { "Sat 28/6/2014" }
             let(:date_2) { "Sat 5/7/2014" }
 
-            it { is_expected.to eq(4) }
+            it { is_expected.to eq(5) }
           end
         end
       end
@@ -999,6 +999,33 @@ RSpec.describe Business::Calendar do
           it { is_expected.to eq(4) }
         end
       end
+
+      context "if a calendar has an extra working date" do
+        context "for a range less than a week long" do
+          let(:date_1) { "Fri 30/5/2014" }
+          let(:date_2) { "Tue 3/6/2014" }
+
+          it { is_expected.to eq(3) }
+        end
+
+        context "for a range more than a week long" do
+          let(:date_1) { "Mon 26/5/2014" }
+          let(:date_2) { "Mon 9/6/2014" }
+
+          it { is_expected.to eq(10) }
+        end
+
+        context "set after initialisation on a working day and a holiday" do
+          before do
+            calendar.set_extra_working_dates(["Wed 4/6/2014", "Sun 22/6/2014"])
+          end
+
+          let(:date_1) { "Mon 2/6/2014" }
+          let(:date_2) { "Mon 30/6/2014" }
+
+          it { is_expected.to eq(16) }
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: business
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - GoCcardless