ndr_support 5.8.1 → 5.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462829abf36ac966363473bfcbe8916ab485af8473fd2653cc506092d367948f
-  data.tar.gz: 8120ba92a97ec0958f74c97c720b4bf885f3b1a211ff529412065996db56c23b
+  metadata.gz: b3f90df368cddc8835eb228b45b2e03088caf7ff494c6dd71538a255ed81ee17
+  data.tar.gz: b7efe09d5283db3ee78934b727893817c772bb1564c02eaa453e216d562e23b1
 SHA512:
-  metadata.gz: b58fcc435bfac08ff05d7234ba2752c5e43f2d07c0bf2f46a12ea94247ba5b5eb71c4a9d7d0c1ac567fcc87cdf84809919002234ea9852179c952740d2dac2d2
-  data.tar.gz: 8a505f48fbf895c63eca3d3f43a54eaefdd3111a0294fb9430f0960aa57f6e2bde82fdbacf1601e6126a17469e40549fc516284288de2ce1e2601e3c356b1a52
+  metadata.gz: 3b5dd0eeb3aec3bf88b4bc71620a661f3fe8a76eb9deef2c6dd8ec8e4d42faf9328f4934531fc0b36e65947f62d7163e4d0165324c8f17df8a1dfa042d942dc1
+  data.tar.gz: ba3cad435e924c140fd528a1cee8bd2e1aa8ccc2431f852d093e01bf7d16e8db21ceecdde3bd3cc53aed7465ffcaa0568f67b0226cbce1f957ced9d35a221ba8

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.8.2 / 2021-10-11
+## Fixed
+* fix issue with blank date causing error for dateranges
+
 ## 5.8.1 / 2021-10-11
 ### Patched
 * Added fix for failing threat scanner tests (#22)

data/code_safety.yml

@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 12f40dced9c3878efa20b938c2de579870ccf925
+    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -75,7 +75,7 @@ file safety:
   lib/ndr_support/daterange.rb:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
+    safe_revision: fc52184297e0a3bcd52b119e2e0add952c8ab7f1
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -167,7 +167,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 12f40dced9c3878efa20b938c2de579870ccf925
+    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
   lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -191,7 +191,7 @@ file safety:
   test/daterange_test.rb:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
+    safe_revision: ccca1dc67e3742efb154e01e01243e7b38180936
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_support/daterange.rb

@@ -43,11 +43,18 @@ class Daterange
       @date2 = nil
       @source = nil
     end
-    raise WrongDateOrderError, 'Invalid date range order' if do_not_sort_dates && @date1 > @date2
+    raise WrongDateOrderError, 'Invalid date range order' if wrong_date_order?(do_not_sort_dates)
 
     self.freeze
   end
 
+  def wrong_date_order?(do_not_sort_dates)
+    return false unless do_not_sort_dates
+    return false unless @date1.present? && @date2.present?
+
+    @date1 > @date2
+  end
+
   # If we have a valid date range, return a string representation of it
   # TODO: possibly add support for to_s(format) e.g. to_s(:short)
   def to_s

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.8.1'
+  VERSION = '5.8.2'
 end

data/test/daterange_test.rb

@@ -31,6 +31,12 @@ class DaterangeTest < Minitest::Test
     assert_equal(dr.to_s, dr2.to_s)
   end
 
+  def test_blank_does_not_trigger_error_and_returns_nil_in_dates
+    dr = Daterange.new('', do_not_sort_dates: true)
+    assert_nil dr.date1
+    assert_nil dr.date2
+  end
+
   def test_date_time_dates_in_reverse_order_with_do_not_sort_dates_true
     d = Time.zone.today
     Daterange.new(d, d + 1, do_not_sort_dates: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.8.2
 platform: ruby
 authors:
 - NCRS Development Team