business 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e6ab03fc3769877d942e77c54647175c8b8554e016fb8c2fb491c4596db07d
-  data.tar.gz: e76c9f5de45c78dc790866d841da5eb234ea8d308e8ba9c9d292b01eb49cb182
+  metadata.gz: 9a053f4e9b8b8fa5ed407b58d1e81155dac75f1f0c305410403011c608c69c60
+  data.tar.gz: 90cd733d6991516ae8c438824e669850d554147fbb47172f1c4f0dd0bdd44e37
 SHA512:
-  metadata.gz: 4c416c3a2845f6ea9b5016d173a8e30b0308a57021c163ad996407e20dae627d5fe10542f30e43fbf4d4e994b4fb99f967c7fb86842eedac89529e81698e5727
-  data.tar.gz: 0c163bd5dc87ff5246022b63e472829924ad9c41468287ef811e700d5b52e503278301c02968c0602933bca8d633d176a2ed90a36be332e590712b68ea4d8ea7
+  metadata.gz: f09af74f16a84326d8b193f219b1d4de9362c618d197977e4c887df49a34e73d9ad3db154cfe7606fa43b3017b4448175ac37e598ea497e8f508888cf3a2bdb2
+  data.tar.gz: 9dc9a98ae02f7cb056af0bd710ac754594931c796d934b18695fafec5caecf1d7e4f107966863bc46d11e71e576b214cb774fd1a19dbe1d8c024483e55e27503

data/.circleci/config.yml

@@ -23,6 +23,9 @@ jobs:
       - run:
           name: Run tests
           command: bundle exec rspec
+      - run:
+          name: Run rubocop
+          command: bundle exec rubocop --parallel --extra-details --display-style-guide
 
 workflows:
   default:

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,3 +1,7 @@
+## 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

data/Gemfile

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

data/README.md

