business 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a017e860726e71c63fe878689cae14a0b738b9d
-  data.tar.gz: 3633a65fa4e14e8a603aa2611a48b32a8ac69fbb
+  metadata.gz: 38d7c459347f1741d925e77a8f359aed43320ac7
+  data.tar.gz: 45c96913b44c0e52db052928ff2fcc2229777c02
 SHA512:
-  metadata.gz: a014c05af60a086b7f76c92e5976cbd29ef3ffadeb4097c08f7dd7dfc623ccf9a61159fc607ec4c0a214acbb163dbefdfdcfe60c7c4c673c0f760b9290726b9b
-  data.tar.gz: 3f7636def162fbe9c27aa87d2ec20e5398c8e2759d58505d0fd118f13112d8756f70aedd3419a480ec7654595e46913cf94bfb62b6d9d940f17a25e69c206731
+  metadata.gz: fc3ca27a207f527ea0049e0f654d9b90f173824cefc06cd0397da811b17594988a0d7a5c30c9686902492a923fee263c490e5fff51096dceb060f249c0f951c0
+  data.tar.gz: 57097df722e522ad352dbca41cc1e109b0ffd5cf7f415df14fda5e34310a3ae4be57eeb42649a2224ef10f0277ea408e794ade3efedaf6583b09dfa55d2b7e92

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.10.0 - September 20, 2017
+
+- Add 2018-2019 Betalingsservice holiday definitions
+
 ## 1.9.0 - August 23, 2017
 
 - Add 2017 Betalingsservice holiday definitions

data/lib/business/calendar.rb

@@ -19,6 +19,12 @@ module Business
       raise "No such calendar '#{calendar}'" unless directory
 
       yaml = YAML.load_file(File.join(directory, "#{calendar}.yml"))
+      valid_keys = ['holidays', 'working_days']
+
+      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'])
     end
 

data/lib/business/data/betalingsservice.yml

@@ -15,6 +15,31 @@ holidays:
   - May 25th, 2017
   - May 26th, 2017
   - June 5th, 2017
-  - December 24th, 2017
   - December 25th, 2017
   - December 26th, 2017
+  - January 1st, 2018
+  - March 29th, 2018
+  - March 30th, 2018
+  - April 2nd, 2018
+  - April 27th, 2018
+  - May 10th, 2018
+  - May 11th, 2018
+  - May 21st, 2018
+  - June 5th, 2018
+  - December 24th, 2018
+  - December 25th, 2018
+  - December 26th, 2018
+  - December 31st, 2018
+  - January 1st, 2019
+  - April 18th, 2019
+  - April 19th, 2019
+  - April 22nd, 2019
+  - May 17th, 2019
+  - May 30th, 2019
+  - May 31st, 2019
+  - June 5th, 2019
+  - June 10th, 2019
+  - December 24th, 2019
+  - December 25th, 2019
+  - December 26th, 2019
+  - December 31st, 2019

data/lib/business/version.rb

@@ -1,3 +1,3 @@
 module Business
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/spec/calendar_spec.rb

@@ -8,6 +8,11 @@ end
 
 describe Business::Calendar do
   describe ".load" do
+    before do
+      fixture_path = File.join(File.dirname(__FILE__), 'fixtures', 'calendars')
+      Business::Calendar.additional_load_paths = [fixture_path]
+    end
+
     context "when given a valid calendar" do
       subject { Business::Calendar.load("weekdays") }
 
@@ -22,11 +27,6 @@ describe Business::Calendar do
     end
 
     context "when given a calendar from a custom directory" do
-      before do
-        Business::Calendar.additional_load_paths = [
-          File.join(File.dirname(__FILE__), 'fixtures', 'calendars')
-        ]
-      end
       after { Business::Calendar.additional_load_paths = nil }
       subject { Business::Calendar.load("ecb") }
 
@@ -49,10 +49,27 @@ describe Business::Calendar do
       end
     end
 
-    context "when given an invalid calendar" do
+    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/) }
     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") }
+    end
+
+    context "when given real business data" do
+      let(:data_path) { File.join(File.dirname(__FILE__), '..', 'lib', 'business', 'data') }
+      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)
+
+          expect(calendar.working_days.length).to be >= 1
+        end
+      end
+    end
   end
 
   describe "#set_working_days" do

data/spec/fixtures/calendars/invalid-keys.yml

@@ -0,0 +1,9 @@
+working_days:
+  - monday
+  - tuesday
+  - wednesday
+  - thursday
+  - friday
+
+holidayswithtypo:
+  - January 1st, 2015

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -63,6 +64,7 @@ files:
 - spec/calendar_spec.rb
 - spec/fixtures/calendars/bacs.yml
 - spec/fixtures/calendars/ecb.yml
+- spec/fixtures/calendars/invalid-keys.yml
 homepage: https://github.com/gocardless/business
 licenses:
 - MIT
@@ -91,3 +93,4 @@ test_files:
 - spec/calendar_spec.rb
 - spec/fixtures/calendars/bacs.yml
 - spec/fixtures/calendars/ecb.yml
+- spec/fixtures/calendars/invalid-keys.yml