ndr_support 5.6.1 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78cc28964136a687eb52b6d70fb215b782f4a9dc3689f6781b62281aba3ce7ed
-  data.tar.gz: b0769e6a9224abedc32b3517f1d26bcc0b8482e587e911960429e94b3fec3a98
+  metadata.gz: e06c6fad074bb00f7ba16334d194b9fcf369147688dbd1f22dcd1cca86e71073
+  data.tar.gz: 7ede15deb1aec6e6ee02d627437eb7c94810755dbcb717db9212c17c2f09ca3e
 SHA512:
-  metadata.gz: 57c36e4153aa9c9c7dc8500d78ddacd19b70ed6ca8a22268c978a2af47e08a054d2ef8451a570ec7d05670f28cab9c92c49d55a3c797442a5440d0b2fd2ed5ee
-  data.tar.gz: 99d6457af2cfa72b7351c524c0fb19b74846f53b7815b8aa9585b39b3d02ef9f6fb89be4ce4314c072c332d2efb3670ddfdb229a50333557b01626fb877d6416
+  metadata.gz: f3b03a27b86891d3cb52dcf3fab222cf3bd42b05cb859918142dd6791a6dc18e5ebba0075911d9d177e7451a5b447b0cf6324455641f913ebb86c78808cf5843
+  data.tar.gz: e5d89586818d5a50a1c3211086ce812d485e90b3080c46986be570ec32e7c740f6d5c312a8580ef727243c5910b60d5acd13f8e94276e0fa07dbf922879a9a85

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.7.0 / 2020-06-30
+## Added
+* Handle three char months in Daterange
+
 ## 5.6.1 / 2020-01-02
 ## Fixed
 * Fix issue with 2020 public holiday

data/code_safety.yml

@@ -16,8 +16,8 @@ file safety:
     safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 6d47e4cec0d8384a2bbbf36c544bb386f69f5273
+    reviewed_by: ollietulloch
+    safe_revision: ce582c10aa4ddddcd22f907d6228cc7bb324a280
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -68,8 +68,8 @@ file safety:
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 8f18bbaa2cd5dbbf6e40eae2e403e47b589d5e9b
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   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: josh.pencheon
-    safe_revision: 4a26fe1677b99f8da3a6928c36d6c4c8d6de0cb8
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   lib/ndr_support/tasks.rb:
     comments: 
     reviewed_by: timgentry
@@ -160,8 +160,8 @@ file safety:
     safe_revision: f7adf44fc2772e1926df37abfd9041d41c303328
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 6d47e4cec0d8384a2bbbf36c544bb386f69f5273
+    reviewed_by: ollietulloch
+    safe_revision: ce582c10aa4ddddcd22f907d6228cc7bb324a280
   lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -184,8 +184,8 @@ file safety:
     safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   test/daterange_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 8f18bbaa2cd5dbbf6e40eae2e403e47b589d5e9b
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   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: josh.pencheon
-    safe_revision: 4a26fe1677b99f8da3a6928c36d6c4c8d6de0cb8
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_support/daterange.rb

@@ -135,12 +135,12 @@ class Daterange
 
   # Update our attribute values using a string representation of the date(s).
   # +s+ consists of one or more dates separated with spaces.
-  # Each date can be in various formats, e.g. d/m/yyyy, ddmmyyyy, yyyy-mm-dd.
-  # Each date can omit days or months, e.g. yyyy, dd/yyyy, yyyy-mm
+  # Each date can be in various formats, e.g. d/m/yyyy, ddmmyyyy, yyyy-mm-dd, dd-mon-yyyy
+  # Each date can omit days or months, e.g. yyyy, dd/yyyy, yyyy-mm, mon-yyyy
   def source=(s)
     @source = s
     ss = s.upcase.sub(/TO/, ' ') # accept default _to_s format
-    if ss =~ /[^0-9\-\/\. ]/ # only allow digits, hyphen, slash, dot, space
+    if ss =~ /[^\w0-9\-\/\. ]/i # only allow letters, digits, hyphen, slash, dot, space
       @date1 = @date2 = nil
     else
       da = [] # temporary array of arrays of dates
@@ -184,7 +184,9 @@ class Daterange
   # e.g year only or year/month only) and return an array of 1..3 integers
   # representing the year, month and day
   def date_string_parts(ds)
-    if ds =~ /([\/\.\-])/ # find a slash or dot or hyphen
+    if ds =~ /\A(\d{1,2}[\/\.\-])?\w{3}[\/\.\-]\d{4}\z/i # dd[-/.]mon[-/.]yyyy or mon[-/.]yyyy
+      result = handle_three_char_months(ds)
+    elsif ds =~ /([\/\.\-])/ # find a slash or dot or hyphen
       delimiter = $1
       result = ds.split(delimiter)
     elsif ds.length == 8 # ddmmyyyy
@@ -200,4 +202,21 @@ class Daterange
     result.reverse! unless delimiter == '-' # change to YMD if not ISO format
     result.collect(&:to_i)
   end
+
+  def handle_three_char_months(datestring)
+    delimiter  = datestring.match(%r{[\/\.\-]})[0]
+    components = datestring.split(delimiter)
+
+    if datestring =~ /\A\d{1,2}#{delimiter}\w{3}#{delimiter}\d{4}\z/i
+      month = abbreviated_month_index_for(components[1])
+      month.nil? ? [] : [components.first, month, components.last]
+    elsif datestring =~ /\A\w{3}#{delimiter}\d{4}\z/i
+      month = abbreviated_month_index_for(components.first)
+      month.nil? ? [] : [month, components.last]
+    end
+  end
+
+  def abbreviated_month_index_for(string)
+    Date::ABBR_MONTHNAMES.index(string.capitalize)
+  end
 end

data/lib/ndr_support/string/conversions.rb

@@ -117,7 +117,7 @@ class String
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
       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.
+        # dd/mon/yy, rare case.
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
       end

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.1'
+  VERSION = '5.7.0'
 end

data/test/daterange_test.rb

@@ -226,4 +226,42 @@ class DaterangeTest < Minitest::Test
     refute_equal dr1, nil
     refute_equal dr1, 0
   end
+
+  def test_three_char_months
+    dr1 = Daterange.new('01-APR-2020')
+    assert_equal '01.04.2020', dr1.date1.to_s
+    assert_equal '01.04.2020', dr1.date2.to_s
+
+    dr2 = Daterange.new('APR-2020')
+    assert_equal '01.04.2020', dr2.date1.to_s
+    assert_equal '30.04.2020', dr2.date2.to_s
+
+    dr3 = Daterange.new('JAN-2020 TO apr-2020')
+    assert_equal '01.01.2020', dr3.date1.to_s
+    assert_equal '30.04.2020', dr3.date2.to_s
+
+    dr4 = Daterange.new('20-JAN-2020 TO 12-Apr-2020')
+    assert_equal '20.01.2020', dr4.date1.to_s
+    assert_equal '12.04.2020', dr4.date2.to_s
+
+    dr5 = Daterange.new('01-BOB-2020')
+    assert_nil dr5.date1
+    assert_nil dr5.date2
+
+    dr6 = Daterange.new('01/APR/2020')
+    assert_equal '01.04.2020', dr6.date1.to_s
+    assert_equal '01.04.2020', dr6.date2.to_s
+
+    dr7 = Daterange.new('APR/2020')
+    assert_equal '01.04.2020', dr7.date1.to_s
+    assert_equal '30.04.2020', dr7.date2.to_s
+
+    dr8 = Daterange.new('JAN/2020 TO apr.2020')
+    assert_equal '01.01.2020', dr8.date1.to_s
+    assert_equal '30.04.2020', dr8.date2.to_s
+
+    dr9 = Daterange.new('20.JAN.2020 TO 12/Apr/2020')
+    assert_equal '20.01.2020', dr9.date1.to_s
+    assert_equal '12.04.2020', dr9.date2.to_s
+  end
 end

data/test/string/conversions_test.rb

@@ -311,7 +311,7 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(2008, 05, 03), '03/05/08'.to_date
   end
 
-  test 'inferred dd/mmm/yy string to_date' do
+  test 'inferred dd/mon/yy string to_date' do
     # pre_epoch
     assert_equal Ourdate.build_datetime(1945, 02, 13), '13/FEB/45'.to_date
     assert_equal Ourdate.build_datetime(1945, 06, 03), '03/JUN/45'.to_date

metadata

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