revs-utils 2.1.10 → 2.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY0NmMxMWFmY2FiODZkNjFjZjU2OGVhMjRlNGJiZmVlNWJjYzc3Ng==
+    ZmNlOTFhOGJkN2JiMWYyYjAxZjZlNTUyNTI1MWNhY2M2N2E2NDJmNQ==
   data.tar.gz: !binary |-
-    MWFkNjhhNTA4M2VmODhiZDdkYmQ0ZjRjOTgyMjNiMjc1MDgwYTRhNQ==
+    NzdjMTJjMjhhZDM4NzVlNTY3NmI5MjI5ZTdiZGU3NTVmMzA4NTg0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MTEwNmNlZTA2MDc3MjczM2Q4ZWViYzFkNDE4NjY2YWYxMGIyZWQyMDU4YjEx
-    OTFjZTZhNjFjYjBjYTg4MDYyZmM0ZDU0YzdjNWM2ZDRmY2Y2NzhmZjM4OWRi
-    NmY3ZWZjMzJmZDBjOGEzMjgzY2UzMjg5NjFiZWEwOWViY2JhYjY=
+    ODk3OTg3OTBhYzQ4MjFjZTMwN2E3YjcyNDU1YmIzYzI1MjBkMWQ5NGZmOWJm
+    Y2U3MWMzMzVkNDFmYWIyM2VmODQ0ZDA4MWNjYmE4MDQ3MDE1NzEzZmE4NDky
+    NzJkYWY3NzQ3ZjU5ZDFjZDkyZWRlZTVlYzU5NWQ2YzUxOGRmZWE=
   data.tar.gz: !binary |-
-    YjcxYTQxMzQyMDRmOTFmNTlhY2VmOTI2ZjliOTc2Nzk3Y2YyYzc0M2Y0Mjcz
-    OTYwYTcwNzg1M2NlNmVlMjViOGJjZTA0OWMzZWY3OGI3YjY4NmJkZmU5ZGQ2
-    ZTZlNDg3ZTljZjQzMjQwOTJkYzY1YTUyODIxYWRlMDkwNWMzOTU=
+    MDc0Zjc5ZmE0ZTFkYTdiNGViYWVjYzAyZWFjNWI0MmEzM2Q5ODQ0ZTdjZGEx
+    MDI2NjllOTBjM2FmMTYwNTIzOThhMTk1YTJkY2NhYTAxMzk0OTkwMWM4YmJh
+    MWQwNjkzYjg2Mjc2OGMwM2E2YzE3NWIwYjkwNDVjYjQ2Zjk5NzU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    revs-utils (2.1.9)
+    revs-utils (2.1.11)
       actionpack (>= 4.1.6)
       chronic
       countries (= 0.9.2)
@@ -51,7 +51,7 @@ GEM
       rest-client
     mime-types (2.4.3)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -60,7 +60,7 @@ GEM
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)

data/README.rdoc

@@ -24,6 +24,8 @@ Shared methods and functions used by revs-indexer, pre-assembly and bulk metadat
 - <b>2.0.4</b> Fix issues with year parsing
 - <b>2.0.10</b> Update to latest version of actionpack
 - <b>2.1.0 - 2.1.4</b> Add field mapping and other common methods used in both revs digital library and revs-indexing
+- <b>2.1.10</b> Display output showing reasons for validation failures when checking manifests
+- <b>2.1.11</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 = "2.1.10"
+    VERSION = "2.1.11"
   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
@@ -22,7 +23,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)
@@ -229,7 +230,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: 2.1.10
+  version: 2.1.11
 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