revs-utils 1.0.11 → 1.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdjYjY1ZDg5Mjk4MjEzOGE2YTI3MTQyOTI1ZWJiYThjYTc0NmEwOA==
+    MDRhNWEwYTJhYmIyOGVlM2E3YzEyYWFmYWRiYjE4Mzg2MjM2ZGI5ZA==
   data.tar.gz: !binary |-
-    OWVhMWUzN2QyM2ExNzgyMGE2NDVmY2Y4ODhmZmMxZDhlNzE4NGE3YQ==
+    YTM3MjNmMjY0MmY2NDA0MDhiYmJhYjM5YjQwYjAzODZhOTA4OTc1Mg==
 SHA512:
   metadata.gz: !binary |-
-    Zjk4ZmE1ODFlZjdkODUzOTA0Yzc4ZmE5OTkyNWRjNTBkNjgxNDdhZGUwODBi
-    ZmZhNzllOWViZDBiMGRjM2E5OTE0ZTQxNzc4NTIyNWE1YjgzZGFlMzFiMTUw
-    YWQ5NjUzZDNlZTMzNWJjZjdhMzE5MzUxNjZkOTU2ODVkNWU3OGQ=
+    ZTc1ZjFhM2E2NzZkMjllMDg2MzRiOGI3ZmM4NmI5Mzk1Y2Y3NzU0ZDYyZmMz
+    ZDE3MWI0MGVhNTkxNTUwNDA3MmNjYmE3ZmQ2NjM1YTMwODkzMGZiNGVhYzVi
+    MGJiYjg2NDYxMDRiZDVkZDQzYmI1OTdiNTJhMDA0OGUxYTMwNDc=
   data.tar.gz: !binary |-
-    MmJlZGU4MGJiZDQzMmRlYTVkYmQ5ZTUyYzRjMzhmZWEzMTJjNzZiMGFmNTU1
-    ODk5YzliYmIyNjhiZDgxZjY5ZDFjZmJhODc1Nzg3OTQ1MzUzZWExMzhhOTA1
-    NjNmYjI0OWM2OGFmNTBmNzRiZWYwMWQ0NDc1YTcyMjEzZmQ1YTI=
+    ZjQ2ZGEwNDA0OWIzYjFjMDlmYWZiNDJjYWRhOGI0M2U4OWNlNzFlZjU3Mjhh
+    OTAzY2JjOGExNDMxOTM5MGNhMmIxOTRkMzliMmRhMDBlNzUwODgxZWVkZWRk
+    ZGNlZDE5ZDkxYmVhNmZiYWRkMjEwOTIwZjNlMGMzMTY0NDA5MGE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (1.0.10)
+    revs-utils (1.0.12)
       actionpack (~> 3)
       countries (= 0.9.2)
       rdf

data/README.rdoc

@@ -21,6 +21,7 @@ Shared methods and functions used by revs-indexer, pre-assembly and bulk metadat
 - <b>1.0.9</b> Add more common format corrections
 - <b>1.0.10</b> Update valid for metadata method so it is not sensitive to blank or uppercase columns
 - <b>1.0.11</b> Fix issues with year parsing
+- <b>1.0.12</b> Allow two digit years in year formatting
 
 == Running tests
 

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "1.0.11"
+    VERSION = "1.0.12"
   end
 end

data/lib/revs-utils.rb

@@ -236,11 +236,14 @@ module Revs
         date_string.to_s.strip.scan(/\D/).empty? and (starting_year..Date.today.year).include?(date_string.to_i)
       end
 
-      # tell us if the string passed is in is a full date of the format M/D/YYYY, and returns the date object if it is valid
+      # tell us if the string passed is in is a full date of the format M/D/YYYY or m-d-yyyy or m-d-yy or M/D/YY, and returns the date object if it is valid
       def get_full_date(date_string)
         begin
-          date_obj=Date.strptime(date_string.gsub('-','/').delete(' '), '%m/%d/%Y')
-          return (is_valid_year?(date_obj.year.to_s) ? date_obj : false)
+          date_obj_string=date_string.gsub('-','/').delete(' ')
+          date_format = (date_obj_string.split('/').last.size == 4 ? '%m/%d/%Y' : '%m/%d/%y') # if we think we have a 4 digit year, parse with 4 year format, else try the two year format
+          date_obj = Date.strptime(date_obj_string, date_format)
+          date_obj=date_obj.prev_year(100) if date_obj > Date.today # if the parsing yields a date in the future, this is a problem, so adjust back a century (due to this issue: http://stackoverflow.com/questions/27058068/ruby-incorrectly-parses-2-digit-year)
+          is_valid_year?(date_obj.year.to_s) ? date_obj : false
         rescue
           false
         end

data/spec/revs-utils_spec.rb

@@ -76,10 +76,14 @@ describe "Revs-Utils" do
    end
       
    it "should indicate if a date is valid" do
-     @revs.get_full_date('bogus').should be_false
      @revs.get_full_date('5/1/1959').should == Date.strptime("5/1/1959", '%m/%d/%Y')
      @revs.get_full_date('5-1-1959').should == Date.strptime("5/1/1959", '%m/%d/%Y')
-     @revs.get_full_date('5-1-59').should be_false # two digit year is not allowed
+     @revs.get_full_date('5-1-2014').should == Date.strptime("5/1/2014", '%m/%d/%Y')
+     @revs.get_full_date('5-1-59').should == Date.strptime("5/1/1959", '%m/%d/%Y') # deal with two digit years ok too
+     @revs.get_full_date('1/1/71').should == Date.strptime("1/1/1971", '%m/%d/%Y') # deal with two digit years ok too
+     @revs.get_full_date('5-1-14').should == Date.strptime("5/1/2014", '%m/%d/%Y') # deal with two digit years ok too     
+     @revs.get_full_date('5-1-21').should == Date.strptime("5/1/1921", '%m/%d/%Y') # deal with two digit years ok too     
+     @revs.get_full_date('bogus').should be_false
    end
 
    it "should indicate if we have a valid year" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revs-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries