revs-utils 1.0.10 → 1.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQxZWMzYTlmNTI0NzM1ZDRmZWU0MmYzZWI5ZmJhMzVkMjJhMzU0Mg==
+    YzdjYjY1ZDg5Mjk4MjEzOGE2YTI3MTQyOTI1ZWJiYThjYTc0NmEwOA==
   data.tar.gz: !binary |-
-    ODRiMDc1MWFjOGFiNmZlYTVmOTQyYjZhOGM1YmZiOWM2MzRhZDMzMA==
+    OWVhMWUzN2QyM2ExNzgyMGE2NDVmY2Y4ODhmZmMxZDhlNzE4NGE3YQ==
 SHA512:
   metadata.gz: !binary |-
-    M2E0ZWQ2NWYzMDVjOWYzNDJhYjMwYTllODYyYWVlY2ZmN2E5YmVhZjc5ZDU1
-    NTMwYTZiYTc4YWJkNTFmM2E5ZDMwY2JjNjQ5MWMyZDdjNzJiYTBiMGQ3ODg0
-    MDA4NjQ0MzUzZDJkODMwNjY5NjhjMzBhZTIwNWUzN2EyMGFiOTU=
+    Zjk4ZmE1ODFlZjdkODUzOTA0Yzc4ZmE5OTkyNWRjNTBkNjgxNDdhZGUwODBi
+    ZmZhNzllOWViZDBiMGRjM2E5OTE0ZTQxNzc4NTIyNWE1YjgzZGFlMzFiMTUw
+    YWQ5NjUzZDNlZTMzNWJjZjdhMzE5MzUxNjZkOTU2ODVkNWU3OGQ=
   data.tar.gz: !binary |-
-    Njk0MzJhODhkMTA4YjU0MmVkZDNjMmRjZTI1MGYxZGU1YmFhMTI5ODg1Yzgx
-    MjVjNTEwMmFjYmQ2NzBkOGM3MjU5NDIzNGNjOTdjYWZmNTFlMjBjMjFlNDhi
-    Y2NlNTQ3ZWUzM2RlMzc3NmE0OTg5NTM1Y2EyYmUzZTgzMmFlYWU=
+    MmJlZGU4MGJiZDQzMmRlYTVkYmQ5ZTUyYzRjMzhmZWEzMTJjNzZiMGFmNTU1
+    ODk5YzliYmIyNjhiZDgxZjY5ZDFjZmJhODc1Nzg3OTQ1MzUzZWExMzhhOTA1
+    NjNmYjI0OWM2OGFmNTBmNzRiZWYwMWQ0NDc1YTcyMjEzZmQ1YTI=

data/README.rdoc

@@ -20,6 +20,7 @@ Shared methods and functions used by revs-indexer, pre-assembly and bulk metadat
 - <b>1.0.8</b> Update clean_collection_name method to deal with other possible names
 - <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
 
 == Running tests
 

data/lib/revs-utils/version.rb

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

data/lib/revs-utils.rb

@@ -258,14 +258,14 @@ module Revs
         years_to_add=[]
         result.each do |year|
 
-          if year.scan(/[1-2][0-9][0-9][0-9][-][0-9][0-9]/).size > 0 # if we have a year that looks like "1961-62" or "1961-73", lets deal with it turning it into [1961,1962] or [1961,1962,1963,1964,1965,1966,1967...etc]
+          if year.scan(/[1-2][0-9][0-9][0-9][-][0-9][0-9]/).size > 0 && year.size == 7 # if we have a year that looks like "1961-62" or "1961-73", lets deal with it turning it into [1961,1962] or [1961,1962,1963,1964,1965,1966,1967...etc]
             start_year=year[2..3]
             end_year=year[5..6]
             stem=year[0..1] 
             for n in start_year..end_year
               years_to_add << "#{stem}#{n}"
             end
-          elsif year.scan(/[1-2][0-9][0-9][0-9][-][1-9]/).size > 0 # if we have a year that lloks like "1961-2" or "1961-3", lets deal with it turning it into [1961,1962] or [1961,1962,1963]
+          elsif year.scan(/[1-2][0-9][0-9][0-9][-][1-9]/).size > 0 && year.size == 6 # if we have a year that lloks like "1961-2" or "1961-3", lets deal with it turning it into [1961,1962] or [1961,1962,1963]
             start_year=year[3..3]
             end_year=year[5..5]
             stem=year[0..2]
@@ -280,7 +280,7 @@ module Revs
             %w{0 1 2 3 4 5 6 7 8 9}.each {|n| years_to_add << "#{stem}#{n}"} # add each year in that decade to the output array
           end
 
-          if year.scan(/[1-2][0-9][0-9][0-9][-][1-2][0-9][0-9][0-9]/).size > 0 # if we have a year that lloks like "1961-1962" or "1930-1955", lets deal with it turning it into [1961,1962] or [1961,1962,1963]
+          if year.scan(/[1-2][0-9][0-9][0-9][-][1-2][0-9][0-9][0-9]/).size > 0 && year.size == 9 # if we have a year that lloks like "1961-1962" or "1930-1955", lets deal with it turning it into [1961,1962] or [1961,1962,1963]
             start_year=year[0..3]
             end_year=year[5..8]
             if end_year.to_i - start_year.to_i < 10 # let's only do the expansion if we don't have some really large date range, like "1930-1985" .. only ranges less than 9 years will be split into separate years

data/spec/revs-utils_spec.rb

@@ -138,6 +138,12 @@ describe "Revs-Utils" do
     
   end
 
+  it "should parse 1800-1802" do
+    
+    @revs.parse_years('1800-1802').should == ['1800','1801','1802']    
+    
+  end
+  
   it "should parse 1955-1957 | 1955 | 1955 and not produce duplicate years" do
     
     @revs.parse_years('1955-1957 | 1955 | 1955').should == ['1955','1956','1957']    

metadata

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