revs-utils 1.0.19 → 1.0.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAzNjMxYjAzOTE5YTcwOTJjYTc1MDkyOTg4NDM0MTA4NzU4ZDBjMw==
+    ZDBmOTBhZTBkZmMxYWYxYWJiMjE5MjE2MzU4MWRmZjIxMGRhZmJmNQ==
   data.tar.gz: !binary |-
-    MmRhMjIzYTcwMmUxM2ZiYmFhODY2NzA2MzhlNDcyNDAwZTRlNzA1Yw==
+    NTMzOWFjOTZiNjRmZDI5Mzg2MGJlYmVhZjNkMTU2ZWQ5OWUxZGE5OA==
 SHA512:
   metadata.gz: !binary |-
-    ODdiMDBmYmZmNTkyMzhlOGJiZmRlYTMwOTdkN2E2MzdmNmM5YjdlNWMwMTg0
-    OTJjYTk2NzczMTJjYWMzZDU4MjhmNjE1NWNhNWFlNjRlOTk0M2JiZDI4OTBk
-    MzI0MzkzNzRhODZiODYxYjdhZTkyNDg3ZWFjY2QxODMxMjVmYjY=
+    YjI2Nzk2NmMyMzk4MmUyYmQ1MDU0ZDBjYzVmOWE5YzI2OTk5NWFmZjY0OTI5
+    YzcwNzg4YWE0ZjA4M2ZkZWIyZDc0MzBmNjFhMTNmYmZjZTBiZjAxNDA5MzY5
+    Y2VhMDhlMjc0MTZjODg0YTk5YzUyOWFlZmI5YzNlYzg0ODUzODA=
   data.tar.gz: !binary |-
-    Nzg1OTQ1OTk1OGNmMWI2ODY0ZWE4M2Y1NDNlNWEzYWFhZGVhZTRhY2FiMjE4
-    ZDRhOWE4NjY3NjVjZWJiYWQ3N2U1OTYyOGI1ZTY5MTc5OTFiYzE2ODU3MDkz
-    NzFiMjE1Njg4NmZlMjVkMDI2NDM3ZDVhOGJiZTMzYThhY2MzNTM=
+    ZjgxYTEyMTE3MzQzOTJkNjcyMDkxMmVmOTUxMDdjNDEzYjhmZjc3MjI2ZDJj
+    OTYxMmY0ODVlOTMyNzVkODVlNmRmZmZhYjkyZjZhMDdjYTFjMGNmOTMzMzA2
+    ZTlhNjQ3YzcyYjg0MDRhNzE1ODIzNzU5NDY0OWQ3Mzg4M2MxNzU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (1.0.18)
+    revs-utils (1.0.20)
       actionpack (~> 3)
       chronic
       countries (= 0.9.2)
@@ -11,9 +11,9 @@ GEM
   remote: http://rubygems.org/
   remote: http://sul-gems.stanford.edu/
   specs:
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -21,10 +21,10 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activesupport (3.2.21)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     builder (3.0.4)
@@ -42,14 +42,14 @@ GEM
       rake (>= 0.8.7)
       rest-client
     mime-types (2.0)
-    multi_json (1.11.0)
-    rack (1.4.5)
+    multi_json (1.11.2)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.1.0)
-    rdf (1.1.11)
+    rdf (1.1.14)
       link_header (~> 0.0, >= 0.0.8)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.rdoc

@@ -22,6 +22,8 @@ Shared methods and functions used by revs-indexer, pre-assembly and bulk metadat
 - <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
+- <b>1.0.19</b> Display output showing reasons for validation failures when checking manifests
+- <b>1.0.20</b> Allow for optional metadata columns in the manifest
 
 == Running tests
 

data/config/manifest_headers.yml

@@ -30,6 +30,8 @@ metadata:
   hide: hide
   format: format
   collection_name: collection_name
+metadata_optional:
+  format_authority: format_authority
 known_formats: 
   - black-and-white film
   - color film
@@ -41,4 +43,5 @@ known_formats:
   - black-and-white negatives
   - color negatives
   - black-and-white transparencies
-  - color transparencies
+  - color transparencies
+  - Glass negatives

data/lib/revs-utils/version.rb

@@ -1,5 +1,5 @@
 module Revs
   module Utils
-    VERSION = "1.0.19"
+    VERSION = "1.0.20"
   end
 end

data/lib/revs-utils.rb

@@ -14,6 +14,7 @@ REVS_LC_TERMS_FILENAME=File.join(PROJECT_ROOT,'files','revs-lc-marque-terms.obj'
 REVS_MANIFEST_HEADERS_FILEPATH = File.join(PROJECT_ROOT,'config',"manifest_headers.yml")
 REGISTER = "register"
 METADATA = "metadata"
+OPTIONAL = "metadata_optional"
 FORMATS = "known_formats"
 
 module Revs
@@ -23,7 +24,7 @@ module Revs
       # 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
-      #  This cached set of terms can be re-generated with "ruby devel/revs_lc_automobile_terms.rb"
+      #  This cached set of terms can be re-generated with "ruby bin/revs_lc_automobile_terms.rb"
       AUTOMOBILE_LC_TERMS= File.open(REVS_LC_TERMS_FILENAME,'rb'){|io| Marshal.load(io)} if File.exists?(REVS_LC_TERMS_FILENAME)
       REVS_MANIFEST_HEADERS_FILE = File.open(REVS_MANIFEST_HEADERS_FILEPATH)
       REVS_MANIFEST_HEADERS = YAML.load( REVS_MANIFEST_HEADERS_FILE)
@@ -150,7 +151,7 @@ module Revs
           puts "has location column as well as specific state,city,country columns"
           result2=false
         end
-        extra_columns = file_headers-get_manifest_section(METADATA).values-get_manifest_section(REGISTER).values
+        extra_columns = file_headers-get_manifest_section(METADATA).values-get_manifest_section(REGISTER).values-get_manifest_section(OPTIONAL).values
         has_extra_columns = (extra_columns == [])
         puts "has unknown columns: #{extra_columns.join(', ')}" unless has_extra_columns
         result3 = has_extra_columns

data/spec/sample-csv-files/clean-sheet.csv

@@ -1,4 +1,4 @@
-format,sourceid,collection_name,filename,year,photographer,label,marque,model,model_year,people,city,state,country,event,description,inst_notes,prod_notes,has_more_metadata
+format,sourceid,collection_name,filename,year,photographer,label,marque,model,model_year,people,city,state,country,event,description,inst_notes,prod_notes,has_more_metadata,format_authority
 black-and-white negatives,2004-100CRAI-b1_1.0_0001,Bruce R Craig Photograph Collection,2004-100CRAI-b1_1.0_0001.tif,,Bruce R Craig,Rutherford Special,Rutherford Special,,,"Rutherford, Slim",,,"full car (rear), #62",,,
 black-and-white negatives,2004-100CRAI-b1_1.0_0002,Bruce R Craig Photograph Collection,2004-100CRAI-b1_1.0_0002.tif,,Bruce R Craig,City of Roses,City of Roses,,,"Sezekendy, Charley",,,"full car, #2",,,
 black-and-white negatives,2004-100CRAI-b1_1.0_0003,Bruce R Craig Photograph Collection,2004-100CRAI-b1_1.0_0003.tif,,Ed Hitzwe,Wilburn | Morgan,,,,Wilburn | Morgan,,,"install tire on wheel, posed photo",,,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revs-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries