ndr_support 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d599151cea4c34a89c568436565e71f11e34d489ed9b6e29aacc009dda5095a4
-  data.tar.gz: 47bc41f2159defce848c6150b4c72032252d6b88088ae38ac354abcf71b9f6e6
+  metadata.gz: 78cc28964136a687eb52b6d70fb215b782f4a9dc3689f6781b62281aba3ce7ed
+  data.tar.gz: b0769e6a9224abedc32b3517f1d26bcc0b8482e587e911960429e94b3fec3a98
 SHA512:
-  metadata.gz: a7d2e904ba474818b94832adc0d2d5eb0844c1dc4d34cb31f2e8f7c717bd183069c8b014227c809f069960d974245cfd511ea0674b07b55f29645e4a2a592b90
-  data.tar.gz: '08f269ba7631cea9a4257a72bad295d8539c0ff6055ab96fcca6a3734d55b7a132213a39e3048cdd81ee437ce6e470b4f79967e84279da782f7eee8c461ef540'
+  metadata.gz: 57c36e4153aa9c9c7dc8500d78ddacd19b70ed6ca8a22268c978a2af47e08a054d2ef8451a570ec7d05670f28cab9c92c49d55a3c797442a5440d0b2fd2ed5ee
+  data.tar.gz: 99d6457af2cfa72b7351c524c0fb19b74846f53b7815b8aa9585b39b3d02ef9f6fb89be4ce4314c072c332d2efb3670ddfdb229a50333557b01626fb877d6416

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.6.1 / 2020-01-02
+## Fixed
+* Fix issue with 2020 public holiday
+* Support 2021 public holidays
+* Ensure dateranges up to 2030 are supported
+
 ## 5.6.0 / 2019-08-29
 ### Added
 * Add `Integer#working_days_since`. (#11)
@@ -9,7 +15,7 @@
 ### Fixed
 * Support Ruby 2.6, Rails 6.0. Minimum Ruby/Rails versions are now 2.5/5.2
 * Warn when WorkingDays lookup is getting stale
-* Improved date parsing in String#to_date
+* Improved date parsing in `String#to_date`
 
 ## 5.5.0 / 2018-11-16
 ### Added

data/code_safety.yml

@@ -17,7 +17,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1f67d8d27b697d51069ea9d3df27ae44db86c694
+    safe_revision: 6d47e4cec0d8384a2bbbf36c544bb386f69f5273
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -61,15 +61,15 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a5afad784e1e28a76e3907f5d742dc221ce8a235
+    safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
+    reviewed_by: josh.pencheon
+    safe_revision: 8f18bbaa2cd5dbbf6e40eae2e403e47b589d5e9b
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -132,8 +132,8 @@ file safety:
     safe_revision: 60cc69774d5aff92252558feae9604544def7583
   lib/ndr_support/string/conversions.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
+    reviewed_by: josh.pencheon
+    safe_revision: 4a26fe1677b99f8da3a6928c36d6c4c8d6de0cb8
   lib/ndr_support/tasks.rb:
     comments: 
     reviewed_by: timgentry
@@ -161,7 +161,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1f67d8d27b697d51069ea9d3df27ae44db86c694
+    safe_revision: 6d47e4cec0d8384a2bbbf36c544bb386f69f5273
   lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -180,12 +180,12 @@ file safety:
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/concerns/working_days_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
+    reviewed_by: josh.pencheon
+    safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   test/daterange_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
+    reviewed_by: josh.pencheon
+    safe_revision: 8f18bbaa2cd5dbbf6e40eae2e403e47b589d5e9b
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -244,8 +244,8 @@ file safety:
     safe_revision: 60cc69774d5aff92252558feae9604544def7583
   test/string/conversions_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
+    reviewed_by: josh.pencheon
+    safe_revision: 4a26fe1677b99f8da3a6928c36d6c4c8d6de0cb8
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_support/concerns/working_days.rb

@@ -83,11 +83,20 @@ module WorkingDays
     '2020-01-01', # Wednesday - New Year's Day
     '2020-04-10', # Friday    - Good Friday
     '2020-04-13', # Monday    - Easter Monday
-    '2020-05-04', # Monday    - Early May bank holiday
+    '2020-05-08', # Friday    - Early May bank holiday (moved from Monday)
     '2020-05-25', # Monday    - Spring bank holiday
     '2020-08-31', # Monday    - Summer bank holiday
     '2020-12-25', # Friday    - Christmas Day
-    '2020-12-26', # Monday    - Boxing Day
+    '2020-12-28', # Monday    - Boxing Day (substitute day)
+    # 2021
+    '2021-01-01', # Friday - New Year’s Day
+    '2021-04-02', # Friday - Good Friday
+    '2021-04-05', # Monday - Easter Monday
+    '2021-05-03', # Monday - Early May bank holiday
+    '2021-05-31', # Monday - Spring bank holiday
+    '2021-08-30', # Monday - Summer bank holiday
+    '2021-12-27', # Monday - Christmas Day
+    '2021-12-28', # Tuesday - Boxing Day
   ].map { |str| Date.parse(str) }
 
   def self.check_lookup

