revs-utils 2.0.4 → 2.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmFjYTMzM2Y5Y2E0OWEzZGJlMzQ2OWVlMWRiYzBhNWNhMGUyYTQ0Mg==
+    ODAzOTc4MGRiMTU0NDExMTQ2NDA2MWRlMjhmZWViMDRhMWUyMDhjMQ==
   data.tar.gz: !binary |-
-    MmZlOGYwNzE1MWNkM2U4OTVlMDk4MDdiOGJiNGQ5NDJlMTI4YzliYg==
+    Y2NmOGNiZDQwNjcyOTE2ZDEyNzgzOWQ3ODBjM2UyOGQxOTVhZDgyYQ==
 SHA512:
   metadata.gz: !binary |-
-    N2RjNzRiNjkxNzMwZWY0M2MyZTkwOGU5YWZmZTU2OGJhMzUyY2E2MDdmMjc1
-    ZWNmMzE2MmExMjI2NzZmMmU1MjFkZWVjMzE0Y2ZmZTI4OWZhN2VlMzg1Y2Q5
-    ZWZiNTAyZDkxOGE5M2Y5NmE5ODMwOWEzOTRmNjViNTVjZmQxNjA=
+    ZDEwZDY1NTQ1MjRiY2E4YjIxNWMyNzIwN2U0OTc2ZjlmMGFiMTQwODVkNzQ0
+    YWNmYWY2NDI0ODU1OGQ1OTdjM2I2MmI1ZjY4ODBlYzZjNjY3NTNhNmE3Y2Zi
+    MzVhYWE1OWJmOTI3Nzg1ODk0MTVmMmVlYzc2MDExYmU4YWJiYTc=
   data.tar.gz: !binary |-
-    NzljOGVhNGZmNWE2Mzk3ODUyNDNkY2QyNDM2NzJkNDM5M2Y2MTkyMGZhNzll
-    YzdiMjdiOWVjY2QwYWJhMjE1YjQ3OTU4YmViZTMwYzUwMzE2NzllNmZiYTg1
-    MDEwYWRiNDk4MDMzODE5MzU2ZDkwNTZiMTQ1ZDgzODhlNjg2Mzk=
+    ZjQ3NjBkNDhkMThlZmUxNTEwZTQxMWY4ODU4MjBmMTI1NzRiOGE0ODVlOWFi
+    ZTdjNzU1NDlhOGNmMDNhOWJhOTRhZDAyYjQ5OWI4MWM0MzlhODlkYzYyZTI2
+    YzVhM2I5ODM2ZjE3ZTgyZGMwOGRhODA5NDU1NGMxMDBlODhmYmY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (2.0.4)
+    revs-utils (2.0.5)
       actionpack (~> 4.1.6)
       countries (= 0.9.2)
       rdf

data/README.rdoc

@@ -18,10 +18,17 @@ Shared methods and functions used by revs-indexer, pre-assembly and bulk metadat
 - <b>1.0.6</b> Add some more conditions to CSV header checks
 - <b>1.0.7</b> Label column needs to be there but does not need to have a value to register
 - <b>1.0.8</b> Update clean_collection_name method to deal with other possible names
+<<<<<<< HEAD
 - <b>2.0.0</b> Updating to use ActionPack 4 for Rails 4 applications.  For Rails 3, continue to use 1.x.y releases.  
 - <b>2.0.1</b> Add more common format corrections
 - <b>2.0.2 and 2.0.3</b> Update valid for metadata method so it is not sensitive to blank or uppercase columns
 - <b>2.0.4</b> Fix issues with year parsing
+=======
+- <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
+>>>>>>> 9db8640... Allow two digit years in year formatting
 
 == Running tests
 

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

data/lib/revs-utils.rb

@@ -235,11 +235,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

@@ -75,10 +75,14 @@ describe "Revs-Utils" do
    end
       
    it "should indicate if a date is valid" do
-     @revs.get_full_date('bogus').should be_falsey
      @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_falsey # 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_falsey
    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: 2.0.4
+  version: 2.0.5
 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