revs-utils 2.0.3 → 2.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQyZmJhNjFjNWRjNjQyZDg2OTcxMWYyYTExZTQzMDA1ZTVlNjFmYQ==
+    YmFjYTMzM2Y5Y2E0OWEzZGJlMzQ2OWVlMWRiYzBhNWNhMGUyYTQ0Mg==
   data.tar.gz: !binary |-
-    MmQxZjNiYmYwOGVmNjhhYzRkMTdlNzA4N2VlODExOGQ4MDliNTZjOQ==
+    MmZlOGYwNzE1MWNkM2U4OTVlMDk4MDdiOGJiNGQ5NDJlMTI4YzliYg==
 SHA512:
   metadata.gz: !binary |-
-    ZGJkMzM4ODFjMmY4ODg5Y2I3YTg4ZTQwZGY3MmJiOTFlY2I4NzgwNmJjYzZj
-    NzM4ZDQwNWZlM2Q2Y2VhOGM3YzBkYjk2ODczMjhmYTdhODY2ZGYzNTc0Zjdl
-    ZDFjNjMyYzkzNTUyYTcwNjMwNDY4NzAwYTg3NjRmOWMyMWU5MWM=
+    N2RjNzRiNjkxNzMwZWY0M2MyZTkwOGU5YWZmZTU2OGJhMzUyY2E2MDdmMjc1
+    ZWNmMzE2MmExMjI2NzZmMmU1MjFkZWVjMzE0Y2ZmZTI4OWZhN2VlMzg1Y2Q5
+    ZWZiNTAyZDkxOGE5M2Y5NmE5ODMwOWEzOTRmNjViNTVjZmQxNjA=
   data.tar.gz: !binary |-
-    MzE2NDhiMjVkY2UwZThiOTQ5ZjEwMWViN2NlNjZlMDlmZDEwZTg4ZTI4ZmQ5
-    YjZhMmM3OGQ5YmJjMmI2MjJkZjk1YTI5N2IyNGRkY2I1NjQ2YjJjZmYxYzFl
-    YjUwZjIwYTliYTAzY2MyY2FjZmY0Njc0OWI3ZTYyMDUzMGY4OTc=
+    NzljOGVhNGZmNWE2Mzk3ODUyNDNkY2QyNDM2NzJkNDM5M2Y2MTkyMGZhNzll
+    YzdiMjdiOWVjY2QwYWJhMjE1YjQ3OTU4YmViZTMwYzUwMzE2NzllNmZiYTg1
+    MDEwYWRiNDk4MDMzODE5MzU2ZDkwNTZiMTQ1ZDgzODhlNjg2Mzk=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (2.0.2)
+    revs-utils (2.0.4)
       actionpack (~> 4.1.6)
       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>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
 
 == Running tests
 

data/lib/revs-utils/version.rb

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

data/lib/revs-utils.rb

@@ -257,14 +257,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]
@@ -279,7 +279,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

@@ -149,6 +149,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 correctly" do
     
     @revs.parse_years('1955-1957').should == ['1955','1956','1957']    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revs-utils
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 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