data/lib/ndr_support/daterange.rb

@@ -6,7 +6,7 @@ require 'ndr_support/integer/julian_date_conversions'
 class Daterange
   attr_reader :date1, :date2, :source
 
-  OKYEARS = 1880..2020
+  OKYEARS = 1880..2030
 
   def self.extract(dates_string)
     dates_string.to_s.split(',').map { |str| new(str) }

data/lib/ndr_support/string/conversions.rb

@@ -85,7 +85,6 @@ class String
   # Try to convert the string value into a date.
   # If given a pattern, use it to parse date, otherwise use default setting to parse it
   def to_date(pattern = nil)
-    return ''  if empty? # TODO: check if this is used... :/
     return nil if blank?
 
     pattern = '%d%m%Y' if 'ddmmyyyy' == pattern

data/lib/ndr_support/version.rb

@@ -3,5 +3,5 @@
 # This defines the NdrSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks.
 module NdrSupport
-  VERSION = '5.6.0'
+  VERSION = '5.6.1'
 end

data/test/concerns/working_days_test.rb

@@ -119,4 +119,22 @@ class WorkingDaysTest < Minitest::Test
     assert_equal 253, @normal_time.working_days_until(@normal_time + 1.year)
     assert_equal 253, @normal_date_time.working_days_until(@normal_date_time + 1.year)
   end
+
+  test 'against GOV.UK holidays' do
+    require 'net/http'
+    require 'json'
+
+    url = 'https://www.gov.uk/bank-holidays/england-and-wales.json'
+    response = Net::HTTP.get(URI(url))
+
+    events = JSON.parse(response)['events']
+    events.each do |event|
+      event_date = event['date']
+      parsed_date = Date.parse(event_date)
+
+      assert parsed_date.public_holiday?, "#{event_date} should be a public holiday"
+      # next if parsed_date.public_holiday?
+      # puts "'#{event_date}', # #{parsed_date.strftime('%A')} - #{event['title']}"
+    end
+  end
 end

data/test/daterange_test.rb

@@ -63,6 +63,12 @@ class DaterangeTest < Minitest::Test
     assert_equal '1880 2020', dr.source
   end
 
+  def test_year_range_future
+    s = 2.years.from_now.strftime('%Y')
+    dr = Daterange.new(s)
+    assert_equal s, dr.to_s, "Daterange should support future years up to #{s}"
+  end
+
   def test_hyphen_month_input_style
     dr = Daterange.new('2000-05')
     assert_equal '05.2000', dr.to_s

data/test/string/conversions_test.rb

@@ -244,8 +244,8 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(1998, 02, 13), '1998-02-13'.to_date('%Y-%m-%d')
     assert_equal Ourdate.build_datetime(1998, 05, 03), '1998-05-03'.to_date('%Y-%m-%d')
 
-    assert ''.to_date('%Y-%m-%d').blank?
-    assert '  '.to_date('%Y-%m-%d').blank?
+    assert_nil ''.to_date('%Y-%m-%d') # Should behave like Rails-defined to_date
+    assert_nil '  '.to_date('%Y-%m-%d')
   end
 
   test '%d-%m-%Y string to_date' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord