business 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbb66616260ec96ece9868d9eb337e31fc3ffb791caf58b9f05010ebd7354dc
-  data.tar.gz: 2f13155d38f7fad38db25cbe49378af3166b2c99886379dc2b6c8a2dce7282c6
+  metadata.gz: b251f5b883fe268c312d1d85b129f20244ca8729a427784f8e5c0b87681ff646
+  data.tar.gz: '05779798d8c21739f31a604b6e46c063f62189b0a7e0a1064e674c1c5fbe9278'
 SHA512:
-  metadata.gz: 13c43f3e262bac0402194d0c9bd98cbd5090b38ec2ed7cb25e66087c831127db1c313661672d74fdf4fe26f3073daab0d5377b345d8d71cfd5137173b2192b0d
-  data.tar.gz: eb039def7aceb3e4936940daaac94e8c2f64c9be8ae92fc776e5c77f3c8f8ceb315a5c6720ecec92c9b5ae7b55ab19dc9752e403d6957bc9cc141ad8a06efad8
+  metadata.gz: 7d117a929340ee63c4978d6a0869e3e99fb585c002ac609a9d12d047aee7a96f75fc04f7a03bda894591348d23a3d3f43a32c1e33366d2bdb77d2ce9481c7e21
+  data.tar.gz: b2b9acd515306f0460e3e48aa89a0c0296b8bd9eebf9a4b51a4a3731fd94b7096ca521fd50db9ace4ba97bbcb7bb24e17cc6d38c488e6855bc8b34c1d0cd982f

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: circleci/ruby:<< parameters.ruby-version >>
+      - image: cimg/ruby:<< parameters.ruby-version >>
     parameters:
       ruby-version:
         type: string
@@ -34,4 +34,4 @@ workflows:
           name: Ruby << matrix.ruby-version >>
           matrix:
             parameters:
-              ruby-version: ["2.4.9", "2.5.8", "2.6.6", "2.7.1"]
+              ruby-version: ["2.6.7", "2.7.3", "3.0.1", "3.1.0"]

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.rubocop.yml

@@ -11,3 +11,6 @@ Naming/AccessorMethodName:
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
+
+Style/HashSyntax:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Upcoming
+
+## 2.3.0 - Jan 31, 2022
+
+- Added permitted classes to YAML's `safe_load` #112 - thanks @attack
+- Removed support for Ruby 2.4, 2.5
+
 ## 2.2.1 - March 9, 2021
 
 - Fix regression on `Calendar#new` #83 - thanks @ineu!

data/business.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   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 "gc_ruboconfig", "~> 2.31.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"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.5.1"
+  spec.add_development_dependency "rubocop", "~> 1.25.0"
 end

data/lib/business/calendar.rb

@@ -2,6 +2,7 @@
 
 require "yaml"
 require "date"
+require "pathname"
 
 module Business
   class Calendar
@@ -16,7 +17,6 @@ module Business
     end
     private_class_method :calendar_directories
 
-    # rubocop:disable Metrics/MethodLength
     def self.load(calendar_name)
       data = find_calendar_data(calendar_name)
       raise "No such calendar '#{calendar_name}'" unless data
@@ -32,16 +32,16 @@ module Business
         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.exist?(File.join(path, "#{calendar_name}.yml"))
+          calendar_path = Pathname.new(path).join("#{calendar_name}.yml")
+          next unless calendar_path.exist?
 
-          break YAML.load_file(File.join(path, "#{calendar_name}.yml"))
+          break YAML.safe_load(calendar_path.read, permitted_classes: [Date])
         end
       end
     end
@@ -156,8 +156,6 @@ 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 = date1.to_date
       date2 = date2.to_date
@@ -190,8 +188,6 @@ module Business
       # 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

data/lib/business/version.rb

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

data/spec/business/calendar_spec.rb

@@ -13,9 +13,9 @@ RSpec.describe Business::Calendar do
     subject(:load_calendar) { described_class.load(calendar) }
 
     let(:dummy_calendar) { { "working_days" => ["monday"] } }
+    let(:fixture_path) { File.join(File.dirname(__FILE__), "../fixtures", "calendars") }
 
     before do
-      fixture_path = File.join(File.dirname(__FILE__), "../fixtures", "calendars")
       described_class.load_paths = [fixture_path, { "foobar" => dummy_calendar }]
     end
 
@@ -25,7 +25,10 @@ RSpec.describe Business::Calendar do
       after { described_class.load_paths = nil }
 
       it "loads the yaml file" do
-        expect(YAML).to receive(:load_file).with(/ecb\.yml$/).and_return({})
+        path = Pathname.new(fixture_path).join("ecb.yml")
+        expect(YAML).to receive(:safe_load).
+          with(path.read, permitted_classes: [Date]).
+          and_return({})
 
         load_calendar
       end

data/spec/fixtures/calendars/ecb.yml

@@ -6,7 +6,7 @@ working_days:
   - friday
 
 holidays:
-  - January 1st, 2013
+  - 2013-01-01
   - March 29th, 2013
   - April 1st, 2013
   - May 1st, 2013

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gc_ruboconfig
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.31.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.25.0
 description: Date calculations based on business calendars
 email:
 - developers@gocardless.com
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Date calculations based on business calendars