revs-utils 2.1.13 → 2.1.14

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmMwNjA1NGQ5ZWQxMTRjMWJkNGE3YTkzMGRlYTFiNjYwZDU4MjEzZA==
-  data.tar.gz: !binary |-
-    NTgxYjhiN2Q3NmRiN2NhNWY2MGM3MGFkM2U5NzgyYjQ0OTg5MDM3YQ==
+SHA1:
+  metadata.gz: b3a789d7280f0e88ed8e96f707d573f77b68837f
+  data.tar.gz: b0d04db28185e3d3060ce44f66960865b34be7ac
 SHA512:
-  metadata.gz: !binary |-
-    MGY2ZGNlZDdiYjJjZTgxOGU3NzZjNWE2ZjAwZDNhMDQ4Y2MxNDExN2UyMGFh
-    MTc1NzM3MzdlZDI4MGNiMjgxNGU1NTczY2IzYTBlYjFiZTEwNjA5NzBiMGY3
-    OGQzMjdmNTg3NGU4YjU1MGZhNDIxZGQwNzE4NzM0MGUyZThjNjE=
-  data.tar.gz: !binary |-
-    MDM5ZGU5MDgzM2JhNzE0N2VmNjM3NjJmZTBkMDQ2YWI4YWZlZmQ5YjMwODA2
-    ZDEwOWIyMzQyOWJjZTFhZDA4YjM5OWE4NmFjODMyM2ZkNzIxMGRmNmYwODJi
-    YmVhNGU2NDRmZmQzYmFjNjllZGU0NzMwMWIzNzc1NjYzMTY0YTg=
+  metadata.gz: dc43d1111eab3e2138a78f4469955808c6b6f9085b2e846194c914d731a9e5f0bed3f32386c7794ff1fac2362af1f203977d1b1a2d7a8ba2e8edb2816ace9889
+  data.tar.gz: fbf9bdbb4bd34b297cf8027d72ac5b26f1ee484b3531eb4eecc88fb0723ea13feed0c3d1ba2dafba206bf498814c58c62f24fb49139c1f768a3a92b376359d4f

data/.gitignore