@@ -23,7 +23,7 @@ We have removed the bundled calendars as of version 2.0.0, if you need the calen
 -  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_paths = ["lib/calendars"] # your_project/lib/calendars/ contains bacs.yml
 Business::Calendar.load("bacs")
 ```
 

data/business.gemspec

@@ -1,23 +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,8 +1,12 @@
-require 'yaml'
-require 'date'
+# 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 :load_paths
     end
@@ -12,54 +16,57 @@ module Business
     end
     private_class_method :calendar_directories
 
+    # rubocop:disable Metrics/MethodLength
     def self.load(calendar_name)
-      data = calendar_directories.detect do |path|
+      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
+
+      new(
+        name: calendar_name,
+        holidays: data["holidays"],
+        working_days: data["working_days"],
+        extra_working_dates: data["extra_working_dates"],
+      )
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    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.exists?(File.join(path, "#{calendar_name}.yml"))
+          next unless File.exist?(File.join(path, "#{calendar_name}.yml"))
 
           break YAML.load_file(File.join(path, "#{calendar_name}.yml"))
         end
       end
-
-      raise "No such calendar '#{calendar_name}'" unless data
-
-      valid_keys = %w(holidays working_days extra_working_dates)
-
-      unless (data.keys - valid_keys).empty?
-        raise "Only valid keys are: #{valid_keys.join(', ')}"
-      end
-
-      self.new(
-        holidays: data['holidays'],
-        working_days: data['working_days'],
-        extra_working_dates: data['extra_working_dates'],
-      )
     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(config)
-      set_extra_working_dates(config[:extra_working_dates])
-      set_working_days(config[:working_days])
-      set_holidays(config[:holidays])
+    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)
 
       unless (@holidays & @extra_working_dates).none?
-        raise ArgumentError, 'Holidays cannot be extra working dates'
+        raise ArgumentError, "Holidays cannot be extra working dates"
       end
     end
 
@@ -70,12 +77,13 @@ module Business
       working_day?(date) && !holiday?(date)
     end
 
-    def working_day?(date) 
+    def working_day?(date)
       date = date.to_date
-      extra_working_dates.include?(date) || working_days.include?(date.strftime('%a').downcase)
+      extra_working_dates.include?(date) ||
+        working_days.include?(date.strftime("%a").downcase)
     end
 
-    def holiday?(date) 
+    def holiday?(date)
       holidays.include?(date.to_date)
     end
 
@@ -98,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,
@@ -121,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
@@ -136,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
@@ -146,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.
@@ -169,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
@@ -189,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)
@@ -209,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

data/lib/business/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Business
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/{calendar_spec.rb → business/calendar_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "business/calendar"
 require "time"
 
@@ -6,61 +8,72 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
 
-describe Business::Calendar do
+RSpec.describe Business::Calendar do
   describe ".load" do
+    subject(:load_calendar) { described_class.load(calendar) }
+
     let(:dummy_calendar) { { "working_days" => ["monday"] } }
 
     before do
-      fixture_path = File.join(File.dirname(__FILE__), 'fixtures', 'calendars')
+      fixture_path = File.join(File.dirname(__FILE__), "../fixtures", "calendars")
       described_class.load_paths = [fixture_path, { "foobar" => dummy_calendar }]
     end
 
     context "when given a calendar from a custom directory" do
-      subject { described_class.load("ecb") }
+      let(:calendar) { "ecb" }
 
       after { described_class.load_paths = nil }
 
       it "loads the yaml file" do
-        expect(YAML).to receive(:load_file) { |path|
-          expect(path).to match(/ecb\.yml$/)
-        }.and_return({})
-        subject
+        expect(YAML).to receive(:load_file).with(/ecb\.yml$/).and_return({})
+
+        load_calendar
       end
 
-      it { is_expected.to be_a Business::Calendar }
+      it { is_expected.to be_a described_class }
 
       context "that also exists as a default calendar" do
-        subject { Business::Calendar.load("bacs") }
+        let(:calendar) { "bacs" }
 
         it "uses the custom calendar" do
-          expect(subject.business_day?(Date.parse("25th December 2014"))).
+          expect(load_calendar.business_day?(Date.parse("25th December 2014"))).
             to eq(true)
         end
       end
     end
 
     context "when loading a calendar as a hash" do
-      subject { described_class.load("foobar") }
+      let(:calendar) { "foobar" }
 
-      it { is_expected.to be_a Business::Calendar }
+      it { is_expected.to be_a described_class }
     end
 
     context "when given a calendar that does not exist" do
-      subject { Business::Calendar.load("invalid-calendar") }
-      specify { expect { subject }.to raise_error(/No such calendar/) }
+      let(:calendar) { "invalid-calendar" }
+
+      specify { expect { load_calendar }.to raise_error(/No such calendar/) }
     end
 
     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, extra_working_dates") }
+      let(:calendar) { "invalid-keys" }
+
+      specify do
+        expect { load_calendar }.
+          to raise_error(
+            "Only valid keys are: holidays, working_days, extra_working_dates",
+          )
+      end
     end
 
     context "when given real business data" do
-      let(:data_path) { File.join(File.dirname(__FILE__), '..', 'lib', 'business', 'data') }
+      let(:data_path) do
+        File.join(File.dirname(__FILE__), "..", "lib", "business", "data")
+      end
+
       it "validates they are all loadable by the calendar" do
         Dir.glob("#{data_path}/*").each do |filename|
           calendar_name = File.basename(filename, ".yml")
-          calendar = Business::Calendar.load(calendar_name)
+          calendar = described_class.load(calendar_name)
 
           expect(calendar.working_days.length).to be >= 1
         end
@@ -69,33 +82,38 @@ describe Business::Calendar do
   end
 
   describe "#set_working_days" do
-    let(:calendar) { Business::Calendar.new({}) }
+    subject(:set_working_days) { calendar.set_working_days(working_days) }
+
+    let(:calendar) { described_class.new(name: "test") }
     let(:working_days) { [] }
-    subject { calendar.set_working_days(working_days) }
 
     context "when given valid working days" do
-      let(:working_days) { %w( mon fri ) }
-      before { subject }
+      let(:working_days) { %w[mon fri] }
+
+      before { set_working_days }
 
       it "assigns them" do
         expect(calendar.working_days).to eq(working_days)
       end
 
       context "that are unnormalised" do
-        let(:working_days) { %w( Monday Friday ) }
+        let(:working_days) { %w[Monday Friday] }
+
         it "normalises them" do
-          expect(calendar.working_days).to eq(%w( mon fri ))
+          expect(calendar.working_days).to eq(%w[mon fri])
         end
       end
     end
 
     context "when given an invalid business day" do
-      let(:working_days) { %w( Notaday ) }
-      specify { expect { subject }.to raise_error(/Invalid day/) }
+      let(:working_days) { %w[Notaday] }
+
+      specify { expect { set_working_days }.to raise_error(/Invalid day/) }
     end
 
     context "when given nil" do
       let(:working_days) { nil }
+
       it "uses the default business days" do
         expect(calendar.working_days).to eq(calendar.default_working_days)
       end
@@ -103,70 +121,78 @@ describe Business::Calendar do
   end
 
   describe "#set_holidays" do
-    let(:calendar) { Business::Calendar.new({}) }
-    let(:holidays) { [] }
-    before { calendar.set_holidays(holidays) }
-    subject { calendar.holidays }
+    subject(:holidays) { calendar.holidays }
+
+    let(:calendar) { described_class.new(name: "test") }
+    let(:holiday_dates) { [] }
+
+    before { calendar.set_holidays(holiday_dates) }
 
     context "when given valid business days" do
-      let(:holidays) { ["1st Jan, 2013"] }
+      let(:holiday_dates) { ["1st Jan, 2013"] }
 
-      it { is_expected.not_to be_empty }
+      it { is_expected.to_not be_empty }
 
       it "converts them to Date objects" do
-        subject.each { |h| expect(h).to be_a Date }
+        expect(holidays).to all be_a Date
       end
     end
 
     context "when given nil" do
-      let(:holidays) { nil }
+      let(:holiday_dates) { nil }
+
       it { is_expected.to be_empty }
     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 }
+    subject(:extra_working_dates) { calendar.extra_working_dates }
+
+    let(:calendar) { described_class.new(name: "test") }
+    let(:extra_dates) { [] }
+
+    before { calendar.set_extra_working_dates(extra_dates) }
 
     context "when given valid business days" do
-      let(:extra_working_dates) { ["1st Jan, 2013"] }
+      let(:extra_dates) { ["1st Jan, 2013"] }
 
-      it { is_expected.not_to be_empty }
+      it { is_expected.to_not be_empty }
 
       it "converts them to Date objects" do
-        subject.each { |h| expect(h).to be_a Date }
+        expect(extra_working_dates).to all 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"])
+    let(:instance) do
+      described_class.new(name: "test",
+                          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')
+      expect { instance }.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"])
+    let(:instance) do
+      described_class.new(name: "test",
+                          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')
+      expect { instance }.to raise_error(ArgumentError).
+        with_message("Extra working dates cannot be on working days")
     end
   end
 
@@ -175,262 +201,315 @@ describe Business::Calendar do
   # tests for both Date *and* Time.
   shared_examples "common" do
     describe "#business_day?" do
+      subject { calendar.business_day?(day) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["9am, Tuesday 1st Jan, 2013"],
-                               extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
+        described_class.new(name: "test",
+                            holidays: ["9am, Tuesday 1st Jan, 2013"],
+                            extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
       end
-      subject { calendar.business_day?(day) }
 
       context "when given a business day" do
         let(:day) { date_class.parse("9am, Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to be_truthy }
       end
 
       context "when given a non-business day" do
         let(:day) { date_class.parse("9am, Saturday 5th Jan, 2013") }
+
         it { is_expected.to be_falsey }
       end
 
       context "when given a business day that is a holiday" 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 "#working_day?" do
+      subject { calendar.working_day?(day) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["9am, Tuesday 1st Jan, 2013"],
-                               extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
+        described_class.new(name: "test",
+                            holidays: ["9am, Tuesday 1st Jan, 2013"],
+                            extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
       end
-      subject { calendar.working_day?(day) }
 
       context "when given a working day" do
         let(:day) { date_class.parse("9am, Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to be_truthy }
       end
 
       context "when given a non-working day" do
         let(:day) { date_class.parse("9am, Saturday 5th Jan, 2013") }
+
         it { is_expected.to be_falsey }
       end
 
       context "when given a working day that is a holiday" do
         let(:day) { date_class.parse("9am, Tuesday 1st Jan, 2013") }
+
         it { is_expected.to be_truthy }
       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 "#holiday?" do
+      subject { calendar.holiday?(day) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["9am, Tuesday 1st Jan, 2013"],
-                               extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
+        described_class.new(name: "test",
+                            holidays: ["9am, Tuesday 1st Jan, 2013"],
+                            extra_working_dates: ["9am, Sunday 6th Jan, 2013"])
       end
-      subject { calendar.holiday?(day) }
 
       context "when given a working day that is not a holiday" do
         let(:day) { date_class.parse("9am, Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to be_falsey }
       end
 
       context "when given a non-working day that is not a holiday day" do
         let(:day) { date_class.parse("9am, Saturday 5th Jan, 2013") }
+
         it { is_expected.to be_falsey }
       end
 
       context "when given a day that is a holiday" do
         let(:day) { date_class.parse("9am, Tuesday 1st Jan, 2013") }
+
         it { is_expected.to be_truthy }
       end
 
       context "when given a non-business day that is no a holiday" do
         let(:day) { date_class.parse("9am, Sunday 6th Jan, 2013") }
+
         it { is_expected.to be_falsey }
       end
     end
 
     describe "#roll_forward" do
+      subject { calendar.roll_forward(date) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"])
+        described_class.new(name: "test", holidays: ["Tuesday 1st Jan, 2013"])
       end
-      subject { calendar.roll_forward(date) }
 
       context "given a business day" do
         let(:date) { date_class.parse("Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to eq(date) }
       end
 
       context "given a non-business day" do
         context "with a business day following it" do
           let(:date) { date_class.parse("Tuesday 1st Jan, 2013") }
+
           it { is_expected.to eq(date + day_interval) }
         end
 
         context "followed by another non-business day" do
           let(:date) { date_class.parse("Saturday 5th Jan, 2013") }
+
           it { is_expected.to eq(date + 2 * day_interval) }
         end
       end
     end
 
     describe "#roll_backward" do
+      subject { calendar.roll_backward(date) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"])
+        described_class.new(name: "test", holidays: ["Tuesday 1st Jan, 2013"])
       end
-      subject { calendar.roll_backward(date) }
 
       context "given a business day" do
         let(:date) { date_class.parse("Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to eq(date) }
       end
 
       context "given a non-business day" do
         context "with a business day preceeding it" do
           let(:date) { date_class.parse("Tuesday 1st Jan, 2013") }
+
           it { is_expected.to eq(date - day_interval) }
         end
 
         context "preceeded by another non-business day" do
           let(:date) { date_class.parse("Sunday 6th Jan, 2013") }
+
           it { is_expected.to eq(date - 2 * day_interval) }
         end
       end
     end
 
     describe "#next_business_day" do
+      subject { calendar.next_business_day(date) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"])
+        described_class.new(name: "test", holidays: ["Tuesday 1st Jan, 2013"])
       end
-      subject { calendar.next_business_day(date) }
 
       context "given a business day" do
         let(:date) { date_class.parse("Wednesday 2nd Jan, 2013") }
+
         it { is_expected.to eq(date + day_interval) }
       end
 
       context "given a non-business day" do
         context "with a business day following it" do
           let(:date) { date_class.parse("Tuesday 1st Jan, 2013") }
+
           it { is_expected.to eq(date + day_interval) }
         end
 
         context "followed by another non-business day" do
           let(:date) { date_class.parse("Saturday 5th Jan, 2013") }
+
           it { is_expected.to eq(date + 2 * day_interval) }
         end
       end
     end
 
     describe "#previous_business_day" do
+      subject { calendar.previous_business_day(date) }
+
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"])
+        described_class.new(name: "test", holidays: ["Tuesday 1st Jan, 2013"])
       end
-      subject { calendar.previous_business_day(date) }
 
       context "given a business day" do
         let(:date) { date_class.parse("Thursday 3nd Jan, 2013") }
+
         it { is_expected.to eq(date - day_interval) }
       end
 
       context "given a non-business day" do
         context "with a business day before it" do
           let(:date) { date_class.parse("Tuesday 1st Jan, 2013") }
+
           it { is_expected.to eq(date - day_interval) }
         end
 
         context "preceeded by another non-business day" do
           let(:date) { date_class.parse("Sunday 6th Jan, 2013") }
+
           it { is_expected.to eq(date - 2 * day_interval) }
         end
       end
     end
 
     describe "#add_business_days" do
+      subject { calendar.add_business_days(date, delta) }
+
       let(:extra_working_dates) { [] }
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Tuesday 1st Jan, 2013"],
-                               extra_working_dates: extra_working_dates)
+        described_class.new(name: "test",
+                            holidays: ["Tuesday 1st Jan, 2013"],
+                            extra_working_dates: extra_working_dates)
       end
       let(:delta) { 2 }
-      subject { calendar.add_business_days(date, delta) }
 
       context "given a business day" do
         context "and a period that includes only business days" do
           let(:date) { date_class.parse("Wednesday 2nd Jan, 2013") }
+
           it { is_expected.to eq(date + delta * day_interval) }
         end
 
         context "and a period that includes a weekend" do
           let(:date) { date_class.parse("Friday 4th Jan, 2013") }
+
           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) }
         end
       end
 
       context "given a non-business day" do
         let(:date) { date_class.parse("Tuesday 1st Jan, 2013") }
+
         it { is_expected.to eq(date + (delta + 1) * day_interval) }
       end
     end
 
     describe "#subtract_business_days" do
+      subject { calendar.subtract_business_days(date, delta) }
+
       let(:extra_working_dates) { [] }
       let(:calendar) do
-        Business::Calendar.new(holidays: ["Thursday 3rd Jan, 2013"],
-                               extra_working_dates: extra_working_dates)
+        described_class.new(name: "test",
+                            holidays: ["Thursday 3rd Jan, 2013"],
+                            extra_working_dates: extra_working_dates)
       end
       let(:delta) { 2 }
-      subject { calendar.subtract_business_days(date, delta) }
 
       context "given a business day" do
         context "and a period that includes only business days" do
           let(:date) { date_class.parse("Wednesday 2nd Jan, 2013") }
+
           it { is_expected.to eq(date - delta * day_interval) }
         end
 
         context "and a period that includes a weekend" do
           let(:date) { date_class.parse("Monday 31st Dec, 2012") }
+
           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) }
         end
       end
 
       context "given a non-business day" do
         let(:date) { date_class.parse("Thursday 3rd Jan, 2013") }
+
         it { is_expected.to eq(date - (delta + 1) * day_interval) }
       end
     end
 
     describe "#business_days_between" do
+      subject do
+        calendar.business_days_between(date_class.parse(date_1),
+                                       date_class.parse(date_2))
+      end
+
       let(:holidays) do
         ["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"]
@@ -439,11 +518,9 @@ describe Business::Calendar 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))
+        described_class.new(name: "test",
+                            holidays: holidays,
+                            extra_working_dates: extra_working_dates)
       end
 
       context "starting on a business day" do
@@ -452,58 +529,68 @@ describe Business::Calendar do
         context "ending on a business day" do
           context "including only business days" do
             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) { "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) }
+
+            it { is_expected.to be(4) }
           end
 
           context "including only business days & holidays" do
             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) { "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) }
+
+            it { is_expected.to be(3) }
           end
         end
 
         context "ending on a weekend day" do
           context "including only business days & weekend days" do
             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) { "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
@@ -512,17 +599,20 @@ describe Business::Calendar do
           context "including only business days & holidays" do
             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) { "Thu 12/6/2014" }
+
             it { is_expected.to eq(8) }
           end
 
-          context 'including business, weekend, holiday days & business date' do
+          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
@@ -532,17 +622,20 @@ describe Business::Calendar do
 
           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
@@ -552,26 +645,29 @@ describe Business::Calendar do
         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) { "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) { "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
@@ -579,36 +675,42 @@ describe Business::Calendar do
         context "ending on a weekend day" do
           context "including only business days & weekend days" do
             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) }
+
+            it { is_expected.to be(5) }
           end
 
           context "including business, weekend days, and holidays" do
             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) }
+
+            it { is_expected.to be(9) }
           end
         end
 
         context "ending on a holiday" do
           context "including business, weekend days, and holidays" do
             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
@@ -618,16 +720,19 @@ describe Business::Calendar do
 
           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
@@ -637,20 +742,22 @@ describe Business::Calendar do
         let(:date_1) { "Thu 12/6/2014" }
 
         context "ending on a business day" do
-
           context "including only business days & holidays" do
             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) { "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
@@ -658,12 +765,14 @@ describe Business::Calendar do
         context "ending on a weekend day" do
           context "including business, weekend days, and holidays" do
             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
@@ -672,17 +781,20 @@ describe Business::Calendar do
           context "including only business days & holidays" do
             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) { "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
@@ -692,37 +804,43 @@ describe Business::Calendar do
 
           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
+      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
@@ -732,17 +850,20 @@ describe Business::Calendar do
 
           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
@@ -754,17 +875,20 @@ describe Business::Calendar 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
@@ -773,6 +897,7 @@ describe Business::Calendar 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
@@ -782,11 +907,14 @@ describe Business::Calendar do
         context "for a range less than a week long" do
           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) { "Mon 16/6/2014" }
           let(:date_2) { "Tue 24/6/2014" }
+
           it { is_expected.to eq(4) }
         end
       end