ndr_support 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e21f71716e6733363c47fb4fb1f457ec616a913902729cb40fa8a227a77d530
-  data.tar.gz: 9b251bf890fb3d835c256fe81d136d51327e749970c21bad0a77529e12655384
+  metadata.gz: 3f5d3aeeaaa13e7221012d0c20948ce96257b4ebb2824e765d0570bc10cec75c
+  data.tar.gz: 57dc19084dc7ebe85fce29dcd5db48372febf8ee58c9cdd8a2ae275c81d1037c
 SHA512:
-  metadata.gz: f603f2982d2615bfc0a4b1963f324ee633a1e9fa8248c575ae52a74403b3dc514a1cbec13b2f162f351e297d6d3df50e9cd8ace0692571f3f8202603fd969598
-  data.tar.gz: 9c3248c3286b5eba6ebf757a8e1f43958c585718f768de8798be3d482a5cfda28e36dfba1286782d9701d587aa3bc7465828f5c576e17bf0ccce377ce974743f
+  metadata.gz: e9b013478c6a967e6dc2293de8c7bae820382fdb6dc0c8b0bb5aae82da064969620fb8143a6ee9013166f0d652c7ce64a7187279ca5b571c718cd74de5d075b5
+  data.tar.gz: c4a0b7c8c41c93aacbf53351d7ef517593e7f0612c6b6cb750ab218223e2d494dc9c746c9005c1bf003d2ed9c9e6ed4887813688f79f7eb22cb25e0bec6cff5b

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.5.1 / 2019-05-15
+### 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
+
 ## 5.5.0 / 2018-11-16
 ### Added
 * Add `ThreatScanner` to wrap ClamAV for virus detection (#10)

data/code_safety.yml

@@ -12,12 +12,12 @@ file safety:
     comments: 'diff failed; reviewed whole file. Revision c88f5ac8c12fd657bb142144e0d3afaa7f9bc361:
       Slack notification secret is public/private key encrypted, so not a disclosure
       risk. As a secondary protection, it''s excluded from the .gem file by ndr_support.gemspec'
-    reviewed_by: brian.shand
-    safe_revision: c88f5ac8c12fd657bb142144e0d3afaa7f9bc361
+    reviewed_by: josh.pencheon
+    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ea1f7dc9a164981570ee2ad7c38197fdb17a6880
+    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -42,34 +42,26 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails42:
-    comments: 
-    reviewed_by: pauleves
-    safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
-  gemfiles/Gemfile.rails50:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 55ed1c2a18b9cc4d1d996ee69419f5ee38f87746
-  gemfiles/Gemfile.rails51:
-    comments: 
-    reviewed_by: brian.shand
-    safe_revision: 4e87fd9d64fc0f15b359ba60fc48cda54453c647
   gemfiles/Gemfile.rails52:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 8a6bedae77d33d0db1b67eaed7972870b6afc993
-  lib/ndr_support.rb:
+  gemfiles/Gemfile.rails60:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ed8ff421cc9353456af13a37049a07ce2545aac1
+    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+  lib/ndr_support.rb:
+    comments: 
+    reviewed_by: brian.shand
+    safe_revision: 44fbdf72f47f4022c7dc9148150ebc18589dac8f
   lib/ndr_support/array.rb:
     comments: 
     reviewed_by: pauleves
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: e5671bd9435490d521028d02bc91ccb47c74c580
+    reviewed_by: brian.shand
+    safe_revision: a64c2c4616317240faec2db7a84761947ae844a3
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -137,7 +129,7 @@ file safety:
   lib/ndr_support/string/conversions.rb:
     comments: 
     reviewed_by: brian.shand
-    safe_revision: 0a06fed3e7530185497f786decdb77a62d35e101
+    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
   lib/ndr_support/tasks.rb:
     comments: 
     reviewed_by: timgentry
@@ -165,7 +157,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: ea1f7dc9a164981570ee2ad7c38197fdb17a6880
+    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
@@ -173,7 +165,7 @@ file safety:
   ndr_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c197b91c07807345f2caf07ec4c14d8b9cbb4e53
+    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
   test/array_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -241,7 +233,7 @@ file safety:
   test/string/conversions_test.rb:
     comments: 
     reviewed_by: brian.shand
-    safe_revision: 1955bf30ffe581610981f0148569e252cba02926
+    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/gemfiles/Gemfile.rails60

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord',  '~> 6.0.0rc1'
+gem 'activesupport', '~> 6.0.0rc1'

data/lib/ndr_support.rb

@@ -21,3 +21,5 @@ require 'ndr_support/yaml/serialization_migration'
 module NdrSupport
   # Your code goes here...
 end
+
+WorkingDays.check_lookup

data/lib/ndr_support/concerns/working_days.rb

@@ -77,8 +77,24 @@ module WorkingDays
     '2019-08-26', # Monday    - Summer bank holiday
     '2019-12-25', # Wednesday - Christmas Day
     '2019-12-26', # Thursday  - Boxing Day
+    # 2020
+    '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-25', # Monday    - Spring bank holiday
+    '2020-08-31', # Monday    - Summer bank holiday
+    '2020-12-25', # Friday    - Christmas Day
+    '2020-12-26', # Monday    - Boxing Day
   ].map { |str| Date.parse(str) }
 