@@ -7,4 +7,5 @@ log/*
 pkg/*
 tags
 tmp
+coverage
 .yardoc/*

data/.travis.yml

@@ -0,0 +1,18 @@
+notifications:
+  email: false
+  
+rvm:
+  - 2.2.2
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+sudo: false
+language: ruby
+cache: bundler
+
+script: bundle exec rake spec 
+
+after_success:
+  coveralls

data/Gemfile

@@ -1,5 +1,9 @@
 source "http://rubygems.org"
-source "http://sul-gems.stanford.edu"
+
+group :development,:test do
+	gem 'rake'
+  gem 'coveralls', require: false
+end
 
 # Specify your gem's dependencies in revs-utils.gemspec
 gemspec

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    revs-utils (2.1.11)
+    revs-utils (2.1.14)
       actionpack (>= 4.1.6)
       chronic
       countries (= 0.9.2)
+      rake
       rdf
 
 GEM
   remote: http://rubygems.org/
-  remote: http://sul-gems.stanford.edu/
   specs:
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (4.2.3)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,9 +34,16 @@ GEM
     chronic (0.10.2)
     countries (0.9.2)
       currencies (>= 0.4.0)
+    coveralls (0.8.2)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     currencies (0.4.2)
     diff-lcs (1.2.5)
-    domain_name (0.5.23)
+    docile (1.1.5)
+    domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     http-cookie (1.0.2)
@@ -44,17 +51,14 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     link_header (0.0.8)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lyberteam-gems-devel (1.0.1)
-      rake (>= 0.8.7)
-      rest-client
-    mime-types (2.4.3)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
+    mime-types (2.6.2)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -64,10 +68,10 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rake (10.4.2)
-    rdf (1.1.14)
+    rdf (1.99.1)
       link_header (~> 0.0, >= 0.0.8)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -81,19 +85,32 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.3)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
     thread_safe (0.3.5)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.1)
     yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  lyberteam-gems-devel (> 1.0.0)
+  coveralls
+  rake
   revs-utils!
   rspec (~> 2.6)
   yard
+
+BUNDLED WITH
+   1.11.2

data/README.rdoc

@@ -1,3 +1,7 @@
+{<img src="https://travis-ci.org/sul-dlss/revs-utils.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/sul-dlss/revs-utils]  {<img src="https://coveralls.io/repos/sul-dlss/revs-utils/badge.svg?branch=master&service=github" alt="Coverage Status" />}[https://coveralls.io/github/sul-dlss/revs-utils?branch=master]
+
+
+
 = Revs::Utils
 
 Shared methods and functions used by revs-indexer, pre-assembly and bulk metadata loading code.

data/Rakefile

@@ -1,8 +1,5 @@
 require "bundler/gem_tasks"
 
-require 'dlss/rake/dlss_release'
-Dlss::Release.new
-
 require 'rspec/core/rake_task'
 
 desc "Run specs"

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "2.1.13"
+    VERSION = "2.1.14"
   end
 end

data/lib/revs-utils.rb

@@ -19,7 +19,7 @@ FORMATS = "known_formats"
 
 module Revs
   module Utils
-        
+
       # a hash of LC Subject Heading terms and their IDs for linking for "Automobiles" http://id.loc.gov/authorities/subjects/sh85010201.html
       # this is cached and loaded from disk and deserialized back into a hash for performance reasons, then stored as a module
       # level constant so it can be reused throughout the pre-assembly run as a constant
@@ -31,7 +31,7 @@ module Revs
       ARCHIVE_DRUIDS={:revs=>'nt028fd5773',:roadandtrack=>'mr163sv5231'}  # a hash of druids of the master archives, keys are arbitrary but druids must match the druids in DOR
                                                                           #  these druids will be used to set the archive name in each document
       MULTI_COLLECTION_ARCHIVES=[:revs] # list the keys from the hash above for any archives that contain multiple collections (like Revs), for which each item in DOR belongs to both a parent collection and the master archive collection ... since we do not want to also add the master archive name as another collection druid to each record, we skip them
-  
+
       # these are used in the revs solr document in the main revs digital library rails app, as well as the revs-indexing-service app
       def revs_field_mappings
         {
@@ -60,6 +60,7 @@ module Revs
           :current_owner=>{:field=>'current_owner_tsi', :weight => 1},
           :entrant=>{:field=>'entrant_ssim', :multi_valued => true, :weight => 1},
           :venue=>{:field=>'venue_ssi'},
+          :engine_type=>{:field=>'engine_type_ssi'},
           :track=>{:field=>'track_ssi', :weight => 1},
           :event=>{:field=>'event_ssi'},
           :group_class=>{:field=>'group_class_tsi', :weight => 1},
@@ -73,15 +74,15 @@ module Revs
           :score=>{:field=>'score_isi', :editstore=>false},
           :timestamp=>{:field=>'timestamp', :editstore=>false},
           :resaved_at=>{:field=>'resaved_at_ssi', :editstore=>false}
-        }  
-      end  
+        }
+      end
 
       # these are used in the revs solr document in the main revs digital library rails app, as well as the revs-indexing-service app
       def revs_location(doc_hash)
         doc_hash=doc_hash.with_indifferent_access
         [doc_hash[:city_sections_ssi],doc_hash[:cities_ssi],doc_hash[:states_ssi],doc_hash[:countries_ssi]].reject(&:blank?).join(', ')
-      end  
-  
+      end
+
       # these are used in the revs solr document in the main revs digital library rails app, as well as the revs-indexing-service app
       def revs_compute_score(doc_hash)
 
@@ -100,80 +101,80 @@ module Revs
         location_weight = 3
         total_weights += location_weight
         total_score += (location_score * location_weight)
-    
+
         return ((total_score/total_weights)*100).ceil
 
       end
 
       # tells you if have a blank value or an array that has just blank values
       def blank_value?(value)
-         value.class == Array ? !value.delete_if(&:blank?).any? : value.blank? 
+         value.class == Array ? !value.delete_if(&:blank?).any? : value.blank?
       end
-                  
+
       def revs_known_formats
         get_manifest_section(FORMATS)
       end
-      
+
       def get_manifest_section(section)
         return REVS_MANIFEST_HEADERS[section]
       end
-      
+
       def manifest_headers_file()
         return REVS_MANIFEST_HEADERS_FILE
       end
-      
+
       def manifest_headers_path()
         return MAINFEST_HEADERS_FILEPATH
       end
-      
+
       def manifest_register_section_name()
         return REGISTER
       end
-      
+
       def manifest_metadata_section_name()
         return METADATA
       end
-      
+
       def read_csv_with_headers(file)
         # load CSV into an array of hashes, allowing UTF-8 to pass through, deleting blank columns
-        #file_contents = IO.read(file).force_encoding("ISO-8859-1").encode("utf-8", replace: nil) 
+        #file_contents = IO.read(file).force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
         file_contents = IO.read(file)
         csv = CSV.parse(file_contents, :headers => true)
         return csv.map { |row| row.to_hash.with_indifferent_access }
       end
-      
-      #Pass this function a list of all CSVs containing metadata for files you are about to register and it will ensure each sourceid is unique 
+
+      #Pass this function a list of all CSVs containing metadata for files you are about to register and it will ensure each sourceid is unique
       def unique_source_ids(file_paths)
         files = Array.new
         file_paths.each do |fp|
           files << read_csv_with_headers(fp)
         end
-        
+
         sources = Array.new
         files.each do |file|
           file.each do |row|
             #Make sure the sourceid and filename are the same
             fname = row[get_manifest_section(REGISTER)['filename']].chomp(File.extname(row[get_manifest_section(REGISTER)['filename']]))
-            return false if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))  
+            return false if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))
             sources << row[get_manifest_section(REGISTER)['sourceid']]
-          end         
+          end
         end
         return sources.uniq.size == sources.size
-      
+
       end
-            
+
       #Pass this function a CSV file and it will return true if the proper headers are there and each entry has the required fields filled in
       def valid_to_register(file_path)
         file = read_csv_with_headers(file_path)
         return check_valid_to_register(file)
       end
-      
-      #Pass this function a CSV file and it will return true if the proper headers are there and each entry has the required fields filled in.  
+
+      #Pass this function a CSV file and it will return true if the proper headers are there and each entry has the required fields filled in.
       def valid_for_metadata(file_path)
         file = read_csv_with_headers(file_path)
         return check_headers(file)
       end
-      
+
       # pass in csv data and it will tell if you everything is safe to register based on having labels, unique sourceIDs and filenames matching sourceIDs
       def check_valid_to_register(csv_data)
         #Make sure all the required headers are there
@@ -186,27 +187,27 @@ module Revs
         #Make sure all files have entries for those required headers
         csv_data.each do |row|
           get_manifest_section(REGISTER).keys.each do |header| # label should be there as a column but does not always need a value
-             if header.downcase !='label' && row[header].blank? 
+             if header.downcase !='label' && row[header].blank?
                puts "#{row[get_manifest_section(REGISTER)['sourceid']]} does not have a value for a required registration field"
                result2=false
              end
           end
           fname = row[get_manifest_section(REGISTER)['filename']].chomp(File.extname(row[get_manifest_section(REGISTER)['filename']]))
-          if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))  
-            puts "#{row[get_manifest_section(REGISTER)['sourceid']]} does not match the filename or has a space in it"            
+          if ((row[get_manifest_section(REGISTER)['sourceid']] != fname) || ((/\s/ =~ row[get_manifest_section(REGISTER)['sourceid']].strip) != nil))
+            puts "#{row[get_manifest_section(REGISTER)['sourceid']]} does not match the filename or has a space in it"
             result3=false
           end
           sources << row[get_manifest_section(REGISTER)['sourceid']]
         end
         result4 = (sources.uniq.size == sources.size)
         unless result4
-          puts "sourceIDs are not all unique" 
+          puts "sourceIDs are not all unique"
           puts sources.uniq.map { | e | [sources.count(e), e] }.select { | c, _ | c > 1 }.sort.reverse.map { | c, e | "#{e}: #{c}" } # show all non-unique sourceIDs and their frequency
         end
         return (result1 && result2 && result3 && result4)
-        
+
       end
-      
+
       # looks at certain metadata fields in manifest to confirm validity (such as dates and formats)
       def check_metadata(csv_data)
         bad_rows=0
@@ -214,20 +215,20 @@ module Revs
           valid_date=revs_is_valid_datestring?(row[get_manifest_section(METADATA)['year']] || row[get_manifest_section(METADATA)['date']])
           valid_format=revs_is_valid_format?(row[get_manifest_section(METADATA)['format']])
           unless (valid_date && valid_format)
-            bad_rows+=1 
+            bad_rows+=1
             puts "#{row[get_manifest_section(REGISTER)['sourceid']]} has a bad year/date or format"
           end
         end
         return bad_rows
       end
-      
+
       # pass in csv data from a file read in and it will tell you if the headers are valid
       def check_headers(csv_data)
-        
+
         result1=result2=true
         file_headers=csv_data[0].keys.reject(&:blank?).collect(&:downcase)
         #The file doesn't need to have all the metadata values, it just can't have headers that aren't used for metadata or registration
-        if file_headers.include?('date') && file_headers.include?('year') # can't have both date and year 
+        if file_headers.include?('date') && file_headers.include?('year') # can't have both date and year
           puts "has both year and date columns"
           result1=false
         end
@@ -239,11 +240,11 @@ module Revs
         has_extra_columns = (extra_columns == [])
         puts "has unknown columns: #{extra_columns.join(', ')}" unless has_extra_columns
         result3 = has_extra_columns
-        
+
         return (result1 && result2 && result3)
-        
+
       end
-      
+
       def clean_collection_name(name)
         return "" if name.blank? || name.nil?
         name=name.to_s
@@ -262,12 +263,12 @@ module Revs
         name.gsub!(/(automobile)\z/i,'')
         return name.strip
       end
-            
+
       def parse_location(row, location)
         row[location].split(/[,|]/).reverse.each do |local|
           country = revs_get_country(local)
-          city_state = revs_get_city_state(local) 
-          row['country'] = country.strip if country 
+          city_state = revs_get_city_state(local)
+          row['country'] = country.strip if country
           if city_state
             row['state'] = revs_get_state_name(city_state[1].strip)
             row['city'] = city_state[0].strip
@@ -286,12 +287,12 @@ module Revs
         formats=format.split("|").collect{|f| f.strip}
         !formats.collect {|f| revs_known_formats.include?(f)}.uniq.include?(false)
       end
-      
+
       # check a single format and fix some common issues
       def revs_check_format(format)
         return revs_check_formats([format]).first
       end
-      
+
       # check the incoming array of formats and fix some common issues
       def revs_check_formats(format)
         known_fixes = {"black-and-white negative"=>"black-and-white negatives",
@@ -300,14 +301,14 @@ module Revs
                        "color negatives/slides"=>"color negatives",
                        "black-and-white negative strips"=>"black-and-white negatives",
                        "black and white"=>"black-and-white negatives",
-                       "black-and-white"=>"black-and-white negatives",                       
+                       "black-and-white"=>"black-and-white negatives",
                        "black and white negative"=>"black-and-white negatives",
                        "black and white negatives"=>"black-and-white negatives",
                        "color transparency"=>"color transparencies",
                        "slide"=>"slides",
                        "color transparancies"=>"color transparencies"
                      }
-        count = 0 
+        count = 0
         format.each do |f|
           format[count] = known_fixes[f.downcase] || f.downcase
           count += 1
@@ -320,8 +321,8 @@ module Revs
         result=false
         variants1=[marque,marque.capitalize,marque.singularize,marque.pluralize,marque.capitalize.singularize,marque.capitalize.pluralize]
         variants2=[]
-        variants1.each do |name| 
-          variants2 << "#{name} automobile" 
+        variants1.each do |name|
+          variants2 << "#{name} automobile"
           variants2 << "#{name} automobiles"
         end
         (variants1+variants2).each do |variant|
@@ -339,7 +340,7 @@ module Revs
         name='US' if name=='USA' # special case; USA is not recognized by the country gem, but US is
         country=Country.find_country_by_name(name.strip) # find it by name
         code=Country.new(name.strip) # find it by code
-        if country.nil? && code.data.nil? 
+        if country.nil? && code.data.nil?
           return false
         else
           return (code.data.nil? ? country.name : code.name)
@@ -385,7 +386,7 @@ module Revs
         is_year=!parse_years(date_string).empty?
         return is_year || is_full_date
       end
-      
+
       # 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
@@ -413,7 +414,7 @@ module Revs
           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] 
+            stem=year[0..1]
             for n in start_year..end_year
               years_to_add << "#{stem}#{n}"
             end

data/revs-utils.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rdf"
   gem.add_dependency "actionpack", '>= 4.1.6'
   gem.add_dependency "chronic"
+  gem.add_dependency "rake"
   
   gem.add_development_dependency "rspec", "~> 2.6"
-  gem.add_development_dependency "lyberteam-gems-devel", "> 1.0.0"
   gem.add_development_dependency "yard"
   
 end

data/spec/revs-utils_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe "Revs-Utils" do
 
   before(:each) do
-    
-    @revs=RevsUtilsTester.new # a class defined in the spec_helper which includes the module methods we need to test 
-    
+
+    @revs=RevsUtilsTester.new # a class defined in the spec_helper which includes the module methods we need to test
+
   end
 
    it "should clean up collection names" do
@@ -20,13 +20,13 @@ describe "Revs-Utils" do
      @revs.clean_collection_name('The Dugdale Collection of the Revs Institute').should == 'Dugdale Collection'
      @revs.clean_collection_name('the Dugdale Collection of the revs institute').should == 'Dugdale Collection'
      @revs.clean_collection_name('Dugdale Collection of the Revs Institute').should == 'Dugdale Collection'
-     @revs.clean_collection_name('Dugdale Collection OF THE REVS INSTITUTE').should == 'Dugdale Collection' 
-     @revs.clean_collection_name('Dugdale Collection of The Revs Institute').should == 'Dugdale Collection'     
-     @revs.clean_collection_name('Dugdale Collection of the Revs institute for Automotive Research, Inc.').should == 'Dugdale Collection'     
+     @revs.clean_collection_name('Dugdale Collection OF THE REVS INSTITUTE').should == 'Dugdale Collection'
+     @revs.clean_collection_name('Dugdale Collection of The Revs Institute').should == 'Dugdale Collection'
+     @revs.clean_collection_name('Dugdale Collection of the Revs institute for Automotive Research, Inc.').should == 'Dugdale Collection'
      @revs.clean_collection_name('Dugdale Collection of the Revs Institute for Automotive Research, Inc').should == 'Dugdale Collection'
-     @revs.clean_collection_name('Dugdale Collection of Some Other Institute for Automotive Research, Inc').should == 'Dugdale Collection of Some Other Institute for Automotive Research, Inc'     
-     @revs.clean_collection_name('Revs Institute Dugdale Collection of the Revs Institute').should == 'Revs Institute Dugdale Collection'     
-     @revs.clean_collection_name('of the Revs Institute The Dugdale Collection of the Revs Institute').should == 'of the Revs Institute The Dugdale Collection'     
+     @revs.clean_collection_name('Dugdale Collection of Some Other Institute for Automotive Research, Inc').should == 'Dugdale Collection of Some Other Institute for Automotive Research, Inc'
+     @revs.clean_collection_name('Revs Institute Dugdale Collection of the Revs Institute').should == 'Revs Institute Dugdale Collection'
+     @revs.clean_collection_name('of the Revs Institute The Dugdale Collection of the Revs Institute').should == 'of the Revs Institute The Dugdale Collection'
    end
 
    it "should clean up marque names" do
@@ -40,7 +40,7 @@ describe "Revs-Utils" do
      @revs.clean_marque_name('ford automobile').should == 'ford'
      @revs.clean_marque_name('ford').should == 'ford'
    end
-      
+
    it "should parse locations" do
      row={'other'=>'value','location'=>'123 Street | Palo Alto | United States'}
      @revs.parse_location(row,'location').should == row.merge('city_section'=>'123 Street ','country'=>'United States')
@@ -50,7 +50,7 @@ describe "Revs-Utils" do
      row={'other'=>'value','location'=>'Paris, France'}
      @revs.parse_location(row,'location').should == row.merge('city_section'=>'Paris','country'=>'France')
    end
-   
+
    it "should lookup marques" do
      @revs.revs_lookup_marque('Ford').should == {"url"=>"http://id.loc.gov/authorities/subjects/sh85050464", "value"=>"Ford automobile"}
      @revs.revs_lookup_marque('Fords').should == {"url"=>"http://id.loc.gov/authorities/subjects/sh85050464", "value"=>"Ford automobile"}
@@ -59,35 +59,35 @@ describe "Revs-Utils" do
      @revs.revs_lookup_marque('Bogus').should be_falsey
      @revs.revs_lookup_marque('').should be_falsey
    end
-   
-   it "should clean up some common format errors from an array" do 
+
+   it "should clean up some common format errors from an array" do
      @revs.revs_check_formats(['black-and-white negative','color negative','leave alone']).should == ['black-and-white negatives','color negatives','leave alone']
      @revs.revs_check_formats(['black and white','color negative','black-and-white negative']).should == ['black-and-white negatives','color negatives','black-and-white negatives']
    end
 
-   it "should clean up some common format errors from a string" do 
+   it "should clean up some common format errors from a string" do
      @revs.revs_check_format('black-and-white negative').should == 'black-and-white negatives'
      @revs.revs_check_format('leave alone').should == 'leave alone'
    end
 
-   it "should clean up some common format errors from that are uppercase and then lower case everything" do 
+   it "should clean up some common format errors from that are uppercase and then lower case everything" do
      @revs.revs_check_format('Color Transparency').should == 'color transparencies'
      @revs.revs_check_format('Leave Alone').should == 'leave alone'
    end
-      
+
    it "should indicate if a date is valid" do
-     
+
      # formats that are ok
      @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-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') 
-     @revs.get_full_date('1/1/71').should == Date.strptime("1/1/1971", '%m/%d/%Y') 
-     @revs.get_full_date('5-1-14').should == Date.strptime("5/1/2014", '%m/%d/%Y')  
-     @revs.get_full_date('5-1-21').should == Date.strptime("5/1/1921", '%m/%d/%Y')  
-     @revs.get_full_date('1966-02-27').should == Date.strptime("2/27/1966", '%m/%d/%Y') 
-     @revs.get_full_date('1966-2-5').should == Date.strptime("2/5/1966", '%m/%d/%Y') 
-     
+     @revs.get_full_date('5-1-59').should == Date.strptime("5/1/1959", '%m/%d/%Y')
+     @revs.get_full_date('1/1/71').should == Date.strptime("1/1/1971", '%m/%d/%Y')
+     @revs.get_full_date('5-1-14').should == Date.strptime("5/1/2014", '%m/%d/%Y')
+     @revs.get_full_date('5-1-21').should == Date.strptime("5/1/1921", '%m/%d/%Y')
+     @revs.get_full_date('1966-02-27').should == Date.strptime("2/27/1966", '%m/%d/%Y')
+     @revs.get_full_date('1966-2-5').should == Date.strptime("2/5/1966", '%m/%d/%Y')
+
      # bad full dates
      @revs.get_full_date('1966-14-11').should be_falsey# bad month
      @revs.get_full_date('1966\4\11').should be_falsey# slashes are the wrong way
@@ -111,15 +111,15 @@ describe "Revs-Utils" do
 
   it "should indicate if we have unknown formats" do
     @revs.revs_is_valid_format?(nil).should be_truthy
-    @revs.revs_is_valid_format?('').should be_truthy    
+    @revs.revs_is_valid_format?('').should be_truthy
     @revs.revs_is_valid_format?('slides').should be_truthy
     @revs.revs_is_valid_format?('slide').should be_falsey
     @revs.revs_is_valid_format?('slides | slide').should be_falsey
     @revs.revs_is_valid_format?('slides | black-and-white negatives').should be_truthy
     @revs.revs_is_valid_format?('black-and-white-negatives').should be_falsey
-    @revs.revs_is_valid_format?('black-and-white negatives').should be_truthy   
+    @revs.revs_is_valid_format?('black-and-white negatives').should be_truthy
   end
-  
+
   it "should indicate if we have a valid datestring" do
     @revs.revs_is_valid_datestring?('1959').should be_truthy
     @revs.revs_is_valid_datestring?('bogus').should be_falsey
@@ -130,8 +130,8 @@ describe "Revs-Utils" do
     @revs.revs_is_valid_datestring?('2/31/1950').should be_falsey
     @revs.revs_is_valid_datestring?('2/2/50').should be_truthy
     @revs.revs_is_valid_datestring?('195x').should be_truthy
- end   
-   
+ end
+
    it "should lookup the country correctly" do
      @revs.revs_get_country('USA').should == "United States"
      @revs.revs_get_country('US').should == "United States"
@@ -149,100 +149,94 @@ describe "Revs-Utils" do
    it "should lookup a state correctly" do
      @revs.revs_get_state_name('Calif').should == "California"
      @revs.revs_get_state_name('Calif.').should == "California"
-     @revs.revs_get_state_name('calif').should == "California"       
-     @revs.revs_get_state_name('Ind').should == "Indiana"       
+     @revs.revs_get_state_name('calif').should == "California"
+     @revs.revs_get_state_name('Ind').should == "Indiana"
      @revs.revs_get_state_name('Bogus').should == "Bogus"
-     @revs.revs_get_state_name('IN').should == "Indiana"       
-     @revs.revs_get_state_name('IN').should == "Indiana"       
+     @revs.revs_get_state_name('IN').should == "Indiana"
+     @revs.revs_get_state_name('IN').should == "Indiana"
    end
-  
+
    it "should parse locations" do
      @revs.revs_location({:cities_ssi=>'Paris',:countries_ssi=>'France'}).should == 'Paris, France'
      @revs.revs_location({:id=>'123',:title_tsi=>'Test'}).should == ''
      @revs.revs_location({:city_sections_ssi=>'Rue Cool 123',:cities_ssi=>'Paris',:countries_ssi=>'France'}).should == 'Rue Cool 123, Paris, France'
      @revs.revs_location({:city_sections_ssi=>'Cool Street',:cities_ssi=>'Paris',:states_ssi=>'Texas',:countries_ssi=>'USA'}).should == 'Cool Street, Paris, Texas, USA'
    end
-   
+
   it "should parse 1950s and 1950's correctly" do
-    
-    @revs.parse_years('1950s').should == ['1950','1951','1952','1953','1954','1955','1956','1957','1958','1959']    
-    @revs.parse_years("1950's").should == ['1950','1951','1952','1953','1954','1955','1956','1957','1958','1959']    
-    
+
+    @revs.parse_years('1950s').should == ['1950','1951','1952','1953','1954','1955','1956','1957','1958','1959']
+    @revs.parse_years("1950's").should == ['1950','1951','1952','1953','1954','1955','1956','1957','1958','1959']
+
   end
 
   it "should parse 1955-57 correctly" do
-    
-    @revs.parse_years('1955-57').should == ['1955','1956','1957']    
-    
+
+    @revs.parse_years('1955-57').should == ['1955','1956','1957']
+
   end
 
   it "should parse 1955 | 1955 and not produce a duplicate year" do
-    
-    @revs.parse_years('1955|1955').should == ['1955']    
-    
+
+    @revs.parse_years('1955|1955').should == ['1955']
+
   end
 
   it "should parse 1955-1957 | 1955-1957 and not produce duplicate years" do
-    
-    @revs.parse_years('1955-1957 | 1955-1957').should == ['1955','1956','1957']    
-    
-  end
 
-  it "should parse 1800-1802" do
-    
-    @revs.parse_years('1800-1802').should == ['1800','1801','1802']    
-    
+    @revs.parse_years('1955-1957 | 1955-1957').should == ['1955','1956','1957']
+
   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']    
-    
+
+    @revs.parse_years('1955-1957 | 1955 | 1955').should == ['1955','1956','1957']
+
   end
 
   it "should parse 1955-1957 | 1955 | 1954 and not produce duplicate years" do
-    
-    @revs.parse_years('1955-1957 | 1955 | 1954').should == ['1954','1955','1956','1957']    
-    
+
+    @revs.parse_years('1955-1957 | 1955 | 1954').should == ['1954','1955','1956','1957']
+
   end
 
   it "should parse 1800-1802" do
-    
-    @revs.parse_years('1800-1802').should == ['1800','1801','1802']    
-    
+
+    @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']    
-    
+
+    @revs.parse_years('1955-1957').should == ['1955','1956','1957']
+
   end
-  
+
   it "should be able to read the manifest headers file and load it as a hash" do
     file_status = File.exists? @revs.manifest_headers_file()
-    file_status.should == true 
-    
+    file_status.should == true
+
     YAML.load(File.open(@revs.manifest_headers_file())).class.should == Hash
   end
-  
+
   it "should have a list of headers required for registration in the manifest headers file" do
     @revs.get_manifest_section(@revs.manifest_register_section_name()).size.should > 0
     (@revs.get_manifest_section(@revs.manifest_register_section_name()).keys - ["sourceid", "label", "filename"]).should == [] #headers required to register
   end
-  
+
   it "should have a list of headers required for metadata updating in the manifest headers file" do
      @revs.get_manifest_section(@revs.manifest_metadata_section_name()).size.should > 0
      (@revs.get_manifest_section(@revs.manifest_metadata_section_name()).keys - ["marque", "model", "people", "entrant", "photographer", "current_owner", "venue", "track", "event",
             "location", "year", "description", "model_year", "model_year", "group_or_class", "race_data", "metadata_sources","state", "country", "city", "date",
             "vehicle_markings", "inst_notes", "prod_notes", "has_more_metadata", "hide", "format", "collection_name"]).should == []
   end
-  
+
   it "should return when true when given a clean sheet to check for headers required for registration and metadata updating" do
     sheet = Dir.pwd + "/spec/sample-csv-files/clean-sheet.csv"
     @revs.valid_to_register(sheet).should == true
     @revs.valid_for_metadata(sheet).should == true
   end
-  
+
   it "should return true for registration, and should be ok for metadata if date exists instead of year" do
      sheet = Dir.pwd + "/spec/sample-csv-files/date-instead-of-year.csv"
      @revs.valid_to_register(sheet).should == true
@@ -253,14 +247,14 @@ describe "Revs-Utils" do
      sheet = Dir.pwd + "/spec/sample-csv-files/blank-label.csv"
      @revs.valid_to_register(sheet).should == true
      sheet = Dir.pwd + "/spec/sample-csv-files/no-blank-label.csv"
-     @revs.valid_to_register(sheet).should == true     
+     @revs.valid_to_register(sheet).should == true
   end
 
   it "should return false for registration if label column does not exist" do
      sheet = Dir.pwd + "/spec/sample-csv-files/no-label-column.csv"
      @revs.valid_to_register(sheet).should == false
   end
- 
+
   it "should return true for registration, and should be ok for metadata even if year exists, but not date" do
      sheet = Dir.pwd + "/spec/sample-csv-files/date-instead-of-year.csv"
      @revs.valid_to_register(sheet).should == true
@@ -278,7 +272,7 @@ describe "Revs-Utils" do
      @revs.valid_to_register(sheet).should == true
      @revs.valid_for_metadata(sheet).should == false
   end
-     
+
   it "should return false for registration and metadata when source_id is mislabeled" do
     sheet = Dir.pwd + "/spec/sample-csv-files/bad-source_id.csv"
     @revs.valid_to_register(sheet).should == false
@@ -290,22 +284,22 @@ describe "Revs-Utils" do
     @revs.valid_to_register(sheet).should == false
     @revs.valid_for_metadata(sheet).should == false
   end
-  
+
   it "should return false when a row does not have a sourceid" do
       sheet = Dir.pwd + "/spec/sample-csv-files/blank-sourceid.csv"
       @revs.valid_to_register(sheet).should == false
   end
-  
+
   it "should return true when each souceid is unique and properly formed from the filename" do
     sheets = [Dir.pwd + "/spec/sample-csv-files/clean-sheet.csv"]
     @revs.unique_source_ids(sheets).should == true
   end
-    
+
   it "should return false when there are duplicate sourceids" do
     sheets = [Dir.pwd + "/spec/sample-csv-files/clean-sheet.csv",Dir.pwd + "/spec/sample-csv-files/clean-sheet.csv"]
     @revs.unique_source_ids(sheets).should == false
   end
-  
+
   it "should return false when a sourceid is not properly based off the filename" do
     sheets = [Dir.pwd + "/spec/sample-csv-files/malformed-sourceid.csv"]
     @revs.unique_source_ids(sheets).should == false
@@ -314,7 +308,7 @@ describe "Revs-Utils" do
   it "should return false when a sourceid has a space in it" do
     sheets = [Dir.pwd + "/spec/sample-csv-files/space-sourceid.csv"]
     @revs.unique_source_ids(sheets).should == false
-  end    
-  
- 
+  end
+
+
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 bootfile = File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require bootfile
 
+require 'coveralls'
+Coveralls.wear!
+
 class RevsUtilsTester
   
   include Revs::Utils

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revs-utils
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -28,84 +28,84 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: lyberteam-gems-devel
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Shared methods and functions used by revs-indexer, pre-assembly and bulk
@@ -119,8 +119,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc.example
+- ".gitignore"
+- ".rvmrc.example"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -159,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Shared methods and functions used by revs-indexer, pre-assembly and bulk