+  def self.check_lookup
+    return true if HOLIDAYS.max >= 1.year.from_now
+
+    warn "NdrSupport's WorkingDays extension has under a year of future data. Check for updates?"
+    false
+  end
+
   # How many complete working days there are until the given
   # `other`. Returns negative number if `other` is earlier.
   def working_days_until(other)

data/lib/ndr_support/string/conversions.rb

@@ -112,12 +112,12 @@ class String
 
       if ['yyyy/dd/mm', 'mm/dd/yyyy'].include?(pattern)
         month, day = day, month
-      elsif 8 == length && self !~ /\d{8}/
+      elsif 8 == length && self =~ /\A\d{2}[^A-Z0-9]\d{2}[^A-Z0-9]\d{2}\z/i
         # dd/mm/yy, rather than yyyymmdd
         year, day = day, year
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
-      elsif 9 == length
+      elsif 9 == length && self =~ /\A\d{2}[^A-Z0-9][A-Z]{3}[^A-Z0-9]\d{2}\z/i
         # dd/mmm/yy, rare case.
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900

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.5.0'
+  VERSION = '5.5.1'
 end

data/ndr_support.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 4.0.13', '< 5.3'
-  spec.add_dependency 'activesupport', '>= 4.0.13', '< 5.3'
+  spec.add_dependency 'activerecord',  '>= 5.2.0', '< 7'
+  spec.add_dependency 'activesupport', '>= 5.2.0', '< 7'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   # Avoid std-lib minitest (which has different namespace)
   spec.add_development_dependency 'minitest', '>= 5.0.0'

data/test/string/conversions_test.rb

@@ -58,6 +58,10 @@ class String::ConversionsTest < Minitest::Test
     assert_ymd [2001, 3, 2],  '02/03/2001'.to_date
     assert_ymd [2010, 7, 11], '2010-07-11'.to_date
 
+    assert_ymd [2001, 3, 2],  '2.3.2001'.to_date
+    assert_ymd [2001, 3, 2],  '2/3/2001'.to_date
+    assert_ymd [2010, 7, 11], '2010-7-11'.to_date
+
     assert_ymd [2001, 2, 3], '2001/02/03'.to_date('yyyy/mm/dd')
     assert_ymd [2001, 2, 3], '2001/03/02'.to_date('yyyy/dd/mm')
     assert_ymd [2001, 2, 3], '2001-02-03'.to_date('yyyy-mm-dd')
@@ -334,6 +338,12 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(2008, 05, 03), '03/05/2008 13:38'.to_date
   end
 
+  test 'incorrectly formatted string to_date' do
+    assert_nil '10-1975'.to_date
+    assert_nil '10.1975A'.to_date
+    assert_nil '10.1975AA'.to_date
+  end
+
   test 'to_boolean' do
     assert_equal true, 'true'.to_boolean
     assert_equal true, 'yes'.to_boolean

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -240,10 +240,8 @@ files:
 - README.md
 - Rakefile
 - code_safety.yml
-- gemfiles/Gemfile.rails42
-- gemfiles/Gemfile.rails50
-- gemfiles/Gemfile.rails51
 - gemfiles/Gemfile.rails52
+- gemfiles/Gemfile.rails60
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -308,15 +306,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: NDR Support library

data/gemfiles/Gemfile.rails42

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 4.2.0'
-gem 'activesupport', '~> 4.2.0'

data/gemfiles/Gemfile.rails50

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 5.0.0'
-gem 'activesupport', '~> 5.0.0'

data/gemfiles/Gemfile.rails51

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-# Minitest 5.10.2 doesn't work with Rails version
-gem 'minitest',      '< 5.10.2'
-
-gem 'activerecord',  '~> 5.1.0'
-gem 'activesupport', '~> 5.1.0'